lex: refactor $blob, $link, and $bytes serialization

beautrait · Mar 29, 2023 · 8a404c3 · 8a404c3
1 parent 143f76f
commit 8a404c3
Show file tree

Hide file tree

Showing 5 changed files with 441 additions and 89 deletions.
diff --git a/gen/main.go b/gen/main.go
@@ -32,7 +32,7 @@ func main() {
 		panic(err)
 	}
 
-	if err := cbg.WriteMapEncodersToFile("lex/util/cbor_gen.go", "util", lexutil.CborChecker{}, lexutil.Blob{}); err != nil {
+	if err := cbg.WriteMapEncodersToFile("lex/util/cbor_gen.go", "util", lexutil.CborChecker{}, lexutil.LegacyBlob{}, lexutil.BlobSchema{}); err != nil {
 		panic(err)
 	}
 

diff --git a/lex/gen.go b/lex/gen.go
@@ -1018,10 +1018,8 @@ func (s *TypeSchema) typeNameForField(name, k string, v TypeSchema) (string, err
 		return "util.LexiconTypeDecoder", nil
 	case "union":
 		return "*" + name + "_" + strings.Title(k), nil
-	case "image":
-		return "*util.Blob", nil
 	case "blob":
-		return "*util.Blob", nil
+		return "*util.LexBlob", nil
 	case "array":
 		subt, err := s.typeNameForField(name+"_"+strings.Title(k), "Elem", *v.Items)
 		if err != nil {
@@ -1030,7 +1028,9 @@ func (s *TypeSchema) typeNameForField(name, k string, v TypeSchema) (string, err
 
 		return "[]" + subt, nil
 	case "cid-link":
-		return "cid.Cid", nil
+		return "util.LexLink", nil
+	case "bytes":
+		return "util.LexBytes", nil
 	default:
 		return "", fmt.Errorf("field %q in %s has unsupported type name (%s)", k, name, v.Type)
 	}

diff --git a/lex/util/cbor_gen.go b/lex/util/cbor_gen.go