chore: Remove the bin testing approach (stephenh#1050)

own2pwn · Jun 5, 2024 · e2c149e · e2c149e
1 parent dd772ef
commit e2c149e
Show file tree

Hide file tree

Showing 193 changed files with 275 additions and 333 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Prepare Integration
         run: ./integration/pbjs.sh
       - name: Codegen
-        run: yarn bin2ts
+        run: yarn proto2ts
       # This will fail if any git-tracked file has changed
       - name: Diff Output
         run: git status && git diff --exit-code

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Prepare Integration
         run: ./integration/pbjs.sh
       - name: Codegen
-        run: yarn bin2ts
+        run: yarn proto2ts
       # This will fail if any git-tracked file has changed
       - name: Diff Output
         run: git status && git diff --exit-code

diff --git a/README.markdown b/README.markdown
@@ -687,8 +687,7 @@ The commands below assume you have **Docker** installed. If you are using OS X,
 - Run `yarn build:test` to generate the test files.
   > _This runs the following commands:_
   >
-  > - `proto2bin` — Converts integration test `.proto` files to `.bin`.
-  > - `bin2ts` — Runs `ts-proto` on the `.bin` files to generate `.ts` files.
+  > - `proto2ts` — Runs `ts-proto` on the `integration/**/*.proto` files to generate `.ts` files.
   > - `proto2pbjs` — Generates a reference implementation using `pbjs` for testing compatibility.
 - Run `yarn test`
 
@@ -704,8 +703,8 @@ The commands below assume you have **Docker** installed. If you are using OS X,
   - Add/update a `integration/your-new-test/some-test.ts` unit test, even if it's as trivial as just making sure the generated code compiles
 - Modify the `ts-proto` code generation logic:
   - Most important logic is found in [src/main.ts](src/main.ts).
-  - After any changes to `src/*.ts` files, run `yarn bin2ts` to re-codegen all integration tests
-    - Or `yarn bin2ts your-new-test` to re-codegen a specific test
+  - After any changes to `src/*.ts` files, run `yarn proto2ts` to re-codegen all integration tests
+    - Or `yarn proto2ts your-new-test` to re-codegen a specific test
     - Again leaving `yarn watch` running should "just do the right thing"
 - Run `yarn test` to verify your changes pass all existing tests
 - Commit and submit a PR

diff --git a/integration/angular/simple-message.bin b/integration/angular/simple-message.bin
diff --git a/integration/async-iterable-services-abort-signal/simple.bin b/integration/async-iterable-services-abort-signal/simple.bin
diff --git a/integration/async-iterable-services/simple.bin b/integration/async-iterable-services/simple.bin
diff --git a/integration/avoid-import-conflicts-folder-name/ui.bin b/integration/avoid-import-conflicts-folder-name/ui.bin
diff --git a/integration/avoid-import-conflicts-folder-name/ui/simple.bin b/integration/avoid-import-conflicts-folder-name/ui/simple.bin
diff --git a/integration/avoid-import-conflicts-types-only/simple.bin b/integration/avoid-import-conflicts-types-only/simple.bin
diff --git a/integration/avoid-import-conflicts-types-only/simple2.bin b/integration/avoid-import-conflicts-types-only/simple2.bin
diff --git a/integration/avoid-import-conflicts/simple.bin b/integration/avoid-import-conflicts/simple.bin
diff --git a/integration/avoid-import-conflicts/simple2.bin b/integration/avoid-import-conflicts/simple2.bin
diff --git a/integration/barrel-imports/bar.bin b/integration/barrel-imports/bar.bin
diff --git a/integration/barrel-imports/foo.bin b/integration/barrel-imports/foo.bin
diff --git a/integration/batching-with-context-esModuleInterop/batching.bin b/integration/batching-with-context-esModuleInterop/batching.bin
diff --git a/integration/batching-with-context/batching.bin b/integration/batching-with-context/batching.bin
diff --git a/integration/batching/batching.bin b/integration/batching/batching.bin
diff --git a/integration/before-after-request-streaming/example.bin b/integration/before-after-request-streaming/example.bin
diff --git a/integration/before-after-request/simple.bin b/integration/before-after-request/simple.bin
diff --git a/integration/before-after-request/simple2.bin b/integration/before-after-request/simple2.bin
diff --git a/integration/bytes-as-base64-browser/message.bin b/integration/bytes-as-base64-browser/message.bin
diff --git a/integration/bytes-as-base64-node/message.bin b/integration/bytes-as-base64-node/message.bin
diff --git a/integration/bytes-as-base64/message.bin b/integration/bytes-as-base64/message.bin
diff --git a/integration/bytes-node/point.bin b/integration/bytes-node/point.bin
diff --git a/integration/codegen.sh b/integration/codegen.sh
diff --git a/integration/codegen.ts b/integration/codegen.ts
diff --git a/integration/const-enum/const-enum.bin b/integration/const-enum/const-enum.bin
diff --git a/integration/default-with-custom-metadata/default-with-custom-metadata.bin b/integration/default-with-custom-metadata/default-with-custom-metadata.bin
diff --git a/integration/default-with-metadata/default-with-metadata.bin b/integration/default-with-metadata/default-with-metadata.bin
diff --git a/integration/dump-response.bin b/integration/dump-response.bin
diff --git a/integration/emit-default-values-json/test.bin b/integration/emit-default-values-json/test.bin
diff --git a/integration/enums-as-literals-with-string-enums/enums-as-literals-with-string-enums.bin b/integration/enums-as-literals-with-string-enums/enums-as-literals-with-string-enums.bin
diff --git a/integration/enums-as-literals/enums-as-literals.bin b/integration/enums-as-literals/enums-as-literals.bin
diff --git a/integration/enums-with-unrecognized-name-value/test.bin b/integration/enums-with-unrecognized-name-value/test.bin
diff --git a/integration/extension-import/base.ts b/integration/extension-import/base.ts
diff --git a/integration/extension-import/extension.ts b/integration/extension-import/extension.ts
diff --git a/integration/extension-import/index.foo.ts b/integration/extension-import/index.foo.ts
diff --git a/integration/extension-import/index.ts b/integration/extension-import/index.ts
diff --git a/integration/extension-import/tsconfig.json b/integration/extension-import/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "target": "es2018",
+    "lib": ["es2018"],
+    "module": "commonjs",
+    "strict": true,
+    "outDir": "build",
+    "skipLibCheck": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true
+  },
+  "include": ["./"]
+}
diff --git a/integration/extensions/test.bin b/integration/extensions/test.bin
diff --git a/integration/fieldmask-optional-all/fieldmask-optional.bin b/integration/fieldmask-optional-all/fieldmask-optional.bin
diff --git a/integration/fieldmask/fieldmask.bin b/integration/fieldmask/fieldmask.bin
diff --git a/...ion/fieldoption-jstype-with-forcelong-bigint/fieldoption-jstype-with-forcelong-bigint.bin b/...ion/fieldoption-jstype-with-forcelong-bigint/fieldoption-jstype-with-forcelong-bigint.bin
diff --git a/...gration/fieldoption-jstype-with-forcelong-long/fieldoption-jstype-with-forcelong-long.bin b/...gration/fieldoption-jstype-with-forcelong-long/fieldoption-jstype-with-forcelong-long.bin
diff --git a/...ion/fieldoption-jstype-with-forcelong-number/fieldoption-jstype-with-forcelong-number.bin b/...ion/fieldoption-jstype-with-forcelong-number/fieldoption-jstype-with-forcelong-number.bin
diff --git a/...ion/fieldoption-jstype-with-forcelong-string/fieldoption-jstype-with-forcelong-string.bin b/...ion/fieldoption-jstype-with-forcelong-string/fieldoption-jstype-with-forcelong-string.bin
diff --git a/integration/fieldoption-jstype/fieldoption-jstype.bin b/integration/fieldoption-jstype/fieldoption-jstype.bin
diff --git a/integration/file-suffix/child.bin b/integration/file-suffix/child.bin
diff --git a/integration/file-suffix/parent.bin b/integration/file-suffix/parent.bin
diff --git a/integration/from-partial-no-initialize/test.bin b/integration/from-partial-no-initialize/test.bin
diff --git a/integration/fromJson-enums/from-json.bin b/integration/fromJson-enums/from-json.bin
diff --git a/integration/generic-metadata/hero.bin b/integration/generic-metadata/hero.bin
diff --git a/integration/generic-service-definitions-and-services/simple.bin b/integration/generic-service-definitions-and-services/simple.bin
diff --git a/integration/generic-service-definitions/simple.bin b/integration/generic-service-definitions/simple.bin
diff --git a/integration/global-this/global-this.bin b/integration/global-this/global-this.bin
diff --git a/integration/groups/test.bin b/integration/groups/test.bin
diff --git a/integration/grpc-js-use-date-false/grpc-js-use-date-false.bin b/integration/grpc-js-use-date-false/grpc-js-use-date-false.bin
diff --git a/integration/grpc-js-use-date-string-nano/grpc-js-use-date-string-nano.bin b/integration/grpc-js-use-date-string-nano/grpc-js-use-date-string-nano.bin
diff --git a/integration/grpc-js-use-date-string/grpc-js-use-date-string.bin b/integration/grpc-js-use-date-string/grpc-js-use-date-string.bin
diff --git a/integration/grpc-js-use-date-true/grpc-js-use-date-true.bin b/integration/grpc-js-use-date-true/grpc-js-use-date-true.bin
diff --git a/integration/grpc-js/google/protobuf/wrappers.bin b/integration/grpc-js/google/protobuf/wrappers.bin
diff --git a/integration/grpc-js/simple.bin b/integration/grpc-js/simple.bin
diff --git a/integration/grpc-web-abort-signal/example.bin b/integration/grpc-web-abort-signal/example.bin
diff --git a/integration/grpc-web-go-server/example.bin b/integration/grpc-web-go-server/example.bin
diff --git a/integration/grpc-web-no-streaming-observable/example.bin b/integration/grpc-web-no-streaming-observable/example.bin
diff --git a/integration/grpc-web-no-streaming/example.bin b/integration/grpc-web-no-streaming/example.bin
diff --git a/integration/grpc-web/example.bin b/integration/grpc-web/example.bin
diff --git a/integration/handle-error-in-default-service/simple.bin b/integration/handle-error-in-default-service/simple.bin
diff --git a/integration/handle-error-with-after-response/simple.bin b/integration/handle-error-with-after-response/simple.bin
diff --git a/integration/import-mapping/mapping.bin b/integration/import-mapping/mapping.bin
diff --git a/integration/import-mapping/some/internal/repo/very_private.bin b/integration/import-mapping/some/internal/repo/very_private.bin
diff --git a/integration/import-suffix/child.bin b/integration/import-suffix/child.bin
diff --git a/integration/import-suffix/parent.bin b/integration/import-suffix/parent.bin
diff --git a/integration/lower-case-svc-methods/math.bin b/integration/lower-case-svc-methods/math.bin
diff --git a/integration/map-bigint-optional/test.bin b/integration/map-bigint-optional/test.bin
diff --git a/integration/map-long-optional/test.bin b/integration/map-long-optional/test.bin
diff --git a/integration/map-longstring-optional/test.bin b/integration/map-longstring-optional/test.bin
diff --git a/integration/meta-typings/google/protobuf/wrappers.bin b/integration/meta-typings/google/protobuf/wrappers.bin
diff --git a/integration/meta-typings/google/type/date.bin b/integration/meta-typings/google/type/date.bin
diff --git a/integration/meta-typings/import_dir/thing.bin b/integration/meta-typings/import_dir/thing.bin
diff --git a/integration/meta-typings/simple.bin b/integration/meta-typings/simple.bin
diff --git a/integration/nestjs-metadata-grpc-js/hero.bin b/integration/nestjs-metadata-grpc-js/hero.bin
diff --git a/integration/nestjs-metadata-observables/hero.bin b/integration/nestjs-metadata-observables/hero.bin
diff --git a/integration/nestjs-metadata-restparameters/hero.bin b/integration/nestjs-metadata-restparameters/hero.bin
diff --git a/integration/nestjs-metadata/hero.bin b/integration/nestjs-metadata/hero.bin
diff --git a/integration/nestjs-restparameters/hero.bin b/integration/nestjs-restparameters/hero.bin
diff --git a/integration/nestjs-simple-observables/hero.bin b/integration/nestjs-simple-observables/hero.bin
diff --git a/integration/nestjs-simple-restparameters/hero.bin b/integration/nestjs-simple-restparameters/hero.bin
diff --git a/integration/nestjs-simple-usedate/hero.bin b/integration/nestjs-simple-usedate/hero.bin
diff --git a/integration/nestjs-simple/hero.bin b/integration/nestjs-simple/hero.bin
diff --git a/integration/nice-grpc/google/protobuf/wrappers.bin b/integration/nice-grpc/google/protobuf/wrappers.bin
diff --git a/integration/nice-grpc/simple.bin b/integration/nice-grpc/simple.bin
diff --git a/integration/no-comments/simple.bin b/integration/no-comments/simple.bin
diff --git a/integration/no-proto-package/no-proto-package.bin b/integration/no-proto-package/no-proto-package.bin
diff --git a/integration/omit-optionals/simple.bin b/integration/omit-optionals/simple.bin
diff --git a/integration/oneof-properties/oneof.bin b/integration/oneof-properties/oneof.bin
diff --git a/integration/oneof-unions-snake/simple.bin b/integration/oneof-unions-snake/simple.bin
diff --git a/integration/oneof-unions/oneof.bin b/integration/oneof-unions/oneof.bin
diff --git a/integration/only-types-grpc-metadata/only-types-grpc-metadata.bin b/integration/only-types-grpc-metadata/only-types-grpc-metadata.bin
diff --git a/integration/only-types/reservation.bin b/integration/only-types/reservation.bin
diff --git a/integration/optional-long/test.bin b/integration/optional-long/test.bin
diff --git a/integration/optional-type-definitions/simple.bin b/integration/optional-type-definitions/simple.bin
diff --git a/integration/options-types-only/options.bin b/integration/options-types-only/options.bin
diff --git a/integration/options-types-only/something/something.bin b/integration/options-types-only/something/something.bin
diff --git a/integration/options/options.bin b/integration/options/options.bin
diff --git a/integration/options/something/something.bin b/integration/options/something/something.bin
diff --git a/integration/output-decode-only/encode.bin b/integration/output-decode-only/encode.bin
diff --git a/integration/output-encode-no-creation-methods/encode.bin b/integration/output-encode-no-creation-methods/encode.bin
diff --git a/integration/output-encode-only/encode.bin b/integration/output-encode-only/encode.bin
diff --git a/integration/output-fromJSON-only/decode.bin b/integration/output-fromJSON-only/decode.bin
diff --git a/integration/output-index/a.bin b/integration/output-index/a.bin
diff --git a/integration/output-toJSON-only/encode.bin b/integration/output-toJSON-only/encode.bin
diff --git a/integration/point/point.bin b/integration/point/point.bin
diff --git a/integration/proto2-long/simple.bin b/integration/proto2-long/simple.bin
diff --git a/integration/proto2-no-default-vals/simple.bin b/integration/proto2-no-default-vals/simple.bin
diff --git a/integration/proto2-no-optionals/simple.bin b/integration/proto2-no-optionals/simple.bin
diff --git a/integration/proto2/simple.bin b/integration/proto2/simple.bin
diff --git a/integration/protoc-gen-dump b/integration/protoc-gen-dump
diff --git a/integration/protoc-gen-dump.bat b/integration/protoc-gen-dump.bat
diff --git a/integration/protoc-gen-ts_proto b/integration/protoc-gen-ts_proto
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../src/plugin')
diff --git a/integration/remove-enum-prefix-string-enums/remove-enum-prefix-string-enums.bin b/integration/remove-enum-prefix-string-enums/remove-enum-prefix-string-enums.bin
diff --git a/integration/remove-enum-prefix/remove-enum-prefix.bin b/integration/remove-enum-prefix/remove-enum-prefix.bin
diff --git a/integration/reserved-words/reserved-words.bin b/integration/reserved-words/reserved-words.bin
diff --git a/integration/return-observable/observable.bin b/integration/return-observable/observable.bin
diff --git a/integration/simple-deprecated-fields/simple.bin b/integration/simple-deprecated-fields/simple.bin
diff --git a/integration/simple-esmodule-interop/empty.bin b/integration/simple-esmodule-interop/empty.bin
diff --git a/integration/simple-esmodule-interop/simple.bin b/integration/simple-esmodule-interop/simple.bin
diff --git a/integration/simple-json-name/simple.bin b/integration/simple-json-name/simple.bin
diff --git a/integration/simple-long-bigint/google/protobuf/wrappers.bin b/integration/simple-long-bigint/google/protobuf/wrappers.bin
diff --git a/integration/simple-long-bigint/simple.bin b/integration/simple-long-bigint/simple.bin
diff --git a/integration/simple-long-string/google/protobuf/wrappers.bin b/integration/simple-long-string/google/protobuf/wrappers.bin
diff --git a/integration/simple-long-string/simple.bin b/integration/simple-long-string/simple.bin
diff --git a/integration/simple-long/google/protobuf/wrappers.bin b/integration/simple-long/google/protobuf/wrappers.bin
diff --git a/integration/simple-long/simple.bin b/integration/simple-long/simple.bin
diff --git a/integration/simple-optionals/google/protobuf/wrappers.bin b/integration/simple-optionals/google/protobuf/wrappers.bin
diff --git a/integration/simple-optionals/import_dir/thing.bin b/integration/simple-optionals/import_dir/thing.bin
diff --git a/integration/simple-optionals/simple.bin b/integration/simple-optionals/simple.bin
diff --git a/integration/simple-optionals/thing.bin b/integration/simple-optionals/thing.bin
diff --git a/integration/simple-proto2/simple.bin b/integration/simple-proto2/simple.bin
diff --git a/integration/simple-prototype-defaults/google/protobuf/wrappers.bin b/integration/simple-prototype-defaults/google/protobuf/wrappers.bin
diff --git a/integration/simple-prototype-defaults/google/type/date.bin b/integration/simple-prototype-defaults/google/type/date.bin
diff --git a/integration/simple-prototype-defaults/import_dir/thing.bin b/integration/simple-prototype-defaults/import_dir/thing.bin
diff --git a/integration/simple-prototype-defaults/simple.bin b/integration/simple-prototype-defaults/simple.bin
diff --git a/integration/simple-snake/google/protobuf/wrappers.bin b/integration/simple-snake/google/protobuf/wrappers.bin
diff --git a/integration/simple-snake/import_dir/thing.bin b/integration/simple-snake/import_dir/thing.bin
diff --git a/integration/simple-snake/simple.bin b/integration/simple-snake/simple.bin
diff --git a/integration/simple-string-enums/simple.bin b/integration/simple-string-enums/simple.bin
diff --git a/integration/simple-unrecognized-enum/google/protobuf/wrappers.bin b/integration/simple-unrecognized-enum/google/protobuf/wrappers.bin
diff --git a/integration/simple-unrecognized-enum/import_dir/thing.bin b/integration/simple-unrecognized-enum/import_dir/thing.bin
diff --git a/integration/simple-unrecognized-enum/simple.bin b/integration/simple-unrecognized-enum/simple.bin
diff --git a/integration/simple/google/protobuf/wrappers.bin b/integration/simple/google/protobuf/wrappers.bin
diff --git a/integration/simple/google/type/date.bin b/integration/simple/google/type/date.bin
diff --git a/integration/simple/import_dir/thing.bin b/integration/simple/import_dir/thing.bin
diff --git a/integration/simple/simple.bin b/integration/simple/simple.bin
diff --git a/integration/static-only-type-registry/bar/bar.bin b/integration/static-only-type-registry/bar/bar.bin
diff --git a/integration/static-only-type-registry/foo.bin b/integration/static-only-type-registry/foo.bin
diff --git a/integration/static-only/bar/bar.bin b/integration/static-only/bar/bar.bin
diff --git a/integration/static-only/foo.bin b/integration/static-only/foo.bin
diff --git a/integration/struct/struct.bin b/integration/struct/struct.bin
diff --git a/integration/tsconfig.proto.json b/integration/tsconfig.proto.json
@@ -15,6 +15,7 @@
     "angular",
     "batching-with-context-esModuleInterop",
     "import-mapping/mapping.ts",
+    "extension-import",
     "simple-esmodule-interop",
     "fieldoption-jstype*"
   ]

diff --git a/integration/type-annotations/bar/bar.bin b/integration/type-annotations/bar/bar.bin
diff --git a/integration/type-annotations/foo.bin b/integration/type-annotations/foo.bin
diff --git a/integration/type-registry/bar/bar.bin b/integration/type-registry/bar/bar.bin
diff --git a/integration/type-registry/foo.bin b/integration/type-registry/foo.bin
diff --git a/integration/types-with-underscores/file.bin b/integration/types-with-underscores/file.bin
diff --git a/integration/unknown-fields/google/protobuf/compiler/plugin.bin b/integration/unknown-fields/google/protobuf/compiler/plugin.bin
diff --git a/integration/unknown-fields/google/protobuf/descriptor.bin b/integration/unknown-fields/google/protobuf/descriptor.bin
diff --git a/integration/unknown-fields/something/something.bin b/integration/unknown-fields/something/something.bin
diff --git a/integration/update-bins.sh b/integration/update-bins.sh