feat(go2proto): directly support `encoding.{TextMarshaler,BinaryMarsh…

…aler}` (#3719) Repeated fields of this type aren't supported yet, as that needs some changes to support importing external types. Will do in a followup.
block · Dec 13, 2024 · b7d6836 · b7d6836
1 parent 46427d2
commit b7d6836
Show file tree

Hide file tree

Showing 21 changed files with 649 additions and 318 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.frontend.lock
 .hermit/
 .vscode/*
 .registry/
@@ -53,4 +54,4 @@ charts/**/output/
 __pycache__/
 *.pyc
 *.pyo
-.venv/
+.venv/
diff --git a/backend/ingress/ingress_test.go b/backend/ingress/ingress_test.go
@@ -245,7 +245,7 @@ func TestResponseBodyForVerb(t *testing.T) {
 					&schema.Data{
 						Name: "Test",
 						Fields: []*schema.Field{
-							{Name: "message", Type: &schema.String{}, Metadata: []schema.Metadata{&schema.MetadataAlias{Kind: schema.AliasKindJson, Alias: "msg"}}},
+							{Name: "message", Type: &schema.String{}, Metadata: []schema.Metadata{&schema.MetadataAlias{Kind: schema.AliasKindJSON, Alias: "msg"}}},
 						},
 					},
 					jsonVerb,

diff --git a/backend/ingress/request.go b/backend/ingress/request.go
@@ -334,7 +334,7 @@ func parseQueryParams(values map[string][]string, data *schema.Data) (map[string
 		}
 		var field *schema.Field
 		for _, f := range data.Fields {
-			if jsonAlias, ok := f.Alias(schema.AliasKindJson).Get(); (ok && jsonAlias == key) || f.Name == key {
+			if jsonAlias, ok := f.Alias(schema.AliasKindJSON).Get(); (ok && jsonAlias == key) || f.Name == key {
 				field = f
 			}
 			for _, typeParam := range data.TypeParameters {
@@ -369,7 +369,7 @@ func parsePathParams(values map[string]string, data *schema.Data) (map[string]an
 	for key, value := range values {
 		var field *schema.Field
 		for _, f := range data.Fields {
-			if jsonAlias, ok := f.Alias(schema.AliasKindJson).Get(); (ok && jsonAlias == key) || f.Name == key {
+			if jsonAlias, ok := f.Alias(schema.AliasKindJSON).Get(); (ok && jsonAlias == key) || f.Name == key {
 				field = f
 			}
 		}

diff --git a/backend/ingress/response.go b/backend/ingress/response.go
@@ -80,7 +80,7 @@ func bodyForType(typ schema.Type, sch *schema.Schema, data []byte) ([]byte, erro
 		}
 
 		err = schema.TransformAliasedFields(sch, t, response, func(obj map[string]any, field *schema.Field) string {
-			if jsonAlias, ok := field.Alias(schema.AliasKindJson).Get(); ok && field.Name != jsonAlias {
+			if jsonAlias, ok := field.Alias(schema.AliasKindJSON).Get(); ok && field.Name != jsonAlias {
 				obj[jsonAlias] = obj[field.Name]
 				delete(obj, field.Name)
 				return jsonAlias