Config Arguments from proto in TS (#414)

* not even sure..

* gen the sig from the cli thing

* improve comment

* improvements

---------

Co-authored-by: lekko-app[bot] <108442683+lekko-app[bot]@users.noreply.github.com>

Author: lekko-jonathan

cmd/lekko/sync.go

@@ -26,6 +26,7 @@ import (
 
 	"golang.org/x/mod/modfile"
 
+	"github.com/iancoleman/strcase"
 	"github.com/lainio/err2"
 	"github.com/lainio/err2/try"
 	"github.com/pkg/errors"
@@ -36,6 +37,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/types/descriptorpb"
+	"google.golang.org/protobuf/types/dynamicpb"
 	"google.golang.org/protobuf/types/known/anypb"
 
 	bffv1beta1 "buf.build/gen/go/lekkodev/cli/protocolbuffers/go/lekko/bff/v1beta1"
@@ -313,7 +315,7 @@ func isSameTS(ctx context.Context, existing map[string]map[string]*featurev1beta
 	dot := try.To1(dotlekko.ReadDotLekko(""))
 	cmd := exec.Command("npx", "ts-to-proto", "--lekko-dir", dot.LekkoPath) // #nosec G204
 	cmd.Dir = root
-	nsString, err := cmd.CombinedOutput()
+	nsString, err := cmd.CombinedOutput() // The output format of ts-to-proto changed, but no one is using this right now..
 	if err != nil {
 		fmt.Println("Error running ts-to-proto")
 		return false, err
@@ -477,8 +479,18 @@ func convertLangCmd() *cobra.Command {
 			if err != nil {
 				panic(err)
 			}
-			privateFile := goToGo(ctx, f)
-			fmt.Println(privateFile)
+
+			if inputLang == "proto-json" && outputLang == "ts" {
+				lines := strings.Split(string(f), "\n")
+				out, err := ProtoJSONToTS([]byte(lines[0]), []byte(lines[1]))
+				if err != nil {
+					panic(err)
+				}
+				fmt.Println(out)
+			} else {
+				privateFile := goToGo(ctx, f)
+				fmt.Println(privateFile)
+			}
 			return nil
 		},
 	}
@@ -731,3 +743,81 @@ func WriteToRepo(ctx context.Context, r repo.ConfigurationRepository, types *pro
 	}
 	return nil
 }
+
+func ProtoJSONToTS(nsString []byte, fdString []byte) (string, error) {
+	registry, err := prototypes.RegisterDynamicTypes(nil)
+	if err != nil {
+		panic(err)
+	}
+	var fileDescriptorProto descriptorpb.FileDescriptorProto
+	err = protojson.UnmarshalOptions{Resolver: registry.Types}.Unmarshal(fdString, &fileDescriptorProto)
+	if err != nil {
+		return "", err
+	}
+	// This is partly duplicated from pkg/sync/golang:RegisterDescriptor
+	fileDescriptor, err := protodesc.NewFile(&fileDescriptorProto, nil)
+	if err != nil {
+		return "", err
+	}
+	var interfaceStrings []string
+
+	for i := 0; i < fileDescriptor.Messages().Len(); i++ {
+		messageDescriptor := fileDescriptor.Messages().Get(i)
+		dynamicMessage := dynamicpb.NewMessage(messageDescriptor)
+
+		err := registry.Types.RegisterMessage(dynamicMessage.Type())
+		if err != nil {
+			return "", err
+		}
+		if !strings.HasSuffix(string(messageDescriptor.Name()), "Args") {
+			face, err := gen.GetTSInterface(messageDescriptor)
+			if err != nil {
+				panic(err)
+			}
+			interfaceStrings = append(interfaceStrings, face+"\n")
+		}
+	}
+	var namespaces bffv1beta1.NamespaceContents
+	err = protojson.UnmarshalOptions{Resolver: registry.Types}.Unmarshal(nsString, &namespaces)
+	if err != nil {
+		return "", err
+	}
+	gen.TypeRegistry = registry.Types
+	var featureStrings []string
+	for _, namespace := range namespaces.Namespaces {
+		for _, c := range namespace.Configs {
+			f := c.StaticFeature
+			if f.GetTree().GetDefault() != nil {
+				f.Tree.DefaultNew = anyToLekkoAny(f.Tree.Default)
+			}
+			for _, c := range f.GetTree().GetConstraints() {
+				if c.GetValue() != nil {
+					c.ValueNew = anyToLekkoAny(c.Value)
+				}
+			}
+
+			var ourParameters string
+			sigType, err := gen.TypeRegistry.FindMessageByName(protoreflect.FullName(namespace.Name + ".config.v1beta1." + strcase.ToCamel(f.Key) + "Args"))
+			if err == nil {
+				d := sigType.Descriptor()
+				var varNames []string
+				var fields []string
+				for i := 0; i < d.Fields().Len(); i++ {
+					f := d.Fields().Get(i)
+					t := gen.FieldDescriptorToTS(f)
+					fields = append(fields, fmt.Sprintf("%s?: %s;", strcase.ToLowerCamel(f.TextName()), t))
+					varNames = append(varNames, strcase.ToLowerCamel(f.TextName()))
+				}
+
+				ourParameters = fmt.Sprintf("{%s}: {%s}", strings.Join(varNames, ", "), strings.Join(fields, " "))
+			}
+
+			fs, err := gen.GenTSForFeature(f, namespace.Name, ourParameters)
+			featureStrings = append(featureStrings, fs)
+			if err != nil {
+				return "", err
+			}
+		}
+	}
+	return strings.Join(append(interfaceStrings, featureStrings...), "\n"), nil
+}

cmd/lekko/sync_test.go

@@ -127,3 +127,16 @@ func Test_goToGo(t *testing.T) {
 		}
 	})
 }
+
+/*
+Here to just run the code, but I really don't want to have an unrelated node thing as a dep for the test
+func Test_ProtoJsonToTs(t *testing.T) {
+	t.Run("simple", func(t *testing.T) {
+		nsStr := `{"namespaces":[{"name":"default","configs":[{"static_feature":{"key":"banner-config","description":"","tree":{"default":{"@type":"type.googleapis.com/default.config.v1beta1.BannerConfig"},"constraints":[{"value":{"cta":{"external":true,"text":"Learn more","url":"https://www.lekko.com/"},"text":"This is a development only example of a banner on the login page","@type":"type.googleapis.com/default.config.v1beta1.BannerConfig"},"ruleAstNew":{"logicalExpression":{"rules":[{"atom":{"contextKey":"pathname","comparisonValue":"/login","comparisonOperator":"COMPARISON_OPERATOR_EQUALS"}},{"atom":{"contextKey":"env","comparisonValue":"development","comparisonOperator":"COMPARISON_OPERATOR_EQUALS"}}],"logicalOperator":"LOGICAL_OPERATOR_AND"}}},{"value":{"cta":{"external":true,"text":"Learn more","url":"https://www.lekko.com/"},"text":"A test banner for a particular repo main page","@type":"type.googleapis.com/default.config.v1beta1.BannerConfig"},"ruleAstNew":{"atom":{"contextKey":"pathname","comparisonValue":"/teams/lekko-staging/repositories/lekkodev/plugins/branches/main","comparisonOperator":"COMPARISON_OPERATOR_EQUALS"}}}]},"type":"FEATURE_TYPE_PROTO"}}]}]}`
+		fdStr := `{"name":"lekko.proto","package":"default.config.v1beta1","dependency":[],"messageType":[{"name":"BannerConfig","field":[{"name":"text","number":1,"type":"TYPE_STRING","typeName":""},{"name":"cta","number":2,"type":"TYPE_MESSAGE","typeName":"default.config.v1beta1.BannerConfig.Cta"},{"name":"permanent","number":3,"type":"TYPE_BOOL","typeName":""}],"nestedType":[{"name":"Cta","field":[{"name":"text","number":1,"type":"TYPE_STRING","typeName":""},{"name":"url","number":2,"type":"TYPE_STRING","typeName":""},{"name":"external","number":3,"type":"TYPE_BOOL","typeName":""}],"nestedType":[],"enumType":[],"extensionRange":[],"extension":[],"oneofDecl":[],"reservedRange":[],"reservedName":[]}],"enumType":[],"extensionRange":[],"extension":[],"oneofDecl":[],"reservedRange":[],"reservedName":[]},{"name":"RemoteTemplates","field":[{"name":"templates","number":1,"label":"LABEL_REPEATED","type":"TYPE_MESSAGE","typeName":"default.config.v1beta1.RemoteTemplates.Templates"}],"nestedType":[{"name":"Templates","field":[{"name":"code","number":1,"type":"TYPE_STRING","typeName":""},{"name":"feature_type","number":2,"type":"TYPE_STRING","typeName":""},{"name":"name","number":3,"type":"TYPE_STRING","typeName":""}],"nestedType":[],"enumType":[],"extensionRange":[],"extension":[],"oneofDecl":[],"reservedRange":[],"reservedName":[]}],"enumType":[],"extensionRange":[],"extension":[],"oneofDecl":[],"reservedRange":[],"reservedName":[]},{"name":"BannerConfigArgs","field":[{"name":"env","number":1,"type":"TYPE_STRING","typeName":""},{"name":"pathname","number":2,"type":"TYPE_STRING","typeName":""}],"nestedType":[],"enumType":[],"extensionRange":[],"extension":[],"oneofDecl":[],"reservedRange":[],"reservedName":[]}],"enumType":[],"service":[],"extension":[],"publicDependency":[],"weakDependency":[],"syntax":"proto3"}`
+		out, err := ProtoJSONToTS([]byte(nsStr), []byte(fdStr))
+		fmt.Println(err)
+		fmt.Println(out)
+	})
+}
+*/

pkg/gen/ts.go

@@ -49,7 +49,7 @@ import (
 
 var TypeRegistry *protoregistry.Types
 
-func fieldDescriptorToTS(f protoreflect.FieldDescriptor) string {
+func FieldDescriptorToTS(f protoreflect.FieldDescriptor) string {
 	var t string
 	switch f.Kind() {
 	case protoreflect.StringKind:
@@ -74,15 +74,15 @@ func fieldDescriptorToTS(f protoreflect.FieldDescriptor) string {
 		t = "string"
 	case protoreflect.MessageKind:
 		if f.IsMap() {
-			t = fmt.Sprintf("Record<%s, %s>", fieldDescriptorToTS(f.MapKey()), fieldDescriptorToTS(f.MapValue()))
+			t = fmt.Sprintf("Record<%s, %s>", FieldDescriptorToTS(f.MapKey()), FieldDescriptorToTS(f.MapValue()))
 		} else if strings.HasPrefix(string(f.Message().FullName()), "google") {
 			t = fmt.Sprintf("protobuf.%s", f.Message().Name())
 		} else {
 			d := f.Message()
 			t = "{\n"
 			for i := 0; i < d.Fields().Len(); i++ {
 				f := d.Fields().Get(i)
-				t += fmt.Sprintf("\t%s?: %s;\n", strcase.ToLowerCamel(f.TextName()), fieldDescriptorToTS(f))
+				t += fmt.Sprintf("\t%s?: %s;\n", strcase.ToLowerCamel(f.TextName()), FieldDescriptorToTS(f))
 			}
 			t += "}"
 		}
@@ -96,15 +96,15 @@ func fieldDescriptorToTS(f protoreflect.FieldDescriptor) string {
 	return t
 }
 
-func getTSInterface(d protoreflect.MessageDescriptor) (string, error) {
+func GetTSInterface(d protoreflect.MessageDescriptor) (string, error) {
 	const templateBody = `export interface {{$.Name}} {
 {{range  $.Fields}}    {{ . }}
 {{end}}}`
 
 	var fields []string
 	for i := 0; i < d.Fields().Len(); i++ {
 		f := d.Fields().Get(i)
-		t := fieldDescriptorToTS(f)
+		t := FieldDescriptorToTS(f)
 		fields = append(fields, fmt.Sprintf("%s?: %s;", strcase.ToLowerCamel(f.TextName()), t))
 	}
 
@@ -184,7 +184,7 @@ func GenTS(ctx context.Context, repoPath, ns string, getWriter func() (io.Writer
 			log.Fatal("error finding the message in the registry", err)
 		}
 		parameters = getTSParameters(ptype.Descriptor())
-		face, err := getTSInterface(ptype.Descriptor())
+		face, err := GetTSInterface(ptype.Descriptor())
 		if err != nil {
 			return err
 		}
@@ -237,7 +237,7 @@ func GenTS(ctx context.Context, repoPath, ns string, getWriter func() (io.Writer
 					if err != nil {
 						return errors.Wrapf(err, "could not find message: %s", protoreflect.FullName(name))
 					}
-					face, err := getTSInterface(ptype.Descriptor())
+					face, err := GetTSInterface(ptype.Descriptor())
 					if err != nil {
 						return err
 					}
@@ -246,19 +246,19 @@ func GenTS(ctx context.Context, repoPath, ns string, getWriter func() (io.Writer
 			}
 		}
 		// Check if there is a per-config signature proto
-		sigType, err := TypeRegistry.FindMessageByName(protoreflect.FullName("lekko.default." + strcase.ToCamel(f.Key) + ".Signature"))
+		sigType, err := TypeRegistry.FindMessageByName(protoreflect.FullName(ns + ".config.v1beta1." + strcase.ToCamel(f.Key) + "Args"))
 		if err == nil {
 			d := sigType.Descriptor()
 			var varNames []string
 			var fields []string
 			for i := 0; i < d.Fields().Len(); i++ {
 				f := d.Fields().Get(i)
-				t := fieldDescriptorToTS(f)
+				t := FieldDescriptorToTS(f)
 				fields = append(fields, fmt.Sprintf("%s?: %s;", strcase.ToLowerCamel(f.TextName()), t))
 				varNames = append(varNames, strcase.ToLowerCamel(f.TextName()))
 			}
 
-			ourParameters = fmt.Sprintf("{%s}: {%s}", strings.Join(varNames, ", "), strings.Join(fields, ", "))
+			ourParameters = fmt.Sprintf("{%s}: {%s}", strings.Join(varNames, ", "), strings.Join(fields, " "))
 		}
 
 		codeString, err := GenTSForFeature(f, ns, ourParameters)