V2: Improve plugin option import_extension (#909)

bufbuild · Jun 28, 2024 · 5a8cedf · 5a8cedf
1 parent b099836
commit 5a8cedf
Show file tree

Hide file tree

Showing 180 changed files with 271 additions and 249 deletions.
diff --git a/packages/protobuf-test/package.json b/packages/protobuf-test/package.json
@@ -7,10 +7,10 @@
     "postbuild": "cp src/perf-payload.* dist && cp -r src/gen/js* dist/gen",
     "pregenerate": "rm -rf src/gen/*/*",
     "generate": "npm run generate:ts && npm run generate:js && npm run generate:ts,json_types && npm run generate:js,json_types",
-    "generate:ts": "protoc --es_out=src/gen/ts --es_opt=ts_nocheck=false,target=ts,import_extension=.js     --proto_path=. $(buf ls-files extra) --proto_path=$(upstream-include test) $(upstream-files test) google/protobuf/type.proto",
-    "generate:js": "protoc --es_out=src/gen/js --es_opt=ts_nocheck=false,target=js+dts,import_extension=.js --proto_path=. $(buf ls-files extra) --proto_path=$(upstream-include test) $(upstream-files test) google/protobuf/type.proto",
-    "generate:ts,json_types": "protoc --es_out=src/gen/ts,json_types --es_opt=ts_nocheck=false,target=ts,import_extension=.js,json_types=true     --proto_path=. extra/json_types.proto",
-    "generate:js,json_types": "protoc --es_out=src/gen/js,json_types --es_opt=ts_nocheck=false,target=js+dts,import_extension=.js,json_types=true --proto_path=. extra/json_types.proto",
+    "generate:ts": "protoc --es_out=src/gen/ts --es_opt=ts_nocheck=false,target=ts,import_extension=js     --proto_path=. $(buf ls-files extra) --proto_path=$(upstream-include test) $(upstream-files test) google/protobuf/type.proto",
+    "generate:js": "protoc --es_out=src/gen/js --es_opt=ts_nocheck=false,target=js+dts,import_extension=js --proto_path=. $(buf ls-files extra) --proto_path=$(upstream-include test) $(upstream-files test) google/protobuf/type.proto",
+    "generate:ts,json_types": "protoc --es_out=src/gen/ts,json_types --es_opt=ts_nocheck=false,target=ts,import_extension=js,json_types=true     --proto_path=. extra/json_types.proto",
+    "generate:js,json_types": "protoc --es_out=src/gen/js,json_types --es_opt=ts_nocheck=false,target=js+dts,import_extension=js,json_types=true --proto_path=. extra/json_types.proto",
     "postgenerate": "license-header src/gen",
     "perf": "tsx src/perf.ts benchmark '.*'",
     "profile": "dexnode dist/esm/perf.js run 'fromBinary perf-payload.bin' 10000",

diff --git a/packages/protobuf-test/src/gen/js,json_types/extra/json_types_pb.d.ts b/packages/protobuf-test/src/gen/js,json_types/extra/json_types_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js,json_types/extra/json_types_pb.js b/packages/protobuf-test/src/gen/js,json_types/extra/json_types_pb.js
diff --git a/packages/protobuf-test/src/gen/js/editions/golden/test_messages_proto3_editions_pb.d.ts b/packages/protobuf-test/src/gen/js/editions/golden/test_messages_proto3_editions_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/editions/golden/test_messages_proto3_editions_pb.js b/packages/protobuf-test/src/gen/js/editions/golden/test_messages_proto3_editions_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/comments_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/comments_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/comments_pb.js b/packages/protobuf-test/src/gen/js/extra/comments_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/deprecation-explicit_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/deprecation-explicit_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/deprecation-explicit_pb.js b/packages/protobuf-test/src/gen/js/extra/deprecation-explicit_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/deprecation-implicit_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/deprecation-implicit_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/deprecation-implicit_pb.js b/packages/protobuf-test/src/gen/js/extra/deprecation-implicit_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023-map-encoding_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/edition2023-map-encoding_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023-map-encoding_pb.js b/packages/protobuf-test/src/gen/js/extra/edition2023-map-encoding_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023-proto2_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/edition2023-proto2_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023-proto2_pb.js b/packages/protobuf-test/src/gen/js/extra/edition2023-proto2_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023-proto3_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/edition2023-proto3_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023-proto3_pb.js b/packages/protobuf-test/src/gen/js/extra/edition2023-proto3_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/edition2023_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/edition2023_pb.js b/packages/protobuf-test/src/gen/js/extra/edition2023_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/empty-file_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/empty-file_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/empty-file_pb.js b/packages/protobuf-test/src/gen/js/extra/empty-file_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/example_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/example_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/example_pb.js b/packages/protobuf-test/src/gen/js/extra/example_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/extensions-proto2_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/extensions-proto2_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/extensions-proto2_pb.js b/packages/protobuf-test/src/gen/js/extra/extensions-proto2_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/extensions-proto3_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/extensions-proto3_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/extensions-proto3_pb.js b/packages/protobuf-test/src/gen/js/extra/extensions-proto3_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/json_types_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/json_types_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/json_types_pb.js b/packages/protobuf-test/src/gen/js/extra/json_types_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/jstype-proto2_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/jstype-proto2_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/jstype-proto2_pb.js b/packages/protobuf-test/src/gen/js/extra/jstype-proto2_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.js b/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-maps_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/msg-maps_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-maps_pb.js b/packages/protobuf-test/src/gen/js/extra/msg-maps_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-message_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/msg-message_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-message_pb.js b/packages/protobuf-test/src/gen/js/extra/msg-message_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-oneof_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/msg-oneof_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-oneof_pb.js b/packages/protobuf-test/src/gen/js/extra/msg-oneof_pb.js
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-scalar_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/msg-scalar_pb.d.ts