Fix over-eager escaping

bufbuild · Feb 19, 2024 · 51dacd5 · 51dacd5
1 parent 8d8c316
commit 51dacd5
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 78 deletions.
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
diff --git a/packages/protobuf-test/src/gen/js/extra/name-clash_pb.js b/packages/protobuf-test/src/gen/js/extra/name-clash_pb.js
diff --git a/packages/protobuf-test/src/gen/ts/extra/name-clash_pb.ts b/packages/protobuf-test/src/gen/ts/extra/name-clash_pb.ts
diff --git a/packages/protobuf/src/private/names.ts b/packages/protobuf/src/private/names.ts
@@ -53,12 +53,7 @@ export function localName(
       const pkg = desc.file.proto.package;
       const offset = pkg.length > 0 ? pkg.length + 1 : 0;
       const name = desc.typeName.substring(offset).replace(/\./g, "_");
-      // For services, we only care about safe identifiers, not safe object properties,
-      // but we have shipped v1 with a bug that respected object properties, and we
-      // do not want to introduce a breaking change, so we continue to escape for
-      // safe object properties.
-      // See https://github.com/bufbuild/protobuf-es/pull/391
-      return safeObjectProperty(safeIdentifier(name));
+      return safeIdentifier(name);
     }
     case "enum_value": {
       const sharedPrefix = desc.parent.sharedPrefix;