V2: Improve clash resolution in generated names (#888)

bufbuild · Jun 13, 2024 · 05acbc4 · 05acbc4
1 parent cf191b1
commit 05acbc4
Show file tree

Hide file tree

Showing 7 changed files with 373 additions and 132 deletions.
diff --git a/packages/bundle-size/src/protoc-gen-entrypoints.ts b/packages/bundle-size/src/protoc-gen-entrypoints.ts
@@ -52,7 +52,7 @@ runNodeJs(
             f.print("// ", file.file.proto.name);
             for (const message of file.messages) {
               const desc = f.import(
-                `${message.name}Desc`,
+                f.importDesc(message).name,
                 `./protobuf-es/${message.file.name}_pb.js`,
               );
               const createCall = [f.runtime.create, "(", desc, ")"];

diff --git a/packages/protobuf-test/extra/name-clash.proto b/packages/protobuf-test/extra/name-clash.proto
@@ -177,16 +177,21 @@ message BigInt {
 
 
 message ClashParent {
-    // should clash with message ClashParent_ClashChild
-    message ClashChild {
-    }
+  // should clash with message ClashParent_ClashChild
+  message ClashChild {}
 }
 
-// TODO we do not support this case
 // should clash with name of ClashParent.ClashChild
-//message ClashParent_ClashChild {
-//}
+message ClashParent_ClashChild {
+}
+
+// message shape should clash with enum descriptor
+message EnumDescClashWithMessageShapeDesc {}
+enum EnumDescClashWithMessageShape { MessageDescClashWithEnumDescDesc_zero = 0; }
 
+// enum shape should clash with message descriptor
+enum EnumShapeClashWithMessageDescDesc { EnumShapeClashWithMessageDescDesc_zero = 0; }
+message EnumShapeClashWithMessageDesc {}
 
 message NoClashFields {
     // ok as object property

diff --git a/packages/protobuf-test/src/gen/js/extra/name-clash_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/name-clash_pb.d.ts