Merge pull request #1037 from qazwsxedckll/dev

feat: generate errors even if no services
asynkron · Mar 8, 2024 · ef91a6a · ef91a6a
2 parents fb0ab3e + f9650ee
commit ef91a6a
Show file tree

Hide file tree

Showing 18 changed files with 483 additions and 720 deletions.
diff --git a/protobuf/protoc-gen-go-grain/Makefile b/protobuf/protoc-gen-go-grain/Makefile
@@ -1,9 +1,9 @@
 .PHONY: testdata
 testdata:
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/hello/*.proto
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/reenter/*.proto
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/multi-services/*.proto
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/error/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/hello/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/reenter/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/multi-services/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/error/*.proto
 
 .PHONY: options
 options:

diff --git a/protobuf/protoc-gen-go-grain/generate.go b/protobuf/protoc-gen-go-grain/generate.go
@@ -30,14 +30,15 @@ var (
 )
 
 func generateFile(gen *protogen.Plugin, file *protogen.File) {
-	if len(file.Services) == 0 {
+	if len(file.Services) == 0 && len(file.Enums) == 0 {
 		return
 	}
+
 	filename := file.GeneratedFilenamePrefix + "_grain.pb.go"
 	g := gen.NewGeneratedFile(filename, file.GoImportPath)
 
 	generateHeader(gen, g, file)
-	generateContent(gen, g, file)
+	generateContent(g, file)
 }
 
 func generateHeader(gen *protogen.Plugin, g *protogen.GeneratedFile, file *protogen.File) {
@@ -60,35 +61,36 @@ func generateHeader(gen *protogen.Plugin, g *protogen.GeneratedFile, file *proto
 	g.P()
 }
 
-func generateContent(gen *protogen.Plugin, g *protogen.GeneratedFile, file *protogen.File) {
+func generateContent(g *protogen.GeneratedFile, file *protogen.File) {
 	g.P("package ", file.GoPackageName)
 
-	if len(file.Services) == 0 {
-		return
-	}
-
-	g.QualifiedGoIdent(actorPackage.Ident(""))
 	g.QualifiedGoIdent(clusterPackage.Ident(""))
-	g.QualifiedGoIdent(protoPackage.Ident(""))
 	g.QualifiedGoIdent(fmtPackage.Ident(""))
-	g.QualifiedGoIdent(timePackage.Ident(""))
-	g.QualifiedGoIdent(slogPackage.Ident(""))
 
 	for _, enum := range file.Enums {
 		if enum.Desc.Name() == "ErrorReason" {
 			generateErrorReasons(g, enum)
 		}
 	}
 
+	if len(file.Services) == 0 {
+		return
+	}
+
+	g.QualifiedGoIdent(actorPackage.Ident(""))
+	g.QualifiedGoIdent(protoPackage.Ident(""))
+	g.QualifiedGoIdent(timePackage.Ident(""))
+	g.QualifiedGoIdent(slogPackage.Ident(""))
+
 	for _, service := range file.Services {
-		generateService(service, file, g)
+		generateService(service, g)
 		g.P()
 	}
 
 	generateRespond(g)
 }
 
-func generateService(service *protogen.Service, file *protogen.File, g *protogen.GeneratedFile) {
+func generateService(service *protogen.Service, g *protogen.GeneratedFile) {
 	if service.Desc.Options().(*descriptorpb.ServiceOptions).GetDeprecated() {
 		g.P("//")
 		g.P(deprecationComment)

diff --git a/protobuf/protoc-gen-go-grain/test/error/error.pb.go b/protobuf/protoc-gen-go-grain/test/error/error.pb.go
diff --git a/...c-gen-go-grain/testdata/error/hello.proto → ...rotoc-gen-go-grain/test/error/error.proto b/...c-gen-go-grain/testdata/error/hello.proto → ...rotoc-gen-go-grain/test/error/error.proto
@@ -2,19 +2,9 @@ syntax = "proto3";
 
 package hello;
 
-import "google/protobuf/empty.proto";
-
 option go_package = "github.com/asynkron/protoactor-go/protoc-gen-go-grain/testdata/hello";
 
 enum ErrorReason {
   USER_NOT_FOUND = 0;
   CONTENT_MISSING = 1;
 }
-
-message SayHelloResponse {
-  string message = 1;
-}
-
-service Hello {
-  rpc SayHello (google.protobuf.Empty) returns (SayHelloResponse) {}
-}
diff --git a/protobuf/protoc-gen-go-grain/test/error/error_grain.pb.go b/protobuf/protoc-gen-go-grain/test/error/error_grain.pb.go