fix enum expr for enum selector (#261)

mercari · Jan 27, 2025 · 600ee5d · 600ee5d
1 parent a603e99
commit 600ee5d
Show file tree

Hide file tree

Showing 21 changed files with 760 additions and 424 deletions.
diff --git a/_examples/02_simple/federation/federation_grpc_federation.pb.go b/_examples/02_simple/federation/federation_grpc_federation.pb.go
diff --git a/_examples/06_alias/federation/federation.pb.go b/_examples/06_alias/federation/federation.pb.go
diff --git a/_examples/06_alias/federation/federation_grpc_federation.pb.go b/_examples/06_alias/federation/federation_grpc_federation.pb.go
diff --git a/_examples/06_alias/main_test.go b/_examples/06_alias/main_test.go
@@ -178,8 +178,9 @@ func TestFederation(t *testing.T) {
 					DupBody: "bodybody2",
 				},
 			},
-			M:    &post.M{X: "xxx"},
-			Type: federation.PostType_POST_TYPE_BAR,
+			M:     &post.M{X: "xxx"},
+			Type:  federation.PostType_POST_TYPE_BAR,
+			Type2: federation.PostType_POST_TYPE_BAR,
 		},
 	}, cmpopts.IgnoreUnexported(
 		federation.GetPostResponse{},

diff --git a/_examples/06_alias/proto/federation/federation.proto b/_examples/06_alias/proto/federation/federation.proto
@@ -75,12 +75,14 @@ message Post {
     def { name: "data2", by: "res2.post.data" }
     def { name: "data_type" by: "grpc.federation.enum.select(true, org.post.PostDataType.from(org.post.PostDataType.POST_TYPE_B), org.post.v2.PostDataType.value('POST_V2_TYPE_B'))" }
     def { name: "data_type2" by: "grpc.federation.enum.select(true, data_type, org.post.v2.PostDataType.value('POST_V2_TYPE_C'))" }
+    def { name: "type_fed" enum { name: "PostType" by: "data_type2" }}
   };
   string id = 1;
   PostData data = 2;
   PostData data2 = 3 [(grpc.federation.field).by = "data2"];
   PostType type = 4 [(grpc.federation.field).by = "data_type2"];
-  org.post.M m = 5 [(grpc.federation.field).by = "M{x: 'xxx'}"];
+  PostType type2 = 5 [(grpc.federation.field).by = "type_fed"];
+  org.post.M m = 6 [(grpc.federation.field).by = "M{x: 'xxx'}"];
 }
 
 enum PostType {