Merge pull request #36 from eclipse/feat/create-depenencies

feat: create dependencies too

protoc-gen-open-models/README.md

@@ -1,3 +1,7 @@
+# protoc-gen-open-models
+This generator will create the models for the @furo/open-models module.
+
+
 Missing Features:
 - OneOf
 - fields which starts with _var to Xvar
@@ -7,6 +11,7 @@ Missing Features:
 - ~~Dependency management when needed~~ 
 - Build Parameter **ApiBaseURL** with a default of "/api" ???
 - Additional bindings for services (look below)
+- version number of protoc-gen-open-models in generates
 
 ```
 service Messaging {

protoc-gen-open-models/main.go

@@ -13,7 +13,7 @@ import (
 	"os/exec"
 )
 
-const version = "1.40.0"
+const version = "1.41.0"
 
 func main() {
 	const debugMode = false

protoc-gen-open-models/pkg/generator/FieldNames.go

@@ -0,0 +1,8 @@
+package generator
+
+import "github.com/iancoleman/strcase"
+
+func cleanFieldName(body string) string {
+	// todo: convert _var_name to XvarName
+	return strcase.ToLowerCamel(body)
+}

protoc-gen-open-models/pkg/generator/ServiceType.go

@@ -82,33 +82,16 @@ func prepareServiceType(service sourceinfo.ServiceInfo, imports ImportMap) Servi
 
 	for _, method := range service.Methods {
 
-		requestTypeFQ := fullQualifiedTypeName(method.Method.GetInputType())
-		responseTypeFQ := fullQualifiedTypeName(method.Method.GetOutputType())
-		classNameOut := allTypes[method.Method.GetOutputType()].Name
-		classNameIn := allTypes[method.Method.GetInputType()].Name
-		fieldPackage := strings.Split("."+service.Package, ".")
-
-		relIn, _ := filepath.Rel(strings.Join(fieldPackage, "/"), "/"+typenameToPath(method.Method.GetInputType()))
-		relOut, _ := filepath.Rel(strings.Join(fieldPackage, "/"), "/"+typenameToPath(method.Method.GetOutputType()))
-		if !strings.HasPrefix(relIn, "..") {
-			relIn = "./" + relIn
-		}
-		if !strings.HasPrefix(relOut, "..") {
-			relOut = "./" + relOut
-		}
-		imports.AddImport(relIn, "I"+PrefixReservedWords(classNameIn), "I"+requestTypeFQ)
-		imports.AddImport(relOut, "I"+PrefixReservedWords(classNameOut), "I"+responseTypeFQ)
-
 		verb, path, err := extractPathAndPattern(method.HttpRule.ApiOptions)
 		// on err, we have no REST endpoints
 		if err == nil {
 			serviceMethods := ServiceMethods{
 				Name:                PrefixReservedWords(method.Name),
-				RequestTypeLiteral:  "I" + requestTypeFQ,
-				ResponseTypeLiteral: "I" + responseTypeFQ,
+				RequestTypeLiteral:  resolveServiceType(method.Method.GetInputType(), service, imports),
+				ResponseTypeLiteral: resolveServiceType(method.Method.GetOutputType(), service, imports),
 				Verb:                verb,
 				Path:                path,
-				Body:                method.HttpRule.ApiOptions.GetBody(),
+				Body:                cleanFieldName(method.HttpRule.ApiOptions.GetBody()),
 				LeadingComments:     multilineComment(method.Info.GetLeadingComments()),
 				TrailingComment:     method.Info.GetTrailingComments(),
 			}
@@ -120,6 +103,43 @@ func prepareServiceType(service sourceinfo.ServiceInfo, imports ImportMap) Servi
 	return serviceType
 }
 
+func resolveServiceType(typeName string, service sourceinfo.ServiceInfo, imports ImportMap) string {
+	// WELL KNOWN
+
+	if isWellKnownType(typeName) {
+		ts := strings.Split(typeName, ".")
+		name := ts[len(ts)-1]
+
+		// ANY
+		if name == "Any" {
+			imports.AddImport("@furo/open-models/dist/index", "type IAny", "")
+			return "IAny"
+		}
+
+		// Empty
+		if name == "Empty" {
+			return "Record<string, never>"
+		}
+
+		primitiveType := WellKnownTypesMap[name]
+		// imports.AddImport("@furo/open-models/dist/index", name, "")
+		return primitiveType
+	}
+
+	// Any
+	// Empty
+
+	// regular message type
+	classNameIn := allTypes[typeName].Name
+	fieldPackage := strings.Split("."+service.Package, ".")
+	rel, _ := filepath.Rel(strings.Join(fieldPackage, "/"), "/"+typenameToPath(typeName))
+	if !strings.HasPrefix(rel, "..") {
+		rel = "./" + rel
+	}
+	imports.AddImport(rel, "I"+PrefixReservedWords(classNameIn), "I"+fullQualifiedTypeName(typeName))
+	return "I" + fullQualifiedTypeName(typeName)
+}
+
 func baseTypeName(typeName string) string {
 	ts := strings.Split(typeName, ".")
 	return ts[len(ts)-1]

protoc-gen-open-models/pkg/generator/generator.go

@@ -59,7 +59,9 @@ func GenerateAll(responseWriter protoplugin.ResponseWriter, request protoplugin.
 
 	}
 
-	for _, fileDescriptorProto := range request.FileDescriptorProtosToGenerate() {
+	// generate with all dependencies
+	// for _, fileDescriptorProto := range request.FileDescriptorProtosToGenerate() {
+	for _, fileDescriptorProto := range request.AllFileDescriptorProtos() {
 		/*if strings.HasPrefix(fileDescriptorProto.GetPackage(), "openapi.v3") {
 			continue
 		}*/

protoc-gen-open-models/pkg/generator/modelTypeResolver.go

@@ -94,6 +94,9 @@ func resolveModelType(imports ImportMap, field sourceinfo.FieldInfo) (
 									imports.AddImport("@furo/open-models/dist/index", "ANY", "")
 									return "ANY", "__TypeSetter", "IAny", "ANY", "", "ANY"
 								}
+
+								// TODO: Empty
+
 								primitiveMapType := WellKnownTypesMap[typeName]
 
 								// for model types return "MAP<string, STRING, string>;"
@@ -151,6 +154,9 @@ func resolveModelType(imports ImportMap, field sourceinfo.FieldInfo) (
 				imports.AddImport("@furo/open-models/dist/index", "ANY", "")
 				return "ANY", "__TypeSetter", "IAny", "ANY", "", "ANY"
 			}
+
+			// TODO: Empty
+
 			primitiveType := WellKnownTypesMap[typeName]
 			imports.AddImport("@furo/open-models/dist/index", typeName, "")
 			return typeName, "__TypeSetter", primitiveType + "| null", typeName, "", typeName

protoc-gen-open-models/pkg/generator/typeResolver.go

@@ -67,6 +67,8 @@ func resolveInterfaceType(imports ImportMap, field sourceinfo.FieldInfo, kindPre
 									return "IAny"
 								}
 
+								// TODO: Empty
+
 								// well known types are using primitives
 								primitiveMapType := WellKnownTypesMap[typeName]
 								imports.AddImport("@furo/open-models/dist/index", typeName, "")
@@ -100,6 +102,8 @@ func resolveInterfaceType(imports ImportMap, field sourceinfo.FieldInfo, kindPre
 				return "IAny"
 			}
 
+			// TODO: Empty
+
 			// well known types are using primitives
 			primitiveType := WellKnownTypesMap[typeName]
 			imports.AddImport("@furo/open-models/dist/index", typeName, "")