Match typeUrls with leading slash in google.protobuf.Any (#618)

bufbuild · Nov 17, 2023 · 9777c0b · 9777c0b
1 parent d1cb9fc
commit 9777c0b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/packages/protobuf-test/src/gen/js/google/protobuf/any_pb.js b/packages/protobuf-test/src/gen/js/google/protobuf/any_pb.js
diff --git a/packages/protobuf-test/src/gen/ts/google/protobuf/any_pb.ts b/packages/protobuf-test/src/gen/ts/google/protobuf/any_pb.ts
diff --git a/packages/protobuf-test/src/google/protobuf/any.test.ts b/packages/protobuf-test/src/google/protobuf/any.test.ts
@@ -84,6 +84,11 @@ describe("google.protobuf.Any", () => {
       expect(got.is("type.googleapis.com/google.protobuf.Value")).toBe(false);
     });
 
+    test(`matches type name with leading slash`, () => {
+      const any = new Any({ typeUrl: "/google.protobuf.Value" });
+      expect(any.is(Value)).toBe(true);
+    });
+
     test(`is returns false for an empty Any`, () => {
       const got = new Any();
 
@@ -106,6 +111,21 @@ describe("google.protobuf.Any", () => {
       expect(unpacked.kind.value).toBe(1);
     });
 
+    test(`unpack correctly unpacks a message with a leading slash type url in the registry`, () => {
+      const typeRegistry = createRegistry(Value);
+      const val = new Value({
+        kind: { case: "numberValue", value: 1 },
+      });
+      const { value } = Any.pack(val);
+      const any = new Any({ typeUrl: "/google.protobuf.Value", value });
+
+      const unpacked = any.unpack(typeRegistry) as Value;
+
+      expect(unpacked).toBeDefined();
+      expect(unpacked.kind.case).toBe("numberValue");
+      expect(unpacked.kind.value).toBe(1);
+    });
+
     test(`unpack returns undefined if message not in the registry`, () => {
       const typeRegistry = createRegistry();
       const val = new Value({

diff --git a/packages/protobuf/src/google/protobuf/any_pb.ts b/packages/protobuf/src/google/protobuf/any_pb.ts
diff --git a/packages/protoc-gen-es/src/javascript.ts b/packages/protoc-gen-es/src/javascript.ts
@@ -263,7 +263,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print("    throw new Error(`invalid type url: ${url}`);");
       f.print("  }");
       f.print(`  const slash = url.lastIndexOf("/");`);
-      f.print("  const name = slash > 0 ? url.substring(slash + 1) : url;");
+      f.print("  const name = slash >= 0 ? url.substring(slash + 1) : url;");
       f.print("  if (!name.length) {");
       f.print("    throw new Error(`invalid type url: ${url}`);");
       f.print("  }");

diff --git a/packages/protoc-gen-es/src/typescript.ts b/packages/protoc-gen-es/src/typescript.ts
@@ -286,7 +286,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print("      throw new Error(`invalid type url: ${url}`);");
       f.print("    }");
       f.print(`    const slash = url.lastIndexOf("/");`);
-      f.print("    const name = slash > 0 ? url.substring(slash + 1) : url;");
+      f.print("    const name = slash >= 0 ? url.substring(slash + 1) : url;");
       f.print("    if (!name.length) {");
       f.print("      throw new Error(`invalid type url: ${url}`);");
       f.print("    }");