From 32a335f7308e67b6075730c0826f94168b6570f7 Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Tue, 5 Sep 2023 09:07:28 +0200 Subject: [PATCH] Update dependencies (#125) --- README.md | 4 +- .../gen/conformance/conformance_pb.ts | 2 +- .../protobuf/test_messages_proto2_pb.ts | 2 +- .../protobuf/test_messages_proto3_pb.ts | 2 +- impl/baseline/package-lock.json | 708 +- impl/baseline/package.json | 12 +- impl/google-protobuf/package-lock.json | 110 +- impl/google-protobuf/package.json | 2 +- .../gen/conformance/conformance_pb.ts | 2 +- .../protobuf/test_messages_proto2_pb.ts | 2 +- .../protobuf/test_messages_proto3_pb.ts | 2 +- impl/protobuf-es/package-lock.json | 706 +- impl/protobuf-es/package.json | 10 +- impl/protobuf-ts/package-lock.json | 538 +- impl/protobuf-ts/package.json | 8 +- impl/protobuf.js/package-lock.json | 42 +- impl/protobuf.js/package.json | 6 +- .../gen/conformance/conformance.ts | 4 +- impl/protoc-gen-ts/gen/google/protobuf/any.ts | 2 +- .../gen/google/protobuf/struct.ts | 2 +- .../google/protobuf/test_messages_proto3.ts | 50 +- .../gen/google/protobuf/wrappers.ts | 2 +- impl/protoc-gen-ts/package-lock.json | 140 +- impl/protoc-gen-ts/package.json | 6 +- impl/protoc-gen-ts/test.sh | 31 +- impl/protoscript/buf.gen.yaml | 2 +- impl/protoscript/failing_tests.txt | 138 +- .../gen/conformance/conformance.pb.ts | 91 +- .../protobuf/test_messages_proto2.pb.ts | 1034 +-- .../protobuf/test_messages_proto3.pb.ts | 866 +- impl/protoscript/package-lock.json | 605 +- impl/protoscript/package.json | 13 +- impl/ts-proto/README.md | 11 +- impl/ts-proto/failing_tests.txt | 409 +- .../google/protobuf/test_messages_proto2.ts | 7136 +++++++++++++++++ impl/ts-proto/package-lock.json | 593 +- impl/ts-proto/package.json | 8 +- impl/ts-proto/runner.ts | 30 +- impl/ts-proto/test.sh | 12 +- 39 files changed, 9493 insertions(+), 3850 deletions(-) create mode 100644 impl/ts-proto/gen/google/protobuf/test_messages_proto2.ts diff --git a/README.md b/README.md index d2b558ab..aca33ea6 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ The current implementations being tested are: |-----------------------------------------|:------------------:|:------------------:|:------------------:|:-------------------------------------:|:----------------------------------------:| | [Protobuf-ES](impl/protobuf-es) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
(0 failures) |
(1 failures) | | [protobuf-ts](impl/protobuf-ts) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
(0 failures) |
(1 failures) | -| [protoscript](impl/protoscript) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
(934 failures) |
(487 failures) | +| [protoscript](impl/protoscript) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
(890 failures) |
(489 failures) | | [google-protobuf](impl/google-protobuf) | :heavy_check_mark: | :x: | :heavy_check_mark: |
(387 failures) |
(216 failures) | | [protobuf.js](impl/protobuf.js) | :heavy_check_mark: | :heavy_check_mark: | :x: |
(375 failures) |
(144 failures) | | [protoc-gen-ts](impl/protoc-gen-ts) | :x: | :heavy_check_mark: | :heavy_check_mark: |
(1085 failures) |
(369 failures) | -| [ts-proto](impl/ts-proto) | :x: | :heavy_check_mark: | :heavy_check_mark: |
(848 failures) |
(528 failures) | +| [ts-proto](impl/ts-proto) | :x: | :heavy_check_mark: | :heavy_check_mark: |
(478 failures) |
(519 failures) | Note: None of the libraries tested implement the text format so the results for those test runs are not shown. diff --git a/impl/baseline/gen/conformance/conformance_pb.ts b/impl/baseline/gen/conformance/conformance_pb.ts index 935ca8b3..dd64c0f9 100644 --- a/impl/baseline/gen/conformance/conformance_pb.ts +++ b/impl/baseline/gen/conformance/conformance_pb.ts @@ -28,7 +28,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// @generated by protoc-gen-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.3.1 with parameter "target=ts" // @generated from file conformance/conformance.proto (package conformance, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/impl/baseline/gen/google/protobuf/test_messages_proto2_pb.ts b/impl/baseline/gen/google/protobuf/test_messages_proto2_pb.ts index 4a95a07a..58d64b0d 100644 --- a/impl/baseline/gen/google/protobuf/test_messages_proto2_pb.ts +++ b/impl/baseline/gen/google/protobuf/test_messages_proto2_pb.ts @@ -35,7 +35,7 @@ // LINT: ALLOW_GROUPS -// @generated by protoc-gen-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.3.1 with parameter "target=ts" // @generated from file google/protobuf/test_messages_proto2.proto (package protobuf_test_messages.proto2, syntax proto2) /* eslint-disable */ // @ts-nocheck diff --git a/impl/baseline/gen/google/protobuf/test_messages_proto3_pb.ts b/impl/baseline/gen/google/protobuf/test_messages_proto3_pb.ts index 2770390a..58ae4834 100644 --- a/impl/baseline/gen/google/protobuf/test_messages_proto3_pb.ts +++ b/impl/baseline/gen/google/protobuf/test_messages_proto3_pb.ts @@ -35,7 +35,7 @@ // - conformance tests // -// @generated by protoc-gen-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.3.1 with parameter "target=ts" // @generated from file google/protobuf/test_messages_proto3.proto (package protobuf_test_messages.proto3, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/impl/baseline/package-lock.json b/impl/baseline/package-lock.json index b98da38d..a243b079 100644 --- a/impl/baseline/package-lock.json +++ b/impl/baseline/package-lock.json @@ -1,25 +1,25 @@ { "name": "baseline", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "baseline", "dependencies": { - "@bufbuild/protobuf": "^1.3.0", - "@bufbuild/protoc-gen-es": "^1.3.0" + "@bufbuild/protobuf": "^1.3.1", + "@bufbuild/protoc-gen-es": "^1.3.1" }, "devDependencies": { - "@bufbuild/buf": "^1.25.0", - "@types/node": "^20.4.5", - "tsx": "^3.12.7", - "typescript": "^5.1.6" + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.7", + "tsx": "^3.12.8", + "typescript": "^5.2.2" } }, "node_modules/@bufbuild/buf": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.25.0.tgz", - "integrity": "sha512-eBlzzVNBSw2cjKtkKZPu7RZK2YLUoB9tVRe+Pf4QVxF0IQtO5zPDdtWCF7/IUjd0V+dOJC25nLSeE5+YeZDqKg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "hasInstallScript": true, "bin": { @@ -31,18 +31,18 @@ "node": ">=12" }, "optionalDependencies": { - "@bufbuild/buf-darwin-arm64": "1.25.0", - "@bufbuild/buf-darwin-x64": "1.25.0", - "@bufbuild/buf-linux-aarch64": "1.25.0", - "@bufbuild/buf-linux-x64": "1.25.0", - "@bufbuild/buf-win32-arm64": "1.25.0", - "@bufbuild/buf-win32-x64": "1.25.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "node_modules/@bufbuild/buf-darwin-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.25.0.tgz", - "integrity": "sha512-X6rf6s/y9VBHfdhhURNBwyDNFYNecOE4GOvzQcwZVYmGteA4Xor8c51ouTPd5wU2lAq/qLwYX2hZAY41uvbMrA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "cpu": [ "arm64" ], @@ -56,9 +56,9 @@ } }, "node_modules/@bufbuild/buf-darwin-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.25.0.tgz", - "integrity": "sha512-H7L8DdPwZsP5WSiOJCScY/E5CT7b0zv49l4WYrbbyg0FDJBMHg8Yn8lEK0Ju/mvlXaAqDZk4pwiwVuCPtt4oBw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "cpu": [ "x64" ], @@ -72,9 +72,9 @@ } }, "node_modules/@bufbuild/buf-linux-aarch64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.25.0.tgz", - "integrity": "sha512-bL0dlBmmJ/AmCtIQXiqJLXIPwHM65O3TT85wFQvurexlwnLs6ajM+zJ2e+Xbj2ccXQ+TI8UKLlVgySHPp7EP0A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "cpu": [ "arm64" ], @@ -88,9 +88,9 @@ } }, "node_modules/@bufbuild/buf-linux-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.25.0.tgz", - "integrity": "sha512-PuxDpPqArjfeZ8LPAru0f/u7nZlE+IIXIjJM6IsnnTqAoBS5A4z9ALUog23BfuU2jJNuPerKPaMs92GAmiSaBQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "cpu": [ "x64" ], @@ -104,9 +104,9 @@ } }, "node_modules/@bufbuild/buf-win32-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.25.0.tgz", - "integrity": "sha512-Uw2Bn2pJfPKdh+J6ocqNKMZiYl07eZWYNbAIzl1vXAl1bH7SvgiEA+ujgOM56I+GmNfVSRWNukrxj5ppPvdTQQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "cpu": [ "arm64" ], @@ -120,9 +120,9 @@ } }, "node_modules/@bufbuild/buf-win32-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.25.0.tgz", - "integrity": "sha512-mTBCyzFbpxSDnn33yfsH2qDC1K9mcduJlFdBgJnVcXaZXghlJQAgNA58dpGuY2fsmcACpiimMgChqpON+/LZ4A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "cpu": [ "x64" ], @@ -136,16 +136,16 @@ } }, "node_modules/@bufbuild/protobuf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.0.tgz", - "integrity": "sha512-G372ods0pLt46yxVRsnP/e2btVPuuzArcMPFpIDeIwiGPuuglEs9y75iG0HMvZgncsj5TvbYRWqbVyOe3PLCWQ==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.1.tgz", + "integrity": "sha512-BUyJWutgP2S8K/1NphOJokuwDckXS4qI2T1pGZAlkFdZchWae3jm6fCdkcGbLlM1QLOcNFFePd+7Feo4BYGrJQ==" }, "node_modules/@bufbuild/protoc-gen-es": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoc-gen-es/-/protoc-gen-es-1.3.0.tgz", - "integrity": "sha512-XxGZwpXMYlwoSyJwCTFb7SZ2xKmv2iCRM022t1wszhY3kNL7rjpyj+3GbpCOjaM1T7NAoLnW0Hyb/M0b0XDb3Q==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@bufbuild/protoc-gen-es/-/protoc-gen-es-1.3.1.tgz", + "integrity": "sha512-Eyk4T1Wh56WhS6RqC7nfYE9a2egejDAzOl5vv8emzSNfHKm6eGrwTiuE+ottg+G6SmC1hNr3NFbvNJJkI+5aSA==", "dependencies": { - "@bufbuild/protoplugin": "1.3.0" + "@bufbuild/protoplugin": "1.3.1" }, "bin": { "protoc-gen-es": "bin/protoc-gen-es" @@ -154,7 +154,7 @@ "node": ">=14" }, "peerDependencies": { - "@bufbuild/protobuf": "1.3.0" + "@bufbuild/protobuf": "1.3.1" }, "peerDependenciesMeta": { "@bufbuild/protobuf": { @@ -163,11 +163,11 @@ } }, "node_modules/@bufbuild/protoplugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoplugin/-/protoplugin-1.3.0.tgz", - "integrity": "sha512-zye8CfJb9VWzaHR/f1qcEkddaRh9De+u6fORsj92Ten8EJUcyhiY5BivET+RMTissAKXKrp/f2zSBCV0dlFxPw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@bufbuild/protoplugin/-/protoplugin-1.3.1.tgz", + "integrity": "sha512-85mSp1FJzjF9uyhzlAS19KNS0CkGUq7dHonRplaTErbuhdBdAVGBPs5SVQpFlYD5j0nMHob8hKsnfA4g8QlrhQ==", "dependencies": { - "@bufbuild/protobuf": "1.3.0", + "@bufbuild/protobuf": "1.3.1", "@typescript/vfs": "^1.4.0", "typescript": "4.5.2" } @@ -195,12 +195,12 @@ } }, "node_modules/@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.2.2.tgz", + "integrity": "sha512-Ub6LaRaAgF80dTSzUdXpFLM1pVDdmEVB9qb5iAzSpyDlX/mfJTFGOnZ516O05p5uWWteNviMKi4PAyEuRxI5gA==", "dev": true, "dependencies": { - "esbuild": "~0.17.6", + "esbuild": "~0.18.20", "source-map-support": "^0.5.21" } }, @@ -215,9 +215,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ "arm" ], @@ -231,9 +231,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ "arm64" ], @@ -247,9 +247,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "cpu": [ "x64" ], @@ -263,9 +263,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], @@ -279,9 +279,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "cpu": [ "x64" ], @@ -295,9 +295,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "cpu": [ "arm64" ], @@ -311,9 +311,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "cpu": [ "x64" ], @@ -327,9 +327,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "cpu": [ "arm" ], @@ -343,9 +343,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "cpu": [ "arm64" ], @@ -359,9 +359,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "cpu": [ "ia32" ], @@ -375,9 +375,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "cpu": [ "loong64" ], @@ -391,9 +391,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "cpu": [ "mips64el" ], @@ -407,9 +407,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "cpu": [ "ppc64" ], @@ -423,9 +423,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "cpu": [ "riscv64" ], @@ -439,9 +439,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "cpu": [ "s390x" ], @@ -455,9 +455,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "cpu": [ "x64" ], @@ -471,9 +471,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "cpu": [ "x64" ], @@ -487,9 +487,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "cpu": [ "x64" ], @@ -503,9 +503,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "cpu": [ "x64" ], @@ -519,9 +519,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "cpu": [ "arm64" ], @@ -535,9 +535,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "cpu": [ "ia32" ], @@ -551,9 +551,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "cpu": [ "x64" ], @@ -567,9 +567,9 @@ } }, "node_modules/@types/node": { - "version": "20.4.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz", - "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==", + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", "dev": true }, "node_modules/@typescript/vfs": { @@ -603,9 +603,9 @@ } }, "node_modules/esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, "bin": { @@ -615,34 +615,34 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -654,10 +654,13 @@ } }, "node_modules/get-tsconfig": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.4.0.tgz", - "integrity": "sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.0.tgz", + "integrity": "sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==", "dev": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, "funding": { "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" } @@ -667,6 +670,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -687,13 +699,13 @@ } }, "node_modules/tsx": { - "version": "3.12.7", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz", - "integrity": "sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==", + "version": "3.12.8", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.8.tgz", + "integrity": "sha512-Lt9KYaRGF023tlLInPj8rgHwsZU8qWLBj4iRXNWxTfjIkU7canGL806AqKear1j722plHuiYNcL2ZCo6uS9UJA==", "dev": true, "dependencies": { "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", + "@esbuild-kit/core-utils": "^3.2.2", "@esbuild-kit/esm-loader": "^2.5.5" }, "bin": { @@ -704,9 +716,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -716,387 +728,5 @@ "node": ">=14.17" } } - }, - "dependencies": { - "@bufbuild/buf": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.25.0.tgz", - "integrity": "sha512-eBlzzVNBSw2cjKtkKZPu7RZK2YLUoB9tVRe+Pf4QVxF0IQtO5zPDdtWCF7/IUjd0V+dOJC25nLSeE5+YeZDqKg==", - "dev": true, - "requires": { - "@bufbuild/buf-darwin-arm64": "1.25.0", - "@bufbuild/buf-darwin-x64": "1.25.0", - "@bufbuild/buf-linux-aarch64": "1.25.0", - "@bufbuild/buf-linux-x64": "1.25.0", - "@bufbuild/buf-win32-arm64": "1.25.0", - "@bufbuild/buf-win32-x64": "1.25.0" - } - }, - "@bufbuild/buf-darwin-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.25.0.tgz", - "integrity": "sha512-X6rf6s/y9VBHfdhhURNBwyDNFYNecOE4GOvzQcwZVYmGteA4Xor8c51ouTPd5wU2lAq/qLwYX2hZAY41uvbMrA==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-darwin-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.25.0.tgz", - "integrity": "sha512-H7L8DdPwZsP5WSiOJCScY/E5CT7b0zv49l4WYrbbyg0FDJBMHg8Yn8lEK0Ju/mvlXaAqDZk4pwiwVuCPtt4oBw==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-linux-aarch64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.25.0.tgz", - "integrity": "sha512-bL0dlBmmJ/AmCtIQXiqJLXIPwHM65O3TT85wFQvurexlwnLs6ajM+zJ2e+Xbj2ccXQ+TI8UKLlVgySHPp7EP0A==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-linux-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.25.0.tgz", - "integrity": "sha512-PuxDpPqArjfeZ8LPAru0f/u7nZlE+IIXIjJM6IsnnTqAoBS5A4z9ALUog23BfuU2jJNuPerKPaMs92GAmiSaBQ==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-win32-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.25.0.tgz", - "integrity": "sha512-Uw2Bn2pJfPKdh+J6ocqNKMZiYl07eZWYNbAIzl1vXAl1bH7SvgiEA+ujgOM56I+GmNfVSRWNukrxj5ppPvdTQQ==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-win32-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.25.0.tgz", - "integrity": "sha512-mTBCyzFbpxSDnn33yfsH2qDC1K9mcduJlFdBgJnVcXaZXghlJQAgNA58dpGuY2fsmcACpiimMgChqpON+/LZ4A==", - "dev": true, - "optional": true - }, - "@bufbuild/protobuf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.0.tgz", - "integrity": "sha512-G372ods0pLt46yxVRsnP/e2btVPuuzArcMPFpIDeIwiGPuuglEs9y75iG0HMvZgncsj5TvbYRWqbVyOe3PLCWQ==" - }, - "@bufbuild/protoc-gen-es": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoc-gen-es/-/protoc-gen-es-1.3.0.tgz", - "integrity": "sha512-XxGZwpXMYlwoSyJwCTFb7SZ2xKmv2iCRM022t1wszhY3kNL7rjpyj+3GbpCOjaM1T7NAoLnW0Hyb/M0b0XDb3Q==", - "requires": { - "@bufbuild/protoplugin": "1.3.0" - } - }, - "@bufbuild/protoplugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoplugin/-/protoplugin-1.3.0.tgz", - "integrity": "sha512-zye8CfJb9VWzaHR/f1qcEkddaRh9De+u6fORsj92Ten8EJUcyhiY5BivET+RMTissAKXKrp/f2zSBCV0dlFxPw==", - "requires": { - "@bufbuild/protobuf": "1.3.0", - "@typescript/vfs": "^1.4.0", - "typescript": "4.5.2" - }, - "dependencies": { - "typescript": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", - "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==" - } - } - }, - "@esbuild-kit/cjs-loader": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@esbuild-kit/cjs-loader/-/cjs-loader-2.4.2.tgz", - "integrity": "sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==", - "dev": true, - "requires": { - "@esbuild-kit/core-utils": "^3.0.0", - "get-tsconfig": "^4.4.0" - } - }, - "@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", - "dev": true, - "requires": { - "esbuild": "~0.17.6", - "source-map-support": "^0.5.21" - } - }, - "@esbuild-kit/esm-loader": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.5.5.tgz", - "integrity": "sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==", - "dev": true, - "requires": { - "@esbuild-kit/core-utils": "^3.0.0", - "get-tsconfig": "^4.4.0" - } - }, - "@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", - "dev": true, - "optional": true - }, - "@types/node": { - "version": "20.4.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz", - "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==", - "dev": true - }, - "@typescript/vfs": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.5.0.tgz", - "integrity": "sha512-AJS307bPgbsZZ9ggCT3wwpg3VbTKMFNHfaY/uF0ahSkYYrPF2dSSKDNIDIQAHm9qJqbLvCsSJH7yN4Vs/CsMMg==", - "requires": { - "debug": "^4.1.1" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", - "dev": true, - "requires": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" - } - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, - "get-tsconfig": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.4.0.tgz", - "integrity": "sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "tsx": { - "version": "3.12.7", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz", - "integrity": "sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==", - "dev": true, - "requires": { - "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", - "@esbuild-kit/esm-loader": "^2.5.5", - "fsevents": "~2.3.2" - } - }, - "typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "dev": true - } } } diff --git a/impl/baseline/package.json b/impl/baseline/package.json index 844d4372..b5c4b459 100644 --- a/impl/baseline/package.json +++ b/impl/baseline/package.json @@ -3,13 +3,13 @@ "private": true, "type": "module", "dependencies": { - "@bufbuild/protobuf": "^1.3.0", - "@bufbuild/protoc-gen-es": "^1.3.0" + "@bufbuild/protobuf": "^1.3.1", + "@bufbuild/protoc-gen-es": "^1.3.1" }, "devDependencies": { - "@bufbuild/buf": "^1.25.0", - "@types/node": "^20.4.5", - "tsx": "^3.12.7", - "typescript": "^5.1.6" + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.7", + "tsx": "^3.12.8", + "typescript": "^5.2.2" } } diff --git a/impl/google-protobuf/package-lock.json b/impl/google-protobuf/package-lock.json index 16047829..6653632a 100644 --- a/impl/google-protobuf/package-lock.json +++ b/impl/google-protobuf/package-lock.json @@ -9,13 +9,13 @@ "google-protobuf": "^3.21.2" }, "devDependencies": { - "@bufbuild/buf": "^1.25.0" + "@bufbuild/buf": "^1.26.1" } }, "node_modules/@bufbuild/buf": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.25.0.tgz", - "integrity": "sha512-eBlzzVNBSw2cjKtkKZPu7RZK2YLUoB9tVRe+Pf4QVxF0IQtO5zPDdtWCF7/IUjd0V+dOJC25nLSeE5+YeZDqKg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "hasInstallScript": true, "bin": { @@ -27,18 +27,18 @@ "node": ">=12" }, "optionalDependencies": { - "@bufbuild/buf-darwin-arm64": "1.25.0", - "@bufbuild/buf-darwin-x64": "1.25.0", - "@bufbuild/buf-linux-aarch64": "1.25.0", - "@bufbuild/buf-linux-x64": "1.25.0", - "@bufbuild/buf-win32-arm64": "1.25.0", - "@bufbuild/buf-win32-x64": "1.25.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "node_modules/@bufbuild/buf-darwin-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.25.0.tgz", - "integrity": "sha512-X6rf6s/y9VBHfdhhURNBwyDNFYNecOE4GOvzQcwZVYmGteA4Xor8c51ouTPd5wU2lAq/qLwYX2hZAY41uvbMrA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "cpu": [ "arm64" ], @@ -52,9 +52,9 @@ } }, "node_modules/@bufbuild/buf-darwin-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.25.0.tgz", - "integrity": "sha512-H7L8DdPwZsP5WSiOJCScY/E5CT7b0zv49l4WYrbbyg0FDJBMHg8Yn8lEK0Ju/mvlXaAqDZk4pwiwVuCPtt4oBw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "cpu": [ "x64" ], @@ -68,9 +68,9 @@ } }, "node_modules/@bufbuild/buf-linux-aarch64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.25.0.tgz", - "integrity": "sha512-bL0dlBmmJ/AmCtIQXiqJLXIPwHM65O3TT85wFQvurexlwnLs6ajM+zJ2e+Xbj2ccXQ+TI8UKLlVgySHPp7EP0A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "cpu": [ "arm64" ], @@ -84,9 +84,9 @@ } }, "node_modules/@bufbuild/buf-linux-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.25.0.tgz", - "integrity": "sha512-PuxDpPqArjfeZ8LPAru0f/u7nZlE+IIXIjJM6IsnnTqAoBS5A4z9ALUog23BfuU2jJNuPerKPaMs92GAmiSaBQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "cpu": [ "x64" ], @@ -100,9 +100,9 @@ } }, "node_modules/@bufbuild/buf-win32-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.25.0.tgz", - "integrity": "sha512-Uw2Bn2pJfPKdh+J6ocqNKMZiYl07eZWYNbAIzl1vXAl1bH7SvgiEA+ujgOM56I+GmNfVSRWNukrxj5ppPvdTQQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "cpu": [ "arm64" ], @@ -116,9 +116,9 @@ } }, "node_modules/@bufbuild/buf-win32-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.25.0.tgz", - "integrity": "sha512-mTBCyzFbpxSDnn33yfsH2qDC1K9mcduJlFdBgJnVcXaZXghlJQAgNA58dpGuY2fsmcACpiimMgChqpON+/LZ4A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "cpu": [ "x64" ], @@ -139,58 +139,58 @@ }, "dependencies": { "@bufbuild/buf": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.25.0.tgz", - "integrity": "sha512-eBlzzVNBSw2cjKtkKZPu7RZK2YLUoB9tVRe+Pf4QVxF0IQtO5zPDdtWCF7/IUjd0V+dOJC25nLSeE5+YeZDqKg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "requires": { - "@bufbuild/buf-darwin-arm64": "1.25.0", - "@bufbuild/buf-darwin-x64": "1.25.0", - "@bufbuild/buf-linux-aarch64": "1.25.0", - "@bufbuild/buf-linux-x64": "1.25.0", - "@bufbuild/buf-win32-arm64": "1.25.0", - "@bufbuild/buf-win32-x64": "1.25.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "@bufbuild/buf-darwin-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.25.0.tgz", - "integrity": "sha512-X6rf6s/y9VBHfdhhURNBwyDNFYNecOE4GOvzQcwZVYmGteA4Xor8c51ouTPd5wU2lAq/qLwYX2hZAY41uvbMrA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "dev": true, "optional": true }, "@bufbuild/buf-darwin-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.25.0.tgz", - "integrity": "sha512-H7L8DdPwZsP5WSiOJCScY/E5CT7b0zv49l4WYrbbyg0FDJBMHg8Yn8lEK0Ju/mvlXaAqDZk4pwiwVuCPtt4oBw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "dev": true, "optional": true }, "@bufbuild/buf-linux-aarch64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.25.0.tgz", - "integrity": "sha512-bL0dlBmmJ/AmCtIQXiqJLXIPwHM65O3TT85wFQvurexlwnLs6ajM+zJ2e+Xbj2ccXQ+TI8UKLlVgySHPp7EP0A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "dev": true, "optional": true }, "@bufbuild/buf-linux-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.25.0.tgz", - "integrity": "sha512-PuxDpPqArjfeZ8LPAru0f/u7nZlE+IIXIjJM6IsnnTqAoBS5A4z9ALUog23BfuU2jJNuPerKPaMs92GAmiSaBQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "dev": true, "optional": true }, "@bufbuild/buf-win32-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.25.0.tgz", - "integrity": "sha512-Uw2Bn2pJfPKdh+J6ocqNKMZiYl07eZWYNbAIzl1vXAl1bH7SvgiEA+ujgOM56I+GmNfVSRWNukrxj5ppPvdTQQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "dev": true, "optional": true }, "@bufbuild/buf-win32-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.25.0.tgz", - "integrity": "sha512-mTBCyzFbpxSDnn33yfsH2qDC1K9mcduJlFdBgJnVcXaZXghlJQAgNA58dpGuY2fsmcACpiimMgChqpON+/LZ4A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "dev": true, "optional": true }, diff --git a/impl/google-protobuf/package.json b/impl/google-protobuf/package.json index 5226ea34..6f2a847a 100644 --- a/impl/google-protobuf/package.json +++ b/impl/google-protobuf/package.json @@ -5,6 +5,6 @@ "google-protobuf": "^3.21.2" }, "devDependencies": { - "@bufbuild/buf": "^1.25.0" + "@bufbuild/buf": "^1.26.1" } } diff --git a/impl/protobuf-es/gen/conformance/conformance_pb.ts b/impl/protobuf-es/gen/conformance/conformance_pb.ts index 935ca8b3..dd64c0f9 100644 --- a/impl/protobuf-es/gen/conformance/conformance_pb.ts +++ b/impl/protobuf-es/gen/conformance/conformance_pb.ts @@ -28,7 +28,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// @generated by protoc-gen-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.3.1 with parameter "target=ts" // @generated from file conformance/conformance.proto (package conformance, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/impl/protobuf-es/gen/google/protobuf/test_messages_proto2_pb.ts b/impl/protobuf-es/gen/google/protobuf/test_messages_proto2_pb.ts index 4a95a07a..58d64b0d 100644 --- a/impl/protobuf-es/gen/google/protobuf/test_messages_proto2_pb.ts +++ b/impl/protobuf-es/gen/google/protobuf/test_messages_proto2_pb.ts @@ -35,7 +35,7 @@ // LINT: ALLOW_GROUPS -// @generated by protoc-gen-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.3.1 with parameter "target=ts" // @generated from file google/protobuf/test_messages_proto2.proto (package protobuf_test_messages.proto2, syntax proto2) /* eslint-disable */ // @ts-nocheck diff --git a/impl/protobuf-es/gen/google/protobuf/test_messages_proto3_pb.ts b/impl/protobuf-es/gen/google/protobuf/test_messages_proto3_pb.ts index 2770390a..58ae4834 100644 --- a/impl/protobuf-es/gen/google/protobuf/test_messages_proto3_pb.ts +++ b/impl/protobuf-es/gen/google/protobuf/test_messages_proto3_pb.ts @@ -35,7 +35,7 @@ // - conformance tests // -// @generated by protoc-gen-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.3.1 with parameter "target=ts" // @generated from file google/protobuf/test_messages_proto3.proto (package protobuf_test_messages.proto3, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/impl/protobuf-es/package-lock.json b/impl/protobuf-es/package-lock.json index 7bcf7d72..00ba1fa3 100644 --- a/impl/protobuf-es/package-lock.json +++ b/impl/protobuf-es/package-lock.json @@ -1,25 +1,25 @@ { "name": "protobuf-es-conformance", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "protobuf-es-conformance", "dependencies": { - "@bufbuild/protobuf": "^1.3.0", - "@bufbuild/protoc-gen-es": "^1.3.0" + "@bufbuild/protobuf": "^1.3.1", + "@bufbuild/protoc-gen-es": "^1.3.1" }, "devDependencies": { - "@bufbuild/buf": "^1.25.0", - "@types/node": "^20.4.5", + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.7", "tsx": "^3.12.7", - "typescript": "^5.1.6" + "typescript": "^5.2.2" } }, "node_modules/@bufbuild/buf": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.25.0.tgz", - "integrity": "sha512-eBlzzVNBSw2cjKtkKZPu7RZK2YLUoB9tVRe+Pf4QVxF0IQtO5zPDdtWCF7/IUjd0V+dOJC25nLSeE5+YeZDqKg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "hasInstallScript": true, "bin": { @@ -31,18 +31,18 @@ "node": ">=12" }, "optionalDependencies": { - "@bufbuild/buf-darwin-arm64": "1.25.0", - "@bufbuild/buf-darwin-x64": "1.25.0", - "@bufbuild/buf-linux-aarch64": "1.25.0", - "@bufbuild/buf-linux-x64": "1.25.0", - "@bufbuild/buf-win32-arm64": "1.25.0", - "@bufbuild/buf-win32-x64": "1.25.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "node_modules/@bufbuild/buf-darwin-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.25.0.tgz", - "integrity": "sha512-X6rf6s/y9VBHfdhhURNBwyDNFYNecOE4GOvzQcwZVYmGteA4Xor8c51ouTPd5wU2lAq/qLwYX2hZAY41uvbMrA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "cpu": [ "arm64" ], @@ -56,9 +56,9 @@ } }, "node_modules/@bufbuild/buf-darwin-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.25.0.tgz", - "integrity": "sha512-H7L8DdPwZsP5WSiOJCScY/E5CT7b0zv49l4WYrbbyg0FDJBMHg8Yn8lEK0Ju/mvlXaAqDZk4pwiwVuCPtt4oBw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "cpu": [ "x64" ], @@ -72,9 +72,9 @@ } }, "node_modules/@bufbuild/buf-linux-aarch64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.25.0.tgz", - "integrity": "sha512-bL0dlBmmJ/AmCtIQXiqJLXIPwHM65O3TT85wFQvurexlwnLs6ajM+zJ2e+Xbj2ccXQ+TI8UKLlVgySHPp7EP0A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "cpu": [ "arm64" ], @@ -88,9 +88,9 @@ } }, "node_modules/@bufbuild/buf-linux-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.25.0.tgz", - "integrity": "sha512-PuxDpPqArjfeZ8LPAru0f/u7nZlE+IIXIjJM6IsnnTqAoBS5A4z9ALUog23BfuU2jJNuPerKPaMs92GAmiSaBQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "cpu": [ "x64" ], @@ -104,9 +104,9 @@ } }, "node_modules/@bufbuild/buf-win32-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.25.0.tgz", - "integrity": "sha512-Uw2Bn2pJfPKdh+J6ocqNKMZiYl07eZWYNbAIzl1vXAl1bH7SvgiEA+ujgOM56I+GmNfVSRWNukrxj5ppPvdTQQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "cpu": [ "arm64" ], @@ -120,9 +120,9 @@ } }, "node_modules/@bufbuild/buf-win32-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.25.0.tgz", - "integrity": "sha512-mTBCyzFbpxSDnn33yfsH2qDC1K9mcduJlFdBgJnVcXaZXghlJQAgNA58dpGuY2fsmcACpiimMgChqpON+/LZ4A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "cpu": [ "x64" ], @@ -136,16 +136,16 @@ } }, "node_modules/@bufbuild/protobuf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.0.tgz", - "integrity": "sha512-G372ods0pLt46yxVRsnP/e2btVPuuzArcMPFpIDeIwiGPuuglEs9y75iG0HMvZgncsj5TvbYRWqbVyOe3PLCWQ==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.1.tgz", + "integrity": "sha512-BUyJWutgP2S8K/1NphOJokuwDckXS4qI2T1pGZAlkFdZchWae3jm6fCdkcGbLlM1QLOcNFFePd+7Feo4BYGrJQ==" }, "node_modules/@bufbuild/protoc-gen-es": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoc-gen-es/-/protoc-gen-es-1.3.0.tgz", - "integrity": "sha512-XxGZwpXMYlwoSyJwCTFb7SZ2xKmv2iCRM022t1wszhY3kNL7rjpyj+3GbpCOjaM1T7NAoLnW0Hyb/M0b0XDb3Q==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@bufbuild/protoc-gen-es/-/protoc-gen-es-1.3.1.tgz", + "integrity": "sha512-Eyk4T1Wh56WhS6RqC7nfYE9a2egejDAzOl5vv8emzSNfHKm6eGrwTiuE+ottg+G6SmC1hNr3NFbvNJJkI+5aSA==", "dependencies": { - "@bufbuild/protoplugin": "1.3.0" + "@bufbuild/protoplugin": "1.3.1" }, "bin": { "protoc-gen-es": "bin/protoc-gen-es" @@ -154,7 +154,7 @@ "node": ">=14" }, "peerDependencies": { - "@bufbuild/protobuf": "1.3.0" + "@bufbuild/protobuf": "1.3.1" }, "peerDependenciesMeta": { "@bufbuild/protobuf": { @@ -163,11 +163,11 @@ } }, "node_modules/@bufbuild/protoplugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoplugin/-/protoplugin-1.3.0.tgz", - "integrity": "sha512-zye8CfJb9VWzaHR/f1qcEkddaRh9De+u6fORsj92Ten8EJUcyhiY5BivET+RMTissAKXKrp/f2zSBCV0dlFxPw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@bufbuild/protoplugin/-/protoplugin-1.3.1.tgz", + "integrity": "sha512-85mSp1FJzjF9uyhzlAS19KNS0CkGUq7dHonRplaTErbuhdBdAVGBPs5SVQpFlYD5j0nMHob8hKsnfA4g8QlrhQ==", "dependencies": { - "@bufbuild/protobuf": "1.3.0", + "@bufbuild/protobuf": "1.3.1", "@typescript/vfs": "^1.4.0", "typescript": "4.5.2" } @@ -195,12 +195,12 @@ } }, "node_modules/@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.2.2.tgz", + "integrity": "sha512-Ub6LaRaAgF80dTSzUdXpFLM1pVDdmEVB9qb5iAzSpyDlX/mfJTFGOnZ516O05p5uWWteNviMKi4PAyEuRxI5gA==", "dev": true, "dependencies": { - "esbuild": "~0.17.6", + "esbuild": "~0.18.20", "source-map-support": "^0.5.21" } }, @@ -215,9 +215,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ "arm" ], @@ -231,9 +231,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ "arm64" ], @@ -247,9 +247,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "cpu": [ "x64" ], @@ -263,9 +263,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], @@ -279,9 +279,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "cpu": [ "x64" ], @@ -295,9 +295,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "cpu": [ "arm64" ], @@ -311,9 +311,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "cpu": [ "x64" ], @@ -327,9 +327,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "cpu": [ "arm" ], @@ -343,9 +343,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "cpu": [ "arm64" ], @@ -359,9 +359,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "cpu": [ "ia32" ], @@ -375,9 +375,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "cpu": [ "loong64" ], @@ -391,9 +391,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "cpu": [ "mips64el" ], @@ -407,9 +407,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "cpu": [ "ppc64" ], @@ -423,9 +423,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "cpu": [ "riscv64" ], @@ -439,9 +439,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "cpu": [ "s390x" ], @@ -455,9 +455,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "cpu": [ "x64" ], @@ -471,9 +471,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "cpu": [ "x64" ], @@ -487,9 +487,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "cpu": [ "x64" ], @@ -503,9 +503,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "cpu": [ "x64" ], @@ -519,9 +519,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "cpu": [ "arm64" ], @@ -535,9 +535,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "cpu": [ "ia32" ], @@ -551,9 +551,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "cpu": [ "x64" ], @@ -567,9 +567,9 @@ } }, "node_modules/@types/node": { - "version": "20.4.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz", - "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==", + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", "dev": true }, "node_modules/@typescript/vfs": { @@ -603,9 +603,9 @@ } }, "node_modules/esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, "bin": { @@ -615,34 +615,34 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -654,10 +654,13 @@ } }, "node_modules/get-tsconfig": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.4.0.tgz", - "integrity": "sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.0.tgz", + "integrity": "sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==", "dev": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, "funding": { "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" } @@ -667,6 +670,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -687,13 +699,13 @@ } }, "node_modules/tsx": { - "version": "3.12.7", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz", - "integrity": "sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==", + "version": "3.12.8", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.8.tgz", + "integrity": "sha512-Lt9KYaRGF023tlLInPj8rgHwsZU8qWLBj4iRXNWxTfjIkU7canGL806AqKear1j722plHuiYNcL2ZCo6uS9UJA==", "dev": true, "dependencies": { "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", + "@esbuild-kit/core-utils": "^3.2.2", "@esbuild-kit/esm-loader": "^2.5.5" }, "bin": { @@ -704,9 +716,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -716,387 +728,5 @@ "node": ">=14.17" } } - }, - "dependencies": { - "@bufbuild/buf": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.25.0.tgz", - "integrity": "sha512-eBlzzVNBSw2cjKtkKZPu7RZK2YLUoB9tVRe+Pf4QVxF0IQtO5zPDdtWCF7/IUjd0V+dOJC25nLSeE5+YeZDqKg==", - "dev": true, - "requires": { - "@bufbuild/buf-darwin-arm64": "1.25.0", - "@bufbuild/buf-darwin-x64": "1.25.0", - "@bufbuild/buf-linux-aarch64": "1.25.0", - "@bufbuild/buf-linux-x64": "1.25.0", - "@bufbuild/buf-win32-arm64": "1.25.0", - "@bufbuild/buf-win32-x64": "1.25.0" - } - }, - "@bufbuild/buf-darwin-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.25.0.tgz", - "integrity": "sha512-X6rf6s/y9VBHfdhhURNBwyDNFYNecOE4GOvzQcwZVYmGteA4Xor8c51ouTPd5wU2lAq/qLwYX2hZAY41uvbMrA==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-darwin-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.25.0.tgz", - "integrity": "sha512-H7L8DdPwZsP5WSiOJCScY/E5CT7b0zv49l4WYrbbyg0FDJBMHg8Yn8lEK0Ju/mvlXaAqDZk4pwiwVuCPtt4oBw==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-linux-aarch64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.25.0.tgz", - "integrity": "sha512-bL0dlBmmJ/AmCtIQXiqJLXIPwHM65O3TT85wFQvurexlwnLs6ajM+zJ2e+Xbj2ccXQ+TI8UKLlVgySHPp7EP0A==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-linux-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.25.0.tgz", - "integrity": "sha512-PuxDpPqArjfeZ8LPAru0f/u7nZlE+IIXIjJM6IsnnTqAoBS5A4z9ALUog23BfuU2jJNuPerKPaMs92GAmiSaBQ==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-win32-arm64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.25.0.tgz", - "integrity": "sha512-Uw2Bn2pJfPKdh+J6ocqNKMZiYl07eZWYNbAIzl1vXAl1bH7SvgiEA+ujgOM56I+GmNfVSRWNukrxj5ppPvdTQQ==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-win32-x64": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.25.0.tgz", - "integrity": "sha512-mTBCyzFbpxSDnn33yfsH2qDC1K9mcduJlFdBgJnVcXaZXghlJQAgNA58dpGuY2fsmcACpiimMgChqpON+/LZ4A==", - "dev": true, - "optional": true - }, - "@bufbuild/protobuf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.0.tgz", - "integrity": "sha512-G372ods0pLt46yxVRsnP/e2btVPuuzArcMPFpIDeIwiGPuuglEs9y75iG0HMvZgncsj5TvbYRWqbVyOe3PLCWQ==" - }, - "@bufbuild/protoc-gen-es": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoc-gen-es/-/protoc-gen-es-1.3.0.tgz", - "integrity": "sha512-XxGZwpXMYlwoSyJwCTFb7SZ2xKmv2iCRM022t1wszhY3kNL7rjpyj+3GbpCOjaM1T7NAoLnW0Hyb/M0b0XDb3Q==", - "requires": { - "@bufbuild/protoplugin": "1.3.0" - } - }, - "@bufbuild/protoplugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protoplugin/-/protoplugin-1.3.0.tgz", - "integrity": "sha512-zye8CfJb9VWzaHR/f1qcEkddaRh9De+u6fORsj92Ten8EJUcyhiY5BivET+RMTissAKXKrp/f2zSBCV0dlFxPw==", - "requires": { - "@bufbuild/protobuf": "1.3.0", - "@typescript/vfs": "^1.4.0", - "typescript": "4.5.2" - }, - "dependencies": { - "typescript": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", - "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==" - } - } - }, - "@esbuild-kit/cjs-loader": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@esbuild-kit/cjs-loader/-/cjs-loader-2.4.2.tgz", - "integrity": "sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==", - "dev": true, - "requires": { - "@esbuild-kit/core-utils": "^3.0.0", - "get-tsconfig": "^4.4.0" - } - }, - "@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", - "dev": true, - "requires": { - "esbuild": "~0.17.6", - "source-map-support": "^0.5.21" - } - }, - "@esbuild-kit/esm-loader": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.5.5.tgz", - "integrity": "sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==", - "dev": true, - "requires": { - "@esbuild-kit/core-utils": "^3.0.0", - "get-tsconfig": "^4.4.0" - } - }, - "@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", - "dev": true, - "optional": true - }, - "@types/node": { - "version": "20.4.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz", - "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==", - "dev": true - }, - "@typescript/vfs": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.5.0.tgz", - "integrity": "sha512-AJS307bPgbsZZ9ggCT3wwpg3VbTKMFNHfaY/uF0ahSkYYrPF2dSSKDNIDIQAHm9qJqbLvCsSJH7yN4Vs/CsMMg==", - "requires": { - "debug": "^4.1.1" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", - "dev": true, - "requires": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" - } - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, - "get-tsconfig": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.4.0.tgz", - "integrity": "sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "tsx": { - "version": "3.12.7", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz", - "integrity": "sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==", - "dev": true, - "requires": { - "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", - "@esbuild-kit/esm-loader": "^2.5.5", - "fsevents": "~2.3.2" - } - }, - "typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "dev": true - } } } diff --git a/impl/protobuf-es/package.json b/impl/protobuf-es/package.json index 245d48b3..441ec4f1 100644 --- a/impl/protobuf-es/package.json +++ b/impl/protobuf-es/package.json @@ -3,13 +3,13 @@ "private": true, "type": "module", "dependencies": { - "@bufbuild/protobuf": "^1.3.0", - "@bufbuild/protoc-gen-es": "^1.3.0" + "@bufbuild/protobuf": "^1.3.1", + "@bufbuild/protoc-gen-es": "^1.3.1" }, "devDependencies": { - "@bufbuild/buf": "^1.25.0", - "@types/node": "^20.4.5", + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.7", "tsx": "^3.12.7", - "typescript": "^5.1.6" + "typescript": "^5.2.2" } } diff --git a/impl/protobuf-ts/package-lock.json b/impl/protobuf-ts/package-lock.json index 7d3c5d84..3317bd1b 100644 --- a/impl/protobuf-ts/package-lock.json +++ b/impl/protobuf-ts/package-lock.json @@ -10,16 +10,16 @@ "@protobuf-ts/runtime": "^2.9.1" }, "devDependencies": { - "@bufbuild/buf": "^1.15.0-1", - "@types/node": "^18.14.2", - "tsx": "^3.12.3", - "typescript": "^5.0.3" + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.9", + "tsx": "^3.12.8", + "typescript": "^5.2.2" } }, "node_modules/@bufbuild/buf": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.15.0.tgz", - "integrity": "sha512-HX6AjKiI8TVFJKWdDGIUC/zZQG/8sf5FbmU5VdbK/U8tbfCwBADkJ6I+qP6HnDDtSU4obS164J0sibdGhAJKqg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "hasInstallScript": true, "bin": { @@ -31,18 +31,18 @@ "node": ">=12" }, "optionalDependencies": { - "@bufbuild/buf-darwin-arm64": "1.15.0", - "@bufbuild/buf-darwin-x64": "1.15.0", - "@bufbuild/buf-linux-aarch64": "1.15.0", - "@bufbuild/buf-linux-x64": "1.15.0", - "@bufbuild/buf-win32-arm64": "1.15.0", - "@bufbuild/buf-win32-x64": "1.15.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "node_modules/@bufbuild/buf-darwin-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.15.0.tgz", - "integrity": "sha512-sLN6uGc8sIBALa7Q4fB6rW9NM0MXK32pH6RRDUdl7aDrp/3A6TLKKBGiHcY81axUyxDTUNFb8dOwhHTI2H8FzQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "cpu": [ "arm64" ], @@ -56,9 +56,9 @@ } }, "node_modules/@bufbuild/buf-darwin-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.15.0.tgz", - "integrity": "sha512-iHml29I/hOl7ORyp9ohiV7fC1WqPbM5UjogwVpA8j06o5SgxRhp42nd80XRAXCM+65ecwiu5JVuspicGzQFOgg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "cpu": [ "x64" ], @@ -72,9 +72,9 @@ } }, "node_modules/@bufbuild/buf-linux-aarch64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.15.0.tgz", - "integrity": "sha512-YQHXqV1HhdpmIUrYg+gZNWCf43XHJJO5TlJT+pzXB/92PoN8gNP3KdxeRaM2sExcCs91G6zy1/Ms9N6DpeidUQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "cpu": [ "arm64" ], @@ -88,9 +88,9 @@ } }, "node_modules/@bufbuild/buf-linux-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.15.0.tgz", - "integrity": "sha512-DD2OcsfofawRPQKXLFMqV2GSzi4WyE7kKE1PvXBtJy7sombv5TM26vgdb+DQv4T4Z2i7vhKshnflNkfd3QXtXA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "cpu": [ "x64" ], @@ -104,9 +104,9 @@ } }, "node_modules/@bufbuild/buf-win32-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.15.0.tgz", - "integrity": "sha512-wk65iDXWRicfrt/9Gb1voAn9eGP2giQfKMrKOoEyytnDHFolMSmQimKH6iQ1uS5Vn0gI/BVp582cF1m9YsbXEg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "cpu": [ "arm64" ], @@ -120,9 +120,9 @@ } }, "node_modules/@bufbuild/buf-win32-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.15.0.tgz", - "integrity": "sha512-KVoMj52ghYfLwGjQ+t19XZiQy8jGSGUYIe/yVZz08rsm5msXHGYOt++Bk3wr48rcv8gts8jo2/h1Ebkj+F6emw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "cpu": [ "x64" ], @@ -146,12 +146,12 @@ } }, "node_modules/@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.2.2.tgz", + "integrity": "sha512-Ub6LaRaAgF80dTSzUdXpFLM1pVDdmEVB9qb5iAzSpyDlX/mfJTFGOnZ516O05p5uWWteNviMKi4PAyEuRxI5gA==", "dev": true, "dependencies": { - "esbuild": "~0.17.6", + "esbuild": "~0.18.20", "source-map-support": "^0.5.21" } }, @@ -166,9 +166,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.11.tgz", - "integrity": "sha512-CdyX6sRVh1NzFCsf5vw3kULwlAhfy9wVt8SZlrhQ7eL2qBjGbFhRBWkkAzuZm9IIEOCKJw4DXA6R85g+qc8RDw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ "arm" ], @@ -182,9 +182,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.11.tgz", - "integrity": "sha512-QnK4d/zhVTuV4/pRM4HUjcsbl43POALU2zvBynmrrqZt9LPcLA3x1fTZPBg2RRguBQnJcnU059yKr+bydkntjg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ "arm64" ], @@ -198,9 +198,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.11.tgz", - "integrity": "sha512-3PL3HKtsDIXGQcSCKtWD/dy+mgc4p2Tvo2qKgKHj9Yf+eniwFnuoQ0OUhlSfAEpKAFzF9N21Nwgnap6zy3L3MQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "cpu": [ "x64" ], @@ -214,9 +214,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.11.tgz", - "integrity": "sha512-pJ950bNKgzhkGNO3Z9TeHzIFtEyC2GDQL3wxkMApDEghYx5Qers84UTNc1bAxWbRkuJOgmOha5V0WUeh8G+YGw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], @@ -230,9 +230,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.11.tgz", - "integrity": "sha512-iB0dQkIHXyczK3BZtzw1tqegf0F0Ab5texX2TvMQjiJIWXAfM4FQl7D909YfXWnB92OQz4ivBYQ2RlxBJrMJOw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "cpu": [ "x64" ], @@ -246,9 +246,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.11.tgz", - "integrity": "sha512-7EFzUADmI1jCHeDRGKgbnF5sDIceZsQGapoO6dmw7r/ZBEKX7CCDnIz8m9yEclzr7mFsd+DyasHzpjfJnmBB1Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "cpu": [ "arm64" ], @@ -262,9 +262,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.11.tgz", - "integrity": "sha512-iPgenptC8i8pdvkHQvXJFzc1eVMR7W2lBPrTE6GbhR54sLcF42mk3zBOjKPOodezzuAz/KSu8CPyFSjcBMkE9g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "cpu": [ "x64" ], @@ -278,9 +278,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.11.tgz", - "integrity": "sha512-M9iK/d4lgZH0U5M1R2p2gqhPV/7JPJcRz+8O8GBKVgqndTzydQ7B2XGDbxtbvFkvIs53uXTobOhv+RyaqhUiMg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "cpu": [ "arm" ], @@ -294,9 +294,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.11.tgz", - "integrity": "sha512-Qxth3gsWWGKz2/qG2d5DsW/57SeA2AmpSMhdg9TSB5Svn2KDob3qxfQSkdnWjSd42kqoxIPy3EJFs+6w1+6Qjg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "cpu": [ "arm64" ], @@ -310,9 +310,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.11.tgz", - "integrity": "sha512-dB1nGaVWtUlb/rRDHmuDQhfqazWE0LMro/AIbT2lWM3CDMHJNpLckH+gCddQyhhcLac2OYw69ikUMO34JLt3wA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "cpu": [ "ia32" ], @@ -326,9 +326,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.11.tgz", - "integrity": "sha512-aCWlq70Q7Nc9WDnormntGS1ar6ZFvUpqr8gXtO+HRejRYPweAFQN615PcgaSJkZjhHp61+MNLhzyVALSF2/Q0g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "cpu": [ "loong64" ], @@ -342,9 +342,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.11.tgz", - "integrity": "sha512-cGeGNdQxqY8qJwlYH1BP6rjIIiEcrM05H7k3tR7WxOLmD1ZxRMd6/QIOWMb8mD2s2YJFNRuNQ+wjMhgEL2oCEw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "cpu": [ "mips64el" ], @@ -358,9 +358,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.11.tgz", - "integrity": "sha512-BdlziJQPW/bNe0E8eYsHB40mYOluS+jULPCjlWiHzDgr+ZBRXPtgMV1nkLEGdpjrwgmtkZHEGEPaKdS/8faLDA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "cpu": [ "ppc64" ], @@ -374,9 +374,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.11.tgz", - "integrity": "sha512-MDLwQbtF+83oJCI1Cixn68Et/ME6gelmhssPebC40RdJaect+IM+l7o/CuG0ZlDs6tZTEIoxUe53H3GmMn8oMA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "cpu": [ "riscv64" ], @@ -390,9 +390,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.11.tgz", - "integrity": "sha512-4N5EMESvws0Ozr2J94VoUD8HIRi7X0uvUv4c0wpTHZyZY9qpaaN7THjosdiW56irQ4qnJ6Lsc+i+5zGWnyqWqQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "cpu": [ "s390x" ], @@ -406,9 +406,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.11.tgz", - "integrity": "sha512-rM/v8UlluxpytFSmVdbCe1yyKQd/e+FmIJE2oPJvbBo+D0XVWi1y/NQ4iTNx+436WmDHQBjVLrbnAQLQ6U7wlw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "cpu": [ "x64" ], @@ -422,9 +422,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.11.tgz", - "integrity": "sha512-4WaAhuz5f91h3/g43VBGdto1Q+X7VEZfpcWGtOFXnggEuLvjV+cP6DyLRU15IjiU9fKLLk41OoJfBFN5DhPvag==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "cpu": [ "x64" ], @@ -438,9 +438,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.11.tgz", - "integrity": "sha512-UBj135Nx4FpnvtE+C8TWGp98oUgBcmNmdYgl5ToKc0mBHxVVqVE7FUS5/ELMImOp205qDAittL6Ezhasc2Ev/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "cpu": [ "x64" ], @@ -454,9 +454,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.11.tgz", - "integrity": "sha512-1/gxTifDC9aXbV2xOfCbOceh5AlIidUrPsMpivgzo8P8zUtczlq1ncFpeN1ZyQJ9lVs2hILy1PG5KPp+w8QPPg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "cpu": [ "x64" ], @@ -470,9 +470,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.11.tgz", - "integrity": "sha512-vtSfyx5yRdpiOW9yp6Ax0zyNOv9HjOAw8WaZg3dF5djEHKKm3UnoohftVvIJtRh0Ec7Hso0RIdTqZvPXJ7FdvQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "cpu": [ "arm64" ], @@ -486,9 +486,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.11.tgz", - "integrity": "sha512-GFPSLEGQr4wHFTiIUJQrnJKZhZjjq4Sphf+mM76nQR6WkQn73vm7IsacmBRPkALfpOCHsopSvLgqdd4iUW2mYw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "cpu": [ "ia32" ], @@ -502,9 +502,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.11.tgz", - "integrity": "sha512-N9vXqLP3eRL8BqSy8yn4Y98cZI2pZ8fyuHx6lKjiG2WABpT2l01TXdzq5Ma2ZUBzfB7tx5dXVhge8X9u0S70ZQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "cpu": [ "x64" ], @@ -588,9 +588,9 @@ } }, "node_modules/@types/node": { - "version": "18.14.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz", - "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==", + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", "dev": true }, "node_modules/buffer-from": { @@ -600,9 +600,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.11.tgz", - "integrity": "sha512-pAMImyokbWDtnA/ufPxjQg0fYo2DDuzAlqwnDvbXqHLphe+m80eF++perYKVm8LeTuj2zUuFXC+xgSVxyoHUdg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, "bin": { @@ -612,28 +612,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.11", - "@esbuild/android-arm64": "0.17.11", - "@esbuild/android-x64": "0.17.11", - "@esbuild/darwin-arm64": "0.17.11", - "@esbuild/darwin-x64": "0.17.11", - "@esbuild/freebsd-arm64": "0.17.11", - "@esbuild/freebsd-x64": "0.17.11", - "@esbuild/linux-arm": "0.17.11", - "@esbuild/linux-arm64": "0.17.11", - "@esbuild/linux-ia32": "0.17.11", - "@esbuild/linux-loong64": "0.17.11", - "@esbuild/linux-mips64el": "0.17.11", - "@esbuild/linux-ppc64": "0.17.11", - "@esbuild/linux-riscv64": "0.17.11", - "@esbuild/linux-s390x": "0.17.11", - "@esbuild/linux-x64": "0.17.11", - "@esbuild/netbsd-x64": "0.17.11", - "@esbuild/openbsd-x64": "0.17.11", - "@esbuild/sunos-x64": "0.17.11", - "@esbuild/win32-arm64": "0.17.11", - "@esbuild/win32-ia32": "0.17.11", - "@esbuild/win32-x64": "0.17.11" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "node_modules/fsevents": { @@ -679,13 +679,13 @@ } }, "node_modules/tsx": { - "version": "3.12.3", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.3.tgz", - "integrity": "sha512-Wc5BFH1xccYTXaQob+lEcimkcb/Pq+0en2s+ruiX0VEIC80nV7/0s7XRahx8NnsoCnpCVUPz8wrqVSPi760LkA==", + "version": "3.12.8", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.8.tgz", + "integrity": "sha512-Lt9KYaRGF023tlLInPj8rgHwsZU8qWLBj4iRXNWxTfjIkU7canGL806AqKear1j722plHuiYNcL2ZCo6uS9UJA==", "dev": true, "dependencies": { "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", + "@esbuild-kit/core-utils": "^3.2.2", "@esbuild-kit/esm-loader": "^2.5.5" }, "bin": { @@ -696,73 +696,73 @@ } }, "node_modules/typescript": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz", - "integrity": "sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } } }, "dependencies": { "@bufbuild/buf": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.15.0.tgz", - "integrity": "sha512-HX6AjKiI8TVFJKWdDGIUC/zZQG/8sf5FbmU5VdbK/U8tbfCwBADkJ6I+qP6HnDDtSU4obS164J0sibdGhAJKqg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "requires": { - "@bufbuild/buf-darwin-arm64": "1.15.0", - "@bufbuild/buf-darwin-x64": "1.15.0", - "@bufbuild/buf-linux-aarch64": "1.15.0", - "@bufbuild/buf-linux-x64": "1.15.0", - "@bufbuild/buf-win32-arm64": "1.15.0", - "@bufbuild/buf-win32-x64": "1.15.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "@bufbuild/buf-darwin-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.15.0.tgz", - "integrity": "sha512-sLN6uGc8sIBALa7Q4fB6rW9NM0MXK32pH6RRDUdl7aDrp/3A6TLKKBGiHcY81axUyxDTUNFb8dOwhHTI2H8FzQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "dev": true, "optional": true }, "@bufbuild/buf-darwin-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.15.0.tgz", - "integrity": "sha512-iHml29I/hOl7ORyp9ohiV7fC1WqPbM5UjogwVpA8j06o5SgxRhp42nd80XRAXCM+65ecwiu5JVuspicGzQFOgg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "dev": true, "optional": true }, "@bufbuild/buf-linux-aarch64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.15.0.tgz", - "integrity": "sha512-YQHXqV1HhdpmIUrYg+gZNWCf43XHJJO5TlJT+pzXB/92PoN8gNP3KdxeRaM2sExcCs91G6zy1/Ms9N6DpeidUQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "dev": true, "optional": true }, "@bufbuild/buf-linux-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.15.0.tgz", - "integrity": "sha512-DD2OcsfofawRPQKXLFMqV2GSzi4WyE7kKE1PvXBtJy7sombv5TM26vgdb+DQv4T4Z2i7vhKshnflNkfd3QXtXA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "dev": true, "optional": true }, "@bufbuild/buf-win32-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.15.0.tgz", - "integrity": "sha512-wk65iDXWRicfrt/9Gb1voAn9eGP2giQfKMrKOoEyytnDHFolMSmQimKH6iQ1uS5Vn0gI/BVp582cF1m9YsbXEg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "dev": true, "optional": true }, "@bufbuild/buf-win32-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.15.0.tgz", - "integrity": "sha512-KVoMj52ghYfLwGjQ+t19XZiQy8jGSGUYIe/yVZz08rsm5msXHGYOt++Bk3wr48rcv8gts8jo2/h1Ebkj+F6emw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "dev": true, "optional": true }, @@ -777,12 +777,12 @@ } }, "@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.2.2.tgz", + "integrity": "sha512-Ub6LaRaAgF80dTSzUdXpFLM1pVDdmEVB9qb5iAzSpyDlX/mfJTFGOnZ516O05p5uWWteNviMKi4PAyEuRxI5gA==", "dev": true, "requires": { - "esbuild": "~0.17.6", + "esbuild": "~0.18.20", "source-map-support": "^0.5.21" } }, @@ -797,156 +797,156 @@ } }, "@esbuild/android-arm": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.11.tgz", - "integrity": "sha512-CdyX6sRVh1NzFCsf5vw3kULwlAhfy9wVt8SZlrhQ7eL2qBjGbFhRBWkkAzuZm9IIEOCKJw4DXA6R85g+qc8RDw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.11.tgz", - "integrity": "sha512-QnK4d/zhVTuV4/pRM4HUjcsbl43POALU2zvBynmrrqZt9LPcLA3x1fTZPBg2RRguBQnJcnU059yKr+bydkntjg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.11.tgz", - "integrity": "sha512-3PL3HKtsDIXGQcSCKtWD/dy+mgc4p2Tvo2qKgKHj9Yf+eniwFnuoQ0OUhlSfAEpKAFzF9N21Nwgnap6zy3L3MQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.11.tgz", - "integrity": "sha512-pJ950bNKgzhkGNO3Z9TeHzIFtEyC2GDQL3wxkMApDEghYx5Qers84UTNc1bAxWbRkuJOgmOha5V0WUeh8G+YGw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.11.tgz", - "integrity": "sha512-iB0dQkIHXyczK3BZtzw1tqegf0F0Ab5texX2TvMQjiJIWXAfM4FQl7D909YfXWnB92OQz4ivBYQ2RlxBJrMJOw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.11.tgz", - "integrity": "sha512-7EFzUADmI1jCHeDRGKgbnF5sDIceZsQGapoO6dmw7r/ZBEKX7CCDnIz8m9yEclzr7mFsd+DyasHzpjfJnmBB1Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.11.tgz", - "integrity": "sha512-iPgenptC8i8pdvkHQvXJFzc1eVMR7W2lBPrTE6GbhR54sLcF42mk3zBOjKPOodezzuAz/KSu8CPyFSjcBMkE9g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.11.tgz", - "integrity": "sha512-M9iK/d4lgZH0U5M1R2p2gqhPV/7JPJcRz+8O8GBKVgqndTzydQ7B2XGDbxtbvFkvIs53uXTobOhv+RyaqhUiMg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.11.tgz", - "integrity": "sha512-Qxth3gsWWGKz2/qG2d5DsW/57SeA2AmpSMhdg9TSB5Svn2KDob3qxfQSkdnWjSd42kqoxIPy3EJFs+6w1+6Qjg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.11.tgz", - "integrity": "sha512-dB1nGaVWtUlb/rRDHmuDQhfqazWE0LMro/AIbT2lWM3CDMHJNpLckH+gCddQyhhcLac2OYw69ikUMO34JLt3wA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.11.tgz", - "integrity": "sha512-aCWlq70Q7Nc9WDnormntGS1ar6ZFvUpqr8gXtO+HRejRYPweAFQN615PcgaSJkZjhHp61+MNLhzyVALSF2/Q0g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.11.tgz", - "integrity": "sha512-cGeGNdQxqY8qJwlYH1BP6rjIIiEcrM05H7k3tR7WxOLmD1ZxRMd6/QIOWMb8mD2s2YJFNRuNQ+wjMhgEL2oCEw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.11.tgz", - "integrity": "sha512-BdlziJQPW/bNe0E8eYsHB40mYOluS+jULPCjlWiHzDgr+ZBRXPtgMV1nkLEGdpjrwgmtkZHEGEPaKdS/8faLDA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.11.tgz", - "integrity": "sha512-MDLwQbtF+83oJCI1Cixn68Et/ME6gelmhssPebC40RdJaect+IM+l7o/CuG0ZlDs6tZTEIoxUe53H3GmMn8oMA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.11.tgz", - "integrity": "sha512-4N5EMESvws0Ozr2J94VoUD8HIRi7X0uvUv4c0wpTHZyZY9qpaaN7THjosdiW56irQ4qnJ6Lsc+i+5zGWnyqWqQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.11.tgz", - "integrity": "sha512-rM/v8UlluxpytFSmVdbCe1yyKQd/e+FmIJE2oPJvbBo+D0XVWi1y/NQ4iTNx+436WmDHQBjVLrbnAQLQ6U7wlw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.11.tgz", - "integrity": "sha512-4WaAhuz5f91h3/g43VBGdto1Q+X7VEZfpcWGtOFXnggEuLvjV+cP6DyLRU15IjiU9fKLLk41OoJfBFN5DhPvag==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.11.tgz", - "integrity": "sha512-UBj135Nx4FpnvtE+C8TWGp98oUgBcmNmdYgl5ToKc0mBHxVVqVE7FUS5/ELMImOp205qDAittL6Ezhasc2Ev/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.11.tgz", - "integrity": "sha512-1/gxTifDC9aXbV2xOfCbOceh5AlIidUrPsMpivgzo8P8zUtczlq1ncFpeN1ZyQJ9lVs2hILy1PG5KPp+w8QPPg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.11.tgz", - "integrity": "sha512-vtSfyx5yRdpiOW9yp6Ax0zyNOv9HjOAw8WaZg3dF5djEHKKm3UnoohftVvIJtRh0Ec7Hso0RIdTqZvPXJ7FdvQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.11.tgz", - "integrity": "sha512-GFPSLEGQr4wHFTiIUJQrnJKZhZjjq4Sphf+mM76nQR6WkQn73vm7IsacmBRPkALfpOCHsopSvLgqdd4iUW2mYw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.11.tgz", - "integrity": "sha512-N9vXqLP3eRL8BqSy8yn4Y98cZI2pZ8fyuHx6lKjiG2WABpT2l01TXdzq5Ma2ZUBzfB7tx5dXVhge8X9u0S70ZQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "dev": true, "optional": true }, @@ -1004,9 +1004,9 @@ } }, "@types/node": { - "version": "18.14.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz", - "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==", + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", "dev": true }, "buffer-from": { @@ -1016,33 +1016,33 @@ "dev": true }, "esbuild": { - "version": "0.17.11", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.11.tgz", - "integrity": "sha512-pAMImyokbWDtnA/ufPxjQg0fYo2DDuzAlqwnDvbXqHLphe+m80eF++perYKVm8LeTuj2zUuFXC+xgSVxyoHUdg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "requires": { - "@esbuild/android-arm": "0.17.11", - "@esbuild/android-arm64": "0.17.11", - "@esbuild/android-x64": "0.17.11", - "@esbuild/darwin-arm64": "0.17.11", - "@esbuild/darwin-x64": "0.17.11", - "@esbuild/freebsd-arm64": "0.17.11", - "@esbuild/freebsd-x64": "0.17.11", - "@esbuild/linux-arm": "0.17.11", - "@esbuild/linux-arm64": "0.17.11", - "@esbuild/linux-ia32": "0.17.11", - "@esbuild/linux-loong64": "0.17.11", - "@esbuild/linux-mips64el": "0.17.11", - "@esbuild/linux-ppc64": "0.17.11", - "@esbuild/linux-riscv64": "0.17.11", - "@esbuild/linux-s390x": "0.17.11", - "@esbuild/linux-x64": "0.17.11", - "@esbuild/netbsd-x64": "0.17.11", - "@esbuild/openbsd-x64": "0.17.11", - "@esbuild/sunos-x64": "0.17.11", - "@esbuild/win32-arm64": "0.17.11", - "@esbuild/win32-ia32": "0.17.11", - "@esbuild/win32-x64": "0.17.11" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "fsevents": { @@ -1075,21 +1075,21 @@ } }, "tsx": { - "version": "3.12.3", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.3.tgz", - "integrity": "sha512-Wc5BFH1xccYTXaQob+lEcimkcb/Pq+0en2s+ruiX0VEIC80nV7/0s7XRahx8NnsoCnpCVUPz8wrqVSPi760LkA==", + "version": "3.12.8", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.8.tgz", + "integrity": "sha512-Lt9KYaRGF023tlLInPj8rgHwsZU8qWLBj4iRXNWxTfjIkU7canGL806AqKear1j722plHuiYNcL2ZCo6uS9UJA==", "dev": true, "requires": { "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", + "@esbuild-kit/core-utils": "^3.2.2", "@esbuild-kit/esm-loader": "^2.5.5", "fsevents": "~2.3.2" } }, "typescript": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz", - "integrity": "sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true } } diff --git a/impl/protobuf-ts/package.json b/impl/protobuf-ts/package.json index dc7dbbd6..ea088549 100644 --- a/impl/protobuf-ts/package.json +++ b/impl/protobuf-ts/package.json @@ -7,9 +7,9 @@ "@protobuf-ts/runtime": "^2.9.1" }, "devDependencies": { - "@bufbuild/buf": "^1.15.0-1", - "@types/node": "^18.14.2", - "tsx": "^3.12.3", - "typescript": "^5.0.3" + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.9", + "tsx": "^3.12.8", + "typescript": "^5.2.2" } } diff --git a/impl/protobuf.js/package-lock.json b/impl/protobuf.js/package-lock.json index 7ba08ed7..5474f927 100644 --- a/impl/protobuf.js/package-lock.json +++ b/impl/protobuf.js/package-lock.json @@ -7,11 +7,11 @@ "name": "protobuf.js-conformance", "dependencies": { "long": "^5.2.3", - "protobufjs": "^7.2.4", - "protobufjs-cli": "^1.0.2" + "protobufjs": "^7.2.5", + "protobufjs-cli": "^1.1.2" }, "devDependencies": { - "typescript": "^5.1.6" + "typescript": "^5.2.2" } }, "node_modules/@babel/parser": { @@ -570,9 +570,9 @@ } }, "node_modules/protobufjs": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", - "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", + "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -593,9 +593,9 @@ } }, "node_modules/protobufjs-cli": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz", - "integrity": "sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.2.tgz", + "integrity": "sha512-8ivXWxT39gZN4mm4ArQyJrRgnIwZqffBWoLDsE21TmMcKI3XwJMV4lEF2WU02C4JAtgYYc2SfJIltelD8to35g==", "dependencies": { "chalk": "^4.0.0", "escodegen": "^1.13.0", @@ -748,9 +748,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1235,9 +1235,9 @@ "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==" }, "protobufjs": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", - "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", + "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", @@ -1254,9 +1254,9 @@ } }, "protobufjs-cli": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz", - "integrity": "sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.2.tgz", + "integrity": "sha512-8ivXWxT39gZN4mm4ArQyJrRgnIwZqffBWoLDsE21TmMcKI3XwJMV4lEF2WU02C4JAtgYYc2SfJIltelD8to35g==", "requires": { "chalk": "^4.0.0", "escodegen": "^1.13.0", @@ -1362,9 +1362,9 @@ } }, "typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true }, "uc.micro": { diff --git a/impl/protobuf.js/package.json b/impl/protobuf.js/package.json index eb3903c6..1696595e 100644 --- a/impl/protobuf.js/package.json +++ b/impl/protobuf.js/package.json @@ -4,10 +4,10 @@ "type": "module", "dependencies": { "long": "^5.2.3", - "protobufjs": "^7.2.4", - "protobufjs-cli": "^1.0.2" + "protobufjs": "^7.2.5", + "protobufjs-cli": "^1.1.2" }, "devDependencies": { - "typescript": "^5.1.6" + "typescript": "^5.2.2" } } diff --git a/impl/protoc-gen-ts/gen/conformance/conformance.ts b/impl/protoc-gen-ts/gen/conformance/conformance.ts index 2fcf6ad5..ef345e72 100644 --- a/impl/protoc-gen-ts/gen/conformance/conformance.ts +++ b/impl/protoc-gen-ts/gen/conformance/conformance.ts @@ -149,7 +149,7 @@ export namespace conformance { } } get protobuf_payload() { - return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array()) as Uint8Array; + return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array(0)) as Uint8Array; } set protobuf_payload(value: Uint8Array) { pb_1.Message.setOneofField(this, 1, this.#one_of_decls[0], value); @@ -543,7 +543,7 @@ export namespace conformance { return pb_1.Message.getField(this, 2) != null; } get protobuf_payload() { - return pb_1.Message.getFieldWithDefault(this, 3, new Uint8Array()) as Uint8Array; + return pb_1.Message.getFieldWithDefault(this, 3, new Uint8Array(0)) as Uint8Array; } set protobuf_payload(value: Uint8Array) { pb_1.Message.setOneofField(this, 3, this.#one_of_decls[0], value); diff --git a/impl/protoc-gen-ts/gen/google/protobuf/any.ts b/impl/protoc-gen-ts/gen/google/protobuf/any.ts index 75a29789..aa90dda1 100644 --- a/impl/protoc-gen-ts/gen/google/protobuf/any.ts +++ b/impl/protoc-gen-ts/gen/google/protobuf/any.ts @@ -29,7 +29,7 @@ export namespace google.protobuf { pb_1.Message.setField(this, 1, value); } get value() { - return pb_1.Message.getFieldWithDefault(this, 2, new Uint8Array()) as Uint8Array; + return pb_1.Message.getFieldWithDefault(this, 2, new Uint8Array(0)) as Uint8Array; } set value(value: Uint8Array) { pb_1.Message.setField(this, 2, value); diff --git a/impl/protoc-gen-ts/gen/google/protobuf/struct.ts b/impl/protoc-gen-ts/gen/google/protobuf/struct.ts index 5b35550f..d47e8978 100644 --- a/impl/protoc-gen-ts/gen/google/protobuf/struct.ts +++ b/impl/protoc-gen-ts/gen/google/protobuf/struct.ts @@ -46,7 +46,7 @@ export namespace google.protobuf { [key: string]: ReturnType; }; } = {}; - if (this.fields.size > 0) { + if (this.fields != null) { data.fields = (Object.fromEntries)((Array.from)(this.fields).map(([key, value]) => [key, value.toObject()])); } return data; diff --git a/impl/protoc-gen-ts/gen/google/protobuf/test_messages_proto3.ts b/impl/protoc-gen-ts/gen/google/protobuf/test_messages_proto3.ts index a6ae05f3..20fe68b0 100644 --- a/impl/protoc-gen-ts/gen/google/protobuf/test_messages_proto3.ts +++ b/impl/protoc-gen-ts/gen/google/protobuf/test_messages_proto3.ts @@ -852,7 +852,7 @@ export namespace protobuf_test_messages.proto3 { pb_1.Message.setField(this, 14, value); } get optional_bytes() { - return pb_1.Message.getFieldWithDefault(this, 15, new Uint8Array()) as Uint8Array; + return pb_1.Message.getFieldWithDefault(this, 15, new Uint8Array(0)) as Uint8Array; } set optional_bytes(value: Uint8Array) { pb_1.Message.setField(this, 15, value); @@ -1017,13 +1017,13 @@ export namespace protobuf_test_messages.proto3 { pb_1.Message.setRepeatedWrapperField(this, 49, value); } get repeated_nested_enum() { - return pb_1.Message.getFieldWithDefault(this, 51, TestAllTypesProto3.NestedEnum.FOO) as TestAllTypesProto3.NestedEnum[]; + return pb_1.Message.getFieldWithDefault(this, 51, []) as TestAllTypesProto3.NestedEnum[]; } set repeated_nested_enum(value: TestAllTypesProto3.NestedEnum[]) { pb_1.Message.setField(this, 51, value); } get repeated_foreign_enum() { - return pb_1.Message.getFieldWithDefault(this, 52, ForeignEnum.FOREIGN_FOO) as ForeignEnum[]; + return pb_1.Message.getFieldWithDefault(this, 52, []) as ForeignEnum[]; } set repeated_foreign_enum(value: ForeignEnum[]) { pb_1.Message.setField(this, 52, value); @@ -1119,7 +1119,7 @@ export namespace protobuf_test_messages.proto3 { pb_1.Message.setField(this, 87, value); } get packed_nested_enum() { - return pb_1.Message.getFieldWithDefault(this, 88, TestAllTypesProto3.NestedEnum.FOO) as TestAllTypesProto3.NestedEnum[]; + return pb_1.Message.getFieldWithDefault(this, 88, []) as TestAllTypesProto3.NestedEnum[]; } set packed_nested_enum(value: TestAllTypesProto3.NestedEnum[]) { pb_1.Message.setField(this, 88, value); @@ -1203,7 +1203,7 @@ export namespace protobuf_test_messages.proto3 { pb_1.Message.setField(this, 101, value); } get unpacked_nested_enum() { - return pb_1.Message.getFieldWithDefault(this, 102, TestAllTypesProto3.NestedEnum.FOO) as TestAllTypesProto3.NestedEnum[]; + return pb_1.Message.getFieldWithDefault(this, 102, []) as TestAllTypesProto3.NestedEnum[]; } set unpacked_nested_enum(value: TestAllTypesProto3.NestedEnum[]) { pb_1.Message.setField(this, 102, value); @@ -1350,7 +1350,7 @@ export namespace protobuf_test_messages.proto3 { return pb_1.Message.getField(this, 113) != null; } get oneof_bytes() { - return pb_1.Message.getFieldWithDefault(this, 114, new Uint8Array()) as Uint8Array; + return pb_1.Message.getFieldWithDefault(this, 114, new Uint8Array(0)) as Uint8Array; } set oneof_bytes(value: Uint8Array) { pb_1.Message.setOneofField(this, 114, this.#one_of_decls[0], value); @@ -2830,61 +2830,61 @@ export namespace protobuf_test_messages.proto3 { if (this.unpacked_nested_enum != null) { data.unpacked_nested_enum = this.unpacked_nested_enum; } - if (this.map_int32_int32.size > 0) { + if (this.map_int32_int32 != null) { data.map_int32_int32 = (Object.fromEntries)(this.map_int32_int32); } - if (this.map_int64_int64.size > 0) { + if (this.map_int64_int64 != null) { data.map_int64_int64 = (Object.fromEntries)(this.map_int64_int64); } - if (this.map_uint32_uint32.size > 0) { + if (this.map_uint32_uint32 != null) { data.map_uint32_uint32 = (Object.fromEntries)(this.map_uint32_uint32); } - if (this.map_uint64_uint64.size > 0) { + if (this.map_uint64_uint64 != null) { data.map_uint64_uint64 = (Object.fromEntries)(this.map_uint64_uint64); } - if (this.map_sint32_sint32.size > 0) { + if (this.map_sint32_sint32 != null) { data.map_sint32_sint32 = (Object.fromEntries)(this.map_sint32_sint32); } - if (this.map_sint64_sint64.size > 0) { + if (this.map_sint64_sint64 != null) { data.map_sint64_sint64 = (Object.fromEntries)(this.map_sint64_sint64); } - if (this.map_fixed32_fixed32.size > 0) { + if (this.map_fixed32_fixed32 != null) { data.map_fixed32_fixed32 = (Object.fromEntries)(this.map_fixed32_fixed32); } - if (this.map_fixed64_fixed64.size > 0) { + if (this.map_fixed64_fixed64 != null) { data.map_fixed64_fixed64 = (Object.fromEntries)(this.map_fixed64_fixed64); } - if (this.map_sfixed32_sfixed32.size > 0) { + if (this.map_sfixed32_sfixed32 != null) { data.map_sfixed32_sfixed32 = (Object.fromEntries)(this.map_sfixed32_sfixed32); } - if (this.map_sfixed64_sfixed64.size > 0) { + if (this.map_sfixed64_sfixed64 != null) { data.map_sfixed64_sfixed64 = (Object.fromEntries)(this.map_sfixed64_sfixed64); } - if (this.map_int32_float.size > 0) { + if (this.map_int32_float != null) { data.map_int32_float = (Object.fromEntries)(this.map_int32_float); } - if (this.map_int32_double.size > 0) { + if (this.map_int32_double != null) { data.map_int32_double = (Object.fromEntries)(this.map_int32_double); } - if (this.map_bool_bool.size > 0) { + if (this.map_bool_bool != null) { data.map_bool_bool = (Object.fromEntries)(this.map_bool_bool); } - if (this.map_string_string.size > 0) { + if (this.map_string_string != null) { data.map_string_string = (Object.fromEntries)(this.map_string_string); } - if (this.map_string_bytes.size > 0) { + if (this.map_string_bytes != null) { data.map_string_bytes = (Object.fromEntries)(this.map_string_bytes); } - if (this.map_string_nested_message.size > 0) { + if (this.map_string_nested_message != null) { data.map_string_nested_message = (Object.fromEntries)((Array.from)(this.map_string_nested_message).map(([key, value]) => [key, value.toObject()])); } - if (this.map_string_foreign_message.size > 0) { + if (this.map_string_foreign_message != null) { data.map_string_foreign_message = (Object.fromEntries)((Array.from)(this.map_string_foreign_message).map(([key, value]) => [key, value.toObject()])); } - if (this.map_string_nested_enum.size > 0) { + if (this.map_string_nested_enum != null) { data.map_string_nested_enum = (Object.fromEntries)(this.map_string_nested_enum); } - if (this.map_string_foreign_enum.size > 0) { + if (this.map_string_foreign_enum != null) { data.map_string_foreign_enum = (Object.fromEntries)(this.map_string_foreign_enum); } if (this.oneof_uint32 != null) { diff --git a/impl/protoc-gen-ts/gen/google/protobuf/wrappers.ts b/impl/protoc-gen-ts/gen/google/protobuf/wrappers.ts index 0eb247b4..85127151 100644 --- a/impl/protoc-gen-ts/gen/google/protobuf/wrappers.ts +++ b/impl/protoc-gen-ts/gen/google/protobuf/wrappers.ts @@ -555,7 +555,7 @@ export namespace google.protobuf { } } get value() { - return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array()) as Uint8Array; + return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array(0)) as Uint8Array; } set value(value: Uint8Array) { pb_1.Message.setField(this, 1, value); diff --git a/impl/protoc-gen-ts/package-lock.json b/impl/protoc-gen-ts/package-lock.json index 3f65ba19..d914ccdb 100644 --- a/impl/protoc-gen-ts/package-lock.json +++ b/impl/protoc-gen-ts/package-lock.json @@ -9,18 +9,18 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@bufbuild/buf": "^1.15.0-1", + "@bufbuild/buf": "^1.26.1", "@types/google-protobuf": "^3.15.6", - "@types/node": "^18.14.0", + "@types/node": "^20.5.9", "google-protobuf": "^3.21.2", - "protoc-gen-ts": "^0.8.5", + "protoc-gen-ts": "^0.8.6", "typescript": "^4.9.5" } }, "node_modules/@bufbuild/buf": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.15.0-1.tgz", - "integrity": "sha512-j+mkNd9kM+2b9JacmZNBxTkbOXtLUltzv0inWBYRqd4dJ+EwAR/CDfK6OXvia94aJsKWy8YKSgLu19VlTYSh1Q==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "hasInstallScript": true, "bin": { "buf": "bin/buf", @@ -31,18 +31,18 @@ "node": ">=12" }, "optionalDependencies": { - "@bufbuild/buf-darwin-arm64": "1.15.0-1", - "@bufbuild/buf-darwin-x64": "1.15.0-1", - "@bufbuild/buf-linux-aarch64": "1.15.0-1", - "@bufbuild/buf-linux-x64": "1.15.0-1", - "@bufbuild/buf-win32-arm64": "1.15.0-1", - "@bufbuild/buf-win32-x64": "1.15.0-1" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "node_modules/@bufbuild/buf-darwin-arm64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.15.0-1.tgz", - "integrity": "sha512-KV3rvScwjMCcj0DSkmx6Ejk8YF7LtnqA3jSokeYbGaLLfSvPXu4q9d0I2pq+jaYIA8RfbMerAqzR8MccdY4Vqw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "cpu": [ "arm64" ], @@ -55,9 +55,9 @@ } }, "node_modules/@bufbuild/buf-darwin-x64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.15.0-1.tgz", - "integrity": "sha512-hSEK9TIGmTA58PhUsvcuhF9LcmZ3mZedPgWT8cAeGZYcNJd1mkUEzsWsqnYYGZRe1QvOPZW1BsPIayWFBrlBMQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "cpu": [ "x64" ], @@ -70,9 +70,9 @@ } }, "node_modules/@bufbuild/buf-linux-aarch64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.15.0-1.tgz", - "integrity": "sha512-Ppa5mNy3z5cmTPo18Sc5xUIPfRBpa/Bc9VyqtUqwMJGtTQ1fC+JJ9LFUL8UxXcvdVRcErxXNyd6oGEZzOoLFFQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "cpu": [ "arm64" ], @@ -85,9 +85,9 @@ } }, "node_modules/@bufbuild/buf-linux-x64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.15.0-1.tgz", - "integrity": "sha512-6QtcPOf6D3cXGAhMIhCkOlveLc19nXFCteUktuK73Ls8XDOLuhef4cEfb/Gh7RQCq6IyfFyzoEzb0cWybXnBbQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "cpu": [ "x64" ], @@ -100,9 +100,9 @@ } }, "node_modules/@bufbuild/buf-win32-arm64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.15.0-1.tgz", - "integrity": "sha512-h356aHM1BvHKjxrs9GjeuDxljqJDNtv8NhzssR3kD4ZkRjZYpMhc8YzpnodY3W520W9/6Q7k7CuVd2vhib1Fyg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "cpu": [ "arm64" ], @@ -115,9 +115,9 @@ } }, "node_modules/@bufbuild/buf-win32-x64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.15.0-1.tgz", - "integrity": "sha512-dc1dBFDTNF/3ulr7rejsX/lBb2eqAPZtHI3w6YUQaXTkhmQtNOe45QkaOYnj4UFj6sBVI53WeAisNf3Wg+SUFQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "cpu": [ "x64" ], @@ -135,9 +135,9 @@ "integrity": "sha512-pYVNNJ+winC4aek+lZp93sIKxnXt5qMkuKmaqS3WGuTq0Bw1ZDYNBgzG5kkdtwcv+GmYJGo3yEg6z2cKKAiEdw==" }, "node_modules/@types/node": { - "version": "18.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz", - "integrity": "sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==" + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==" }, "node_modules/google-protobuf": { "version": "3.21.2", @@ -145,9 +145,9 @@ "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==" }, "node_modules/protoc-gen-ts": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/protoc-gen-ts/-/protoc-gen-ts-0.8.5.tgz", - "integrity": "sha512-LHZ+w/+DqmdgnhPtShgqtPtdv+hJ9bAXEIqNU0kkY2bPcCVIEWz5seOv20FCw6gbKorriTGP8xgz2RsIcrRvVw==", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/protoc-gen-ts/-/protoc-gen-ts-0.8.6.tgz", + "integrity": "sha512-66oeorGy4QBvYjQGd/gaeOYyFqKyRmRgTpofmnw8buMG0P7A0jQjoKSvKJz5h5tNUaVkIzvGBUTRVGakrhhwpA==", "bin": { "protoc-gen-ts": "bin/protoc-gen-ts.js" }, @@ -157,7 +157,7 @@ }, "peerDependencies": { "google-protobuf": "^3.13.0", - "typescript": ">=4" + "typescript": "4.x.x" } }, "node_modules/typescript": { @@ -175,52 +175,52 @@ }, "dependencies": { "@bufbuild/buf": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.15.0-1.tgz", - "integrity": "sha512-j+mkNd9kM+2b9JacmZNBxTkbOXtLUltzv0inWBYRqd4dJ+EwAR/CDfK6OXvia94aJsKWy8YKSgLu19VlTYSh1Q==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "requires": { - "@bufbuild/buf-darwin-arm64": "1.15.0-1", - "@bufbuild/buf-darwin-x64": "1.15.0-1", - "@bufbuild/buf-linux-aarch64": "1.15.0-1", - "@bufbuild/buf-linux-x64": "1.15.0-1", - "@bufbuild/buf-win32-arm64": "1.15.0-1", - "@bufbuild/buf-win32-x64": "1.15.0-1" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "@bufbuild/buf-darwin-arm64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.15.0-1.tgz", - "integrity": "sha512-KV3rvScwjMCcj0DSkmx6Ejk8YF7LtnqA3jSokeYbGaLLfSvPXu4q9d0I2pq+jaYIA8RfbMerAqzR8MccdY4Vqw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "optional": true }, "@bufbuild/buf-darwin-x64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.15.0-1.tgz", - "integrity": "sha512-hSEK9TIGmTA58PhUsvcuhF9LcmZ3mZedPgWT8cAeGZYcNJd1mkUEzsWsqnYYGZRe1QvOPZW1BsPIayWFBrlBMQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "optional": true }, "@bufbuild/buf-linux-aarch64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.15.0-1.tgz", - "integrity": "sha512-Ppa5mNy3z5cmTPo18Sc5xUIPfRBpa/Bc9VyqtUqwMJGtTQ1fC+JJ9LFUL8UxXcvdVRcErxXNyd6oGEZzOoLFFQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "optional": true }, "@bufbuild/buf-linux-x64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.15.0-1.tgz", - "integrity": "sha512-6QtcPOf6D3cXGAhMIhCkOlveLc19nXFCteUktuK73Ls8XDOLuhef4cEfb/Gh7RQCq6IyfFyzoEzb0cWybXnBbQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "optional": true }, "@bufbuild/buf-win32-arm64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.15.0-1.tgz", - "integrity": "sha512-h356aHM1BvHKjxrs9GjeuDxljqJDNtv8NhzssR3kD4ZkRjZYpMhc8YzpnodY3W520W9/6Q7k7CuVd2vhib1Fyg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "optional": true }, "@bufbuild/buf-win32-x64": { - "version": "1.15.0-1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.15.0-1.tgz", - "integrity": "sha512-dc1dBFDTNF/3ulr7rejsX/lBb2eqAPZtHI3w6YUQaXTkhmQtNOe45QkaOYnj4UFj6sBVI53WeAisNf3Wg+SUFQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "optional": true }, "@types/google-protobuf": { @@ -229,9 +229,9 @@ "integrity": "sha512-pYVNNJ+winC4aek+lZp93sIKxnXt5qMkuKmaqS3WGuTq0Bw1ZDYNBgzG5kkdtwcv+GmYJGo3yEg6z2cKKAiEdw==" }, "@types/node": { - "version": "18.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz", - "integrity": "sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==" + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==" }, "google-protobuf": { "version": "3.21.2", @@ -239,9 +239,9 @@ "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==" }, "protoc-gen-ts": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/protoc-gen-ts/-/protoc-gen-ts-0.8.5.tgz", - "integrity": "sha512-LHZ+w/+DqmdgnhPtShgqtPtdv+hJ9bAXEIqNU0kkY2bPcCVIEWz5seOv20FCw6gbKorriTGP8xgz2RsIcrRvVw==", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/protoc-gen-ts/-/protoc-gen-ts-0.8.6.tgz", + "integrity": "sha512-66oeorGy4QBvYjQGd/gaeOYyFqKyRmRgTpofmnw8buMG0P7A0jQjoKSvKJz5h5tNUaVkIzvGBUTRVGakrhhwpA==", "requires": {} }, "typescript": { diff --git a/impl/protoc-gen-ts/package.json b/impl/protoc-gen-ts/package.json index 8929b451..ae07fb37 100644 --- a/impl/protoc-gen-ts/package.json +++ b/impl/protoc-gen-ts/package.json @@ -10,11 +10,11 @@ "author": "", "license": "ISC", "dependencies": { - "@bufbuild/buf": "^1.15.0-1", + "@bufbuild/buf": "^1.26.1", "@types/google-protobuf": "^3.15.6", - "@types/node": "^18.14.0", + "@types/node": "^20.5.9", "google-protobuf": "^3.21.2", - "protoc-gen-ts": "^0.8.5", + "protoc-gen-ts": "^0.8.6", "typescript": "^4.9.5" } } diff --git a/impl/protoc-gen-ts/test.sh b/impl/protoc-gen-ts/test.sh index c2243312..b660d9c0 100755 --- a/impl/protoc-gen-ts/test.sh +++ b/impl/protoc-gen-ts/test.sh @@ -5,10 +5,37 @@ set -euo pipefail npm ci rm -rf gen/* -# protoc-gen-ts v0.8.5 crashes when compiling test_messages_proto2.proto +# protoc-gen-ts v0.8.x crashes when compiling test_messages_proto2.proto npx buf generate ../../proto --exclude-path ../../proto/google/protobuf/test_messages_proto2.proto -# protoc-gen-ts v0.8.5 appears to generate invalid code for repeated enum fields +# protoc-gen-ts v0.8.6 generates code with type errors - we ignore them to run the conformance suite +#gen/conformance/conformance.ts:86:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/conformance/conformance.ts:380:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/conformance/conformance.ts:755:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/conformance/conformance.ts:822:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/any.ts:94:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/duration.ts:94:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/field_mask.ts:71:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/struct.ts:88:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/struct.ts:337:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/struct.ts:404:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/test_messages_proto3.ts:1888:18 - error TS1268: An index signature parameter type must be 'string', 'number', 'symbol', or a template literal type. +#gen/google/protobuf/test_messages_proto3.ts:2536:22 - error TS1268: An index signature parameter type must be 'string', 'number', 'symbol', or a template literal type. +#gen/google/protobuf/test_messages_proto3.ts:3932:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/test_messages_proto3.ts:4040:20 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/test_messages_proto3.ts:4108:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/test_messages_proto3.ts:4148:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/test_messages_proto3.ts:4188:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/timestamp.ts:94:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:71:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:138:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:205:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:272:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:339:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:406:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:473:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:540:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. +#gen/google/protobuf/wrappers.ts:607:16 - error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'Message'. npx tsc --noEmit || true # finally, run the tests diff --git a/impl/protoscript/buf.gen.yaml b/impl/protoscript/buf.gen.yaml index 3bce38b8..8edbf0fc 100644 --- a/impl/protoscript/buf.gen.yaml +++ b/impl/protoscript/buf.gen.yaml @@ -1,6 +1,6 @@ version: v1 plugins: - name: protoscript - path: node_modules/protoscript/compiler.js + path: node_modules/protoscript/dist/compiler.js opt: language=typescript out: gen diff --git a/impl/protoscript/failing_tests.txt b/impl/protoscript/failing_tests.txt index 782e5486..0b43dfe7 100644 --- a/impl/protoscript/failing_tests.txt +++ b/impl/protoscript/failing_tests.txt @@ -218,29 +218,27 @@ Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.UINT32[9].ProtobufOutput Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.UINT64[0].ProtobufOutput Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.UINT64[1].ProtobufOutput Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.UINT64[2].ProtobufOutput +Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedFalse +Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedTrue +Recommended.Proto3.JsonInput.BoolFieldIntegerOne +Recommended.Proto3.JsonInput.BoolFieldIntegerZero Recommended.Proto3.JsonInput.BytesFieldBase64Url.JsonOutput Recommended.Proto3.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.Proto3.JsonInput.DurationHas3FractionalDigits.Validator Recommended.Proto3.JsonInput.DurationHas6FractionalDigits.Validator Recommended.Proto3.JsonInput.DurationHas9FractionalDigits.Validator Recommended.Proto3.JsonInput.DurationHasZeroFractionalDigit.Validator -Recommended.Proto3.JsonInput.FieldNameWithDoubleUnderscores.JsonOutput +Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter Recommended.Proto3.JsonInput.FieldNameWithDoubleUnderscores.ProtobufOutput -Recommended.Proto3.JsonInput.FieldNameWithDoubleUnderscores.Validator Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInOptionalField.ProtobufOutput Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInRepeatedField.ProtobufOutput -Recommended.Proto3.JsonInput.Int64FieldBeString.Validator -Recommended.Proto3.JsonInput.MultilineNoSpaces.JsonOutput +Recommended.Proto3.JsonInput.MapFieldValueIsNull Recommended.Proto3.JsonInput.MultilineNoSpaces.ProtobufOutput -Recommended.Proto3.JsonInput.MultilineWithSpaces.JsonOutput Recommended.Proto3.JsonInput.MultilineWithSpaces.ProtobufOutput -Recommended.Proto3.JsonInput.NullValueInNormalMessage.Validator Recommended.Proto3.JsonInput.NullValueInOtherOneofNewFormat.Validator Recommended.Proto3.JsonInput.NullValueInOtherOneofOldFormat.Validator -Recommended.Proto3.JsonInput.OneLineNoSpaces.JsonOutput Recommended.Proto3.JsonInput.OneLineNoSpaces.ProtobufOutput -Recommended.Proto3.JsonInput.OneLineWithSpaces.JsonOutput Recommended.Proto3.JsonInput.OneLineWithSpaces.ProtobufOutput Recommended.Proto3.JsonInput.OneofZeroBool.JsonOutput Recommended.Proto3.JsonInput.OneofZeroBool.ProtobufOutput @@ -248,11 +246,9 @@ Recommended.Proto3.JsonInput.OneofZeroBytes.JsonOutput Recommended.Proto3.JsonInput.OneofZeroBytes.ProtobufOutput Recommended.Proto3.JsonInput.OneofZeroDouble.JsonOutput Recommended.Proto3.JsonInput.OneofZeroDouble.ProtobufOutput -Recommended.Proto3.JsonInput.OneofZeroEnum.JsonOutput Recommended.Proto3.JsonInput.OneofZeroEnum.ProtobufOutput Recommended.Proto3.JsonInput.OneofZeroFloat.JsonOutput Recommended.Proto3.JsonInput.OneofZeroFloat.ProtobufOutput -Recommended.Proto3.JsonInput.OneofZeroMessage.JsonOutput Recommended.Proto3.JsonInput.OneofZeroMessage.ProtobufOutput Recommended.Proto3.JsonInput.OneofZeroString.JsonOutput Recommended.Proto3.JsonInput.OneofZeroString.ProtobufOutput @@ -260,12 +256,18 @@ Recommended.Proto3.JsonInput.OneofZeroUint32.JsonOutput Recommended.Proto3.JsonInput.OneofZeroUint32.ProtobufOutput Recommended.Proto3.JsonInput.OneofZeroUint64.JsonOutput Recommended.Proto3.JsonInput.OneofZeroUint64.ProtobufOutput +Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInMapValue +Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInOptionalField +Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInRepeatedField +Recommended.Proto3.JsonInput.RepeatedFieldPrimitiveElementIsNull +Recommended.Proto3.JsonInput.StringFieldSurrogateInWrongOrder +Recommended.Proto3.JsonInput.StringFieldUnpairedHighSurrogate +Recommended.Proto3.JsonInput.StringFieldUnpairedLowSurrogate Recommended.Proto3.JsonInput.TimestampHas3FractionalDigits.Validator Recommended.Proto3.JsonInput.TimestampHas6FractionalDigits.Validator Recommended.Proto3.JsonInput.TimestampHas9FractionalDigits.Validator Recommended.Proto3.JsonInput.TimestampHasZeroFractionalDigit.Validator Recommended.Proto3.JsonInput.TimestampZeroNormalized.Validator -Recommended.Proto3.JsonInput.Uint64FieldBeString.Validator Recommended.Proto3.ProtobufInput.OneofZeroBool.ProtobufOutput Recommended.Proto3.ProtobufInput.OneofZeroBytes.JsonOutput Recommended.Proto3.ProtobufInput.OneofZeroBytes.ProtobufOutput @@ -784,7 +786,6 @@ Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[9].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[0].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[1].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[2].ProtobufOutput -Required.Proto3.JsonInput.AllFieldAcceptNull.JsonOutput Required.Proto3.JsonInput.AllFieldAcceptNull.ProtobufOutput Required.Proto3.JsonInput.Any.JsonOutput Required.Proto3.JsonInput.Any.ProtobufOutput @@ -806,95 +807,62 @@ Required.Proto3.JsonInput.AnyWithValueForInteger.JsonOutput Required.Proto3.JsonInput.AnyWithValueForInteger.ProtobufOutput Required.Proto3.JsonInput.AnyWithValueForJsonObject.JsonOutput Required.Proto3.JsonInput.AnyWithValueForJsonObject.ProtobufOutput -Required.Proto3.JsonInput.BoolFieldFalse.JsonOutput Required.Proto3.JsonInput.BoolFieldFalse.ProtobufOutput -Required.Proto3.JsonInput.BoolFieldTrue.JsonOutput Required.Proto3.JsonInput.BoolFieldTrue.ProtobufOutput -Required.Proto3.JsonInput.BoolMapEscapedKey.JsonOutput Required.Proto3.JsonInput.BoolMapEscapedKey.ProtobufOutput Required.Proto3.JsonInput.BoolMapField.JsonOutput Required.Proto3.JsonInput.BoolMapField.ProtobufOutput -Required.Proto3.JsonInput.BytesField.JsonOutput Required.Proto3.JsonInput.BytesField.ProtobufOutput -Required.Proto3.JsonInput.BytesRepeatedField.JsonOutput Required.Proto3.JsonInput.BytesRepeatedField.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldInfinity.JsonOutput Required.Proto3.JsonInput.DoubleFieldInfinity.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldMaxNegativeValue.JsonOutput Required.Proto3.JsonInput.DoubleFieldMaxNegativeValue.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldMaxPositiveValue.JsonOutput Required.Proto3.JsonInput.DoubleFieldMaxPositiveValue.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldMinNegativeValue.JsonOutput Required.Proto3.JsonInput.DoubleFieldMinNegativeValue.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldMinPositiveValue.JsonOutput Required.Proto3.JsonInput.DoubleFieldMinPositiveValue.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldNan.JsonOutput Required.Proto3.JsonInput.DoubleFieldNan.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldNegativeInfinity.JsonOutput Required.Proto3.JsonInput.DoubleFieldNegativeInfinity.ProtobufOutput -Required.Proto3.JsonInput.DoubleFieldQuotedValue.JsonOutput Required.Proto3.JsonInput.DoubleFieldQuotedValue.ProtobufOutput +Required.Proto3.JsonInput.DoubleFieldTooSmall +Required.Proto3.JsonInput.DurationJsonInputTooLarge +Required.Proto3.JsonInput.DurationJsonInputTooSmall Required.Proto3.JsonInput.DurationMaxValue.JsonOutput Required.Proto3.JsonInput.DurationMaxValue.ProtobufOutput Required.Proto3.JsonInput.DurationMinValue.JsonOutput Required.Proto3.JsonInput.DurationMinValue.ProtobufOutput +Required.Proto3.JsonInput.DurationMissingS Required.Proto3.JsonInput.DurationNegativeNanos.JsonOutput Required.Proto3.JsonInput.DurationNegativeNanos.ProtobufOutput Required.Proto3.JsonInput.DurationNegativeSeconds.JsonOutput Required.Proto3.JsonInput.DurationNegativeSeconds.ProtobufOutput -Required.Proto3.JsonInput.DurationNull.JsonOutput Required.Proto3.JsonInput.DurationNull.ProtobufOutput Required.Proto3.JsonInput.DurationRepeatedValue.JsonOutput Required.Proto3.JsonInput.DurationRepeatedValue.ProtobufOutput Required.Proto3.JsonInput.EmptyFieldMask.JsonOutput Required.Proto3.JsonInput.EmptyFieldMask.ProtobufOutput -Required.Proto3.JsonInput.EnumField.JsonOutput Required.Proto3.JsonInput.EnumField.ProtobufOutput -Required.Proto3.JsonInput.EnumFieldNumericValueNonZero.JsonOutput Required.Proto3.JsonInput.EnumFieldNumericValueNonZero.ProtobufOutput -Required.Proto3.JsonInput.EnumFieldNumericValueZero.JsonOutput Required.Proto3.JsonInput.EnumFieldNumericValueZero.ProtobufOutput -Required.Proto3.JsonInput.EnumFieldUnknownValue.Validator -Required.Proto3.JsonInput.EnumFieldWithAlias.JsonOutput Required.Proto3.JsonInput.EnumFieldWithAlias.ProtobufOutput -Required.Proto3.JsonInput.EnumFieldWithAliasDifferentCase.JsonOutput Required.Proto3.JsonInput.EnumFieldWithAliasDifferentCase.ProtobufOutput -Required.Proto3.JsonInput.EnumFieldWithAliasLowerCase.JsonOutput Required.Proto3.JsonInput.EnumFieldWithAliasLowerCase.ProtobufOutput -Required.Proto3.JsonInput.EnumFieldWithAliasUseAlias.JsonOutput Required.Proto3.JsonInput.EnumFieldWithAliasUseAlias.ProtobufOutput -Required.Proto3.JsonInput.EnumRepeatedField.JsonOutput Required.Proto3.JsonInput.EnumRepeatedField.ProtobufOutput Required.Proto3.JsonInput.FieldMask.JsonOutput Required.Proto3.JsonInput.FieldMask.ProtobufOutput -Required.Proto3.JsonInput.FieldNameEscaped.JsonOutput Required.Proto3.JsonInput.FieldNameEscaped.ProtobufOutput -Required.Proto3.JsonInput.FieldNameInLowerCamelCase.Validator -Required.Proto3.JsonInput.FieldNameInSnakeCase.JsonOutput Required.Proto3.JsonInput.FieldNameInSnakeCase.ProtobufOutput -Required.Proto3.JsonInput.FieldNameWithMixedCases.JsonOutput Required.Proto3.JsonInput.FieldNameWithMixedCases.ProtobufOutput -Required.Proto3.JsonInput.FieldNameWithMixedCases.Validator -Required.Proto3.JsonInput.FieldNameWithNumbers.JsonOutput Required.Proto3.JsonInput.FieldNameWithNumbers.ProtobufOutput -Required.Proto3.JsonInput.FieldNameWithNumbers.Validator -Required.Proto3.JsonInput.FloatFieldInfinity.JsonOutput Required.Proto3.JsonInput.FloatFieldInfinity.ProtobufOutput -Required.Proto3.JsonInput.FloatFieldMaxNegativeValue.JsonOutput Required.Proto3.JsonInput.FloatFieldMaxNegativeValue.ProtobufOutput -Required.Proto3.JsonInput.FloatFieldMaxPositiveValue.JsonOutput Required.Proto3.JsonInput.FloatFieldMaxPositiveValue.ProtobufOutput -Required.Proto3.JsonInput.FloatFieldMinNegativeValue.JsonOutput Required.Proto3.JsonInput.FloatFieldMinNegativeValue.ProtobufOutput -Required.Proto3.JsonInput.FloatFieldMinPositiveValue.JsonOutput Required.Proto3.JsonInput.FloatFieldMinPositiveValue.ProtobufOutput -Required.Proto3.JsonInput.FloatFieldNan.JsonOutput Required.Proto3.JsonInput.FloatFieldNan.ProtobufOutput -Required.Proto3.JsonInput.FloatFieldNegativeInfinity.JsonOutput Required.Proto3.JsonInput.FloatFieldNegativeInfinity.ProtobufOutput -Required.Proto3.JsonInput.FloatFieldQuotedValue.JsonOutput Required.Proto3.JsonInput.FloatFieldQuotedValue.ProtobufOutput -Required.Proto3.JsonInput.HelloWorld.JsonOutput +Required.Proto3.JsonInput.FloatFieldTooLarge +Required.Proto3.JsonInput.FloatFieldTooSmall Required.Proto3.JsonInput.HelloWorld.ProtobufOutput Required.Proto3.JsonInput.IgnoreUnknownJsonFalse.ProtobufOutput Required.Proto3.JsonInput.IgnoreUnknownJsonNull.ProtobufOutput @@ -902,47 +870,35 @@ Required.Proto3.JsonInput.IgnoreUnknownJsonNumber.ProtobufOutput Required.Proto3.JsonInput.IgnoreUnknownJsonObject.ProtobufOutput Required.Proto3.JsonInput.IgnoreUnknownJsonString.ProtobufOutput Required.Proto3.JsonInput.IgnoreUnknownJsonTrue.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldExponentialFormat.JsonOutput Required.Proto3.JsonInput.Int32FieldExponentialFormat.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldFloatTrailingZero.JsonOutput Required.Proto3.JsonInput.Int32FieldFloatTrailingZero.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldMaxFloatValue.JsonOutput +Required.Proto3.JsonInput.Int32FieldLeadingSpace Required.Proto3.JsonInput.Int32FieldMaxFloatValue.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldMaxValue.JsonOutput Required.Proto3.JsonInput.Int32FieldMaxValue.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldMinFloatValue.JsonOutput Required.Proto3.JsonInput.Int32FieldMinFloatValue.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldMinValue.JsonOutput Required.Proto3.JsonInput.Int32FieldMinValue.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldStringValue.JsonOutput +Required.Proto3.JsonInput.Int32FieldNotInteger +Required.Proto3.JsonInput.Int32FieldNotNumber Required.Proto3.JsonInput.Int32FieldStringValue.ProtobufOutput -Required.Proto3.JsonInput.Int32FieldStringValueEscaped.JsonOutput Required.Proto3.JsonInput.Int32FieldStringValueEscaped.ProtobufOutput -Required.Proto3.JsonInput.Int32MapEscapedKey.JsonOutput +Required.Proto3.JsonInput.Int32FieldTooLarge +Required.Proto3.JsonInput.Int32FieldTooSmall +Required.Proto3.JsonInput.Int32FieldTrailingSpace Required.Proto3.JsonInput.Int32MapEscapedKey.ProtobufOutput -Required.Proto3.JsonInput.Int32MapField.JsonOutput Required.Proto3.JsonInput.Int32MapField.ProtobufOutput -Required.Proto3.JsonInput.Int64FieldMaxValue.JsonOutput Required.Proto3.JsonInput.Int64FieldMaxValue.ProtobufOutput -Required.Proto3.JsonInput.Int64FieldMaxValueNotQuoted.JsonOutput Required.Proto3.JsonInput.Int64FieldMaxValueNotQuoted.ProtobufOutput -Required.Proto3.JsonInput.Int64FieldMinValue.JsonOutput Required.Proto3.JsonInput.Int64FieldMinValue.ProtobufOutput -Required.Proto3.JsonInput.Int64FieldMinValueNotQuoted.JsonOutput Required.Proto3.JsonInput.Int64FieldMinValueNotQuoted.ProtobufOutput -Required.Proto3.JsonInput.Int64MapEscapedKey.JsonOutput +Required.Proto3.JsonInput.Int64FieldTooLarge +Required.Proto3.JsonInput.Int64FieldTooSmall Required.Proto3.JsonInput.Int64MapEscapedKey.ProtobufOutput -Required.Proto3.JsonInput.Int64MapField.JsonOutput Required.Proto3.JsonInput.Int64MapField.ProtobufOutput -Required.Proto3.JsonInput.MessageField.JsonOutput Required.Proto3.JsonInput.MessageField.ProtobufOutput -Required.Proto3.JsonInput.MessageMapField.JsonOutput Required.Proto3.JsonInput.MessageMapField.ProtobufOutput -Required.Proto3.JsonInput.MessageRepeatedField.JsonOutput Required.Proto3.JsonInput.MessageRepeatedField.ProtobufOutput -Required.Proto3.JsonInput.OneofFieldNullFirst.JsonOutput +Required.Proto3.JsonInput.OneofFieldDuplicate Required.Proto3.JsonInput.OneofFieldNullFirst.ProtobufOutput -Required.Proto3.JsonInput.OneofFieldNullSecond.JsonOutput Required.Proto3.JsonInput.OneofFieldNullSecond.ProtobufOutput Required.Proto3.JsonInput.OptionalBoolWrapper.JsonOutput Required.Proto3.JsonInput.OptionalBoolWrapper.ProtobufOutput @@ -964,9 +920,7 @@ Required.Proto3.JsonInput.OptionalUint64Wrapper.JsonOutput Required.Proto3.JsonInput.OptionalUint64Wrapper.ProtobufOutput Required.Proto3.JsonInput.OptionalWrapperTypesWithNonDefaultValue.JsonOutput Required.Proto3.JsonInput.OptionalWrapperTypesWithNonDefaultValue.ProtobufOutput -Required.Proto3.JsonInput.OriginalProtoFieldName.JsonOutput Required.Proto3.JsonInput.OriginalProtoFieldName.ProtobufOutput -Required.Proto3.JsonInput.PrimitiveRepeatedField.JsonOutput Required.Proto3.JsonInput.PrimitiveRepeatedField.ProtobufOutput Required.Proto3.JsonInput.RepeatedBoolWrapper.JsonOutput Required.Proto3.JsonInput.RepeatedBoolWrapper.ProtobufOutput @@ -974,6 +928,15 @@ Required.Proto3.JsonInput.RepeatedBytesWrapper.JsonOutput Required.Proto3.JsonInput.RepeatedBytesWrapper.ProtobufOutput Required.Proto3.JsonInput.RepeatedDoubleWrapper.JsonOutput Required.Proto3.JsonInput.RepeatedDoubleWrapper.ProtobufOutput +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingIntegersGotBool +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingIntegersGotMessage +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingIntegersGotString +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingMessagesGotBool +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingMessagesGotInt +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingMessagesGotString +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt +Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotMessage Required.Proto3.JsonInput.RepeatedFloatWrapper.JsonOutput Required.Proto3.JsonInput.RepeatedFloatWrapper.ProtobufOutput Required.Proto3.JsonInput.RepeatedInt32Wrapper.JsonOutput @@ -990,32 +953,30 @@ Required.Proto3.JsonInput.RepeatedUint64Wrapper.JsonOutput Required.Proto3.JsonInput.RepeatedUint64Wrapper.ProtobufOutput Required.Proto3.JsonInput.RepeatedValue.JsonOutput Required.Proto3.JsonInput.RepeatedValue.ProtobufOutput -Required.Proto3.JsonInput.SkipsDefaultPrimitive.Validator -Required.Proto3.JsonInput.StringField.JsonOutput Required.Proto3.JsonInput.StringField.ProtobufOutput -Required.Proto3.JsonInput.StringFieldEscape.JsonOutput Required.Proto3.JsonInput.StringFieldEscape.ProtobufOutput -Required.Proto3.JsonInput.StringFieldSurrogatePair.JsonOutput +Required.Proto3.JsonInput.StringFieldNotAString Required.Proto3.JsonInput.StringFieldSurrogatePair.ProtobufOutput -Required.Proto3.JsonInput.StringFieldUnicode.JsonOutput Required.Proto3.JsonInput.StringFieldUnicode.ProtobufOutput -Required.Proto3.JsonInput.StringFieldUnicodeEscape.JsonOutput Required.Proto3.JsonInput.StringFieldUnicodeEscape.ProtobufOutput -Required.Proto3.JsonInput.StringFieldUnicodeEscapeWithLowercaseHexLetters.JsonOutput Required.Proto3.JsonInput.StringFieldUnicodeEscapeWithLowercaseHexLetters.ProtobufOutput -Required.Proto3.JsonInput.StringRepeatedField.JsonOutput Required.Proto3.JsonInput.StringRepeatedField.ProtobufOutput Required.Proto3.JsonInput.Struct.JsonOutput Required.Proto3.JsonInput.Struct.ProtobufOutput Required.Proto3.JsonInput.StructWithEmptyListValue.JsonOutput Required.Proto3.JsonInput.StructWithEmptyListValue.ProtobufOutput +Required.Proto3.JsonInput.TimestampJsonInputLowercaseT +Required.Proto3.JsonInput.TimestampJsonInputLowercaseZ +Required.Proto3.JsonInput.TimestampJsonInputMissingT +Required.Proto3.JsonInput.TimestampJsonInputMissingZ +Required.Proto3.JsonInput.TimestampJsonInputTooLarge +Required.Proto3.JsonInput.TimestampJsonInputTooSmall Required.Proto3.JsonInput.TimestampLeap.JsonOutput Required.Proto3.JsonInput.TimestampLeap.ProtobufOutput Required.Proto3.JsonInput.TimestampMaxValue.JsonOutput Required.Proto3.JsonInput.TimestampMaxValue.ProtobufOutput Required.Proto3.JsonInput.TimestampMinValue.JsonOutput Required.Proto3.JsonInput.TimestampMinValue.ProtobufOutput -Required.Proto3.JsonInput.TimestampNull.JsonOutput Required.Proto3.JsonInput.TimestampNull.ProtobufOutput Required.Proto3.JsonInput.TimestampRepeatedValue.JsonOutput Required.Proto3.JsonInput.TimestampRepeatedValue.ProtobufOutput @@ -1023,17 +984,15 @@ Required.Proto3.JsonInput.TimestampWithNegativeOffset.JsonOutput Required.Proto3.JsonInput.TimestampWithNegativeOffset.ProtobufOutput Required.Proto3.JsonInput.TimestampWithPositiveOffset.JsonOutput Required.Proto3.JsonInput.TimestampWithPositiveOffset.ProtobufOutput -Required.Proto3.JsonInput.Uint32FieldMaxFloatValue.JsonOutput Required.Proto3.JsonInput.Uint32FieldMaxFloatValue.ProtobufOutput -Required.Proto3.JsonInput.Uint32FieldMaxValue.JsonOutput Required.Proto3.JsonInput.Uint32FieldMaxValue.ProtobufOutput -Required.Proto3.JsonInput.Uint32MapField.JsonOutput +Required.Proto3.JsonInput.Uint32FieldNotInteger +Required.Proto3.JsonInput.Uint32FieldNotNumber +Required.Proto3.JsonInput.Uint32FieldTooLarge Required.Proto3.JsonInput.Uint32MapField.ProtobufOutput -Required.Proto3.JsonInput.Uint64FieldMaxValue.JsonOutput Required.Proto3.JsonInput.Uint64FieldMaxValue.ProtobufOutput -Required.Proto3.JsonInput.Uint64FieldMaxValueNotQuoted.JsonOutput Required.Proto3.JsonInput.Uint64FieldMaxValueNotQuoted.ProtobufOutput -Required.Proto3.JsonInput.Uint64MapField.JsonOutput +Required.Proto3.JsonInput.Uint64FieldTooLarge Required.Proto3.JsonInput.Uint64MapField.ProtobufOutput Required.Proto3.JsonInput.ValueAcceptBool.JsonOutput Required.Proto3.JsonInput.ValueAcceptBool.ProtobufOutput @@ -1049,7 +1008,6 @@ Required.Proto3.JsonInput.ValueAcceptObject.JsonOutput Required.Proto3.JsonInput.ValueAcceptObject.ProtobufOutput Required.Proto3.JsonInput.ValueAcceptString.JsonOutput Required.Proto3.JsonInput.ValueAcceptString.ProtobufOutput -Required.Proto3.JsonInput.WrapperTypesWithNullValue.JsonOutput Required.Proto3.JsonInput.WrapperTypesWithNullValue.ProtobufOutput Required.Proto3.ProtobufInput.DoubleFieldNormalizeQuietNan.JsonOutput Required.Proto3.ProtobufInput.DoubleFieldNormalizeSignalingNan.JsonOutput diff --git a/impl/protoscript/gen/conformance/conformance.pb.ts b/impl/protoscript/gen/conformance/conformance.pb.ts index 6cc133c0..53819391 100644 --- a/impl/protoscript/gen/conformance/conformance.pb.ts +++ b/impl/protoscript/gen/conformance/conformance.pb.ts @@ -2,7 +2,7 @@ // Source: conformance/conformance.proto /* eslint-disable */ -import type { ByteSource } from "protoscript"; +import type { ByteSource, PartialDeep } from "protoscript"; import { BinaryReader, BinaryWriter, @@ -298,7 +298,7 @@ export const FailureSet = { /** * Serializes FailureSet to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return FailureSet._writeMessage(msg, new BinaryWriter()).getResultBuffer(); }, @@ -308,7 +308,7 @@ export const FailureSet = { decode: function (bytes: ByteSource): FailureSet { return FailureSet._readMessage( FailureSet.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -325,8 +325,8 @@ export const FailureSet = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.failure?.length) { writer.writeRepeatedString(1, msg.failure); @@ -359,10 +359,10 @@ export const ConformanceRequest = { /** * Serializes ConformanceRequest to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return ConformanceRequest._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -372,7 +372,7 @@ export const ConformanceRequest = { decode: function (bytes: ByteSource): ConformanceRequest { return ConformanceRequest._readMessage( ConformanceRequest.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -397,8 +397,8 @@ export const ConformanceRequest = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.protobufPayload?.length) { writer.writeBytes(1, msg.protobufPayload); @@ -428,7 +428,7 @@ export const ConformanceRequest = { writer.writeMessage( 6, msg.jspbEncodingOptions, - JspbEncodingConfig._writeMessage + JspbEncodingConfig._writeMessage, ); } if (msg.printUnknownFields) { @@ -442,7 +442,7 @@ export const ConformanceRequest = { */ _readMessage: function ( msg: ConformanceRequest, - reader: BinaryReader + reader: BinaryReader, ): ConformanceRequest { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -478,7 +478,7 @@ export const ConformanceRequest = { case 6: { reader.readMessage( msg.jspbEncodingOptions, - JspbEncodingConfig._readMessage + JspbEncodingConfig._readMessage, ); break; } @@ -500,10 +500,10 @@ export const ConformanceResponse = { /** * Serializes ConformanceResponse to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return ConformanceResponse._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -513,7 +513,7 @@ export const ConformanceResponse = { decode: function (bytes: ByteSource): ConformanceResponse { return ConformanceResponse._readMessage( ConformanceResponse.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -538,8 +538,8 @@ export const ConformanceResponse = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.parseError != undefined) { writer.writeString(1, msg.parseError); @@ -576,7 +576,7 @@ export const ConformanceResponse = { */ _readMessage: function ( msg: ConformanceResponse, - reader: BinaryReader + reader: BinaryReader, ): ConformanceResponse { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -631,10 +631,10 @@ export const JspbEncodingConfig = { /** * Serializes JspbEncodingConfig to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return JspbEncodingConfig._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -644,7 +644,7 @@ export const JspbEncodingConfig = { decode: function (bytes: ByteSource): JspbEncodingConfig { return JspbEncodingConfig._readMessage( JspbEncodingConfig.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -661,8 +661,8 @@ export const JspbEncodingConfig = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.useJspbArrayAnyFormat) { writer.writeBool(1, msg.useJspbArrayAnyFormat); @@ -675,7 +675,7 @@ export const JspbEncodingConfig = { */ _readMessage: function ( msg: JspbEncodingConfig, - reader: BinaryReader + reader: BinaryReader, ): JspbEncodingConfig { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -844,7 +844,7 @@ export const FailureSetJSON = { /** * Serializes FailureSet to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(FailureSetJSON._writeMessage(msg)); }, @@ -854,7 +854,7 @@ export const FailureSetJSON = { decode: function (json: string): FailureSet { return FailureSetJSON._readMessage( FailureSetJSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -870,7 +870,9 @@ export const FailureSetJSON = { /** * @private */ - _writeMessage: function (msg: Partial): Record { + _writeMessage: function ( + msg: PartialDeep, + ): Record { const json: Record = {}; if (msg.failure?.length) { json["failure"] = msg.failure; @@ -894,7 +896,7 @@ export const ConformanceRequestJSON = { /** * Serializes ConformanceRequest to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(ConformanceRequestJSON._writeMessage(msg)); }, @@ -904,7 +906,7 @@ export const ConformanceRequestJSON = { decode: function (json: string): ConformanceRequest { return ConformanceRequestJSON._readMessage( ConformanceRequestJSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -929,7 +931,7 @@ export const ConformanceRequestJSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.protobufPayload?.length) { @@ -958,7 +960,7 @@ export const ConformanceRequestJSON = { } if (msg.jspbEncodingOptions) { const _jspbEncodingOptions_ = JspbEncodingConfigJSON._writeMessage( - msg.jspbEncodingOptions + msg.jspbEncodingOptions, ); if (Object.keys(_jspbEncodingOptions_).length > 0) { json["jspbEncodingOptions"] = _jspbEncodingOptions_; @@ -975,7 +977,7 @@ export const ConformanceRequestJSON = { */ _readMessage: function ( msg: ConformanceRequest, - json: any + json: any, ): ConformanceRequest { const _protobufPayload_ = json["protobufPayload"] ?? json["protobuf_payload"]; @@ -1010,9 +1012,10 @@ export const ConformanceRequestJSON = { const _jspbEncodingOptions_ = json["jspbEncodingOptions"] ?? json["jspb_encoding_options"]; if (_jspbEncodingOptions_) { - const m = JspbEncodingConfigJSON.initialize(); - JspbEncodingConfigJSON._readMessage(m, _jspbEncodingOptions_); - msg.jspbEncodingOptions = m; + JspbEncodingConfigJSON._readMessage( + msg.jspbEncodingOptions, + _jspbEncodingOptions_, + ); } const _printUnknownFields_ = json["printUnknownFields"] ?? json["print_unknown_fields"]; @@ -1027,7 +1030,7 @@ export const ConformanceResponseJSON = { /** * Serializes ConformanceResponse to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(ConformanceResponseJSON._writeMessage(msg)); }, @@ -1037,7 +1040,7 @@ export const ConformanceResponseJSON = { decode: function (json: string): ConformanceResponse { return ConformanceResponseJSON._readMessage( ConformanceResponseJSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -1062,7 +1065,7 @@ export const ConformanceResponseJSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.parseError != undefined) { @@ -1100,7 +1103,7 @@ export const ConformanceResponseJSON = { */ _readMessage: function ( msg: ConformanceResponse, - json: any + json: any, ): ConformanceResponse { const _parseError_ = json["parseError"] ?? json["parse_error"]; if (_parseError_) { @@ -1147,7 +1150,7 @@ export const JspbEncodingConfigJSON = { /** * Serializes JspbEncodingConfig to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(JspbEncodingConfigJSON._writeMessage(msg)); }, @@ -1157,7 +1160,7 @@ export const JspbEncodingConfigJSON = { decode: function (json: string): JspbEncodingConfig { return JspbEncodingConfigJSON._readMessage( JspbEncodingConfigJSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -1174,7 +1177,7 @@ export const JspbEncodingConfigJSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.useJspbArrayAnyFormat) { @@ -1188,7 +1191,7 @@ export const JspbEncodingConfigJSON = { */ _readMessage: function ( msg: JspbEncodingConfig, - json: any + json: any, ): JspbEncodingConfig { const _useJspbArrayAnyFormat_ = json["useJspbArrayAnyFormat"] ?? json["use_jspb_array_any_format"]; diff --git a/impl/protoscript/gen/google/protobuf/test_messages_proto2.pb.ts b/impl/protoscript/gen/google/protobuf/test_messages_proto2.pb.ts index 23302b7d..29710f26 100644 --- a/impl/protoscript/gen/google/protobuf/test_messages_proto2.pb.ts +++ b/impl/protoscript/gen/google/protobuf/test_messages_proto2.pb.ts @@ -2,7 +2,7 @@ // Source: google/protobuf/test_messages_proto2.proto /* eslint-disable */ -import type { ByteSource } from "protoscript"; +import type { ByteSource, PartialDeep } from "protoscript"; import { BinaryReader, BinaryWriter, @@ -532,10 +532,10 @@ export const TestAllTypesProto2 = { /** * Serializes TestAllTypesProto2 to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return TestAllTypesProto2._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -545,7 +545,7 @@ export const TestAllTypesProto2 = { decode: function (bytes: ByteSource): TestAllTypesProto2 { return TestAllTypesProto2._readMessage( TestAllTypesProto2.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -693,8 +693,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.optionalInt32) { writer.writeInt32(1, msg.optionalInt32); @@ -745,14 +745,14 @@ export const TestAllTypesProto2 = { writer.writeMessage( 18, msg.optionalNestedMessage, - TestAllTypesProto2.NestedMessage._writeMessage + TestAllTypesProto2.NestedMessage._writeMessage, ); } if (msg.optionalForeignMessage) { writer.writeMessage( 19, msg.optionalForeignMessage, - ForeignMessageProto2._writeMessage + ForeignMessageProto2._writeMessage, ); } if ( @@ -761,7 +761,7 @@ export const TestAllTypesProto2 = { ) { writer.writeEnum( 21, - TestAllTypesProto2.NestedEnum._toInt(msg.optionalNestedEnum) + TestAllTypesProto2.NestedEnum._toInt(msg.optionalNestedEnum), ); } if ( @@ -780,7 +780,7 @@ export const TestAllTypesProto2 = { writer.writeMessage( 27, msg.recursiveMessage, - TestAllTypesProto2._writeMessage + TestAllTypesProto2._writeMessage, ); } if (msg.repeatedInt32?.length) { @@ -789,7 +789,7 @@ export const TestAllTypesProto2 = { if (msg.repeatedInt64?.length) { writer.writePackedInt64String( 32, - msg.repeatedInt64.map((x) => x.toString() as any) + msg.repeatedInt64.map((x) => x.toString() as any), ); } if (msg.repeatedUint32?.length) { @@ -798,7 +798,7 @@ export const TestAllTypesProto2 = { if (msg.repeatedUint64?.length) { writer.writePackedUint64String( 34, - msg.repeatedUint64.map((x) => x.toString() as any) + msg.repeatedUint64.map((x) => x.toString() as any), ); } if (msg.repeatedSint32?.length) { @@ -807,7 +807,7 @@ export const TestAllTypesProto2 = { if (msg.repeatedSint64?.length) { writer.writePackedSint64String( 36, - msg.repeatedSint64.map((x) => x.toString() as any) + msg.repeatedSint64.map((x) => x.toString() as any), ); } if (msg.repeatedFixed32?.length) { @@ -816,7 +816,7 @@ export const TestAllTypesProto2 = { if (msg.repeatedFixed64?.length) { writer.writePackedFixed64String( 38, - msg.repeatedFixed64.map((x) => x.toString() as any) + msg.repeatedFixed64.map((x) => x.toString() as any), ); } if (msg.repeatedSfixed32?.length) { @@ -825,7 +825,7 @@ export const TestAllTypesProto2 = { if (msg.repeatedSfixed64?.length) { writer.writePackedSfixed64String( 40, - msg.repeatedSfixed64.map((x) => x.toString() as any) + msg.repeatedSfixed64.map((x) => x.toString() as any), ); } if (msg.repeatedFloat?.length) { @@ -847,26 +847,26 @@ export const TestAllTypesProto2 = { writer.writeRepeatedMessage( 48, msg.repeatedNestedMessage as any, - TestAllTypesProto2.NestedMessage._writeMessage + TestAllTypesProto2.NestedMessage._writeMessage, ); } if (msg.repeatedForeignMessage?.length) { writer.writeRepeatedMessage( 49, msg.repeatedForeignMessage as any, - ForeignMessageProto2._writeMessage + ForeignMessageProto2._writeMessage, ); } if (msg.repeatedNestedEnum?.length) { writer.writePackedEnum( 51, - msg.repeatedNestedEnum.map(TestAllTypesProto2.NestedEnum._toInt) + msg.repeatedNestedEnum.map(TestAllTypesProto2.NestedEnum._toInt), ); } if (msg.repeatedForeignEnum?.length) { writer.writePackedEnum( 52, - msg.repeatedForeignEnum.map(ForeignEnumProto2._toInt) + msg.repeatedForeignEnum.map(ForeignEnumProto2._toInt), ); } if (msg.repeatedStringPiece?.length) { @@ -881,7 +881,7 @@ export const TestAllTypesProto2 = { if (msg.packedInt64?.length) { writer.writePackedInt64String( 76, - msg.packedInt64.map((x) => x.toString() as any) + msg.packedInt64.map((x) => x.toString() as any), ); } if (msg.packedUint32?.length) { @@ -890,7 +890,7 @@ export const TestAllTypesProto2 = { if (msg.packedUint64?.length) { writer.writePackedUint64String( 78, - msg.packedUint64.map((x) => x.toString() as any) + msg.packedUint64.map((x) => x.toString() as any), ); } if (msg.packedSint32?.length) { @@ -899,7 +899,7 @@ export const TestAllTypesProto2 = { if (msg.packedSint64?.length) { writer.writePackedSint64String( 80, - msg.packedSint64.map((x) => x.toString() as any) + msg.packedSint64.map((x) => x.toString() as any), ); } if (msg.packedFixed32?.length) { @@ -908,7 +908,7 @@ export const TestAllTypesProto2 = { if (msg.packedFixed64?.length) { writer.writePackedFixed64String( 82, - msg.packedFixed64.map((x) => x.toString() as any) + msg.packedFixed64.map((x) => x.toString() as any), ); } if (msg.packedSfixed32?.length) { @@ -917,7 +917,7 @@ export const TestAllTypesProto2 = { if (msg.packedSfixed64?.length) { writer.writePackedSfixed64String( 84, - msg.packedSfixed64.map((x) => x.toString() as any) + msg.packedSfixed64.map((x) => x.toString() as any), ); } if (msg.packedFloat?.length) { @@ -932,7 +932,7 @@ export const TestAllTypesProto2 = { if (msg.packedNestedEnum?.length) { writer.writePackedEnum( 88, - msg.packedNestedEnum.map(TestAllTypesProto2.NestedEnum._toInt) + msg.packedNestedEnum.map(TestAllTypesProto2.NestedEnum._toInt), ); } if (msg.unpackedInt32?.length) { @@ -941,7 +941,7 @@ export const TestAllTypesProto2 = { if (msg.unpackedInt64?.length) { writer.writePackedInt64String( 90, - msg.unpackedInt64.map((x) => x.toString() as any) + msg.unpackedInt64.map((x) => x.toString() as any), ); } if (msg.unpackedUint32?.length) { @@ -950,7 +950,7 @@ export const TestAllTypesProto2 = { if (msg.unpackedUint64?.length) { writer.writePackedUint64String( 92, - msg.unpackedUint64.map((x) => x.toString() as any) + msg.unpackedUint64.map((x) => x.toString() as any), ); } if (msg.unpackedSint32?.length) { @@ -959,7 +959,7 @@ export const TestAllTypesProto2 = { if (msg.unpackedSint64?.length) { writer.writePackedSint64String( 94, - msg.unpackedSint64.map((x) => x.toString() as any) + msg.unpackedSint64.map((x) => x.toString() as any), ); } if (msg.unpackedFixed32?.length) { @@ -968,7 +968,7 @@ export const TestAllTypesProto2 = { if (msg.unpackedFixed64?.length) { writer.writePackedFixed64String( 96, - msg.unpackedFixed64.map((x) => x.toString() as any) + msg.unpackedFixed64.map((x) => x.toString() as any), ); } if (msg.unpackedSfixed32?.length) { @@ -977,7 +977,7 @@ export const TestAllTypesProto2 = { if (msg.unpackedSfixed64?.length) { writer.writePackedSfixed64String( 98, - msg.unpackedSfixed64.map((x) => x.toString() as any) + msg.unpackedSfixed64.map((x) => x.toString() as any), ); } if (msg.unpackedFloat?.length) { @@ -992,7 +992,7 @@ export const TestAllTypesProto2 = { if (msg.unpackedNestedEnum?.length) { writer.writePackedEnum( 102, - msg.unpackedNestedEnum.map(TestAllTypesProto2.NestedEnum._toInt) + msg.unpackedNestedEnum.map(TestAllTypesProto2.NestedEnum._toInt), ); } if (msg.mapInt32Int32) { @@ -1002,7 +1002,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapInt32Int32._writeMessage + TestAllTypesProto2.MapInt32Int32._writeMessage, ); } if (msg.mapInt64Int64) { @@ -1012,7 +1012,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapInt64Int64._writeMessage + TestAllTypesProto2.MapInt64Int64._writeMessage, ); } if (msg.mapUint32Uint32) { @@ -1022,7 +1022,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapUint32Uint32._writeMessage + TestAllTypesProto2.MapUint32Uint32._writeMessage, ); } if (msg.mapUint64Uint64) { @@ -1032,7 +1032,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapUint64Uint64._writeMessage + TestAllTypesProto2.MapUint64Uint64._writeMessage, ); } if (msg.mapSint32Sint32) { @@ -1042,7 +1042,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapSint32Sint32._writeMessage + TestAllTypesProto2.MapSint32Sint32._writeMessage, ); } if (msg.mapSint64Sint64) { @@ -1052,7 +1052,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapSint64Sint64._writeMessage + TestAllTypesProto2.MapSint64Sint64._writeMessage, ); } if (msg.mapFixed32Fixed32) { @@ -1062,7 +1062,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapFixed32Fixed32._writeMessage + TestAllTypesProto2.MapFixed32Fixed32._writeMessage, ); } if (msg.mapFixed64Fixed64) { @@ -1072,7 +1072,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapFixed64Fixed64._writeMessage + TestAllTypesProto2.MapFixed64Fixed64._writeMessage, ); } if (msg.mapSfixed32Sfixed32) { @@ -1082,7 +1082,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapSfixed32Sfixed32._writeMessage + TestAllTypesProto2.MapSfixed32Sfixed32._writeMessage, ); } if (msg.mapSfixed64Sfixed64) { @@ -1092,7 +1092,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapSfixed64Sfixed64._writeMessage + TestAllTypesProto2.MapSfixed64Sfixed64._writeMessage, ); } if (msg.mapInt32Float) { @@ -1102,7 +1102,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapInt32Float._writeMessage + TestAllTypesProto2.MapInt32Float._writeMessage, ); } if (msg.mapInt32Double) { @@ -1112,7 +1112,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapInt32Double._writeMessage + TestAllTypesProto2.MapInt32Double._writeMessage, ); } if (msg.mapBoolBool) { @@ -1122,7 +1122,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapBoolBool._writeMessage + TestAllTypesProto2.MapBoolBool._writeMessage, ); } if (msg.mapStringString) { @@ -1132,7 +1132,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapStringString._writeMessage + TestAllTypesProto2.MapStringString._writeMessage, ); } if (msg.mapStringBytes) { @@ -1142,7 +1142,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapStringBytes._writeMessage + TestAllTypesProto2.MapStringBytes._writeMessage, ); } if (msg.mapStringNestedMessage) { @@ -1152,7 +1152,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapStringNestedMessage._writeMessage + TestAllTypesProto2.MapStringNestedMessage._writeMessage, ); } if (msg.mapStringForeignMessage) { @@ -1162,7 +1162,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapStringForeignMessage._writeMessage + TestAllTypesProto2.MapStringForeignMessage._writeMessage, ); } if (msg.mapStringNestedEnum) { @@ -1172,7 +1172,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapStringNestedEnum._writeMessage + TestAllTypesProto2.MapStringNestedEnum._writeMessage, ); } if (msg.mapStringForeignEnum) { @@ -1182,7 +1182,7 @@ export const TestAllTypesProto2 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto2.MapStringForeignEnum._writeMessage + TestAllTypesProto2.MapStringForeignEnum._writeMessage, ); } if (msg.oneofUint32 != undefined) { @@ -1192,7 +1192,7 @@ export const TestAllTypesProto2 = { writer.writeMessage( 112, msg.oneofNestedMessage, - TestAllTypesProto2.NestedMessage._writeMessage + TestAllTypesProto2.NestedMessage._writeMessage, ); } if (msg.oneofString != undefined) { @@ -1216,7 +1216,7 @@ export const TestAllTypesProto2 = { if (msg.oneofEnum != undefined) { writer.writeEnum( 119, - TestAllTypesProto2.NestedEnum._toInt(msg.oneofEnum) + TestAllTypesProto2.NestedEnum._toInt(msg.oneofEnum), ); } if (msg.defaultInt32) { @@ -1326,7 +1326,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -1394,26 +1394,26 @@ export const TestAllTypesProto2 = { case 18: { reader.readMessage( msg.optionalNestedMessage, - TestAllTypesProto2.NestedMessage._readMessage + TestAllTypesProto2.NestedMessage._readMessage, ); break; } case 19: { reader.readMessage( msg.optionalForeignMessage, - ForeignMessageProto2._readMessage + ForeignMessageProto2._readMessage, ); break; } case 21: { msg.optionalNestedEnum = TestAllTypesProto2.NestedEnum._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } case 22: { msg.optionalForeignEnum = ForeignEnumProto2._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -1426,9 +1426,10 @@ export const TestAllTypesProto2 = { break; } case 27: { + msg.recursiveMessage = TestAllTypesProto2.initialize(); reader.readMessage( msg.recursiveMessage, - TestAllTypesProto2._readMessage + TestAllTypesProto2._readMessage, ); break; } @@ -1443,7 +1444,7 @@ export const TestAllTypesProto2 = { case 32: { if (reader.isDelimited()) { msg.repeatedInt64.push( - ...reader.readPackedInt64String().map(BigInt) + ...reader.readPackedInt64String().map(BigInt), ); } else { msg.repeatedInt64.push(BigInt(reader.readInt64String())); @@ -1461,7 +1462,7 @@ export const TestAllTypesProto2 = { case 34: { if (reader.isDelimited()) { msg.repeatedUint64.push( - ...reader.readPackedUint64String().map(BigInt) + ...reader.readPackedUint64String().map(BigInt), ); } else { msg.repeatedUint64.push(BigInt(reader.readUint64String())); @@ -1479,7 +1480,7 @@ export const TestAllTypesProto2 = { case 36: { if (reader.isDelimited()) { msg.repeatedSint64.push( - ...reader.readPackedSint64String().map(BigInt) + ...reader.readPackedSint64String().map(BigInt), ); } else { msg.repeatedSint64.push(BigInt(reader.readSint64String())); @@ -1497,7 +1498,7 @@ export const TestAllTypesProto2 = { case 38: { if (reader.isDelimited()) { msg.repeatedFixed64.push( - ...reader.readPackedFixed64String().map(BigInt) + ...reader.readPackedFixed64String().map(BigInt), ); } else { msg.repeatedFixed64.push(BigInt(reader.readFixed64String())); @@ -1515,7 +1516,7 @@ export const TestAllTypesProto2 = { case 40: { if (reader.isDelimited()) { msg.repeatedSfixed64.push( - ...reader.readPackedSfixed64String().map(BigInt) + ...reader.readPackedSfixed64String().map(BigInt), ); } else { msg.repeatedSfixed64.push(BigInt(reader.readSfixed64String())); @@ -1571,11 +1572,11 @@ export const TestAllTypesProto2 = { msg.repeatedNestedEnum.push( ...reader .readPackedEnum() - .map(TestAllTypesProto2.NestedEnum._fromInt) + .map(TestAllTypesProto2.NestedEnum._fromInt), ); } else { msg.repeatedNestedEnum.push( - TestAllTypesProto2.NestedEnum._fromInt(reader.readEnum()) + TestAllTypesProto2.NestedEnum._fromInt(reader.readEnum()), ); } break; @@ -1583,11 +1584,11 @@ export const TestAllTypesProto2 = { case 52: { if (reader.isDelimited()) { msg.repeatedForeignEnum.push( - ...reader.readPackedEnum().map(ForeignEnumProto2._fromInt) + ...reader.readPackedEnum().map(ForeignEnumProto2._fromInt), ); } else { msg.repeatedForeignEnum.push( - ForeignEnumProto2._fromInt(reader.readEnum()) + ForeignEnumProto2._fromInt(reader.readEnum()), ); } break; @@ -1627,7 +1628,7 @@ export const TestAllTypesProto2 = { case 78: { if (reader.isDelimited()) { msg.packedUint64.push( - ...reader.readPackedUint64String().map(BigInt) + ...reader.readPackedUint64String().map(BigInt), ); } else { msg.packedUint64.push(BigInt(reader.readUint64String())); @@ -1645,7 +1646,7 @@ export const TestAllTypesProto2 = { case 80: { if (reader.isDelimited()) { msg.packedSint64.push( - ...reader.readPackedSint64String().map(BigInt) + ...reader.readPackedSint64String().map(BigInt), ); } else { msg.packedSint64.push(BigInt(reader.readSint64String())); @@ -1663,7 +1664,7 @@ export const TestAllTypesProto2 = { case 82: { if (reader.isDelimited()) { msg.packedFixed64.push( - ...reader.readPackedFixed64String().map(BigInt) + ...reader.readPackedFixed64String().map(BigInt), ); } else { msg.packedFixed64.push(BigInt(reader.readFixed64String())); @@ -1681,7 +1682,7 @@ export const TestAllTypesProto2 = { case 84: { if (reader.isDelimited()) { msg.packedSfixed64.push( - ...reader.readPackedSfixed64String().map(BigInt) + ...reader.readPackedSfixed64String().map(BigInt), ); } else { msg.packedSfixed64.push(BigInt(reader.readSfixed64String())); @@ -1717,11 +1718,11 @@ export const TestAllTypesProto2 = { msg.packedNestedEnum.push( ...reader .readPackedEnum() - .map(TestAllTypesProto2.NestedEnum._fromInt) + .map(TestAllTypesProto2.NestedEnum._fromInt), ); } else { msg.packedNestedEnum.push( - TestAllTypesProto2.NestedEnum._fromInt(reader.readEnum()) + TestAllTypesProto2.NestedEnum._fromInt(reader.readEnum()), ); } break; @@ -1737,7 +1738,7 @@ export const TestAllTypesProto2 = { case 90: { if (reader.isDelimited()) { msg.unpackedInt64.push( - ...reader.readPackedInt64String().map(BigInt) + ...reader.readPackedInt64String().map(BigInt), ); } else { msg.unpackedInt64.push(BigInt(reader.readInt64String())); @@ -1755,7 +1756,7 @@ export const TestAllTypesProto2 = { case 92: { if (reader.isDelimited()) { msg.unpackedUint64.push( - ...reader.readPackedUint64String().map(BigInt) + ...reader.readPackedUint64String().map(BigInt), ); } else { msg.unpackedUint64.push(BigInt(reader.readUint64String())); @@ -1773,7 +1774,7 @@ export const TestAllTypesProto2 = { case 94: { if (reader.isDelimited()) { msg.unpackedSint64.push( - ...reader.readPackedSint64String().map(BigInt) + ...reader.readPackedSint64String().map(BigInt), ); } else { msg.unpackedSint64.push(BigInt(reader.readSint64String())); @@ -1791,7 +1792,7 @@ export const TestAllTypesProto2 = { case 96: { if (reader.isDelimited()) { msg.unpackedFixed64.push( - ...reader.readPackedFixed64String().map(BigInt) + ...reader.readPackedFixed64String().map(BigInt), ); } else { msg.unpackedFixed64.push(BigInt(reader.readFixed64String())); @@ -1809,7 +1810,7 @@ export const TestAllTypesProto2 = { case 98: { if (reader.isDelimited()) { msg.unpackedSfixed64.push( - ...reader.readPackedSfixed64String().map(BigInt) + ...reader.readPackedSfixed64String().map(BigInt), ); } else { msg.unpackedSfixed64.push(BigInt(reader.readSfixed64String())); @@ -1845,11 +1846,11 @@ export const TestAllTypesProto2 = { msg.unpackedNestedEnum.push( ...reader .readPackedEnum() - .map(TestAllTypesProto2.NestedEnum._fromInt) + .map(TestAllTypesProto2.NestedEnum._fromInt), ); } else { msg.unpackedNestedEnum.push( - TestAllTypesProto2.NestedEnum._fromInt(reader.readEnum()) + TestAllTypesProto2.NestedEnum._fromInt(reader.readEnum()), ); } break; @@ -1858,7 +1859,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapInt32Int32; reader.readMessage( map, - TestAllTypesProto2.MapInt32Int32._readMessage + TestAllTypesProto2.MapInt32Int32._readMessage, ); msg.mapInt32Int32[map.key.toString()] = map.value; break; @@ -1867,7 +1868,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapInt64Int64; reader.readMessage( map, - TestAllTypesProto2.MapInt64Int64._readMessage + TestAllTypesProto2.MapInt64Int64._readMessage, ); msg.mapInt64Int64[map.key.toString()] = map.value; break; @@ -1876,7 +1877,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapUint32Uint32; reader.readMessage( map, - TestAllTypesProto2.MapUint32Uint32._readMessage + TestAllTypesProto2.MapUint32Uint32._readMessage, ); msg.mapUint32Uint32[map.key.toString()] = map.value; break; @@ -1885,7 +1886,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapUint64Uint64; reader.readMessage( map, - TestAllTypesProto2.MapUint64Uint64._readMessage + TestAllTypesProto2.MapUint64Uint64._readMessage, ); msg.mapUint64Uint64[map.key.toString()] = map.value; break; @@ -1894,7 +1895,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapSint32Sint32; reader.readMessage( map, - TestAllTypesProto2.MapSint32Sint32._readMessage + TestAllTypesProto2.MapSint32Sint32._readMessage, ); msg.mapSint32Sint32[map.key.toString()] = map.value; break; @@ -1903,7 +1904,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapSint64Sint64; reader.readMessage( map, - TestAllTypesProto2.MapSint64Sint64._readMessage + TestAllTypesProto2.MapSint64Sint64._readMessage, ); msg.mapSint64Sint64[map.key.toString()] = map.value; break; @@ -1912,7 +1913,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapFixed32Fixed32; reader.readMessage( map, - TestAllTypesProto2.MapFixed32Fixed32._readMessage + TestAllTypesProto2.MapFixed32Fixed32._readMessage, ); msg.mapFixed32Fixed32[map.key.toString()] = map.value; break; @@ -1921,7 +1922,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapFixed64Fixed64; reader.readMessage( map, - TestAllTypesProto2.MapFixed64Fixed64._readMessage + TestAllTypesProto2.MapFixed64Fixed64._readMessage, ); msg.mapFixed64Fixed64[map.key.toString()] = map.value; break; @@ -1930,7 +1931,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapSfixed32Sfixed32; reader.readMessage( map, - TestAllTypesProto2.MapSfixed32Sfixed32._readMessage + TestAllTypesProto2.MapSfixed32Sfixed32._readMessage, ); msg.mapSfixed32Sfixed32[map.key.toString()] = map.value; break; @@ -1939,7 +1940,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapSfixed64Sfixed64; reader.readMessage( map, - TestAllTypesProto2.MapSfixed64Sfixed64._readMessage + TestAllTypesProto2.MapSfixed64Sfixed64._readMessage, ); msg.mapSfixed64Sfixed64[map.key.toString()] = map.value; break; @@ -1948,7 +1949,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapInt32Float; reader.readMessage( map, - TestAllTypesProto2.MapInt32Float._readMessage + TestAllTypesProto2.MapInt32Float._readMessage, ); msg.mapInt32Float[map.key.toString()] = map.value; break; @@ -1957,7 +1958,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapInt32Double; reader.readMessage( map, - TestAllTypesProto2.MapInt32Double._readMessage + TestAllTypesProto2.MapInt32Double._readMessage, ); msg.mapInt32Double[map.key.toString()] = map.value; break; @@ -1972,7 +1973,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapStringString; reader.readMessage( map, - TestAllTypesProto2.MapStringString._readMessage + TestAllTypesProto2.MapStringString._readMessage, ); msg.mapStringString[map.key.toString()] = map.value; break; @@ -1981,7 +1982,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapStringBytes; reader.readMessage( map, - TestAllTypesProto2.MapStringBytes._readMessage + TestAllTypesProto2.MapStringBytes._readMessage, ); msg.mapStringBytes[map.key.toString()] = map.value; break; @@ -1990,7 +1991,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapStringNestedMessage; reader.readMessage( map, - TestAllTypesProto2.MapStringNestedMessage._readMessage + TestAllTypesProto2.MapStringNestedMessage._readMessage, ); msg.mapStringNestedMessage[map.key.toString()] = map.value; break; @@ -1999,7 +2000,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapStringForeignMessage; reader.readMessage( map, - TestAllTypesProto2.MapStringForeignMessage._readMessage + TestAllTypesProto2.MapStringForeignMessage._readMessage, ); msg.mapStringForeignMessage[map.key.toString()] = map.value; break; @@ -2008,7 +2009,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapStringNestedEnum; reader.readMessage( map, - TestAllTypesProto2.MapStringNestedEnum._readMessage + TestAllTypesProto2.MapStringNestedEnum._readMessage, ); msg.mapStringNestedEnum[map.key.toString()] = map.value; break; @@ -2017,7 +2018,7 @@ export const TestAllTypesProto2 = { const map = {} as TestAllTypesProto2.MapStringForeignEnum; reader.readMessage( map, - TestAllTypesProto2.MapStringForeignEnum._readMessage + TestAllTypesProto2.MapStringForeignEnum._readMessage, ); msg.mapStringForeignEnum[map.key.toString()] = map.value; break; @@ -2031,7 +2032,7 @@ export const TestAllTypesProto2 = { TestAllTypesProto2.NestedMessage.initialize(); reader.readMessage( msg.oneofNestedMessage, - TestAllTypesProto2.NestedMessage._readMessage + TestAllTypesProto2.NestedMessage._readMessage, ); break; } @@ -2061,7 +2062,7 @@ export const TestAllTypesProto2 = { } case 119: { msg.oneofEnum = TestAllTypesProto2.NestedEnum._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -2264,11 +2265,11 @@ export const TestAllTypesProto2 = { * Serializes TestAllTypesProto2.NestedMessage to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllTypesProto2.NestedMessage._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -2278,7 +2279,7 @@ export const TestAllTypesProto2 = { decode: function (bytes: ByteSource): TestAllTypesProto2.NestedMessage { return TestAllTypesProto2.NestedMessage._readMessage( TestAllTypesProto2.NestedMessage.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -2296,8 +2297,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.a) { writer.writeInt32(1, msg.a); @@ -2306,7 +2307,7 @@ export const TestAllTypesProto2 = { writer.writeMessage( 2, msg.corecursive, - TestAllTypesProto2._writeMessage + TestAllTypesProto2._writeMessage, ); } return writer; @@ -2317,7 +2318,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.NestedMessage, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.NestedMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2327,9 +2328,10 @@ export const TestAllTypesProto2 = { break; } case 2: { + msg.corecursive = TestAllTypesProto2.initialize(); reader.readMessage( msg.corecursive, - TestAllTypesProto2._readMessage + TestAllTypesProto2._readMessage, ); break; } @@ -2348,8 +2350,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt32(1, msg.key); @@ -2365,7 +2367,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt32Int32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapInt32Int32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2393,8 +2395,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt64String(1, msg.key.toString() as any); @@ -2410,7 +2412,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt64Int64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapInt64Int64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2438,8 +2440,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeUint32(1, msg.key); @@ -2455,7 +2457,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapUint32Uint32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapUint32Uint32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2483,8 +2485,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeUint64String(1, msg.key.toString() as any); @@ -2500,7 +2502,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapUint64Uint64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapUint64Uint64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2528,8 +2530,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSint32(1, msg.key); @@ -2545,7 +2547,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSint32Sint32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapSint32Sint32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2573,8 +2575,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSint64String(1, msg.key.toString() as any); @@ -2590,7 +2592,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSint64Sint64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapSint64Sint64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2618,8 +2620,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeFixed32(1, msg.key); @@ -2635,7 +2637,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapFixed32Fixed32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapFixed32Fixed32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2663,8 +2665,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeFixed64String(1, msg.key.toString() as any); @@ -2680,7 +2682,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapFixed64Fixed64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapFixed64Fixed64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2708,8 +2710,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSfixed32(1, msg.key); @@ -2725,7 +2727,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSfixed32Sfixed32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapSfixed32Sfixed32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2753,8 +2755,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSfixed64String(1, msg.key.toString() as any); @@ -2770,7 +2772,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSfixed64Sfixed64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapSfixed64Sfixed64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2798,8 +2800,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt32(1, msg.key); @@ -2815,7 +2817,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt32Float, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapInt32Float { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2843,8 +2845,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt32(1, msg.key); @@ -2860,7 +2862,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt32Double, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapInt32Double { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2888,8 +2890,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeBool(1, msg.key); @@ -2905,7 +2907,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapBoolBool, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapBoolBool { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2933,8 +2935,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -2950,7 +2952,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringString, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapStringString { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2978,8 +2980,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -2995,7 +2997,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringBytes, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapStringBytes { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3023,8 +3025,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3033,7 +3035,7 @@ export const TestAllTypesProto2 = { writer.writeMessage( 2, msg.value, - TestAllTypesProto2.NestedMessage._writeMessage + TestAllTypesProto2.NestedMessage._writeMessage, ); } return writer; @@ -3044,7 +3046,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringNestedMessage, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapStringNestedMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3057,7 +3059,7 @@ export const TestAllTypesProto2 = { msg.value = TestAllTypesProto2.NestedMessage.initialize(); reader.readMessage( msg.value, - TestAllTypesProto2.NestedMessage._readMessage + TestAllTypesProto2.NestedMessage._readMessage, ); break; } @@ -3076,8 +3078,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3093,7 +3095,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringForeignMessage, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapStringForeignMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3122,8 +3124,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3139,7 +3141,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringNestedEnum, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapStringNestedEnum { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3150,7 +3152,7 @@ export const TestAllTypesProto2 = { } case 2: { msg.value = TestAllTypesProto2.NestedEnum._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -3169,8 +3171,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3186,7 +3188,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringForeignEnum, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MapStringForeignEnum { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3213,10 +3215,10 @@ export const TestAllTypesProto2 = { /** * Serializes TestAllTypesProto2.Data to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return TestAllTypesProto2.Data._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3226,7 +3228,7 @@ export const TestAllTypesProto2 = { decode: function (bytes: ByteSource): TestAllTypesProto2.Data { return TestAllTypesProto2.Data._readMessage( TestAllTypesProto2.Data.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3244,8 +3246,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.groupInt32) { writer.writeInt32(202, msg.groupInt32); @@ -3261,7 +3263,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.Data, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.Data { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3289,7 +3291,7 @@ export const TestAllTypesProto2 = { * Serializes TestAllTypesProto2.MessageSetCorrect to protobuf. */ encode: function ( - _msg?: Partial + _msg?: PartialDeep, ): Uint8Array { return new Uint8Array(); }, @@ -3298,7 +3300,7 @@ export const TestAllTypesProto2 = { * Deserializes TestAllTypesProto2.MessageSetCorrect from protobuf. */ decode: function ( - _bytes?: ByteSource + _bytes?: ByteSource, ): TestAllTypesProto2.MessageSetCorrect { return {}; }, @@ -3314,8 +3316,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - _msg: Partial, - writer: BinaryWriter + _msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { return writer; }, @@ -3325,7 +3327,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( _msg: TestAllTypesProto2.MessageSetCorrect, - _reader: BinaryReader + _reader: BinaryReader, ): TestAllTypesProto2.MessageSetCorrect { return _msg; }, @@ -3336,11 +3338,11 @@ export const TestAllTypesProto2 = { * Serializes TestAllTypesProto2.MessageSetCorrectExtension1 to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllTypesProto2.MessageSetCorrectExtension1._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3348,11 +3350,11 @@ export const TestAllTypesProto2 = { * Deserializes TestAllTypesProto2.MessageSetCorrectExtension1 from protobuf. */ decode: function ( - bytes: ByteSource + bytes: ByteSource, ): TestAllTypesProto2.MessageSetCorrectExtension1 { return TestAllTypesProto2.MessageSetCorrectExtension1._readMessage( TestAllTypesProto2.MessageSetCorrectExtension1.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3369,8 +3371,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.str) { writer.writeString(25, msg.str); @@ -3383,7 +3385,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MessageSetCorrectExtension1, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MessageSetCorrectExtension1 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3407,11 +3409,11 @@ export const TestAllTypesProto2 = { * Serializes TestAllTypesProto2.MessageSetCorrectExtension2 to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllTypesProto2.MessageSetCorrectExtension2._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3419,11 +3421,11 @@ export const TestAllTypesProto2 = { * Deserializes TestAllTypesProto2.MessageSetCorrectExtension2 from protobuf. */ decode: function ( - bytes: ByteSource + bytes: ByteSource, ): TestAllTypesProto2.MessageSetCorrectExtension2 { return TestAllTypesProto2.MessageSetCorrectExtension2._readMessage( TestAllTypesProto2.MessageSetCorrectExtension2.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3440,8 +3442,8 @@ export const TestAllTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.i) { writer.writeInt32(9, msg.i); @@ -3454,7 +3456,7 @@ export const TestAllTypesProto2 = { */ _readMessage: function ( msg: TestAllTypesProto2.MessageSetCorrectExtension2, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto2.MessageSetCorrectExtension2 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3478,10 +3480,10 @@ export const ForeignMessageProto2 = { /** * Serializes ForeignMessageProto2 to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return ForeignMessageProto2._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3491,7 +3493,7 @@ export const ForeignMessageProto2 = { decode: function (bytes: ByteSource): ForeignMessageProto2 { return ForeignMessageProto2._readMessage( ForeignMessageProto2.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3508,8 +3510,8 @@ export const ForeignMessageProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.c) { writer.writeInt32(1, msg.c); @@ -3522,7 +3524,7 @@ export const ForeignMessageProto2 = { */ _readMessage: function ( msg: ForeignMessageProto2, - reader: BinaryReader + reader: BinaryReader, ): ForeignMessageProto2 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3545,10 +3547,10 @@ export const UnknownToTestAllTypes = { /** * Serializes UnknownToTestAllTypes to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return UnknownToTestAllTypes._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3558,7 +3560,7 @@ export const UnknownToTestAllTypes = { decode: function (bytes: ByteSource): UnknownToTestAllTypes { return UnknownToTestAllTypes._readMessage( UnknownToTestAllTypes.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3579,8 +3581,8 @@ export const UnknownToTestAllTypes = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.optionalInt32) { writer.writeInt32(1001, msg.optionalInt32); @@ -3592,7 +3594,7 @@ export const UnknownToTestAllTypes = { writer.writeMessage( 1003, msg.nestedMessage, - ForeignMessageProto2._writeMessage + ForeignMessageProto2._writeMessage, ); } if (msg.optionalBool) { @@ -3609,7 +3611,7 @@ export const UnknownToTestAllTypes = { */ _readMessage: function ( msg: UnknownToTestAllTypes, - reader: BinaryReader + reader: BinaryReader, ): UnknownToTestAllTypes { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3625,7 +3627,7 @@ export const UnknownToTestAllTypes = { case 1003: { reader.readMessage( msg.nestedMessage, - ForeignMessageProto2._readMessage + ForeignMessageProto2._readMessage, ); break; } @@ -3655,11 +3657,11 @@ export const UnknownToTestAllTypes = { * Serializes UnknownToTestAllTypes.OptionalGroup to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return UnknownToTestAllTypes.OptionalGroup._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3669,7 +3671,7 @@ export const UnknownToTestAllTypes = { decode: function (bytes: ByteSource): UnknownToTestAllTypes.OptionalGroup { return UnknownToTestAllTypes.OptionalGroup._readMessage( UnknownToTestAllTypes.OptionalGroup.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3686,8 +3688,8 @@ export const UnknownToTestAllTypes = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.a) { writer.writeInt32(1, msg.a); @@ -3700,7 +3702,7 @@ export const UnknownToTestAllTypes = { */ _readMessage: function ( msg: UnknownToTestAllTypes.OptionalGroup, - reader: BinaryReader + reader: BinaryReader, ): UnknownToTestAllTypes.OptionalGroup { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3724,7 +3726,7 @@ export const NullHypothesisProto2 = { /** * Serializes NullHypothesisProto2 to protobuf. */ - encode: function (_msg?: Partial): Uint8Array { + encode: function (_msg?: PartialDeep): Uint8Array { return new Uint8Array(); }, @@ -3746,8 +3748,8 @@ export const NullHypothesisProto2 = { * @private */ _writeMessage: function ( - _msg: Partial, - writer: BinaryWriter + _msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { return writer; }, @@ -3757,7 +3759,7 @@ export const NullHypothesisProto2 = { */ _readMessage: function ( _msg: NullHypothesisProto2, - _reader: BinaryReader + _reader: BinaryReader, ): NullHypothesisProto2 { return _msg; }, @@ -3767,7 +3769,7 @@ export const EnumOnlyProto2 = { /** * Serializes EnumOnlyProto2 to protobuf. */ - encode: function (_msg?: Partial): Uint8Array { + encode: function (_msg?: PartialDeep): Uint8Array { return new Uint8Array(); }, @@ -3789,8 +3791,8 @@ export const EnumOnlyProto2 = { * @private */ _writeMessage: function ( - _msg: Partial, - writer: BinaryWriter + _msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { return writer; }, @@ -3800,7 +3802,7 @@ export const EnumOnlyProto2 = { */ _readMessage: function ( _msg: EnumOnlyProto2, - _reader: BinaryReader + _reader: BinaryReader, ): EnumOnlyProto2 { return _msg; }, @@ -3849,10 +3851,10 @@ export const OneStringProto2 = { /** * Serializes OneStringProto2 to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return OneStringProto2._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3862,7 +3864,7 @@ export const OneStringProto2 = { decode: function (bytes: ByteSource): OneStringProto2 { return OneStringProto2._readMessage( OneStringProto2.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3879,8 +3881,8 @@ export const OneStringProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.data) { writer.writeString(1, msg.data); @@ -3893,7 +3895,7 @@ export const OneStringProto2 = { */ _readMessage: function ( msg: OneStringProto2, - reader: BinaryReader + reader: BinaryReader, ): OneStringProto2 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3916,10 +3918,10 @@ export const ProtoWithKeywords = { /** * Serializes ProtoWithKeywords to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return ProtoWithKeywords._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3929,7 +3931,7 @@ export const ProtoWithKeywords = { decode: function (bytes: ByteSource): ProtoWithKeywords { return ProtoWithKeywords._readMessage( ProtoWithKeywords.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3948,8 +3950,8 @@ export const ProtoWithKeywords = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.inline) { writer.writeInt32(1, msg.inline); @@ -3968,7 +3970,7 @@ export const ProtoWithKeywords = { */ _readMessage: function ( msg: ProtoWithKeywords, - reader: BinaryReader + reader: BinaryReader, ): ProtoWithKeywords { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3999,10 +4001,10 @@ export const TestAllRequiredTypesProto2 = { /** * Serializes TestAllRequiredTypesProto2 to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return TestAllRequiredTypesProto2._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -4012,7 +4014,7 @@ export const TestAllRequiredTypesProto2 = { decode: function (bytes: ByteSource): TestAllRequiredTypesProto2 { return TestAllRequiredTypesProto2._readMessage( TestAllRequiredTypesProto2.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -4067,8 +4069,8 @@ export const TestAllRequiredTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.requiredInt32) { writer.writeInt32(1, msg.requiredInt32); @@ -4119,14 +4121,14 @@ export const TestAllRequiredTypesProto2 = { writer.writeMessage( 18, msg.requiredNestedMessage, - TestAllRequiredTypesProto2.NestedMessage._writeMessage + TestAllRequiredTypesProto2.NestedMessage._writeMessage, ); } if (msg.requiredForeignMessage) { writer.writeMessage( 19, msg.requiredForeignMessage, - ForeignMessageProto2._writeMessage + ForeignMessageProto2._writeMessage, ); } if ( @@ -4135,7 +4137,7 @@ export const TestAllRequiredTypesProto2 = { ) { writer.writeEnum( 21, - TestAllRequiredTypesProto2.NestedEnum._toInt(msg.requiredNestedEnum) + TestAllRequiredTypesProto2.NestedEnum._toInt(msg.requiredNestedEnum), ); } if ( @@ -4154,14 +4156,14 @@ export const TestAllRequiredTypesProto2 = { writer.writeMessage( 27, msg.recursiveMessage, - TestAllRequiredTypesProto2._writeMessage + TestAllRequiredTypesProto2._writeMessage, ); } if (msg.optionalRecursiveMessage) { writer.writeMessage( 28, msg.optionalRecursiveMessage, - TestAllRequiredTypesProto2._writeMessage + TestAllRequiredTypesProto2._writeMessage, ); } if (msg.defaultInt32) { @@ -4217,7 +4219,7 @@ export const TestAllRequiredTypesProto2 = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2, - reader: BinaryReader + reader: BinaryReader, ): TestAllRequiredTypesProto2 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -4285,14 +4287,14 @@ export const TestAllRequiredTypesProto2 = { case 18: { reader.readMessage( msg.requiredNestedMessage, - TestAllRequiredTypesProto2.NestedMessage._readMessage + TestAllRequiredTypesProto2.NestedMessage._readMessage, ); break; } case 19: { reader.readMessage( msg.requiredForeignMessage, - ForeignMessageProto2._readMessage + ForeignMessageProto2._readMessage, ); break; } @@ -4303,7 +4305,7 @@ export const TestAllRequiredTypesProto2 = { } case 22: { msg.requiredForeignEnum = ForeignEnumProto2._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -4316,16 +4318,19 @@ export const TestAllRequiredTypesProto2 = { break; } case 27: { + msg.recursiveMessage = TestAllRequiredTypesProto2.initialize(); reader.readMessage( msg.recursiveMessage, - TestAllRequiredTypesProto2._readMessage + TestAllRequiredTypesProto2._readMessage, ); break; } case 28: { + msg.optionalRecursiveMessage = + TestAllRequiredTypesProto2.initialize(); reader.readMessage( msg.optionalRecursiveMessage, - TestAllRequiredTypesProto2._readMessage + TestAllRequiredTypesProto2._readMessage, ); break; } @@ -4456,11 +4461,11 @@ export const TestAllRequiredTypesProto2 = { * Serializes TestAllRequiredTypesProto2.NestedMessage to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllRequiredTypesProto2.NestedMessage._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -4468,11 +4473,11 @@ export const TestAllRequiredTypesProto2 = { * Deserializes TestAllRequiredTypesProto2.NestedMessage from protobuf. */ decode: function ( - bytes: ByteSource + bytes: ByteSource, ): TestAllRequiredTypesProto2.NestedMessage { return TestAllRequiredTypesProto2.NestedMessage._readMessage( TestAllRequiredTypesProto2.NestedMessage.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -4491,8 +4496,8 @@ export const TestAllRequiredTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.a) { writer.writeInt32(1, msg.a); @@ -4501,14 +4506,14 @@ export const TestAllRequiredTypesProto2 = { writer.writeMessage( 2, msg.corecursive, - TestAllRequiredTypesProto2._writeMessage + TestAllRequiredTypesProto2._writeMessage, ); } if (msg.optionalCorecursive) { writer.writeMessage( 3, msg.optionalCorecursive, - TestAllRequiredTypesProto2._writeMessage + TestAllRequiredTypesProto2._writeMessage, ); } return writer; @@ -4519,7 +4524,7 @@ export const TestAllRequiredTypesProto2 = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.NestedMessage, - reader: BinaryReader + reader: BinaryReader, ): TestAllRequiredTypesProto2.NestedMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -4529,16 +4534,18 @@ export const TestAllRequiredTypesProto2 = { break; } case 2: { + msg.corecursive = TestAllRequiredTypesProto2.initialize(); reader.readMessage( msg.corecursive, - TestAllRequiredTypesProto2._readMessage + TestAllRequiredTypesProto2._readMessage, ); break; } case 3: { + msg.optionalCorecursive = TestAllRequiredTypesProto2.initialize(); reader.readMessage( msg.optionalCorecursive, - TestAllRequiredTypesProto2._readMessage + TestAllRequiredTypesProto2._readMessage, ); break; } @@ -4557,11 +4564,11 @@ export const TestAllRequiredTypesProto2 = { * Serializes TestAllRequiredTypesProto2.Data to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllRequiredTypesProto2.Data._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -4571,7 +4578,7 @@ export const TestAllRequiredTypesProto2 = { decode: function (bytes: ByteSource): TestAllRequiredTypesProto2.Data { return TestAllRequiredTypesProto2.Data._readMessage( TestAllRequiredTypesProto2.Data.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -4589,8 +4596,8 @@ export const TestAllRequiredTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.groupInt32) { writer.writeInt32(202, msg.groupInt32); @@ -4606,7 +4613,7 @@ export const TestAllRequiredTypesProto2 = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.Data, - reader: BinaryReader + reader: BinaryReader, ): TestAllRequiredTypesProto2.Data { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -4634,7 +4641,7 @@ export const TestAllRequiredTypesProto2 = { * Serializes TestAllRequiredTypesProto2.MessageSetCorrect to protobuf. */ encode: function ( - _msg?: Partial + _msg?: PartialDeep, ): Uint8Array { return new Uint8Array(); }, @@ -4643,7 +4650,7 @@ export const TestAllRequiredTypesProto2 = { * Deserializes TestAllRequiredTypesProto2.MessageSetCorrect from protobuf. */ decode: function ( - _bytes?: ByteSource + _bytes?: ByteSource, ): TestAllRequiredTypesProto2.MessageSetCorrect { return {}; }, @@ -4659,8 +4666,8 @@ export const TestAllRequiredTypesProto2 = { * @private */ _writeMessage: function ( - _msg: Partial, - writer: BinaryWriter + _msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { return writer; }, @@ -4670,7 +4677,7 @@ export const TestAllRequiredTypesProto2 = { */ _readMessage: function ( _msg: TestAllRequiredTypesProto2.MessageSetCorrect, - _reader: BinaryReader + _reader: BinaryReader, ): TestAllRequiredTypesProto2.MessageSetCorrect { return _msg; }, @@ -4681,11 +4688,11 @@ export const TestAllRequiredTypesProto2 = { * Serializes TestAllRequiredTypesProto2.MessageSetCorrectExtension1 to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllRequiredTypesProto2.MessageSetCorrectExtension1._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -4693,11 +4700,11 @@ export const TestAllRequiredTypesProto2 = { * Deserializes TestAllRequiredTypesProto2.MessageSetCorrectExtension1 from protobuf. */ decode: function ( - bytes: ByteSource + bytes: ByteSource, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension1 { return TestAllRequiredTypesProto2.MessageSetCorrectExtension1._readMessage( TestAllRequiredTypesProto2.MessageSetCorrectExtension1.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -4715,8 +4722,8 @@ export const TestAllRequiredTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.str) { writer.writeString(25, msg.str); @@ -4729,7 +4736,7 @@ export const TestAllRequiredTypesProto2 = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.MessageSetCorrectExtension1, - reader: BinaryReader + reader: BinaryReader, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension1 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -4753,11 +4760,11 @@ export const TestAllRequiredTypesProto2 = { * Serializes TestAllRequiredTypesProto2.MessageSetCorrectExtension2 to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllRequiredTypesProto2.MessageSetCorrectExtension2._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -4765,11 +4772,11 @@ export const TestAllRequiredTypesProto2 = { * Deserializes TestAllRequiredTypesProto2.MessageSetCorrectExtension2 from protobuf. */ decode: function ( - bytes: ByteSource + bytes: ByteSource, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension2 { return TestAllRequiredTypesProto2.MessageSetCorrectExtension2._readMessage( TestAllRequiredTypesProto2.MessageSetCorrectExtension2.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -4787,8 +4794,8 @@ export const TestAllRequiredTypesProto2 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.i) { writer.writeInt32(9, msg.i); @@ -4801,7 +4808,7 @@ export const TestAllRequiredTypesProto2 = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.MessageSetCorrectExtension2, - reader: BinaryReader + reader: BinaryReader, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension2 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -4875,7 +4882,7 @@ export const TestAllTypesProto2JSON = { /** * Serializes TestAllTypesProto2 to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(TestAllTypesProto2JSON._writeMessage(msg)); }, @@ -4885,7 +4892,7 @@ export const TestAllTypesProto2JSON = { decode: function (json: string): TestAllTypesProto2 { return TestAllTypesProto2JSON._readMessage( TestAllTypesProto2JSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -4915,7 +4922,7 @@ export const TestAllTypesProto2JSON = { optionalForeignEnum: ForeignEnumProto2._fromInt(0), optionalStringPiece: "", optionalCord: "", - recursiveMessage: TestAllTypesProto2JSON.initialize(), + recursiveMessage: undefined, repeatedInt32: [], repeatedInt64: [], repeatedUint32: [], @@ -5033,7 +5040,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.optionalInt32) { @@ -5084,7 +5091,7 @@ export const TestAllTypesProto2JSON = { if (msg.optionalNestedMessage) { const _optionalNestedMessage_ = TestAllTypesProto2JSON.NestedMessage._writeMessage( - msg.optionalNestedMessage + msg.optionalNestedMessage, ); if (Object.keys(_optionalNestedMessage_).length > 0) { json["optionalNestedMessage"] = _optionalNestedMessage_; @@ -5092,7 +5099,7 @@ export const TestAllTypesProto2JSON = { } if (msg.optionalForeignMessage) { const _optionalForeignMessage_ = ForeignMessageProto2JSON._writeMessage( - msg.optionalForeignMessage + msg.optionalForeignMessage, ); if (Object.keys(_optionalForeignMessage_).length > 0) { json["optionalForeignMessage"] = _optionalForeignMessage_; @@ -5118,7 +5125,7 @@ export const TestAllTypesProto2JSON = { } if (msg.recursiveMessage) { const _recursiveMessage_ = TestAllTypesProto2JSON._writeMessage( - msg.recursiveMessage + msg.recursiveMessage, ); if (Object.keys(_recursiveMessage_).length > 0) { json["recursiveMessage"] = _recursiveMessage_; @@ -5171,12 +5178,12 @@ export const TestAllTypesProto2JSON = { } if (msg.repeatedNestedMessage?.length) { json["repeatedNestedMessage"] = msg.repeatedNestedMessage.map( - TestAllTypesProto2JSON.NestedMessage._writeMessage + TestAllTypesProto2JSON.NestedMessage._writeMessage, ); } if (msg.repeatedForeignMessage?.length) { json["repeatedForeignMessage"] = msg.repeatedForeignMessage.map( - ForeignMessageProto2JSON._writeMessage + ForeignMessageProto2JSON._writeMessage, ); } if (msg.repeatedNestedEnum?.length) { @@ -5280,7 +5287,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapInt32Int32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt32Int32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt32Int32_).length > 0) { json["mapInt32Int32"] = _mapInt32Int32_; @@ -5291,7 +5298,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapInt64Int64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt64Int64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt64Int64_).length > 0) { json["mapInt64Int64"] = _mapInt64Int64_; @@ -5302,7 +5309,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapUint32Uint32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapUint32Uint32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapUint32Uint32_).length > 0) { json["mapUint32Uint32"] = _mapUint32Uint32_; @@ -5313,7 +5320,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapUint64Uint64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapUint64Uint64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapUint64Uint64_).length > 0) { json["mapUint64Uint64"] = _mapUint64Uint64_; @@ -5324,7 +5331,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapSint32Sint32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSint32Sint32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSint32Sint32_).length > 0) { json["mapSint32Sint32"] = _mapSint32Sint32_; @@ -5335,7 +5342,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapSint64Sint64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSint64Sint64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSint64Sint64_).length > 0) { json["mapSint64Sint64"] = _mapSint64Sint64_; @@ -5346,7 +5353,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapFixed32Fixed32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapFixed32Fixed32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapFixed32Fixed32_).length > 0) { json["mapFixed32Fixed32"] = _mapFixed32Fixed32_; @@ -5357,7 +5364,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapFixed64Fixed64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapFixed64Fixed64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapFixed64Fixed64_).length > 0) { json["mapFixed64Fixed64"] = _mapFixed64Fixed64_; @@ -5368,7 +5375,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapSfixed32Sfixed32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSfixed32Sfixed32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSfixed32Sfixed32_).length > 0) { json["mapSfixed32Sfixed32"] = _mapSfixed32Sfixed32_; @@ -5379,7 +5386,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapSfixed64Sfixed64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSfixed64Sfixed64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSfixed64Sfixed64_).length > 0) { json["mapSfixed64Sfixed64"] = _mapSfixed64Sfixed64_; @@ -5390,7 +5397,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapInt32Float) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt32Float._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt32Float_).length > 0) { json["mapInt32Float"] = _mapInt32Float_; @@ -5401,7 +5408,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapInt32Double) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt32Double._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt32Double_).length > 0) { json["mapInt32Double"] = _mapInt32Double_; @@ -5412,7 +5419,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapBoolBool) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapBoolBool._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapBoolBool_).length > 0) { json["mapBoolBool"] = _mapBoolBool_; @@ -5423,7 +5430,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapStringString) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringString._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringString_).length > 0) { json["mapStringString"] = _mapStringString_; @@ -5434,7 +5441,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapStringBytes) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringBytes._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringBytes_).length > 0) { json["mapStringBytes"] = _mapStringBytes_; @@ -5445,7 +5452,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapStringNestedMessage) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringNestedMessage._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringNestedMessage_).length > 0) { json["mapStringNestedMessage"] = _mapStringNestedMessage_; @@ -5456,7 +5463,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapStringForeignMessage) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringForeignMessage._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringForeignMessage_).length > 0) { json["mapStringForeignMessage"] = _mapStringForeignMessage_; @@ -5467,7 +5474,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapStringNestedEnum) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringNestedEnum._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringNestedEnum_).length > 0) { json["mapStringNestedEnum"] = _mapStringNestedEnum_; @@ -5478,7 +5485,7 @@ export const TestAllTypesProto2JSON = { Object.entries(msg.mapStringForeignEnum) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringForeignEnum._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringForeignEnum_).length > 0) { json["mapStringForeignEnum"] = _mapStringForeignEnum_; @@ -5490,7 +5497,7 @@ export const TestAllTypesProto2JSON = { if (msg.oneofNestedMessage != undefined) { const _oneofNestedMessage_ = TestAllTypesProto2JSON.NestedMessage._writeMessage( - msg.oneofNestedMessage + msg.oneofNestedMessage, ); json["oneofNestedMessage"] = _oneofNestedMessage_; } @@ -5622,7 +5629,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2, - json: any + json: any, ): TestAllTypesProto2 { const _optionalInt32_ = json["optionalInt32"] ?? json["optional_int32"]; if (_optionalInt32_) { @@ -5691,19 +5698,18 @@ export const TestAllTypesProto2JSON = { const _optionalNestedMessage_ = json["optionalNestedMessage"] ?? json["optional_nested_message"]; if (_optionalNestedMessage_) { - const m = TestAllTypesProto2JSON.NestedMessage.initialize(); TestAllTypesProto2JSON.NestedMessage._readMessage( - m, - _optionalNestedMessage_ + msg.optionalNestedMessage, + _optionalNestedMessage_, ); - msg.optionalNestedMessage = m; } const _optionalForeignMessage_ = json["optionalForeignMessage"] ?? json["optional_foreign_message"]; if (_optionalForeignMessage_) { - const m = ForeignMessageProto2JSON.initialize(); - ForeignMessageProto2JSON._readMessage(m, _optionalForeignMessage_); - msg.optionalForeignMessage = m; + ForeignMessageProto2JSON._readMessage( + msg.optionalForeignMessage, + _optionalForeignMessage_, + ); } const _optionalNestedEnum_ = json["optionalNestedEnum"] ?? json["optional_nested_enum"]; @@ -5727,9 +5733,11 @@ export const TestAllTypesProto2JSON = { const _recursiveMessage_ = json["recursiveMessage"] ?? json["recursive_message"]; if (_recursiveMessage_) { - const m = TestAllTypesProto2JSON.initialize(); - TestAllTypesProto2JSON._readMessage(m, _recursiveMessage_); - msg.recursiveMessage = m; + msg.recursiveMessage = TestAllTypesProto2JSON.initialize(); + TestAllTypesProto2JSON._readMessage( + msg.recursiveMessage, + _recursiveMessage_, + ); } const _repeatedInt32_ = json["repeatedInt32"] ?? json["repeated_int32"]; if (_repeatedInt32_) { @@ -5956,7 +5964,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapInt32Int32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt32Int32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapInt64Int64_ = json["mapInt64Int64"] ?? json["map_int64_int64"]; @@ -5965,7 +5973,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapInt64Int64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt64Int64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapUint32Uint32_ = @@ -5975,7 +5983,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapUint32Uint32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapUint32Uint32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapUint64Uint64_ = @@ -5985,7 +5993,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapUint64Uint64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapUint64Uint64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSint32Sint32_ = @@ -5995,7 +6003,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapSint32Sint32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSint32Sint32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSint64Sint64_ = @@ -6005,7 +6013,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapSint64Sint64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSint64Sint64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapFixed32Fixed32_ = @@ -6015,7 +6023,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapFixed32Fixed32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapFixed32Fixed32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapFixed64Fixed64_ = @@ -6025,7 +6033,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapFixed64Fixed64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapFixed64Fixed64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSfixed32Sfixed32_ = @@ -6035,7 +6043,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapSfixed32Sfixed32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSfixed32Sfixed32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSfixed64Sfixed64_ = @@ -6045,7 +6053,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapSfixed64Sfixed64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapSfixed64Sfixed64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapInt32Float_ = json["mapInt32Float"] ?? json["map_int32_float"]; @@ -6054,7 +6062,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapInt32Float_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt32Float._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapInt32Double_ = json["mapInt32Double"] ?? json["map_int32_double"]; @@ -6063,7 +6071,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapInt32Double_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapInt32Double._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapBoolBool_ = json["mapBoolBool"] ?? json["map_bool_bool"]; @@ -6072,7 +6080,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapBoolBool_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapBoolBool._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringString_ = @@ -6082,7 +6090,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapStringString_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringString._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringBytes_ = json["mapStringBytes"] ?? json["map_string_bytes"]; @@ -6091,7 +6099,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapStringBytes_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringBytes._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringNestedMessage_ = @@ -6101,7 +6109,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapStringNestedMessage_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringNestedMessage._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringForeignMessage_ = @@ -6111,7 +6119,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapStringForeignMessage_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringForeignMessage._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringNestedEnum_ = @@ -6121,7 +6129,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapStringNestedEnum_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringNestedEnum._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringForeignEnum_ = @@ -6131,7 +6139,7 @@ export const TestAllTypesProto2JSON = { Object.entries(_mapStringForeignEnum_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto2JSON.MapStringForeignEnum._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _oneofUint32_ = json["oneofUint32"] ?? json["oneof_uint32"]; @@ -6141,12 +6149,12 @@ export const TestAllTypesProto2JSON = { const _oneofNestedMessage_ = json["oneofNestedMessage"] ?? json["oneof_nested_message"]; if (_oneofNestedMessage_) { - const m = TestAllTypesProto2JSON.NestedMessage.initialize(); + msg.oneofNestedMessage = + TestAllTypesProto2JSON.NestedMessage.initialize(); TestAllTypesProto2JSON.NestedMessage._readMessage( - m, - _oneofNestedMessage_ + msg.oneofNestedMessage, + _oneofNestedMessage_, ); - msg.oneofNestedMessage = m; } const _oneofString_ = json["oneofString"] ?? json["oneof_string"]; if (_oneofString_) { @@ -6372,9 +6380,11 @@ export const TestAllTypesProto2JSON = { /** * Serializes TestAllTypesProto2.NestedMessage to JSON. */ - encode: function (msg: Partial): string { + encode: function ( + msg: PartialDeep, + ): string { return JSON.stringify( - TestAllTypesProto2JSON.NestedMessage._writeMessage(msg) + TestAllTypesProto2JSON.NestedMessage._writeMessage(msg), ); }, @@ -6384,7 +6394,7 @@ export const TestAllTypesProto2JSON = { decode: function (json: string): TestAllTypesProto2.NestedMessage { return TestAllTypesProto2JSON.NestedMessage._readMessage( TestAllTypesProto2JSON.NestedMessage.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -6394,7 +6404,7 @@ export const TestAllTypesProto2JSON = { initialize: function (): TestAllTypesProto2.NestedMessage { return { a: 0, - corecursive: TestAllTypesProto2JSON.initialize(), + corecursive: undefined, }; }, @@ -6402,7 +6412,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.a) { @@ -6410,7 +6420,7 @@ export const TestAllTypesProto2JSON = { } if (msg.corecursive) { const _corecursive_ = TestAllTypesProto2JSON._writeMessage( - msg.corecursive + msg.corecursive, ); if (Object.keys(_corecursive_).length > 0) { json["corecursive"] = _corecursive_; @@ -6424,7 +6434,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.NestedMessage, - json: any + json: any, ): TestAllTypesProto2.NestedMessage { const _a_ = json["a"]; if (_a_) { @@ -6432,9 +6442,8 @@ export const TestAllTypesProto2JSON = { } const _corecursive_ = json["corecursive"]; if (_corecursive_) { - const m = TestAllTypesProto2JSON.initialize(); - TestAllTypesProto2JSON._readMessage(m, _corecursive_); - msg.corecursive = m; + msg.corecursive = TestAllTypesProto2JSON.initialize(); + TestAllTypesProto2JSON._readMessage(msg.corecursive, _corecursive_); } return msg; }, @@ -6445,7 +6454,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6462,7 +6471,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt32Int32, - json: any + json: any, ): TestAllTypesProto2.MapInt32Int32 { const _key_ = json["key"]; if (_key_) { @@ -6481,7 +6490,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6498,7 +6507,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt64Int64, - json: any + json: any, ): TestAllTypesProto2.MapInt64Int64 { const _key_ = json["key"]; if (_key_) { @@ -6517,7 +6526,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6534,7 +6543,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapUint32Uint32, - json: any + json: any, ): TestAllTypesProto2.MapUint32Uint32 { const _key_ = json["key"]; if (_key_) { @@ -6553,7 +6562,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6570,7 +6579,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapUint64Uint64, - json: any + json: any, ): TestAllTypesProto2.MapUint64Uint64 { const _key_ = json["key"]; if (_key_) { @@ -6589,7 +6598,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6606,7 +6615,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSint32Sint32, - json: any + json: any, ): TestAllTypesProto2.MapSint32Sint32 { const _key_ = json["key"]; if (_key_) { @@ -6625,7 +6634,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6642,7 +6651,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSint64Sint64, - json: any + json: any, ): TestAllTypesProto2.MapSint64Sint64 { const _key_ = json["key"]; if (_key_) { @@ -6661,7 +6670,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6678,7 +6687,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapFixed32Fixed32, - json: any + json: any, ): TestAllTypesProto2.MapFixed32Fixed32 { const _key_ = json["key"]; if (_key_) { @@ -6697,7 +6706,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6714,7 +6723,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapFixed64Fixed64, - json: any + json: any, ): TestAllTypesProto2.MapFixed64Fixed64 { const _key_ = json["key"]; if (_key_) { @@ -6733,7 +6742,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6750,7 +6759,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSfixed32Sfixed32, - json: any + json: any, ): TestAllTypesProto2.MapSfixed32Sfixed32 { const _key_ = json["key"]; if (_key_) { @@ -6769,7 +6778,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6786,7 +6795,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapSfixed64Sfixed64, - json: any + json: any, ): TestAllTypesProto2.MapSfixed64Sfixed64 { const _key_ = json["key"]; if (_key_) { @@ -6805,7 +6814,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6822,7 +6831,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt32Float, - json: any + json: any, ): TestAllTypesProto2.MapInt32Float { const _key_ = json["key"]; if (_key_) { @@ -6841,7 +6850,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6858,7 +6867,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapInt32Double, - json: any + json: any, ): TestAllTypesProto2.MapInt32Double { const _key_ = json["key"]; if (_key_) { @@ -6877,7 +6886,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6894,7 +6903,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapBoolBool, - json: any + json: any, ): TestAllTypesProto2.MapBoolBool { const _key_ = json["key"]; if (_key_) { @@ -6913,7 +6922,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6930,7 +6939,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringString, - json: any + json: any, ): TestAllTypesProto2.MapStringString { const _key_ = json["key"]; if (_key_) { @@ -6949,7 +6958,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6966,7 +6975,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringBytes, - json: any + json: any, ): TestAllTypesProto2.MapStringBytes { const _key_ = json["key"]; if (_key_) { @@ -6985,7 +6994,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6993,7 +7002,7 @@ export const TestAllTypesProto2JSON = { } if (msg.value) { const _value_ = TestAllTypesProto2JSON.NestedMessage._writeMessage( - msg.value + msg.value, ); if (Object.keys(_value_).length > 0) { json["value"] = _value_; @@ -7007,7 +7016,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringNestedMessage, - json: any + json: any, ): TestAllTypesProto2.MapStringNestedMessage { const _key_ = json["key"]; if (_key_) { @@ -7015,9 +7024,7 @@ export const TestAllTypesProto2JSON = { } const _value_ = json["value"]; if (_value_) { - const m = TestAllTypesProto2JSON.NestedMessage.initialize(); - TestAllTypesProto2JSON.NestedMessage._readMessage(m, _value_); - msg.value = m; + TestAllTypesProto2JSON.NestedMessage._readMessage(msg.value, _value_); } return msg; }, @@ -7028,7 +7035,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -7048,7 +7055,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringForeignMessage, - json: any + json: any, ): TestAllTypesProto2.MapStringForeignMessage { const _key_ = json["key"]; if (_key_) { @@ -7056,9 +7063,7 @@ export const TestAllTypesProto2JSON = { } const _value_ = json["value"]; if (_value_) { - const m = ForeignMessageProto2JSON.initialize(); - ForeignMessageProto2JSON._readMessage(m, _value_); - msg.value = m; + ForeignMessageProto2JSON._readMessage(msg.value, _value_); } return msg; }, @@ -7069,7 +7074,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -7086,7 +7091,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringNestedEnum, - json: any + json: any, ): TestAllTypesProto2.MapStringNestedEnum { const _key_ = json["key"]; if (_key_) { @@ -7105,7 +7110,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -7122,7 +7127,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MapStringForeignEnum, - json: any + json: any, ): TestAllTypesProto2.MapStringForeignEnum { const _key_ = json["key"]; if (_key_) { @@ -7140,7 +7145,7 @@ export const TestAllTypesProto2JSON = { /** * Serializes TestAllTypesProto2.Data to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(TestAllTypesProto2JSON.Data._writeMessage(msg)); }, @@ -7150,7 +7155,7 @@ export const TestAllTypesProto2JSON = { decode: function (json: string): TestAllTypesProto2.Data { return TestAllTypesProto2JSON.Data._readMessage( TestAllTypesProto2JSON.Data.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7168,7 +7173,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.groupInt32) { @@ -7185,7 +7190,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.Data, - json: any + json: any, ): TestAllTypesProto2.Data { const _groupInt32_ = json["groupInt32"] ?? json["group_int32"]; if (_groupInt32_) { @@ -7204,7 +7209,7 @@ export const TestAllTypesProto2JSON = { * Serializes TestAllTypesProto2.MessageSetCorrect to JSON. */ encode: function ( - _msg?: Partial + _msg?: PartialDeep, ): string { return "{}"; }, @@ -7227,7 +7232,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - _msg: Partial + _msg: PartialDeep, ): Record { return {}; }, @@ -7237,7 +7242,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MessageSetCorrect, - _json: any + _json: any, ): TestAllTypesProto2.MessageSetCorrect { return msg; }, @@ -7248,10 +7253,10 @@ export const TestAllTypesProto2JSON = { * Serializes TestAllTypesProto2.MessageSetCorrectExtension1 to JSON. */ encode: function ( - msg: Partial + msg: PartialDeep, ): string { return JSON.stringify( - TestAllTypesProto2JSON.MessageSetCorrectExtension1._writeMessage(msg) + TestAllTypesProto2JSON.MessageSetCorrectExtension1._writeMessage(msg), ); }, @@ -7259,11 +7264,11 @@ export const TestAllTypesProto2JSON = { * Deserializes TestAllTypesProto2.MessageSetCorrectExtension1 from JSON. */ decode: function ( - json: string + json: string, ): TestAllTypesProto2.MessageSetCorrectExtension1 { return TestAllTypesProto2JSON.MessageSetCorrectExtension1._readMessage( TestAllTypesProto2JSON.MessageSetCorrectExtension1.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7280,7 +7285,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.str) { @@ -7294,7 +7299,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MessageSetCorrectExtension1, - json: any + json: any, ): TestAllTypesProto2.MessageSetCorrectExtension1 { const _str_ = json["str"]; if (_str_) { @@ -7309,10 +7314,10 @@ export const TestAllTypesProto2JSON = { * Serializes TestAllTypesProto2.MessageSetCorrectExtension2 to JSON. */ encode: function ( - msg: Partial + msg: PartialDeep, ): string { return JSON.stringify( - TestAllTypesProto2JSON.MessageSetCorrectExtension2._writeMessage(msg) + TestAllTypesProto2JSON.MessageSetCorrectExtension2._writeMessage(msg), ); }, @@ -7320,11 +7325,11 @@ export const TestAllTypesProto2JSON = { * Deserializes TestAllTypesProto2.MessageSetCorrectExtension2 from JSON. */ decode: function ( - json: string + json: string, ): TestAllTypesProto2.MessageSetCorrectExtension2 { return TestAllTypesProto2JSON.MessageSetCorrectExtension2._readMessage( TestAllTypesProto2JSON.MessageSetCorrectExtension2.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7341,7 +7346,7 @@ export const TestAllTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.i) { @@ -7355,7 +7360,7 @@ export const TestAllTypesProto2JSON = { */ _readMessage: function ( msg: TestAllTypesProto2.MessageSetCorrectExtension2, - json: any + json: any, ): TestAllTypesProto2.MessageSetCorrectExtension2 { const _i_ = json["i"]; if (_i_) { @@ -7370,7 +7375,7 @@ export const ForeignMessageProto2JSON = { /** * Serializes ForeignMessageProto2 to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(ForeignMessageProto2JSON._writeMessage(msg)); }, @@ -7380,7 +7385,7 @@ export const ForeignMessageProto2JSON = { decode: function (json: string): ForeignMessageProto2 { return ForeignMessageProto2JSON._readMessage( ForeignMessageProto2JSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7397,7 +7402,7 @@ export const ForeignMessageProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.c) { @@ -7411,7 +7416,7 @@ export const ForeignMessageProto2JSON = { */ _readMessage: function ( msg: ForeignMessageProto2, - json: any + json: any, ): ForeignMessageProto2 { const _c_ = json["c"]; if (_c_) { @@ -7425,7 +7430,7 @@ export const UnknownToTestAllTypesJSON = { /** * Serializes UnknownToTestAllTypes to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(UnknownToTestAllTypesJSON._writeMessage(msg)); }, @@ -7435,7 +7440,7 @@ export const UnknownToTestAllTypesJSON = { decode: function (json: string): UnknownToTestAllTypes { return UnknownToTestAllTypesJSON._readMessage( UnknownToTestAllTypesJSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7456,7 +7461,7 @@ export const UnknownToTestAllTypesJSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.optionalInt32) { @@ -7467,7 +7472,7 @@ export const UnknownToTestAllTypesJSON = { } if (msg.nestedMessage) { const _nestedMessage_ = ForeignMessageProto2JSON._writeMessage( - msg.nestedMessage + msg.nestedMessage, ); if (Object.keys(_nestedMessage_).length > 0) { json["nestedMessage"] = _nestedMessage_; @@ -7487,7 +7492,7 @@ export const UnknownToTestAllTypesJSON = { */ _readMessage: function ( msg: UnknownToTestAllTypes, - json: any + json: any, ): UnknownToTestAllTypes { const _optionalInt32_ = json["optionalInt32"] ?? json["optional_int32"]; if (_optionalInt32_) { @@ -7499,9 +7504,7 @@ export const UnknownToTestAllTypesJSON = { } const _nestedMessage_ = json["nestedMessage"] ?? json["nested_message"]; if (_nestedMessage_) { - const m = ForeignMessageProto2JSON.initialize(); - ForeignMessageProto2JSON._readMessage(m, _nestedMessage_); - msg.nestedMessage = m; + ForeignMessageProto2JSON._readMessage(msg.nestedMessage, _nestedMessage_); } const _optionalBool_ = json["optionalBool"] ?? json["optional_bool"]; if (_optionalBool_) { @@ -7519,10 +7522,10 @@ export const UnknownToTestAllTypesJSON = { * Serializes UnknownToTestAllTypes.OptionalGroup to JSON. */ encode: function ( - msg: Partial + msg: PartialDeep, ): string { return JSON.stringify( - UnknownToTestAllTypesJSON.OptionalGroup._writeMessage(msg) + UnknownToTestAllTypesJSON.OptionalGroup._writeMessage(msg), ); }, @@ -7532,7 +7535,7 @@ export const UnknownToTestAllTypesJSON = { decode: function (json: string): UnknownToTestAllTypes.OptionalGroup { return UnknownToTestAllTypesJSON.OptionalGroup._readMessage( UnknownToTestAllTypesJSON.OptionalGroup.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7549,7 +7552,7 @@ export const UnknownToTestAllTypesJSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.a) { @@ -7563,7 +7566,7 @@ export const UnknownToTestAllTypesJSON = { */ _readMessage: function ( msg: UnknownToTestAllTypes.OptionalGroup, - json: any + json: any, ): UnknownToTestAllTypes.OptionalGroup { const _a_ = json["a"]; if (_a_) { @@ -7578,7 +7581,7 @@ export const NullHypothesisProto2JSON = { /** * Serializes NullHypothesisProto2 to JSON. */ - encode: function (_msg?: Partial): string { + encode: function (_msg?: PartialDeep): string { return "{}"; }, @@ -7600,7 +7603,7 @@ export const NullHypothesisProto2JSON = { * @private */ _writeMessage: function ( - _msg: Partial + _msg: PartialDeep, ): Record { return {}; }, @@ -7610,7 +7613,7 @@ export const NullHypothesisProto2JSON = { */ _readMessage: function ( msg: NullHypothesisProto2, - _json: any + _json: any, ): NullHypothesisProto2 { return msg; }, @@ -7620,7 +7623,7 @@ export const EnumOnlyProto2JSON = { /** * Serializes EnumOnlyProto2 to JSON. */ - encode: function (_msg?: Partial): string { + encode: function (_msg?: PartialDeep): string { return "{}"; }, @@ -7642,7 +7645,7 @@ export const EnumOnlyProto2JSON = { * @private */ _writeMessage: function ( - _msg: Partial + _msg: PartialDeep, ): Record { return {}; }, @@ -7698,7 +7701,7 @@ export const OneStringProto2JSON = { /** * Serializes OneStringProto2 to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(OneStringProto2JSON._writeMessage(msg)); }, @@ -7708,7 +7711,7 @@ export const OneStringProto2JSON = { decode: function (json: string): OneStringProto2 { return OneStringProto2JSON._readMessage( OneStringProto2JSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7725,7 +7728,7 @@ export const OneStringProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.data) { @@ -7750,7 +7753,7 @@ export const ProtoWithKeywordsJSON = { /** * Serializes ProtoWithKeywords to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(ProtoWithKeywordsJSON._writeMessage(msg)); }, @@ -7760,7 +7763,7 @@ export const ProtoWithKeywordsJSON = { decode: function (json: string): ProtoWithKeywords { return ProtoWithKeywordsJSON._readMessage( ProtoWithKeywordsJSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7779,7 +7782,7 @@ export const ProtoWithKeywordsJSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.inline) { @@ -7799,7 +7802,7 @@ export const ProtoWithKeywordsJSON = { */ _readMessage: function ( msg: ProtoWithKeywords, - json: any + json: any, ): ProtoWithKeywords { const _inline_ = json["inline"]; if (_inline_) { @@ -7821,7 +7824,7 @@ export const TestAllRequiredTypesProto2JSON = { /** * Serializes TestAllRequiredTypesProto2 to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(TestAllRequiredTypesProto2JSON._writeMessage(msg)); }, @@ -7831,7 +7834,7 @@ export const TestAllRequiredTypesProto2JSON = { decode: function (json: string): TestAllRequiredTypesProto2 { return TestAllRequiredTypesProto2JSON._readMessage( TestAllRequiredTypesProto2JSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -7862,8 +7865,8 @@ export const TestAllRequiredTypesProto2JSON = { requiredForeignEnum: ForeignEnumProto2._fromInt(0), requiredStringPiece: "", requiredCord: "", - recursiveMessage: TestAllRequiredTypesProto2JSON.initialize(), - optionalRecursiveMessage: TestAllRequiredTypesProto2JSON.initialize(), + recursiveMessage: undefined, + optionalRecursiveMessage: undefined, defaultInt32: 0, defaultInt64: 0n, defaultUint32: 0, @@ -7886,7 +7889,7 @@ export const TestAllRequiredTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.requiredInt32) { @@ -7937,7 +7940,7 @@ export const TestAllRequiredTypesProto2JSON = { if (msg.requiredNestedMessage) { const _requiredNestedMessage_ = TestAllRequiredTypesProto2JSON.NestedMessage._writeMessage( - msg.requiredNestedMessage + msg.requiredNestedMessage, ); if (Object.keys(_requiredNestedMessage_).length > 0) { json["requiredNestedMessage"] = _requiredNestedMessage_; @@ -7945,7 +7948,7 @@ export const TestAllRequiredTypesProto2JSON = { } if (msg.requiredForeignMessage) { const _requiredForeignMessage_ = ForeignMessageProto2JSON._writeMessage( - msg.requiredForeignMessage + msg.requiredForeignMessage, ); if (Object.keys(_requiredForeignMessage_).length > 0) { json["requiredForeignMessage"] = _requiredForeignMessage_; @@ -7971,7 +7974,7 @@ export const TestAllRequiredTypesProto2JSON = { } if (msg.recursiveMessage) { const _recursiveMessage_ = TestAllRequiredTypesProto2JSON._writeMessage( - msg.recursiveMessage + msg.recursiveMessage, ); if (Object.keys(_recursiveMessage_).length > 0) { json["recursiveMessage"] = _recursiveMessage_; @@ -7980,7 +7983,7 @@ export const TestAllRequiredTypesProto2JSON = { if (msg.optionalRecursiveMessage) { const _optionalRecursiveMessage_ = TestAllRequiredTypesProto2JSON._writeMessage( - msg.optionalRecursiveMessage + msg.optionalRecursiveMessage, ); if (Object.keys(_optionalRecursiveMessage_).length > 0) { json["optionalRecursiveMessage"] = _optionalRecursiveMessage_; @@ -8039,7 +8042,7 @@ export const TestAllRequiredTypesProto2JSON = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2, - json: any + json: any, ): TestAllRequiredTypesProto2 { const _requiredInt32_ = json["requiredInt32"] ?? json["required_int32"]; if (_requiredInt32_) { @@ -8108,19 +8111,18 @@ export const TestAllRequiredTypesProto2JSON = { const _requiredNestedMessage_ = json["requiredNestedMessage"] ?? json["required_nested_message"]; if (_requiredNestedMessage_) { - const m = TestAllRequiredTypesProto2JSON.NestedMessage.initialize(); TestAllRequiredTypesProto2JSON.NestedMessage._readMessage( - m, - _requiredNestedMessage_ + msg.requiredNestedMessage, + _requiredNestedMessage_, ); - msg.requiredNestedMessage = m; } const _requiredForeignMessage_ = json["requiredForeignMessage"] ?? json["required_foreign_message"]; if (_requiredForeignMessage_) { - const m = ForeignMessageProto2JSON.initialize(); - ForeignMessageProto2JSON._readMessage(m, _requiredForeignMessage_); - msg.requiredForeignMessage = m; + ForeignMessageProto2JSON._readMessage( + msg.requiredForeignMessage, + _requiredForeignMessage_, + ); } const _requiredNestedEnum_ = json["requiredNestedEnum"] ?? json["required_nested_enum"]; @@ -8144,19 +8146,21 @@ export const TestAllRequiredTypesProto2JSON = { const _recursiveMessage_ = json["recursiveMessage"] ?? json["recursive_message"]; if (_recursiveMessage_) { - const m = TestAllRequiredTypesProto2JSON.initialize(); - TestAllRequiredTypesProto2JSON._readMessage(m, _recursiveMessage_); - msg.recursiveMessage = m; + msg.recursiveMessage = TestAllRequiredTypesProto2JSON.initialize(); + TestAllRequiredTypesProto2JSON._readMessage( + msg.recursiveMessage, + _recursiveMessage_, + ); } const _optionalRecursiveMessage_ = json["optionalRecursiveMessage"] ?? json["optional_recursive_message"]; if (_optionalRecursiveMessage_) { - const m = TestAllRequiredTypesProto2JSON.initialize(); + msg.optionalRecursiveMessage = + TestAllRequiredTypesProto2JSON.initialize(); TestAllRequiredTypesProto2JSON._readMessage( - m, - _optionalRecursiveMessage_ + msg.optionalRecursiveMessage, + _optionalRecursiveMessage_, ); - msg.optionalRecursiveMessage = m; } const _defaultInt32_ = json["defaultInt32"] ?? json["default_int32"]; if (_defaultInt32_) { @@ -8281,10 +8285,10 @@ export const TestAllRequiredTypesProto2JSON = { * Serializes TestAllRequiredTypesProto2.NestedMessage to JSON. */ encode: function ( - msg: Partial + msg: PartialDeep, ): string { return JSON.stringify( - TestAllRequiredTypesProto2JSON.NestedMessage._writeMessage(msg) + TestAllRequiredTypesProto2JSON.NestedMessage._writeMessage(msg), ); }, @@ -8294,7 +8298,7 @@ export const TestAllRequiredTypesProto2JSON = { decode: function (json: string): TestAllRequiredTypesProto2.NestedMessage { return TestAllRequiredTypesProto2JSON.NestedMessage._readMessage( TestAllRequiredTypesProto2JSON.NestedMessage.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -8304,8 +8308,8 @@ export const TestAllRequiredTypesProto2JSON = { initialize: function (): TestAllRequiredTypesProto2.NestedMessage { return { a: 0, - corecursive: TestAllRequiredTypesProto2JSON.initialize(), - optionalCorecursive: TestAllRequiredTypesProto2JSON.initialize(), + corecursive: undefined, + optionalCorecursive: undefined, }; }, @@ -8313,7 +8317,7 @@ export const TestAllRequiredTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.a) { @@ -8321,7 +8325,7 @@ export const TestAllRequiredTypesProto2JSON = { } if (msg.corecursive) { const _corecursive_ = TestAllRequiredTypesProto2JSON._writeMessage( - msg.corecursive + msg.corecursive, ); if (Object.keys(_corecursive_).length > 0) { json["corecursive"] = _corecursive_; @@ -8342,7 +8346,7 @@ export const TestAllRequiredTypesProto2JSON = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.NestedMessage, - json: any + json: any, ): TestAllRequiredTypesProto2.NestedMessage { const _a_ = json["a"]; if (_a_) { @@ -8350,16 +8354,20 @@ export const TestAllRequiredTypesProto2JSON = { } const _corecursive_ = json["corecursive"]; if (_corecursive_) { - const m = TestAllRequiredTypesProto2JSON.initialize(); - TestAllRequiredTypesProto2JSON._readMessage(m, _corecursive_); - msg.corecursive = m; + msg.corecursive = TestAllRequiredTypesProto2JSON.initialize(); + TestAllRequiredTypesProto2JSON._readMessage( + msg.corecursive, + _corecursive_, + ); } const _optionalCorecursive_ = json["optionalCorecursive"] ?? json["optional_corecursive"]; if (_optionalCorecursive_) { - const m = TestAllRequiredTypesProto2JSON.initialize(); - TestAllRequiredTypesProto2JSON._readMessage(m, _optionalCorecursive_); - msg.optionalCorecursive = m; + msg.optionalCorecursive = TestAllRequiredTypesProto2JSON.initialize(); + TestAllRequiredTypesProto2JSON._readMessage( + msg.optionalCorecursive, + _optionalCorecursive_, + ); } return msg; }, @@ -8369,9 +8377,11 @@ export const TestAllRequiredTypesProto2JSON = { /** * Serializes TestAllRequiredTypesProto2.Data to JSON. */ - encode: function (msg: Partial): string { + encode: function ( + msg: PartialDeep, + ): string { return JSON.stringify( - TestAllRequiredTypesProto2JSON.Data._writeMessage(msg) + TestAllRequiredTypesProto2JSON.Data._writeMessage(msg), ); }, @@ -8381,7 +8391,7 @@ export const TestAllRequiredTypesProto2JSON = { decode: function (json: string): TestAllRequiredTypesProto2.Data { return TestAllRequiredTypesProto2JSON.Data._readMessage( TestAllRequiredTypesProto2JSON.Data.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -8399,7 +8409,7 @@ export const TestAllRequiredTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.groupInt32) { @@ -8416,7 +8426,7 @@ export const TestAllRequiredTypesProto2JSON = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.Data, - json: any + json: any, ): TestAllRequiredTypesProto2.Data { const _groupInt32_ = json["groupInt32"] ?? json["group_int32"]; if (_groupInt32_) { @@ -8435,7 +8445,7 @@ export const TestAllRequiredTypesProto2JSON = { * Serializes TestAllRequiredTypesProto2.MessageSetCorrect to JSON. */ encode: function ( - _msg?: Partial + _msg?: PartialDeep, ): string { return "{}"; }, @@ -8444,7 +8454,7 @@ export const TestAllRequiredTypesProto2JSON = { * Deserializes TestAllRequiredTypesProto2.MessageSetCorrect from JSON. */ decode: function ( - _json?: string + _json?: string, ): TestAllRequiredTypesProto2.MessageSetCorrect { return {}; }, @@ -8460,7 +8470,7 @@ export const TestAllRequiredTypesProto2JSON = { * @private */ _writeMessage: function ( - _msg: Partial + _msg: PartialDeep, ): Record { return {}; }, @@ -8470,7 +8480,7 @@ export const TestAllRequiredTypesProto2JSON = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.MessageSetCorrect, - _json: any + _json: any, ): TestAllRequiredTypesProto2.MessageSetCorrect { return msg; }, @@ -8481,12 +8491,12 @@ export const TestAllRequiredTypesProto2JSON = { * Serializes TestAllRequiredTypesProto2.MessageSetCorrectExtension1 to JSON. */ encode: function ( - msg: Partial + msg: PartialDeep, ): string { return JSON.stringify( TestAllRequiredTypesProto2JSON.MessageSetCorrectExtension1._writeMessage( - msg - ) + msg, + ), ); }, @@ -8494,11 +8504,11 @@ export const TestAllRequiredTypesProto2JSON = { * Deserializes TestAllRequiredTypesProto2.MessageSetCorrectExtension1 from JSON. */ decode: function ( - json: string + json: string, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension1 { return TestAllRequiredTypesProto2JSON.MessageSetCorrectExtension1._readMessage( TestAllRequiredTypesProto2JSON.MessageSetCorrectExtension1.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -8516,7 +8526,7 @@ export const TestAllRequiredTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.str) { @@ -8530,7 +8540,7 @@ export const TestAllRequiredTypesProto2JSON = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.MessageSetCorrectExtension1, - json: any + json: any, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension1 { const _str_ = json["str"]; if (_str_) { @@ -8545,12 +8555,12 @@ export const TestAllRequiredTypesProto2JSON = { * Serializes TestAllRequiredTypesProto2.MessageSetCorrectExtension2 to JSON. */ encode: function ( - msg: Partial + msg: PartialDeep, ): string { return JSON.stringify( TestAllRequiredTypesProto2JSON.MessageSetCorrectExtension2._writeMessage( - msg - ) + msg, + ), ); }, @@ -8558,11 +8568,11 @@ export const TestAllRequiredTypesProto2JSON = { * Deserializes TestAllRequiredTypesProto2.MessageSetCorrectExtension2 from JSON. */ decode: function ( - json: string + json: string, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension2 { return TestAllRequiredTypesProto2JSON.MessageSetCorrectExtension2._readMessage( TestAllRequiredTypesProto2JSON.MessageSetCorrectExtension2.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -8580,7 +8590,7 @@ export const TestAllRequiredTypesProto2JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.i) { @@ -8594,7 +8604,7 @@ export const TestAllRequiredTypesProto2JSON = { */ _readMessage: function ( msg: TestAllRequiredTypesProto2.MessageSetCorrectExtension2, - json: any + json: any, ): TestAllRequiredTypesProto2.MessageSetCorrectExtension2 { const _i_ = json["i"]; if (_i_) { diff --git a/impl/protoscript/gen/google/protobuf/test_messages_proto3.pb.ts b/impl/protoscript/gen/google/protobuf/test_messages_proto3.pb.ts index 506e39a7..62ace99f 100644 --- a/impl/protoscript/gen/google/protobuf/test_messages_proto3.pb.ts +++ b/impl/protoscript/gen/google/protobuf/test_messages_proto3.pb.ts @@ -2,7 +2,7 @@ // Source: google/protobuf/test_messages_proto3.proto /* eslint-disable */ -import type { ByteSource } from "protoscript"; +import type { ByteSource, PartialDeep } from "protoscript"; import { BinaryReader, BinaryWriter, @@ -438,10 +438,10 @@ export const TestAllTypesProto3 = { /** * Serializes TestAllTypesProto3 to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return TestAllTypesProto3._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -451,7 +451,7 @@ export const TestAllTypesProto3 = { decode: function (bytes: ByteSource): TestAllTypesProto3 { return TestAllTypesProto3._readMessage( TestAllTypesProto3.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -618,8 +618,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.optionalInt32) { writer.writeInt32(1, msg.optionalInt32); @@ -670,14 +670,14 @@ export const TestAllTypesProto3 = { writer.writeMessage( 18, msg.optionalNestedMessage, - TestAllTypesProto3.NestedMessage._writeMessage + TestAllTypesProto3.NestedMessage._writeMessage, ); } if (msg.optionalForeignMessage) { writer.writeMessage( 19, msg.optionalForeignMessage, - ForeignMessage._writeMessage + ForeignMessage._writeMessage, ); } if ( @@ -686,7 +686,7 @@ export const TestAllTypesProto3 = { ) { writer.writeEnum( 21, - TestAllTypesProto3.NestedEnum._toInt(msg.optionalNestedEnum) + TestAllTypesProto3.NestedEnum._toInt(msg.optionalNestedEnum), ); } if ( @@ -701,7 +701,7 @@ export const TestAllTypesProto3 = { ) { writer.writeEnum( 23, - TestAllTypesProto3.AliasedEnum._toInt(msg.optionalAliasedEnum) + TestAllTypesProto3.AliasedEnum._toInt(msg.optionalAliasedEnum), ); } if (msg.optionalStringPiece) { @@ -714,7 +714,7 @@ export const TestAllTypesProto3 = { writer.writeMessage( 27, msg.recursiveMessage, - TestAllTypesProto3._writeMessage + TestAllTypesProto3._writeMessage, ); } if (msg.repeatedInt32?.length) { @@ -723,7 +723,7 @@ export const TestAllTypesProto3 = { if (msg.repeatedInt64?.length) { writer.writePackedInt64String( 32, - msg.repeatedInt64.map((x) => x.toString() as any) + msg.repeatedInt64.map((x) => x.toString() as any), ); } if (msg.repeatedUint32?.length) { @@ -732,7 +732,7 @@ export const TestAllTypesProto3 = { if (msg.repeatedUint64?.length) { writer.writePackedUint64String( 34, - msg.repeatedUint64.map((x) => x.toString() as any) + msg.repeatedUint64.map((x) => x.toString() as any), ); } if (msg.repeatedSint32?.length) { @@ -741,7 +741,7 @@ export const TestAllTypesProto3 = { if (msg.repeatedSint64?.length) { writer.writePackedSint64String( 36, - msg.repeatedSint64.map((x) => x.toString() as any) + msg.repeatedSint64.map((x) => x.toString() as any), ); } if (msg.repeatedFixed32?.length) { @@ -750,7 +750,7 @@ export const TestAllTypesProto3 = { if (msg.repeatedFixed64?.length) { writer.writePackedFixed64String( 38, - msg.repeatedFixed64.map((x) => x.toString() as any) + msg.repeatedFixed64.map((x) => x.toString() as any), ); } if (msg.repeatedSfixed32?.length) { @@ -759,7 +759,7 @@ export const TestAllTypesProto3 = { if (msg.repeatedSfixed64?.length) { writer.writePackedSfixed64String( 40, - msg.repeatedSfixed64.map((x) => x.toString() as any) + msg.repeatedSfixed64.map((x) => x.toString() as any), ); } if (msg.repeatedFloat?.length) { @@ -781,26 +781,26 @@ export const TestAllTypesProto3 = { writer.writeRepeatedMessage( 48, msg.repeatedNestedMessage as any, - TestAllTypesProto3.NestedMessage._writeMessage + TestAllTypesProto3.NestedMessage._writeMessage, ); } if (msg.repeatedForeignMessage?.length) { writer.writeRepeatedMessage( 49, msg.repeatedForeignMessage as any, - ForeignMessage._writeMessage + ForeignMessage._writeMessage, ); } if (msg.repeatedNestedEnum?.length) { writer.writePackedEnum( 51, - msg.repeatedNestedEnum.map(TestAllTypesProto3.NestedEnum._toInt) + msg.repeatedNestedEnum.map(TestAllTypesProto3.NestedEnum._toInt), ); } if (msg.repeatedForeignEnum?.length) { writer.writePackedEnum( 52, - msg.repeatedForeignEnum.map(ForeignEnum._toInt) + msg.repeatedForeignEnum.map(ForeignEnum._toInt), ); } if (msg.repeatedStringPiece?.length) { @@ -815,7 +815,7 @@ export const TestAllTypesProto3 = { if (msg.packedInt64?.length) { writer.writePackedInt64String( 76, - msg.packedInt64.map((x) => x.toString() as any) + msg.packedInt64.map((x) => x.toString() as any), ); } if (msg.packedUint32?.length) { @@ -824,7 +824,7 @@ export const TestAllTypesProto3 = { if (msg.packedUint64?.length) { writer.writePackedUint64String( 78, - msg.packedUint64.map((x) => x.toString() as any) + msg.packedUint64.map((x) => x.toString() as any), ); } if (msg.packedSint32?.length) { @@ -833,7 +833,7 @@ export const TestAllTypesProto3 = { if (msg.packedSint64?.length) { writer.writePackedSint64String( 80, - msg.packedSint64.map((x) => x.toString() as any) + msg.packedSint64.map((x) => x.toString() as any), ); } if (msg.packedFixed32?.length) { @@ -842,7 +842,7 @@ export const TestAllTypesProto3 = { if (msg.packedFixed64?.length) { writer.writePackedFixed64String( 82, - msg.packedFixed64.map((x) => x.toString() as any) + msg.packedFixed64.map((x) => x.toString() as any), ); } if (msg.packedSfixed32?.length) { @@ -851,7 +851,7 @@ export const TestAllTypesProto3 = { if (msg.packedSfixed64?.length) { writer.writePackedSfixed64String( 84, - msg.packedSfixed64.map((x) => x.toString() as any) + msg.packedSfixed64.map((x) => x.toString() as any), ); } if (msg.packedFloat?.length) { @@ -866,7 +866,7 @@ export const TestAllTypesProto3 = { if (msg.packedNestedEnum?.length) { writer.writePackedEnum( 88, - msg.packedNestedEnum.map(TestAllTypesProto3.NestedEnum._toInt) + msg.packedNestedEnum.map(TestAllTypesProto3.NestedEnum._toInt), ); } if (msg.unpackedInt32?.length) { @@ -875,7 +875,7 @@ export const TestAllTypesProto3 = { if (msg.unpackedInt64?.length) { writer.writePackedInt64String( 90, - msg.unpackedInt64.map((x) => x.toString() as any) + msg.unpackedInt64.map((x) => x.toString() as any), ); } if (msg.unpackedUint32?.length) { @@ -884,7 +884,7 @@ export const TestAllTypesProto3 = { if (msg.unpackedUint64?.length) { writer.writePackedUint64String( 92, - msg.unpackedUint64.map((x) => x.toString() as any) + msg.unpackedUint64.map((x) => x.toString() as any), ); } if (msg.unpackedSint32?.length) { @@ -893,7 +893,7 @@ export const TestAllTypesProto3 = { if (msg.unpackedSint64?.length) { writer.writePackedSint64String( 94, - msg.unpackedSint64.map((x) => x.toString() as any) + msg.unpackedSint64.map((x) => x.toString() as any), ); } if (msg.unpackedFixed32?.length) { @@ -902,7 +902,7 @@ export const TestAllTypesProto3 = { if (msg.unpackedFixed64?.length) { writer.writePackedFixed64String( 96, - msg.unpackedFixed64.map((x) => x.toString() as any) + msg.unpackedFixed64.map((x) => x.toString() as any), ); } if (msg.unpackedSfixed32?.length) { @@ -911,7 +911,7 @@ export const TestAllTypesProto3 = { if (msg.unpackedSfixed64?.length) { writer.writePackedSfixed64String( 98, - msg.unpackedSfixed64.map((x) => x.toString() as any) + msg.unpackedSfixed64.map((x) => x.toString() as any), ); } if (msg.unpackedFloat?.length) { @@ -926,7 +926,7 @@ export const TestAllTypesProto3 = { if (msg.unpackedNestedEnum?.length) { writer.writePackedEnum( 102, - msg.unpackedNestedEnum.map(TestAllTypesProto3.NestedEnum._toInt) + msg.unpackedNestedEnum.map(TestAllTypesProto3.NestedEnum._toInt), ); } if (msg.mapInt32Int32) { @@ -936,7 +936,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapInt32Int32._writeMessage + TestAllTypesProto3.MapInt32Int32._writeMessage, ); } if (msg.mapInt64Int64) { @@ -946,7 +946,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapInt64Int64._writeMessage + TestAllTypesProto3.MapInt64Int64._writeMessage, ); } if (msg.mapUint32Uint32) { @@ -956,7 +956,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapUint32Uint32._writeMessage + TestAllTypesProto3.MapUint32Uint32._writeMessage, ); } if (msg.mapUint64Uint64) { @@ -966,7 +966,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapUint64Uint64._writeMessage + TestAllTypesProto3.MapUint64Uint64._writeMessage, ); } if (msg.mapSint32Sint32) { @@ -976,7 +976,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapSint32Sint32._writeMessage + TestAllTypesProto3.MapSint32Sint32._writeMessage, ); } if (msg.mapSint64Sint64) { @@ -986,7 +986,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapSint64Sint64._writeMessage + TestAllTypesProto3.MapSint64Sint64._writeMessage, ); } if (msg.mapFixed32Fixed32) { @@ -996,7 +996,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapFixed32Fixed32._writeMessage + TestAllTypesProto3.MapFixed32Fixed32._writeMessage, ); } if (msg.mapFixed64Fixed64) { @@ -1006,7 +1006,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapFixed64Fixed64._writeMessage + TestAllTypesProto3.MapFixed64Fixed64._writeMessage, ); } if (msg.mapSfixed32Sfixed32) { @@ -1016,7 +1016,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapSfixed32Sfixed32._writeMessage + TestAllTypesProto3.MapSfixed32Sfixed32._writeMessage, ); } if (msg.mapSfixed64Sfixed64) { @@ -1026,7 +1026,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapSfixed64Sfixed64._writeMessage + TestAllTypesProto3.MapSfixed64Sfixed64._writeMessage, ); } if (msg.mapInt32Float) { @@ -1036,7 +1036,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapInt32Float._writeMessage + TestAllTypesProto3.MapInt32Float._writeMessage, ); } if (msg.mapInt32Double) { @@ -1046,7 +1046,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapInt32Double._writeMessage + TestAllTypesProto3.MapInt32Double._writeMessage, ); } if (msg.mapBoolBool) { @@ -1056,7 +1056,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapBoolBool._writeMessage + TestAllTypesProto3.MapBoolBool._writeMessage, ); } if (msg.mapStringString) { @@ -1066,7 +1066,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapStringString._writeMessage + TestAllTypesProto3.MapStringString._writeMessage, ); } if (msg.mapStringBytes) { @@ -1076,7 +1076,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapStringBytes._writeMessage + TestAllTypesProto3.MapStringBytes._writeMessage, ); } if (msg.mapStringNestedMessage) { @@ -1086,7 +1086,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapStringNestedMessage._writeMessage + TestAllTypesProto3.MapStringNestedMessage._writeMessage, ); } if (msg.mapStringForeignMessage) { @@ -1096,7 +1096,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapStringForeignMessage._writeMessage + TestAllTypesProto3.MapStringForeignMessage._writeMessage, ); } if (msg.mapStringNestedEnum) { @@ -1106,7 +1106,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapStringNestedEnum._writeMessage + TestAllTypesProto3.MapStringNestedEnum._writeMessage, ); } if (msg.mapStringForeignEnum) { @@ -1116,7 +1116,7 @@ export const TestAllTypesProto3 = { key: key as any, value: value as any, })) as any, - TestAllTypesProto3.MapStringForeignEnum._writeMessage + TestAllTypesProto3.MapStringForeignEnum._writeMessage, ); } if (msg.oneofUint32 != undefined) { @@ -1126,7 +1126,7 @@ export const TestAllTypesProto3 = { writer.writeMessage( 112, msg.oneofNestedMessage, - TestAllTypesProto3.NestedMessage._writeMessage + TestAllTypesProto3.NestedMessage._writeMessage, ); } if (msg.oneofString != undefined) { @@ -1150,7 +1150,7 @@ export const TestAllTypesProto3 = { if (msg.oneofEnum != undefined) { writer.writeEnum( 119, - TestAllTypesProto3.NestedEnum._toInt(msg.oneofEnum) + TestAllTypesProto3.NestedEnum._toInt(msg.oneofEnum), ); } if (msg.oneofNullValue != undefined) { @@ -1160,154 +1160,154 @@ export const TestAllTypesProto3 = { writer.writeMessage( 201, msg.optionalBoolWrapper, - protoscript.BoolValue._writeMessage + protoscript.BoolValue._writeMessage, ); } if (msg.optionalInt32Wrapper) { writer.writeMessage( 202, msg.optionalInt32Wrapper, - protoscript.Int32Value._writeMessage + protoscript.Int32Value._writeMessage, ); } if (msg.optionalInt64Wrapper) { writer.writeMessage( 203, msg.optionalInt64Wrapper, - protoscript.Int64Value._writeMessage + protoscript.Int64Value._writeMessage, ); } if (msg.optionalUint32Wrapper) { writer.writeMessage( 204, msg.optionalUint32Wrapper, - protoscript.UInt32Value._writeMessage + protoscript.UInt32Value._writeMessage, ); } if (msg.optionalUint64Wrapper) { writer.writeMessage( 205, msg.optionalUint64Wrapper, - protoscript.UInt64Value._writeMessage + protoscript.UInt64Value._writeMessage, ); } if (msg.optionalFloatWrapper) { writer.writeMessage( 206, msg.optionalFloatWrapper, - protoscript.FloatValue._writeMessage + protoscript.FloatValue._writeMessage, ); } if (msg.optionalDoubleWrapper) { writer.writeMessage( 207, msg.optionalDoubleWrapper, - protoscript.DoubleValue._writeMessage + protoscript.DoubleValue._writeMessage, ); } if (msg.optionalStringWrapper) { writer.writeMessage( 208, msg.optionalStringWrapper, - protoscript.StringValue._writeMessage + protoscript.StringValue._writeMessage, ); } if (msg.optionalBytesWrapper) { writer.writeMessage( 209, msg.optionalBytesWrapper, - protoscript.BytesValue._writeMessage + protoscript.BytesValue._writeMessage, ); } if (msg.repeatedBoolWrapper?.length) { writer.writeRepeatedMessage( 211, msg.repeatedBoolWrapper as any, - protoscript.BoolValue._writeMessage + protoscript.BoolValue._writeMessage, ); } if (msg.repeatedInt32Wrapper?.length) { writer.writeRepeatedMessage( 212, msg.repeatedInt32Wrapper as any, - protoscript.Int32Value._writeMessage + protoscript.Int32Value._writeMessage, ); } if (msg.repeatedInt64Wrapper?.length) { writer.writeRepeatedMessage( 213, msg.repeatedInt64Wrapper as any, - protoscript.Int64Value._writeMessage + protoscript.Int64Value._writeMessage, ); } if (msg.repeatedUint32Wrapper?.length) { writer.writeRepeatedMessage( 214, msg.repeatedUint32Wrapper as any, - protoscript.UInt32Value._writeMessage + protoscript.UInt32Value._writeMessage, ); } if (msg.repeatedUint64Wrapper?.length) { writer.writeRepeatedMessage( 215, msg.repeatedUint64Wrapper as any, - protoscript.UInt64Value._writeMessage + protoscript.UInt64Value._writeMessage, ); } if (msg.repeatedFloatWrapper?.length) { writer.writeRepeatedMessage( 216, msg.repeatedFloatWrapper as any, - protoscript.FloatValue._writeMessage + protoscript.FloatValue._writeMessage, ); } if (msg.repeatedDoubleWrapper?.length) { writer.writeRepeatedMessage( 217, msg.repeatedDoubleWrapper as any, - protoscript.DoubleValue._writeMessage + protoscript.DoubleValue._writeMessage, ); } if (msg.repeatedStringWrapper?.length) { writer.writeRepeatedMessage( 218, msg.repeatedStringWrapper as any, - protoscript.StringValue._writeMessage + protoscript.StringValue._writeMessage, ); } if (msg.repeatedBytesWrapper?.length) { writer.writeRepeatedMessage( 219, msg.repeatedBytesWrapper as any, - protoscript.BytesValue._writeMessage + protoscript.BytesValue._writeMessage, ); } if (msg.optionalDuration) { writer.writeMessage( 301, msg.optionalDuration, - protoscript.Duration._writeMessage + protoscript.Duration._writeMessage, ); } if (msg.optionalTimestamp) { writer.writeMessage( 302, msg.optionalTimestamp, - protoscript.Timestamp._writeMessage + protoscript.Timestamp._writeMessage, ); } if (msg.optionalFieldMask) { writer.writeMessage( 303, msg.optionalFieldMask, - protoscript.FieldMask._writeMessage + protoscript.FieldMask._writeMessage, ); } if (msg.optionalStruct) { writer.writeMessage( 304, msg.optionalStruct, - protoscript.Struct._writeMessage + protoscript.Struct._writeMessage, ); } if (msg.optionalAny) { @@ -1317,7 +1317,7 @@ export const TestAllTypesProto3 = { writer.writeMessage( 306, msg.optionalValue, - protoscript.Value._writeMessage + protoscript.Value._writeMessage, ); } if ( @@ -1326,56 +1326,56 @@ export const TestAllTypesProto3 = { ) { writer.writeEnum( 307, - protoscript.NullValue._toInt(msg.optionalNullValue) + protoscript.NullValue._toInt(msg.optionalNullValue), ); } if (msg.repeatedDuration?.length) { writer.writeRepeatedMessage( 311, msg.repeatedDuration as any, - protoscript.Duration._writeMessage + protoscript.Duration._writeMessage, ); } if (msg.repeatedTimestamp?.length) { writer.writeRepeatedMessage( 312, msg.repeatedTimestamp as any, - protoscript.Timestamp._writeMessage + protoscript.Timestamp._writeMessage, ); } if (msg.repeatedFieldmask?.length) { writer.writeRepeatedMessage( 313, msg.repeatedFieldmask as any, - protoscript.FieldMask._writeMessage + protoscript.FieldMask._writeMessage, ); } if (msg.repeatedStruct?.length) { writer.writeRepeatedMessage( 324, msg.repeatedStruct as any, - protoscript.Struct._writeMessage + protoscript.Struct._writeMessage, ); } if (msg.repeatedAny?.length) { writer.writeRepeatedMessage( 315, msg.repeatedAny as any, - protoscript.Any._writeMessage + protoscript.Any._writeMessage, ); } if (msg.repeatedValue?.length) { writer.writeRepeatedMessage( 316, msg.repeatedValue as any, - protoscript.Value._writeMessage + protoscript.Value._writeMessage, ); } if (msg.repeatedListValue?.length) { writer.writeRepeatedMessage( 317, msg.repeatedListValue as any, - protoscript.ListValue._writeMessage + protoscript.ListValue._writeMessage, ); } if (msg.fieldname1) { @@ -1440,7 +1440,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -1508,20 +1508,20 @@ export const TestAllTypesProto3 = { case 18: { reader.readMessage( msg.optionalNestedMessage, - TestAllTypesProto3.NestedMessage._readMessage + TestAllTypesProto3.NestedMessage._readMessage, ); break; } case 19: { reader.readMessage( msg.optionalForeignMessage, - ForeignMessage._readMessage + ForeignMessage._readMessage, ); break; } case 21: { msg.optionalNestedEnum = TestAllTypesProto3.NestedEnum._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -1531,7 +1531,7 @@ export const TestAllTypesProto3 = { } case 23: { msg.optionalAliasedEnum = TestAllTypesProto3.AliasedEnum._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -1544,9 +1544,10 @@ export const TestAllTypesProto3 = { break; } case 27: { + msg.recursiveMessage = TestAllTypesProto3.initialize(); reader.readMessage( msg.recursiveMessage, - TestAllTypesProto3._readMessage + TestAllTypesProto3._readMessage, ); break; } @@ -1561,7 +1562,7 @@ export const TestAllTypesProto3 = { case 32: { if (reader.isDelimited()) { msg.repeatedInt64.push( - ...reader.readPackedInt64String().map(BigInt) + ...reader.readPackedInt64String().map(BigInt), ); } else { msg.repeatedInt64.push(BigInt(reader.readInt64String())); @@ -1579,7 +1580,7 @@ export const TestAllTypesProto3 = { case 34: { if (reader.isDelimited()) { msg.repeatedUint64.push( - ...reader.readPackedUint64String().map(BigInt) + ...reader.readPackedUint64String().map(BigInt), ); } else { msg.repeatedUint64.push(BigInt(reader.readUint64String())); @@ -1597,7 +1598,7 @@ export const TestAllTypesProto3 = { case 36: { if (reader.isDelimited()) { msg.repeatedSint64.push( - ...reader.readPackedSint64String().map(BigInt) + ...reader.readPackedSint64String().map(BigInt), ); } else { msg.repeatedSint64.push(BigInt(reader.readSint64String())); @@ -1615,7 +1616,7 @@ export const TestAllTypesProto3 = { case 38: { if (reader.isDelimited()) { msg.repeatedFixed64.push( - ...reader.readPackedFixed64String().map(BigInt) + ...reader.readPackedFixed64String().map(BigInt), ); } else { msg.repeatedFixed64.push(BigInt(reader.readFixed64String())); @@ -1633,7 +1634,7 @@ export const TestAllTypesProto3 = { case 40: { if (reader.isDelimited()) { msg.repeatedSfixed64.push( - ...reader.readPackedSfixed64String().map(BigInt) + ...reader.readPackedSfixed64String().map(BigInt), ); } else { msg.repeatedSfixed64.push(BigInt(reader.readSfixed64String())); @@ -1689,11 +1690,11 @@ export const TestAllTypesProto3 = { msg.repeatedNestedEnum.push( ...reader .readPackedEnum() - .map(TestAllTypesProto3.NestedEnum._fromInt) + .map(TestAllTypesProto3.NestedEnum._fromInt), ); } else { msg.repeatedNestedEnum.push( - TestAllTypesProto3.NestedEnum._fromInt(reader.readEnum()) + TestAllTypesProto3.NestedEnum._fromInt(reader.readEnum()), ); } break; @@ -1701,11 +1702,11 @@ export const TestAllTypesProto3 = { case 52: { if (reader.isDelimited()) { msg.repeatedForeignEnum.push( - ...reader.readPackedEnum().map(ForeignEnum._fromInt) + ...reader.readPackedEnum().map(ForeignEnum._fromInt), ); } else { msg.repeatedForeignEnum.push( - ForeignEnum._fromInt(reader.readEnum()) + ForeignEnum._fromInt(reader.readEnum()), ); } break; @@ -1745,7 +1746,7 @@ export const TestAllTypesProto3 = { case 78: { if (reader.isDelimited()) { msg.packedUint64.push( - ...reader.readPackedUint64String().map(BigInt) + ...reader.readPackedUint64String().map(BigInt), ); } else { msg.packedUint64.push(BigInt(reader.readUint64String())); @@ -1763,7 +1764,7 @@ export const TestAllTypesProto3 = { case 80: { if (reader.isDelimited()) { msg.packedSint64.push( - ...reader.readPackedSint64String().map(BigInt) + ...reader.readPackedSint64String().map(BigInt), ); } else { msg.packedSint64.push(BigInt(reader.readSint64String())); @@ -1781,7 +1782,7 @@ export const TestAllTypesProto3 = { case 82: { if (reader.isDelimited()) { msg.packedFixed64.push( - ...reader.readPackedFixed64String().map(BigInt) + ...reader.readPackedFixed64String().map(BigInt), ); } else { msg.packedFixed64.push(BigInt(reader.readFixed64String())); @@ -1799,7 +1800,7 @@ export const TestAllTypesProto3 = { case 84: { if (reader.isDelimited()) { msg.packedSfixed64.push( - ...reader.readPackedSfixed64String().map(BigInt) + ...reader.readPackedSfixed64String().map(BigInt), ); } else { msg.packedSfixed64.push(BigInt(reader.readSfixed64String())); @@ -1835,11 +1836,11 @@ export const TestAllTypesProto3 = { msg.packedNestedEnum.push( ...reader .readPackedEnum() - .map(TestAllTypesProto3.NestedEnum._fromInt) + .map(TestAllTypesProto3.NestedEnum._fromInt), ); } else { msg.packedNestedEnum.push( - TestAllTypesProto3.NestedEnum._fromInt(reader.readEnum()) + TestAllTypesProto3.NestedEnum._fromInt(reader.readEnum()), ); } break; @@ -1855,7 +1856,7 @@ export const TestAllTypesProto3 = { case 90: { if (reader.isDelimited()) { msg.unpackedInt64.push( - ...reader.readPackedInt64String().map(BigInt) + ...reader.readPackedInt64String().map(BigInt), ); } else { msg.unpackedInt64.push(BigInt(reader.readInt64String())); @@ -1873,7 +1874,7 @@ export const TestAllTypesProto3 = { case 92: { if (reader.isDelimited()) { msg.unpackedUint64.push( - ...reader.readPackedUint64String().map(BigInt) + ...reader.readPackedUint64String().map(BigInt), ); } else { msg.unpackedUint64.push(BigInt(reader.readUint64String())); @@ -1891,7 +1892,7 @@ export const TestAllTypesProto3 = { case 94: { if (reader.isDelimited()) { msg.unpackedSint64.push( - ...reader.readPackedSint64String().map(BigInt) + ...reader.readPackedSint64String().map(BigInt), ); } else { msg.unpackedSint64.push(BigInt(reader.readSint64String())); @@ -1909,7 +1910,7 @@ export const TestAllTypesProto3 = { case 96: { if (reader.isDelimited()) { msg.unpackedFixed64.push( - ...reader.readPackedFixed64String().map(BigInt) + ...reader.readPackedFixed64String().map(BigInt), ); } else { msg.unpackedFixed64.push(BigInt(reader.readFixed64String())); @@ -1927,7 +1928,7 @@ export const TestAllTypesProto3 = { case 98: { if (reader.isDelimited()) { msg.unpackedSfixed64.push( - ...reader.readPackedSfixed64String().map(BigInt) + ...reader.readPackedSfixed64String().map(BigInt), ); } else { msg.unpackedSfixed64.push(BigInt(reader.readSfixed64String())); @@ -1963,11 +1964,11 @@ export const TestAllTypesProto3 = { msg.unpackedNestedEnum.push( ...reader .readPackedEnum() - .map(TestAllTypesProto3.NestedEnum._fromInt) + .map(TestAllTypesProto3.NestedEnum._fromInt), ); } else { msg.unpackedNestedEnum.push( - TestAllTypesProto3.NestedEnum._fromInt(reader.readEnum()) + TestAllTypesProto3.NestedEnum._fromInt(reader.readEnum()), ); } break; @@ -1976,7 +1977,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapInt32Int32; reader.readMessage( map, - TestAllTypesProto3.MapInt32Int32._readMessage + TestAllTypesProto3.MapInt32Int32._readMessage, ); msg.mapInt32Int32[map.key.toString()] = map.value; break; @@ -1985,7 +1986,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapInt64Int64; reader.readMessage( map, - TestAllTypesProto3.MapInt64Int64._readMessage + TestAllTypesProto3.MapInt64Int64._readMessage, ); msg.mapInt64Int64[map.key.toString()] = map.value; break; @@ -1994,7 +1995,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapUint32Uint32; reader.readMessage( map, - TestAllTypesProto3.MapUint32Uint32._readMessage + TestAllTypesProto3.MapUint32Uint32._readMessage, ); msg.mapUint32Uint32[map.key.toString()] = map.value; break; @@ -2003,7 +2004,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapUint64Uint64; reader.readMessage( map, - TestAllTypesProto3.MapUint64Uint64._readMessage + TestAllTypesProto3.MapUint64Uint64._readMessage, ); msg.mapUint64Uint64[map.key.toString()] = map.value; break; @@ -2012,7 +2013,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapSint32Sint32; reader.readMessage( map, - TestAllTypesProto3.MapSint32Sint32._readMessage + TestAllTypesProto3.MapSint32Sint32._readMessage, ); msg.mapSint32Sint32[map.key.toString()] = map.value; break; @@ -2021,7 +2022,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapSint64Sint64; reader.readMessage( map, - TestAllTypesProto3.MapSint64Sint64._readMessage + TestAllTypesProto3.MapSint64Sint64._readMessage, ); msg.mapSint64Sint64[map.key.toString()] = map.value; break; @@ -2030,7 +2031,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapFixed32Fixed32; reader.readMessage( map, - TestAllTypesProto3.MapFixed32Fixed32._readMessage + TestAllTypesProto3.MapFixed32Fixed32._readMessage, ); msg.mapFixed32Fixed32[map.key.toString()] = map.value; break; @@ -2039,7 +2040,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapFixed64Fixed64; reader.readMessage( map, - TestAllTypesProto3.MapFixed64Fixed64._readMessage + TestAllTypesProto3.MapFixed64Fixed64._readMessage, ); msg.mapFixed64Fixed64[map.key.toString()] = map.value; break; @@ -2048,7 +2049,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapSfixed32Sfixed32; reader.readMessage( map, - TestAllTypesProto3.MapSfixed32Sfixed32._readMessage + TestAllTypesProto3.MapSfixed32Sfixed32._readMessage, ); msg.mapSfixed32Sfixed32[map.key.toString()] = map.value; break; @@ -2057,7 +2058,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapSfixed64Sfixed64; reader.readMessage( map, - TestAllTypesProto3.MapSfixed64Sfixed64._readMessage + TestAllTypesProto3.MapSfixed64Sfixed64._readMessage, ); msg.mapSfixed64Sfixed64[map.key.toString()] = map.value; break; @@ -2066,7 +2067,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapInt32Float; reader.readMessage( map, - TestAllTypesProto3.MapInt32Float._readMessage + TestAllTypesProto3.MapInt32Float._readMessage, ); msg.mapInt32Float[map.key.toString()] = map.value; break; @@ -2075,7 +2076,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapInt32Double; reader.readMessage( map, - TestAllTypesProto3.MapInt32Double._readMessage + TestAllTypesProto3.MapInt32Double._readMessage, ); msg.mapInt32Double[map.key.toString()] = map.value; break; @@ -2090,7 +2091,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapStringString; reader.readMessage( map, - TestAllTypesProto3.MapStringString._readMessage + TestAllTypesProto3.MapStringString._readMessage, ); msg.mapStringString[map.key.toString()] = map.value; break; @@ -2099,7 +2100,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapStringBytes; reader.readMessage( map, - TestAllTypesProto3.MapStringBytes._readMessage + TestAllTypesProto3.MapStringBytes._readMessage, ); msg.mapStringBytes[map.key.toString()] = map.value; break; @@ -2108,7 +2109,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapStringNestedMessage; reader.readMessage( map, - TestAllTypesProto3.MapStringNestedMessage._readMessage + TestAllTypesProto3.MapStringNestedMessage._readMessage, ); msg.mapStringNestedMessage[map.key.toString()] = map.value; break; @@ -2117,7 +2118,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapStringForeignMessage; reader.readMessage( map, - TestAllTypesProto3.MapStringForeignMessage._readMessage + TestAllTypesProto3.MapStringForeignMessage._readMessage, ); msg.mapStringForeignMessage[map.key.toString()] = map.value; break; @@ -2126,7 +2127,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapStringNestedEnum; reader.readMessage( map, - TestAllTypesProto3.MapStringNestedEnum._readMessage + TestAllTypesProto3.MapStringNestedEnum._readMessage, ); msg.mapStringNestedEnum[map.key.toString()] = map.value; break; @@ -2135,7 +2136,7 @@ export const TestAllTypesProto3 = { const map = {} as TestAllTypesProto3.MapStringForeignEnum; reader.readMessage( map, - TestAllTypesProto3.MapStringForeignEnum._readMessage + TestAllTypesProto3.MapStringForeignEnum._readMessage, ); msg.mapStringForeignEnum[map.key.toString()] = map.value; break; @@ -2149,7 +2150,7 @@ export const TestAllTypesProto3 = { TestAllTypesProto3.NestedMessage.initialize(); reader.readMessage( msg.oneofNestedMessage, - TestAllTypesProto3.NestedMessage._readMessage + TestAllTypesProto3.NestedMessage._readMessage, ); break; } @@ -2179,76 +2180,76 @@ export const TestAllTypesProto3 = { } case 119: { msg.oneofEnum = TestAllTypesProto3.NestedEnum._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } case 120: { msg.oneofNullValue = protoscript.NullValue._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } case 201: { reader.readMessage( msg.optionalBoolWrapper, - protoscript.BoolValue._readMessage + protoscript.BoolValue._readMessage, ); break; } case 202: { reader.readMessage( msg.optionalInt32Wrapper, - protoscript.Int32Value._readMessage + protoscript.Int32Value._readMessage, ); break; } case 203: { reader.readMessage( msg.optionalInt64Wrapper, - protoscript.Int64Value._readMessage + protoscript.Int64Value._readMessage, ); break; } case 204: { reader.readMessage( msg.optionalUint32Wrapper, - protoscript.UInt32Value._readMessage + protoscript.UInt32Value._readMessage, ); break; } case 205: { reader.readMessage( msg.optionalUint64Wrapper, - protoscript.UInt64Value._readMessage + protoscript.UInt64Value._readMessage, ); break; } case 206: { reader.readMessage( msg.optionalFloatWrapper, - protoscript.FloatValue._readMessage + protoscript.FloatValue._readMessage, ); break; } case 207: { reader.readMessage( msg.optionalDoubleWrapper, - protoscript.DoubleValue._readMessage + protoscript.DoubleValue._readMessage, ); break; } case 208: { reader.readMessage( msg.optionalStringWrapper, - protoscript.StringValue._readMessage + protoscript.StringValue._readMessage, ); break; } case 209: { reader.readMessage( msg.optionalBytesWrapper, - protoscript.BytesValue._readMessage + protoscript.BytesValue._readMessage, ); break; } @@ -2309,28 +2310,28 @@ export const TestAllTypesProto3 = { case 301: { reader.readMessage( msg.optionalDuration, - protoscript.Duration._readMessage + protoscript.Duration._readMessage, ); break; } case 302: { reader.readMessage( msg.optionalTimestamp, - protoscript.Timestamp._readMessage + protoscript.Timestamp._readMessage, ); break; } case 303: { reader.readMessage( msg.optionalFieldMask, - protoscript.FieldMask._readMessage + protoscript.FieldMask._readMessage, ); break; } case 304: { reader.readMessage( msg.optionalStruct, - protoscript.Struct._readMessage + protoscript.Struct._readMessage, ); break; } @@ -2344,7 +2345,7 @@ export const TestAllTypesProto3 = { } case 307: { msg.optionalNullValue = protoscript.NullValue._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -2587,11 +2588,11 @@ export const TestAllTypesProto3 = { * Serializes TestAllTypesProto3.NestedMessage to protobuf. */ encode: function ( - msg: Partial + msg: PartialDeep, ): Uint8Array { return TestAllTypesProto3.NestedMessage._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -2601,7 +2602,7 @@ export const TestAllTypesProto3 = { decode: function (bytes: ByteSource): TestAllTypesProto3.NestedMessage { return TestAllTypesProto3.NestedMessage._readMessage( TestAllTypesProto3.NestedMessage.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -2619,8 +2620,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.a) { writer.writeInt32(1, msg.a); @@ -2629,7 +2630,7 @@ export const TestAllTypesProto3 = { writer.writeMessage( 2, msg.corecursive, - TestAllTypesProto3._writeMessage + TestAllTypesProto3._writeMessage, ); } return writer; @@ -2640,7 +2641,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.NestedMessage, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.NestedMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2650,9 +2651,10 @@ export const TestAllTypesProto3 = { break; } case 2: { + msg.corecursive = TestAllTypesProto3.initialize(); reader.readMessage( msg.corecursive, - TestAllTypesProto3._readMessage + TestAllTypesProto3._readMessage, ); break; } @@ -2671,8 +2673,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt32(1, msg.key); @@ -2688,7 +2690,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt32Int32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapInt32Int32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2716,8 +2718,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt64String(1, msg.key.toString() as any); @@ -2733,7 +2735,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt64Int64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapInt64Int64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2761,8 +2763,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeUint32(1, msg.key); @@ -2778,7 +2780,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapUint32Uint32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapUint32Uint32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2806,8 +2808,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeUint64String(1, msg.key.toString() as any); @@ -2823,7 +2825,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapUint64Uint64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapUint64Uint64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2851,8 +2853,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSint32(1, msg.key); @@ -2868,7 +2870,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSint32Sint32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapSint32Sint32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2896,8 +2898,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSint64String(1, msg.key.toString() as any); @@ -2913,7 +2915,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSint64Sint64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapSint64Sint64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2941,8 +2943,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeFixed32(1, msg.key); @@ -2958,7 +2960,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapFixed32Fixed32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapFixed32Fixed32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -2986,8 +2988,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeFixed64String(1, msg.key.toString() as any); @@ -3003,7 +3005,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapFixed64Fixed64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapFixed64Fixed64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3031,8 +3033,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSfixed32(1, msg.key); @@ -3048,7 +3050,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSfixed32Sfixed32, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapSfixed32Sfixed32 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3076,8 +3078,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeSfixed64String(1, msg.key.toString() as any); @@ -3093,7 +3095,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSfixed64Sfixed64, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapSfixed64Sfixed64 { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3121,8 +3123,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt32(1, msg.key); @@ -3138,7 +3140,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt32Float, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapInt32Float { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3166,8 +3168,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeInt32(1, msg.key); @@ -3183,7 +3185,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt32Double, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapInt32Double { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3211,8 +3213,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeBool(1, msg.key); @@ -3228,7 +3230,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapBoolBool, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapBoolBool { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3256,8 +3258,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3273,7 +3275,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringString, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapStringString { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3301,8 +3303,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3318,7 +3320,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringBytes, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapStringBytes { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3346,8 +3348,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3356,7 +3358,7 @@ export const TestAllTypesProto3 = { writer.writeMessage( 2, msg.value, - TestAllTypesProto3.NestedMessage._writeMessage + TestAllTypesProto3.NestedMessage._writeMessage, ); } return writer; @@ -3367,7 +3369,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringNestedMessage, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapStringNestedMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3380,7 +3382,7 @@ export const TestAllTypesProto3 = { msg.value = TestAllTypesProto3.NestedMessage.initialize(); reader.readMessage( msg.value, - TestAllTypesProto3.NestedMessage._readMessage + TestAllTypesProto3.NestedMessage._readMessage, ); break; } @@ -3399,8 +3401,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3416,7 +3418,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringForeignMessage, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapStringForeignMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3445,8 +3447,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3462,7 +3464,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringNestedEnum, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapStringNestedEnum { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3473,7 +3475,7 @@ export const TestAllTypesProto3 = { } case 2: { msg.value = TestAllTypesProto3.NestedEnum._fromInt( - reader.readEnum() + reader.readEnum(), ); break; } @@ -3492,8 +3494,8 @@ export const TestAllTypesProto3 = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.key) { writer.writeString(1, msg.key); @@ -3509,7 +3511,7 @@ export const TestAllTypesProto3 = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringForeignEnum, - reader: BinaryReader + reader: BinaryReader, ): TestAllTypesProto3.MapStringForeignEnum { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3537,10 +3539,10 @@ export const ForeignMessage = { /** * Serializes ForeignMessage to protobuf. */ - encode: function (msg: Partial): Uint8Array { + encode: function (msg: PartialDeep): Uint8Array { return ForeignMessage._writeMessage( msg, - new BinaryWriter() + new BinaryWriter(), ).getResultBuffer(); }, @@ -3550,7 +3552,7 @@ export const ForeignMessage = { decode: function (bytes: ByteSource): ForeignMessage { return ForeignMessage._readMessage( ForeignMessage.initialize(), - new BinaryReader(bytes) + new BinaryReader(bytes), ); }, @@ -3567,8 +3569,8 @@ export const ForeignMessage = { * @private */ _writeMessage: function ( - msg: Partial, - writer: BinaryWriter + msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { if (msg.c) { writer.writeInt32(1, msg.c); @@ -3581,7 +3583,7 @@ export const ForeignMessage = { */ _readMessage: function ( msg: ForeignMessage, - reader: BinaryReader + reader: BinaryReader, ): ForeignMessage { while (reader.nextField()) { const field = reader.getFieldNumber(); @@ -3604,7 +3606,7 @@ export const NullHypothesisProto3 = { /** * Serializes NullHypothesisProto3 to protobuf. */ - encode: function (_msg?: Partial): Uint8Array { + encode: function (_msg?: PartialDeep): Uint8Array { return new Uint8Array(); }, @@ -3626,8 +3628,8 @@ export const NullHypothesisProto3 = { * @private */ _writeMessage: function ( - _msg: Partial, - writer: BinaryWriter + _msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { return writer; }, @@ -3637,7 +3639,7 @@ export const NullHypothesisProto3 = { */ _readMessage: function ( _msg: NullHypothesisProto3, - _reader: BinaryReader + _reader: BinaryReader, ): NullHypothesisProto3 { return _msg; }, @@ -3647,7 +3649,7 @@ export const EnumOnlyProto3 = { /** * Serializes EnumOnlyProto3 to protobuf. */ - encode: function (_msg?: Partial): Uint8Array { + encode: function (_msg?: PartialDeep): Uint8Array { return new Uint8Array(); }, @@ -3669,8 +3671,8 @@ export const EnumOnlyProto3 = { * @private */ _writeMessage: function ( - _msg: Partial, - writer: BinaryWriter + _msg: PartialDeep, + writer: BinaryWriter, ): BinaryWriter { return writer; }, @@ -3680,7 +3682,7 @@ export const EnumOnlyProto3 = { */ _readMessage: function ( _msg: EnumOnlyProto3, - _reader: BinaryReader + _reader: BinaryReader, ): EnumOnlyProto3 { return _msg; }, @@ -3779,7 +3781,7 @@ export const TestAllTypesProto3JSON = { /** * Serializes TestAllTypesProto3 to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(TestAllTypesProto3JSON._writeMessage(msg)); }, @@ -3789,7 +3791,7 @@ export const TestAllTypesProto3JSON = { decode: function (json: string): TestAllTypesProto3 { return TestAllTypesProto3JSON._readMessage( TestAllTypesProto3JSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -3820,7 +3822,7 @@ export const TestAllTypesProto3JSON = { optionalAliasedEnum: TestAllTypesProto3.AliasedEnum._fromInt(0), optionalStringPiece: "", optionalCord: "", - recursiveMessage: TestAllTypesProto3JSON.initialize(), + recursiveMessage: undefined, repeatedInt32: [], repeatedInt64: [], repeatedUint32: [], @@ -3956,7 +3958,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.optionalInt32) { @@ -4007,7 +4009,7 @@ export const TestAllTypesProto3JSON = { if (msg.optionalNestedMessage) { const _optionalNestedMessage_ = TestAllTypesProto3JSON.NestedMessage._writeMessage( - msg.optionalNestedMessage + msg.optionalNestedMessage, ); if (Object.keys(_optionalNestedMessage_).length > 0) { json["optionalNestedMessage"] = _optionalNestedMessage_; @@ -4015,7 +4017,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalForeignMessage) { const _optionalForeignMessage_ = ForeignMessageJSON._writeMessage( - msg.optionalForeignMessage + msg.optionalForeignMessage, ); if (Object.keys(_optionalForeignMessage_).length > 0) { json["optionalForeignMessage"] = _optionalForeignMessage_; @@ -4047,7 +4049,7 @@ export const TestAllTypesProto3JSON = { } if (msg.recursiveMessage) { const _recursiveMessage_ = TestAllTypesProto3JSON._writeMessage( - msg.recursiveMessage + msg.recursiveMessage, ); if (Object.keys(_recursiveMessage_).length > 0) { json["recursiveMessage"] = _recursiveMessage_; @@ -4100,12 +4102,12 @@ export const TestAllTypesProto3JSON = { } if (msg.repeatedNestedMessage?.length) { json["repeatedNestedMessage"] = msg.repeatedNestedMessage.map( - TestAllTypesProto3JSON.NestedMessage._writeMessage + TestAllTypesProto3JSON.NestedMessage._writeMessage, ); } if (msg.repeatedForeignMessage?.length) { json["repeatedForeignMessage"] = msg.repeatedForeignMessage.map( - ForeignMessageJSON._writeMessage + ForeignMessageJSON._writeMessage, ); } if (msg.repeatedNestedEnum?.length) { @@ -4209,7 +4211,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapInt32Int32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt32Int32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt32Int32_).length > 0) { json["mapInt32Int32"] = _mapInt32Int32_; @@ -4220,7 +4222,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapInt64Int64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt64Int64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt64Int64_).length > 0) { json["mapInt64Int64"] = _mapInt64Int64_; @@ -4231,7 +4233,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapUint32Uint32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapUint32Uint32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapUint32Uint32_).length > 0) { json["mapUint32Uint32"] = _mapUint32Uint32_; @@ -4242,7 +4244,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapUint64Uint64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapUint64Uint64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapUint64Uint64_).length > 0) { json["mapUint64Uint64"] = _mapUint64Uint64_; @@ -4253,7 +4255,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapSint32Sint32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSint32Sint32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSint32Sint32_).length > 0) { json["mapSint32Sint32"] = _mapSint32Sint32_; @@ -4264,7 +4266,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapSint64Sint64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSint64Sint64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSint64Sint64_).length > 0) { json["mapSint64Sint64"] = _mapSint64Sint64_; @@ -4275,7 +4277,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapFixed32Fixed32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapFixed32Fixed32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapFixed32Fixed32_).length > 0) { json["mapFixed32Fixed32"] = _mapFixed32Fixed32_; @@ -4286,7 +4288,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapFixed64Fixed64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapFixed64Fixed64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapFixed64Fixed64_).length > 0) { json["mapFixed64Fixed64"] = _mapFixed64Fixed64_; @@ -4297,7 +4299,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapSfixed32Sfixed32) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSfixed32Sfixed32._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSfixed32Sfixed32_).length > 0) { json["mapSfixed32Sfixed32"] = _mapSfixed32Sfixed32_; @@ -4308,7 +4310,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapSfixed64Sfixed64) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSfixed64Sfixed64._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapSfixed64Sfixed64_).length > 0) { json["mapSfixed64Sfixed64"] = _mapSfixed64Sfixed64_; @@ -4319,7 +4321,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapInt32Float) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt32Float._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt32Float_).length > 0) { json["mapInt32Float"] = _mapInt32Float_; @@ -4330,7 +4332,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapInt32Double) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt32Double._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapInt32Double_).length > 0) { json["mapInt32Double"] = _mapInt32Double_; @@ -4341,7 +4343,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapBoolBool) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapBoolBool._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapBoolBool_).length > 0) { json["mapBoolBool"] = _mapBoolBool_; @@ -4352,7 +4354,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapStringString) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringString._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringString_).length > 0) { json["mapStringString"] = _mapStringString_; @@ -4363,7 +4365,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapStringBytes) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringBytes._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringBytes_).length > 0) { json["mapStringBytes"] = _mapStringBytes_; @@ -4374,7 +4376,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapStringNestedMessage) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringNestedMessage._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringNestedMessage_).length > 0) { json["mapStringNestedMessage"] = _mapStringNestedMessage_; @@ -4385,7 +4387,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapStringForeignMessage) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringForeignMessage._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringForeignMessage_).length > 0) { json["mapStringForeignMessage"] = _mapStringForeignMessage_; @@ -4396,7 +4398,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapStringNestedEnum) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringNestedEnum._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringNestedEnum_).length > 0) { json["mapStringNestedEnum"] = _mapStringNestedEnum_; @@ -4407,7 +4409,7 @@ export const TestAllTypesProto3JSON = { Object.entries(msg.mapStringForeignEnum) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringForeignEnum._writeMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); if (Object.keys(_mapStringForeignEnum_).length > 0) { json["mapStringForeignEnum"] = _mapStringForeignEnum_; @@ -4419,7 +4421,7 @@ export const TestAllTypesProto3JSON = { if (msg.oneofNestedMessage != undefined) { const _oneofNestedMessage_ = TestAllTypesProto3JSON.NestedMessage._writeMessage( - msg.oneofNestedMessage + msg.oneofNestedMessage, ); json["oneofNestedMessage"] = _oneofNestedMessage_; } @@ -4449,7 +4451,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalBoolWrapper) { const _optionalBoolWrapper_ = protoscript.BoolValueJSON._writeMessage( - msg.optionalBoolWrapper + msg.optionalBoolWrapper, ); if (Object.keys(_optionalBoolWrapper_).length > 0) { json["optionalBoolWrapper"] = _optionalBoolWrapper_; @@ -4457,7 +4459,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalInt32Wrapper) { const _optionalInt32Wrapper_ = protoscript.Int32ValueJSON._writeMessage( - msg.optionalInt32Wrapper + msg.optionalInt32Wrapper, ); if (Object.keys(_optionalInt32Wrapper_).length > 0) { json["optionalInt32Wrapper"] = _optionalInt32Wrapper_; @@ -4465,7 +4467,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalInt64Wrapper) { const _optionalInt64Wrapper_ = protoscript.Int64ValueJSON._writeMessage( - msg.optionalInt64Wrapper + msg.optionalInt64Wrapper, ); if (Object.keys(_optionalInt64Wrapper_).length > 0) { json["optionalInt64Wrapper"] = _optionalInt64Wrapper_; @@ -4473,7 +4475,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalUint32Wrapper) { const _optionalUint32Wrapper_ = protoscript.UInt32ValueJSON._writeMessage( - msg.optionalUint32Wrapper + msg.optionalUint32Wrapper, ); if (Object.keys(_optionalUint32Wrapper_).length > 0) { json["optionalUint32Wrapper"] = _optionalUint32Wrapper_; @@ -4481,7 +4483,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalUint64Wrapper) { const _optionalUint64Wrapper_ = protoscript.UInt64ValueJSON._writeMessage( - msg.optionalUint64Wrapper + msg.optionalUint64Wrapper, ); if (Object.keys(_optionalUint64Wrapper_).length > 0) { json["optionalUint64Wrapper"] = _optionalUint64Wrapper_; @@ -4489,7 +4491,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalFloatWrapper) { const _optionalFloatWrapper_ = protoscript.FloatValueJSON._writeMessage( - msg.optionalFloatWrapper + msg.optionalFloatWrapper, ); if (Object.keys(_optionalFloatWrapper_).length > 0) { json["optionalFloatWrapper"] = _optionalFloatWrapper_; @@ -4497,7 +4499,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalDoubleWrapper) { const _optionalDoubleWrapper_ = protoscript.DoubleValueJSON._writeMessage( - msg.optionalDoubleWrapper + msg.optionalDoubleWrapper, ); if (Object.keys(_optionalDoubleWrapper_).length > 0) { json["optionalDoubleWrapper"] = _optionalDoubleWrapper_; @@ -4505,7 +4507,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalStringWrapper) { const _optionalStringWrapper_ = protoscript.StringValueJSON._writeMessage( - msg.optionalStringWrapper + msg.optionalStringWrapper, ); if (Object.keys(_optionalStringWrapper_).length > 0) { json["optionalStringWrapper"] = _optionalStringWrapper_; @@ -4513,7 +4515,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalBytesWrapper) { const _optionalBytesWrapper_ = protoscript.BytesValueJSON._writeMessage( - msg.optionalBytesWrapper + msg.optionalBytesWrapper, ); if (Object.keys(_optionalBytesWrapper_).length > 0) { json["optionalBytesWrapper"] = _optionalBytesWrapper_; @@ -4521,52 +4523,52 @@ export const TestAllTypesProto3JSON = { } if (msg.repeatedBoolWrapper?.length) { json["repeatedBoolWrapper"] = msg.repeatedBoolWrapper.map( - protoscript.BoolValueJSON._writeMessage + protoscript.BoolValueJSON._writeMessage, ); } if (msg.repeatedInt32Wrapper?.length) { json["repeatedInt32Wrapper"] = msg.repeatedInt32Wrapper.map( - protoscript.Int32ValueJSON._writeMessage + protoscript.Int32ValueJSON._writeMessage, ); } if (msg.repeatedInt64Wrapper?.length) { json["repeatedInt64Wrapper"] = msg.repeatedInt64Wrapper.map( - protoscript.Int64ValueJSON._writeMessage + protoscript.Int64ValueJSON._writeMessage, ); } if (msg.repeatedUint32Wrapper?.length) { json["repeatedUint32Wrapper"] = msg.repeatedUint32Wrapper.map( - protoscript.UInt32ValueJSON._writeMessage + protoscript.UInt32ValueJSON._writeMessage, ); } if (msg.repeatedUint64Wrapper?.length) { json["repeatedUint64Wrapper"] = msg.repeatedUint64Wrapper.map( - protoscript.UInt64ValueJSON._writeMessage + protoscript.UInt64ValueJSON._writeMessage, ); } if (msg.repeatedFloatWrapper?.length) { json["repeatedFloatWrapper"] = msg.repeatedFloatWrapper.map( - protoscript.FloatValueJSON._writeMessage + protoscript.FloatValueJSON._writeMessage, ); } if (msg.repeatedDoubleWrapper?.length) { json["repeatedDoubleWrapper"] = msg.repeatedDoubleWrapper.map( - protoscript.DoubleValueJSON._writeMessage + protoscript.DoubleValueJSON._writeMessage, ); } if (msg.repeatedStringWrapper?.length) { json["repeatedStringWrapper"] = msg.repeatedStringWrapper.map( - protoscript.StringValueJSON._writeMessage + protoscript.StringValueJSON._writeMessage, ); } if (msg.repeatedBytesWrapper?.length) { json["repeatedBytesWrapper"] = msg.repeatedBytesWrapper.map( - protoscript.BytesValueJSON._writeMessage + protoscript.BytesValueJSON._writeMessage, ); } if (msg.optionalDuration) { const _optionalDuration_ = protoscript.DurationJSON._writeMessage( - msg.optionalDuration + msg.optionalDuration, ); if (Object.keys(_optionalDuration_).length > 0) { json["optionalDuration"] = _optionalDuration_; @@ -4574,7 +4576,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalTimestamp) { const _optionalTimestamp_ = protoscript.TimestampJSON._writeMessage( - msg.optionalTimestamp + msg.optionalTimestamp, ); if (Object.keys(_optionalTimestamp_).length > 0) { json["optionalTimestamp"] = _optionalTimestamp_; @@ -4582,7 +4584,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalFieldMask) { const _optionalFieldMask_ = protoscript.FieldMaskJSON._writeMessage( - msg.optionalFieldMask + msg.optionalFieldMask, ); if (Object.keys(_optionalFieldMask_).length > 0) { json["optionalFieldMask"] = _optionalFieldMask_; @@ -4590,7 +4592,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalStruct) { const _optionalStruct_ = protoscript.StructJSON._writeMessage( - msg.optionalStruct + msg.optionalStruct, ); if (Object.keys(_optionalStruct_).length > 0) { json["optionalStruct"] = _optionalStruct_; @@ -4604,7 +4606,7 @@ export const TestAllTypesProto3JSON = { } if (msg.optionalValue) { const _optionalValue_ = protoscript.ValueJSON._writeMessage( - msg.optionalValue + msg.optionalValue, ); if (Object.keys(_optionalValue_).length > 0) { json["optionalValue"] = _optionalValue_; @@ -4618,37 +4620,37 @@ export const TestAllTypesProto3JSON = { } if (msg.repeatedDuration?.length) { json["repeatedDuration"] = msg.repeatedDuration.map( - protoscript.DurationJSON._writeMessage + protoscript.DurationJSON._writeMessage, ); } if (msg.repeatedTimestamp?.length) { json["repeatedTimestamp"] = msg.repeatedTimestamp.map( - protoscript.TimestampJSON._writeMessage + protoscript.TimestampJSON._writeMessage, ); } if (msg.repeatedFieldmask?.length) { json["repeatedFieldmask"] = msg.repeatedFieldmask.map( - protoscript.FieldMaskJSON._writeMessage + protoscript.FieldMaskJSON._writeMessage, ); } if (msg.repeatedStruct?.length) { json["repeatedStruct"] = msg.repeatedStruct.map( - protoscript.StructJSON._writeMessage + protoscript.StructJSON._writeMessage, ); } if (msg.repeatedAny?.length) { json["repeatedAny"] = msg.repeatedAny.map( - protoscript.AnyJSON._writeMessage + protoscript.AnyJSON._writeMessage, ); } if (msg.repeatedValue?.length) { json["repeatedValue"] = msg.repeatedValue.map( - protoscript.ValueJSON._writeMessage + protoscript.ValueJSON._writeMessage, ); } if (msg.repeatedListValue?.length) { json["repeatedListValue"] = msg.repeatedListValue.map( - protoscript.ListValueJSON._writeMessage + protoscript.ListValueJSON._writeMessage, ); } if (msg.fieldname1) { @@ -4713,7 +4715,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3, - json: any + json: any, ): TestAllTypesProto3 { const _optionalInt32_ = json["optionalInt32"] ?? json["optional_int32"]; if (_optionalInt32_) { @@ -4782,19 +4784,18 @@ export const TestAllTypesProto3JSON = { const _optionalNestedMessage_ = json["optionalNestedMessage"] ?? json["optional_nested_message"]; if (_optionalNestedMessage_) { - const m = TestAllTypesProto3JSON.NestedMessage.initialize(); TestAllTypesProto3JSON.NestedMessage._readMessage( - m, - _optionalNestedMessage_ + msg.optionalNestedMessage, + _optionalNestedMessage_, ); - msg.optionalNestedMessage = m; } const _optionalForeignMessage_ = json["optionalForeignMessage"] ?? json["optional_foreign_message"]; if (_optionalForeignMessage_) { - const m = ForeignMessageJSON.initialize(); - ForeignMessageJSON._readMessage(m, _optionalForeignMessage_); - msg.optionalForeignMessage = m; + ForeignMessageJSON._readMessage( + msg.optionalForeignMessage, + _optionalForeignMessage_, + ); } const _optionalNestedEnum_ = json["optionalNestedEnum"] ?? json["optional_nested_enum"]; @@ -4823,9 +4824,11 @@ export const TestAllTypesProto3JSON = { const _recursiveMessage_ = json["recursiveMessage"] ?? json["recursive_message"]; if (_recursiveMessage_) { - const m = TestAllTypesProto3JSON.initialize(); - TestAllTypesProto3JSON._readMessage(m, _recursiveMessage_); - msg.recursiveMessage = m; + msg.recursiveMessage = TestAllTypesProto3JSON.initialize(); + TestAllTypesProto3JSON._readMessage( + msg.recursiveMessage, + _recursiveMessage_, + ); } const _repeatedInt32_ = json["repeatedInt32"] ?? json["repeated_int32"]; if (_repeatedInt32_) { @@ -5052,7 +5055,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapInt32Int32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt32Int32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapInt64Int64_ = json["mapInt64Int64"] ?? json["map_int64_int64"]; @@ -5061,7 +5064,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapInt64Int64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt64Int64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapUint32Uint32_ = @@ -5071,7 +5074,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapUint32Uint32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapUint32Uint32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapUint64Uint64_ = @@ -5081,7 +5084,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapUint64Uint64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapUint64Uint64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSint32Sint32_ = @@ -5091,7 +5094,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapSint32Sint32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSint32Sint32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSint64Sint64_ = @@ -5101,7 +5104,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapSint64Sint64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSint64Sint64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapFixed32Fixed32_ = @@ -5111,7 +5114,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapFixed32Fixed32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapFixed32Fixed32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapFixed64Fixed64_ = @@ -5121,7 +5124,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapFixed64Fixed64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapFixed64Fixed64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSfixed32Sfixed32_ = @@ -5131,7 +5134,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapSfixed32Sfixed32_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSfixed32Sfixed32._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapSfixed64Sfixed64_ = @@ -5141,7 +5144,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapSfixed64Sfixed64_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapSfixed64Sfixed64._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapInt32Float_ = json["mapInt32Float"] ?? json["map_int32_float"]; @@ -5150,7 +5153,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapInt32Float_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt32Float._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapInt32Double_ = json["mapInt32Double"] ?? json["map_int32_double"]; @@ -5159,7 +5162,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapInt32Double_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapInt32Double._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapBoolBool_ = json["mapBoolBool"] ?? json["map_bool_bool"]; @@ -5168,7 +5171,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapBoolBool_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapBoolBool._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringString_ = @@ -5178,7 +5181,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapStringString_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringString._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringBytes_ = json["mapStringBytes"] ?? json["map_string_bytes"]; @@ -5187,7 +5190,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapStringBytes_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringBytes._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringNestedMessage_ = @@ -5197,7 +5200,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapStringNestedMessage_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringNestedMessage._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringForeignMessage_ = @@ -5207,7 +5210,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapStringForeignMessage_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringForeignMessage._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringNestedEnum_ = @@ -5217,7 +5220,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapStringNestedEnum_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringNestedEnum._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _mapStringForeignEnum_ = @@ -5227,7 +5230,7 @@ export const TestAllTypesProto3JSON = { Object.entries(_mapStringForeignEnum_) .map(([key, value]) => ({ key: key as any, value: value as any })) .map(TestAllTypesProto3JSON.MapStringForeignEnum._readMessage) - .map(({ key, value }) => [key, value]) + .map(({ key, value }) => [key, value]), ); } const _oneofUint32_ = json["oneofUint32"] ?? json["oneof_uint32"]; @@ -5237,12 +5240,12 @@ export const TestAllTypesProto3JSON = { const _oneofNestedMessage_ = json["oneofNestedMessage"] ?? json["oneof_nested_message"]; if (_oneofNestedMessage_) { - const m = TestAllTypesProto3JSON.NestedMessage.initialize(); + msg.oneofNestedMessage = + TestAllTypesProto3JSON.NestedMessage.initialize(); TestAllTypesProto3JSON.NestedMessage._readMessage( - m, - _oneofNestedMessage_ + msg.oneofNestedMessage, + _oneofNestedMessage_, ); - msg.oneofNestedMessage = m; } const _oneofString_ = json["oneofString"] ?? json["oneof_string"]; if (_oneofString_) { @@ -5279,65 +5282,74 @@ export const TestAllTypesProto3JSON = { const _optionalBoolWrapper_ = json["optionalBoolWrapper"] ?? json["optional_bool_wrapper"]; if (_optionalBoolWrapper_) { - const m = protoscript.BoolValueJSON.initialize(); - protoscript.BoolValueJSON._readMessage(m, _optionalBoolWrapper_); - msg.optionalBoolWrapper = m; + protoscript.BoolValueJSON._readMessage( + msg.optionalBoolWrapper, + _optionalBoolWrapper_, + ); } const _optionalInt32Wrapper_ = json["optionalInt32Wrapper"] ?? json["optional_int32_wrapper"]; if (_optionalInt32Wrapper_) { - const m = protoscript.Int32ValueJSON.initialize(); - protoscript.Int32ValueJSON._readMessage(m, _optionalInt32Wrapper_); - msg.optionalInt32Wrapper = m; + protoscript.Int32ValueJSON._readMessage( + msg.optionalInt32Wrapper, + _optionalInt32Wrapper_, + ); } const _optionalInt64Wrapper_ = json["optionalInt64Wrapper"] ?? json["optional_int64_wrapper"]; if (_optionalInt64Wrapper_) { - const m = protoscript.Int64ValueJSON.initialize(); - protoscript.Int64ValueJSON._readMessage(m, _optionalInt64Wrapper_); - msg.optionalInt64Wrapper = m; + protoscript.Int64ValueJSON._readMessage( + msg.optionalInt64Wrapper, + _optionalInt64Wrapper_, + ); } const _optionalUint32Wrapper_ = json["optionalUint32Wrapper"] ?? json["optional_uint32_wrapper"]; if (_optionalUint32Wrapper_) { - const m = protoscript.UInt32ValueJSON.initialize(); - protoscript.UInt32ValueJSON._readMessage(m, _optionalUint32Wrapper_); - msg.optionalUint32Wrapper = m; + protoscript.UInt32ValueJSON._readMessage( + msg.optionalUint32Wrapper, + _optionalUint32Wrapper_, + ); } const _optionalUint64Wrapper_ = json["optionalUint64Wrapper"] ?? json["optional_uint64_wrapper"]; if (_optionalUint64Wrapper_) { - const m = protoscript.UInt64ValueJSON.initialize(); - protoscript.UInt64ValueJSON._readMessage(m, _optionalUint64Wrapper_); - msg.optionalUint64Wrapper = m; + protoscript.UInt64ValueJSON._readMessage( + msg.optionalUint64Wrapper, + _optionalUint64Wrapper_, + ); } const _optionalFloatWrapper_ = json["optionalFloatWrapper"] ?? json["optional_float_wrapper"]; if (_optionalFloatWrapper_) { - const m = protoscript.FloatValueJSON.initialize(); - protoscript.FloatValueJSON._readMessage(m, _optionalFloatWrapper_); - msg.optionalFloatWrapper = m; + protoscript.FloatValueJSON._readMessage( + msg.optionalFloatWrapper, + _optionalFloatWrapper_, + ); } const _optionalDoubleWrapper_ = json["optionalDoubleWrapper"] ?? json["optional_double_wrapper"]; if (_optionalDoubleWrapper_) { - const m = protoscript.DoubleValueJSON.initialize(); - protoscript.DoubleValueJSON._readMessage(m, _optionalDoubleWrapper_); - msg.optionalDoubleWrapper = m; + protoscript.DoubleValueJSON._readMessage( + msg.optionalDoubleWrapper, + _optionalDoubleWrapper_, + ); } const _optionalStringWrapper_ = json["optionalStringWrapper"] ?? json["optional_string_wrapper"]; if (_optionalStringWrapper_) { - const m = protoscript.StringValueJSON.initialize(); - protoscript.StringValueJSON._readMessage(m, _optionalStringWrapper_); - msg.optionalStringWrapper = m; + protoscript.StringValueJSON._readMessage( + msg.optionalStringWrapper, + _optionalStringWrapper_, + ); } const _optionalBytesWrapper_ = json["optionalBytesWrapper"] ?? json["optional_bytes_wrapper"]; if (_optionalBytesWrapper_) { - const m = protoscript.BytesValueJSON.initialize(); - protoscript.BytesValueJSON._readMessage(m, _optionalBytesWrapper_); - msg.optionalBytesWrapper = m; + protoscript.BytesValueJSON._readMessage( + msg.optionalBytesWrapper, + _optionalBytesWrapper_, + ); } const _repeatedBoolWrapper_ = json["repeatedBoolWrapper"] ?? json["repeated_bool_wrapper"]; @@ -5423,41 +5435,38 @@ export const TestAllTypesProto3JSON = { const _optionalDuration_ = json["optionalDuration"] ?? json["optional_duration"]; if (_optionalDuration_) { - const m = protoscript.DurationJSON.initialize(); - protoscript.DurationJSON._readMessage(m, _optionalDuration_); - msg.optionalDuration = m; + protoscript.DurationJSON._readMessage( + msg.optionalDuration, + _optionalDuration_, + ); } const _optionalTimestamp_ = json["optionalTimestamp"] ?? json["optional_timestamp"]; if (_optionalTimestamp_) { - const m = protoscript.TimestampJSON.initialize(); - protoscript.TimestampJSON._readMessage(m, _optionalTimestamp_); - msg.optionalTimestamp = m; + protoscript.TimestampJSON._readMessage( + msg.optionalTimestamp, + _optionalTimestamp_, + ); } const _optionalFieldMask_ = json["optionalFieldMask"] ?? json["optional_field_mask"]; if (_optionalFieldMask_) { - const m = protoscript.FieldMaskJSON.initialize(); - protoscript.FieldMaskJSON._readMessage(m, _optionalFieldMask_); - msg.optionalFieldMask = m; + protoscript.FieldMaskJSON._readMessage( + msg.optionalFieldMask, + _optionalFieldMask_, + ); } const _optionalStruct_ = json["optionalStruct"] ?? json["optional_struct"]; if (_optionalStruct_) { - const m = protoscript.StructJSON.initialize(); - protoscript.StructJSON._readMessage(m, _optionalStruct_); - msg.optionalStruct = m; + protoscript.StructJSON._readMessage(msg.optionalStruct, _optionalStruct_); } const _optionalAny_ = json["optionalAny"] ?? json["optional_any"]; if (_optionalAny_) { - const m = protoscript.AnyJSON.initialize(); - protoscript.AnyJSON._readMessage(m, _optionalAny_); - msg.optionalAny = m; + protoscript.AnyJSON._readMessage(msg.optionalAny, _optionalAny_); } const _optionalValue_ = json["optionalValue"] ?? json["optional_value"]; if (_optionalValue_) { - const m = protoscript.ValueJSON.initialize(); - protoscript.ValueJSON._readMessage(m, _optionalValue_); - msg.optionalValue = m; + protoscript.ValueJSON._readMessage(msg.optionalValue, _optionalValue_); } const _optionalNullValue_ = json["optionalNullValue"] ?? json["optional_null_value"]; @@ -5716,9 +5725,11 @@ export const TestAllTypesProto3JSON = { /** * Serializes TestAllTypesProto3.NestedMessage to JSON. */ - encode: function (msg: Partial): string { + encode: function ( + msg: PartialDeep, + ): string { return JSON.stringify( - TestAllTypesProto3JSON.NestedMessage._writeMessage(msg) + TestAllTypesProto3JSON.NestedMessage._writeMessage(msg), ); }, @@ -5728,7 +5739,7 @@ export const TestAllTypesProto3JSON = { decode: function (json: string): TestAllTypesProto3.NestedMessage { return TestAllTypesProto3JSON.NestedMessage._readMessage( TestAllTypesProto3JSON.NestedMessage.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -5738,7 +5749,7 @@ export const TestAllTypesProto3JSON = { initialize: function (): TestAllTypesProto3.NestedMessage { return { a: 0, - corecursive: TestAllTypesProto3JSON.initialize(), + corecursive: undefined, }; }, @@ -5746,7 +5757,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.a) { @@ -5754,7 +5765,7 @@ export const TestAllTypesProto3JSON = { } if (msg.corecursive) { const _corecursive_ = TestAllTypesProto3JSON._writeMessage( - msg.corecursive + msg.corecursive, ); if (Object.keys(_corecursive_).length > 0) { json["corecursive"] = _corecursive_; @@ -5768,7 +5779,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.NestedMessage, - json: any + json: any, ): TestAllTypesProto3.NestedMessage { const _a_ = json["a"]; if (_a_) { @@ -5776,9 +5787,8 @@ export const TestAllTypesProto3JSON = { } const _corecursive_ = json["corecursive"]; if (_corecursive_) { - const m = TestAllTypesProto3JSON.initialize(); - TestAllTypesProto3JSON._readMessage(m, _corecursive_); - msg.corecursive = m; + msg.corecursive = TestAllTypesProto3JSON.initialize(); + TestAllTypesProto3JSON._readMessage(msg.corecursive, _corecursive_); } return msg; }, @@ -5789,7 +5799,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -5806,7 +5816,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt32Int32, - json: any + json: any, ): TestAllTypesProto3.MapInt32Int32 { const _key_ = json["key"]; if (_key_) { @@ -5825,7 +5835,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -5842,7 +5852,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt64Int64, - json: any + json: any, ): TestAllTypesProto3.MapInt64Int64 { const _key_ = json["key"]; if (_key_) { @@ -5861,7 +5871,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -5878,7 +5888,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapUint32Uint32, - json: any + json: any, ): TestAllTypesProto3.MapUint32Uint32 { const _key_ = json["key"]; if (_key_) { @@ -5897,7 +5907,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -5914,7 +5924,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapUint64Uint64, - json: any + json: any, ): TestAllTypesProto3.MapUint64Uint64 { const _key_ = json["key"]; if (_key_) { @@ -5933,7 +5943,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -5950,7 +5960,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSint32Sint32, - json: any + json: any, ): TestAllTypesProto3.MapSint32Sint32 { const _key_ = json["key"]; if (_key_) { @@ -5969,7 +5979,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -5986,7 +5996,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSint64Sint64, - json: any + json: any, ): TestAllTypesProto3.MapSint64Sint64 { const _key_ = json["key"]; if (_key_) { @@ -6005,7 +6015,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6022,7 +6032,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapFixed32Fixed32, - json: any + json: any, ): TestAllTypesProto3.MapFixed32Fixed32 { const _key_ = json["key"]; if (_key_) { @@ -6041,7 +6051,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6058,7 +6068,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapFixed64Fixed64, - json: any + json: any, ): TestAllTypesProto3.MapFixed64Fixed64 { const _key_ = json["key"]; if (_key_) { @@ -6077,7 +6087,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6094,7 +6104,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSfixed32Sfixed32, - json: any + json: any, ): TestAllTypesProto3.MapSfixed32Sfixed32 { const _key_ = json["key"]; if (_key_) { @@ -6113,7 +6123,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6130,7 +6140,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapSfixed64Sfixed64, - json: any + json: any, ): TestAllTypesProto3.MapSfixed64Sfixed64 { const _key_ = json["key"]; if (_key_) { @@ -6149,7 +6159,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6166,7 +6176,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt32Float, - json: any + json: any, ): TestAllTypesProto3.MapInt32Float { const _key_ = json["key"]; if (_key_) { @@ -6185,7 +6195,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6202,7 +6212,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapInt32Double, - json: any + json: any, ): TestAllTypesProto3.MapInt32Double { const _key_ = json["key"]; if (_key_) { @@ -6221,7 +6231,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6238,7 +6248,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapBoolBool, - json: any + json: any, ): TestAllTypesProto3.MapBoolBool { const _key_ = json["key"]; if (_key_) { @@ -6257,7 +6267,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6274,7 +6284,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringString, - json: any + json: any, ): TestAllTypesProto3.MapStringString { const _key_ = json["key"]; if (_key_) { @@ -6293,7 +6303,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6310,7 +6320,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringBytes, - json: any + json: any, ): TestAllTypesProto3.MapStringBytes { const _key_ = json["key"]; if (_key_) { @@ -6329,7 +6339,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6337,7 +6347,7 @@ export const TestAllTypesProto3JSON = { } if (msg.value) { const _value_ = TestAllTypesProto3JSON.NestedMessage._writeMessage( - msg.value + msg.value, ); if (Object.keys(_value_).length > 0) { json["value"] = _value_; @@ -6351,7 +6361,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringNestedMessage, - json: any + json: any, ): TestAllTypesProto3.MapStringNestedMessage { const _key_ = json["key"]; if (_key_) { @@ -6359,9 +6369,7 @@ export const TestAllTypesProto3JSON = { } const _value_ = json["value"]; if (_value_) { - const m = TestAllTypesProto3JSON.NestedMessage.initialize(); - TestAllTypesProto3JSON.NestedMessage._readMessage(m, _value_); - msg.value = m; + TestAllTypesProto3JSON.NestedMessage._readMessage(msg.value, _value_); } return msg; }, @@ -6372,7 +6380,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6392,7 +6400,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringForeignMessage, - json: any + json: any, ): TestAllTypesProto3.MapStringForeignMessage { const _key_ = json["key"]; if (_key_) { @@ -6400,9 +6408,7 @@ export const TestAllTypesProto3JSON = { } const _value_ = json["value"]; if (_value_) { - const m = ForeignMessageJSON.initialize(); - ForeignMessageJSON._readMessage(m, _value_); - msg.value = m; + ForeignMessageJSON._readMessage(msg.value, _value_); } return msg; }, @@ -6413,7 +6419,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6430,7 +6436,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringNestedEnum, - json: any + json: any, ): TestAllTypesProto3.MapStringNestedEnum { const _key_ = json["key"]; if (_key_) { @@ -6449,7 +6455,7 @@ export const TestAllTypesProto3JSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.key) { @@ -6466,7 +6472,7 @@ export const TestAllTypesProto3JSON = { */ _readMessage: function ( msg: TestAllTypesProto3.MapStringForeignEnum, - json: any + json: any, ): TestAllTypesProto3.MapStringForeignEnum { const _key_ = json["key"]; if (_key_) { @@ -6485,7 +6491,7 @@ export const ForeignMessageJSON = { /** * Serializes ForeignMessage to JSON. */ - encode: function (msg: Partial): string { + encode: function (msg: PartialDeep): string { return JSON.stringify(ForeignMessageJSON._writeMessage(msg)); }, @@ -6495,7 +6501,7 @@ export const ForeignMessageJSON = { decode: function (json: string): ForeignMessage { return ForeignMessageJSON._readMessage( ForeignMessageJSON.initialize(), - JSON.parse(json) + JSON.parse(json), ); }, @@ -6512,7 +6518,7 @@ export const ForeignMessageJSON = { * @private */ _writeMessage: function ( - msg: Partial + msg: PartialDeep, ): Record { const json: Record = {}; if (msg.c) { @@ -6537,7 +6543,7 @@ export const NullHypothesisProto3JSON = { /** * Serializes NullHypothesisProto3 to JSON. */ - encode: function (_msg?: Partial): string { + encode: function (_msg?: PartialDeep): string { return "{}"; }, @@ -6559,7 +6565,7 @@ export const NullHypothesisProto3JSON = { * @private */ _writeMessage: function ( - _msg: Partial + _msg: PartialDeep, ): Record { return {}; }, @@ -6569,7 +6575,7 @@ export const NullHypothesisProto3JSON = { */ _readMessage: function ( msg: NullHypothesisProto3, - _json: any + _json: any, ): NullHypothesisProto3 { return msg; }, @@ -6579,7 +6585,7 @@ export const EnumOnlyProto3JSON = { /** * Serializes EnumOnlyProto3 to JSON. */ - encode: function (_msg?: Partial): string { + encode: function (_msg?: PartialDeep): string { return "{}"; }, @@ -6601,7 +6607,7 @@ export const EnumOnlyProto3JSON = { * @private */ _writeMessage: function ( - _msg: Partial + _msg: PartialDeep, ): Record { return {}; }, diff --git a/impl/protoscript/package-lock.json b/impl/protoscript/package-lock.json index 8a8ea9d5..685ae230 100644 --- a/impl/protoscript/package-lock.json +++ b/impl/protoscript/package-lock.json @@ -5,21 +5,18 @@ "packages": { "": { "name": "protoscript-conformance", - "dependencies": { - "protoscript": "file:vendor/ProtoScript-0.0.14/dist" - }, "devDependencies": { - "@bufbuild/buf": "^1.15.0", - "@types/node": "^18.14.2", - "protoscript": "0.0.15", - "tsx": "^3.12.3", - "typescript": "^4.9.5" + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.9", + "protoscript": "^0.0.18", + "tsx": "^3.12.8", + "typescript": "^5.2.2" } }, "node_modules/@bufbuild/buf": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.15.0.tgz", - "integrity": "sha512-HX6AjKiI8TVFJKWdDGIUC/zZQG/8sf5FbmU5VdbK/U8tbfCwBADkJ6I+qP6HnDDtSU4obS164J0sibdGhAJKqg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "hasInstallScript": true, "bin": { @@ -31,18 +28,18 @@ "node": ">=12" }, "optionalDependencies": { - "@bufbuild/buf-darwin-arm64": "1.15.0", - "@bufbuild/buf-darwin-x64": "1.15.0", - "@bufbuild/buf-linux-aarch64": "1.15.0", - "@bufbuild/buf-linux-x64": "1.15.0", - "@bufbuild/buf-win32-arm64": "1.15.0", - "@bufbuild/buf-win32-x64": "1.15.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "node_modules/@bufbuild/buf-darwin-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.15.0.tgz", - "integrity": "sha512-sLN6uGc8sIBALa7Q4fB6rW9NM0MXK32pH6RRDUdl7aDrp/3A6TLKKBGiHcY81axUyxDTUNFb8dOwhHTI2H8FzQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "cpu": [ "arm64" ], @@ -56,9 +53,9 @@ } }, "node_modules/@bufbuild/buf-darwin-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.15.0.tgz", - "integrity": "sha512-iHml29I/hOl7ORyp9ohiV7fC1WqPbM5UjogwVpA8j06o5SgxRhp42nd80XRAXCM+65ecwiu5JVuspicGzQFOgg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "cpu": [ "x64" ], @@ -72,9 +69,9 @@ } }, "node_modules/@bufbuild/buf-linux-aarch64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.15.0.tgz", - "integrity": "sha512-YQHXqV1HhdpmIUrYg+gZNWCf43XHJJO5TlJT+pzXB/92PoN8gNP3KdxeRaM2sExcCs91G6zy1/Ms9N6DpeidUQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "cpu": [ "arm64" ], @@ -88,9 +85,9 @@ } }, "node_modules/@bufbuild/buf-linux-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.15.0.tgz", - "integrity": "sha512-DD2OcsfofawRPQKXLFMqV2GSzi4WyE7kKE1PvXBtJy7sombv5TM26vgdb+DQv4T4Z2i7vhKshnflNkfd3QXtXA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "cpu": [ "x64" ], @@ -104,9 +101,9 @@ } }, "node_modules/@bufbuild/buf-win32-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.15.0.tgz", - "integrity": "sha512-wk65iDXWRicfrt/9Gb1voAn9eGP2giQfKMrKOoEyytnDHFolMSmQimKH6iQ1uS5Vn0gI/BVp582cF1m9YsbXEg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "cpu": [ "arm64" ], @@ -120,9 +117,9 @@ } }, "node_modules/@bufbuild/buf-win32-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.15.0.tgz", - "integrity": "sha512-KVoMj52ghYfLwGjQ+t19XZiQy8jGSGUYIe/yVZz08rsm5msXHGYOt++Bk3wr48rcv8gts8jo2/h1Ebkj+F6emw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "cpu": [ "x64" ], @@ -146,12 +143,12 @@ } }, "node_modules/@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.2.2.tgz", + "integrity": "sha512-Ub6LaRaAgF80dTSzUdXpFLM1pVDdmEVB9qb5iAzSpyDlX/mfJTFGOnZ516O05p5uWWteNviMKi4PAyEuRxI5gA==", "dev": true, "dependencies": { - "esbuild": "~0.17.6", + "esbuild": "~0.18.20", "source-map-support": "^0.5.21" } }, @@ -166,9 +163,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ "arm" ], @@ -182,9 +179,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ "arm64" ], @@ -198,9 +195,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "cpu": [ "x64" ], @@ -214,9 +211,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], @@ -230,9 +227,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "cpu": [ "x64" ], @@ -246,9 +243,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "cpu": [ "arm64" ], @@ -262,9 +259,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "cpu": [ "x64" ], @@ -278,9 +275,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "cpu": [ "arm" ], @@ -294,9 +291,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "cpu": [ "arm64" ], @@ -310,9 +307,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "cpu": [ "ia32" ], @@ -326,9 +323,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "cpu": [ "loong64" ], @@ -342,9 +339,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "cpu": [ "mips64el" ], @@ -358,9 +355,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "cpu": [ "ppc64" ], @@ -374,9 +371,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "cpu": [ "riscv64" ], @@ -390,9 +387,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "cpu": [ "s390x" ], @@ -406,9 +403,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "cpu": [ "x64" ], @@ -422,9 +419,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "cpu": [ "x64" ], @@ -438,9 +435,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "cpu": [ "x64" ], @@ -454,9 +451,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "cpu": [ "x64" ], @@ -470,9 +467,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "cpu": [ "arm64" ], @@ -486,9 +483,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "cpu": [ "ia32" ], @@ -502,9 +499,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "cpu": [ "x64" ], @@ -518,9 +515,9 @@ } }, "node_modules/@types/node": { - "version": "18.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz", - "integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==", + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", "dev": true }, "node_modules/buffer-from": { @@ -530,9 +527,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, "bin": { @@ -542,28 +539,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "node_modules/fsevents": { @@ -595,34 +592,34 @@ "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==", "dev": true }, - "node_modules/prettier": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz", - "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==", + "node_modules/protoscript": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/protoscript/-/protoscript-0.0.18.tgz", + "integrity": "sha512-VQGYcyjHwbCWK/p8PE3or1bAWovRPzGlS6ueYSZ5PsK3mXEmA5e6gcT5R1+aMsiCn+4/Wo8CC+yL/meub4DqsA==", + "dev": true, + "dependencies": { + "google-protobuf": "^3.21.2", + "prettier": "^3.0.0" + }, + "bin": { + "protoscript": "dist/cli/index.js" + } + }, + "node_modules/protoscript/node_modules/prettier": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/protoscript": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/protoscript/-/protoscript-0.0.15.tgz", - "integrity": "sha512-CwXpfO0jdQ7VOc7UYm6dLPfQfcjk2TSwvYk0h2LdgjZ1NJePAXI85o1iL9LyDMGtijHR4CbAKCpm4VizGyunXA==", - "dev": true, - "dependencies": { - "google-protobuf": "^3.21.0", - "prettier": "^2.7.1" - }, - "bin": { - "protoscript": "cli/index.js" - } - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -643,13 +640,13 @@ } }, "node_modules/tsx": { - "version": "3.12.3", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.3.tgz", - "integrity": "sha512-Wc5BFH1xccYTXaQob+lEcimkcb/Pq+0en2s+ruiX0VEIC80nV7/0s7XRahx8NnsoCnpCVUPz8wrqVSPi760LkA==", + "version": "3.12.8", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.8.tgz", + "integrity": "sha512-Lt9KYaRGF023tlLInPj8rgHwsZU8qWLBj4iRXNWxTfjIkU7canGL806AqKear1j722plHuiYNcL2ZCo6uS9UJA==", "dev": true, "dependencies": { "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", + "@esbuild-kit/core-utils": "^3.2.2", "@esbuild-kit/esm-loader": "^2.5.5" }, "bin": { @@ -660,16 +657,16 @@ } }, "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "vendor/protoscript/dist": { @@ -688,58 +685,58 @@ }, "dependencies": { "@bufbuild/buf": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.15.0.tgz", - "integrity": "sha512-HX6AjKiI8TVFJKWdDGIUC/zZQG/8sf5FbmU5VdbK/U8tbfCwBADkJ6I+qP6HnDDtSU4obS164J0sibdGhAJKqg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", + "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", "dev": true, "requires": { - "@bufbuild/buf-darwin-arm64": "1.15.0", - "@bufbuild/buf-darwin-x64": "1.15.0", - "@bufbuild/buf-linux-aarch64": "1.15.0", - "@bufbuild/buf-linux-x64": "1.15.0", - "@bufbuild/buf-win32-arm64": "1.15.0", - "@bufbuild/buf-win32-x64": "1.15.0" + "@bufbuild/buf-darwin-arm64": "1.26.1", + "@bufbuild/buf-darwin-x64": "1.26.1", + "@bufbuild/buf-linux-aarch64": "1.26.1", + "@bufbuild/buf-linux-x64": "1.26.1", + "@bufbuild/buf-win32-arm64": "1.26.1", + "@bufbuild/buf-win32-x64": "1.26.1" } }, "@bufbuild/buf-darwin-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.15.0.tgz", - "integrity": "sha512-sLN6uGc8sIBALa7Q4fB6rW9NM0MXK32pH6RRDUdl7aDrp/3A6TLKKBGiHcY81axUyxDTUNFb8dOwhHTI2H8FzQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", + "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", "dev": true, "optional": true }, "@bufbuild/buf-darwin-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.15.0.tgz", - "integrity": "sha512-iHml29I/hOl7ORyp9ohiV7fC1WqPbM5UjogwVpA8j06o5SgxRhp42nd80XRAXCM+65ecwiu5JVuspicGzQFOgg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", + "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", "dev": true, "optional": true }, "@bufbuild/buf-linux-aarch64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.15.0.tgz", - "integrity": "sha512-YQHXqV1HhdpmIUrYg+gZNWCf43XHJJO5TlJT+pzXB/92PoN8gNP3KdxeRaM2sExcCs91G6zy1/Ms9N6DpeidUQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", + "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", "dev": true, "optional": true }, "@bufbuild/buf-linux-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.15.0.tgz", - "integrity": "sha512-DD2OcsfofawRPQKXLFMqV2GSzi4WyE7kKE1PvXBtJy7sombv5TM26vgdb+DQv4T4Z2i7vhKshnflNkfd3QXtXA==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", + "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", "dev": true, "optional": true }, "@bufbuild/buf-win32-arm64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.15.0.tgz", - "integrity": "sha512-wk65iDXWRicfrt/9Gb1voAn9eGP2giQfKMrKOoEyytnDHFolMSmQimKH6iQ1uS5Vn0gI/BVp582cF1m9YsbXEg==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", + "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", "dev": true, "optional": true }, "@bufbuild/buf-win32-x64": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.15.0.tgz", - "integrity": "sha512-KVoMj52ghYfLwGjQ+t19XZiQy8jGSGUYIe/yVZz08rsm5msXHGYOt++Bk3wr48rcv8gts8jo2/h1Ebkj+F6emw==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", + "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", "dev": true, "optional": true }, @@ -754,12 +751,12 @@ } }, "@esbuild-kit/core-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz", - "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.2.2.tgz", + "integrity": "sha512-Ub6LaRaAgF80dTSzUdXpFLM1pVDdmEVB9qb5iAzSpyDlX/mfJTFGOnZ516O05p5uWWteNviMKi4PAyEuRxI5gA==", "dev": true, "requires": { - "esbuild": "~0.17.6", + "esbuild": "~0.18.20", "source-map-support": "^0.5.21" } }, @@ -774,163 +771,163 @@ } }, "@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "dev": true, "optional": true }, "@types/node": { - "version": "18.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz", - "integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==", + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", "dev": true }, "buffer-from": { @@ -940,33 +937,33 @@ "dev": true }, "esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "requires": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "fsevents": { @@ -988,20 +985,22 @@ "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==", "dev": true }, - "prettier": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz", - "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==", - "dev": true - }, "protoscript": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/protoscript/-/protoscript-0.0.15.tgz", - "integrity": "sha512-CwXpfO0jdQ7VOc7UYm6dLPfQfcjk2TSwvYk0h2LdgjZ1NJePAXI85o1iL9LyDMGtijHR4CbAKCpm4VizGyunXA==", + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/protoscript/-/protoscript-0.0.18.tgz", + "integrity": "sha512-VQGYcyjHwbCWK/p8PE3or1bAWovRPzGlS6ueYSZ5PsK3mXEmA5e6gcT5R1+aMsiCn+4/Wo8CC+yL/meub4DqsA==", "dev": true, "requires": { - "google-protobuf": "^3.21.0", - "prettier": "^2.7.1" + "google-protobuf": "^3.21.2", + "prettier": "^3.0.0" + }, + "dependencies": { + "prettier": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "dev": true + } } }, "source-map": { @@ -1021,21 +1020,21 @@ } }, "tsx": { - "version": "3.12.3", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.3.tgz", - "integrity": "sha512-Wc5BFH1xccYTXaQob+lEcimkcb/Pq+0en2s+ruiX0VEIC80nV7/0s7XRahx8NnsoCnpCVUPz8wrqVSPi760LkA==", + "version": "3.12.8", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.8.tgz", + "integrity": "sha512-Lt9KYaRGF023tlLInPj8rgHwsZU8qWLBj4iRXNWxTfjIkU7canGL806AqKear1j722plHuiYNcL2ZCo6uS9UJA==", "dev": true, "requires": { "@esbuild-kit/cjs-loader": "^2.4.2", - "@esbuild-kit/core-utils": "^3.0.0", + "@esbuild-kit/core-utils": "^3.2.2", "@esbuild-kit/esm-loader": "^2.5.5", "fsevents": "~2.3.2" } }, "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true } } diff --git a/impl/protoscript/package.json b/impl/protoscript/package.json index a34b0310..922cac14 100644 --- a/impl/protoscript/package.json +++ b/impl/protoscript/package.json @@ -2,14 +2,11 @@ "name": "protoscript-conformance", "private": true, "type": "module", - "dependencies": { - "protoscript": "file:vendor/ProtoScript-0.0.14/dist" - }, "devDependencies": { - "@bufbuild/buf": "^1.15.0", - "@types/node": "^18.14.2", - "protoscript": "0.0.15", - "tsx": "^3.12.3", - "typescript": "^4.9.5" + "@bufbuild/buf": "^1.26.1", + "@types/node": "^20.5.9", + "protoscript": "^0.0.18", + "tsx": "^3.12.8", + "typescript": "^5.2.2" } } diff --git a/impl/ts-proto/README.md b/impl/ts-proto/README.md index 72aa12bc..7f9ce653 100644 --- a/impl/ts-proto/README.md +++ b/impl/ts-proto/README.md @@ -4,12 +4,5 @@ ## Caveats -The `ts-proto` library fails generating the `test_messages_proto2.proto` file in the Conformance Tests due to its -usage of [group fields](https://protobuf.dev/reference/protobuf/proto2-spec/#group_field). As a result, this file is -intentionally skipped during the generation process, causing all `proto2` tests to fail. - -In addition, `ts-proto` generates duplicate case statements for the `AliasedEnum` message in the -`test_messages_proto3.proto` file. This is because it uses an `allow_alias` option, which permits duplicate values. -Because `tsx` uses `esbuild` under the hood, this causes `tsx` to issue warnings. This, in turn, results in the -test runner hanging. To circumvent this, the `ts-proto` suite does not use `tsx`. The files are built with -`esbuild` ahead of time and the warnings are silenced. +ts-proto v1.157.0 generates code with type errors for the test messages. We ignore +the type errors to run the conformance suite. diff --git a/impl/ts-proto/failing_tests.txt b/impl/ts-proto/failing_tests.txt index 08c7c772..f3b88857 100644 --- a/impl/ts-proto/failing_tests.txt +++ b/impl/ts-proto/failing_tests.txt @@ -2,16 +2,7 @@ Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput Recommended.FieldMaskPathsDontRoundTrip.JsonOutput Recommended.FieldMaskTooManyUnderscore.JsonOutput Recommended.Proto2.JsonInput.FieldNameExtension.Validator -Recommended.Proto2.ProtobufInput.OneofZeroBool.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroBytes.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroDouble.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroEnum.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroFloat.ProtobufOutput Recommended.Proto2.ProtobufInput.OneofZeroMessage.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroMessageSetTwice.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroString.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroUint32.ProtobufOutput -Recommended.Proto2.ProtobufInput.OneofZeroUint64.ProtobufOutput Recommended.Proto2.ProtobufInput.ValidDataOneofBinary.BOOL.DefaultValue.ProtobufOutput Recommended.Proto2.ProtobufInput.ValidDataOneofBinary.BOOL.MultipleValuesForDifferentField.ProtobufOutput Recommended.Proto2.ProtobufInput.ValidDataOneofBinary.BOOL.MultipleValuesForSameField.ProtobufOutput @@ -247,6 +238,9 @@ Recommended.Proto3.JsonInput.FieldNameWithDoubleUnderscores.Validator Recommended.Proto3.JsonInput.FloatFieldInfinityNotQuoted Recommended.Proto3.JsonInput.FloatFieldNanNotQuoted Recommended.Proto3.JsonInput.FloatFieldNegativeInfinityNotQuoted +Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput +Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInOptionalField.ProtobufOutput +Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInRepeatedField.ProtobufOutput Recommended.Proto3.JsonInput.Int32MapFieldKeyNotQuoted Recommended.Proto3.JsonInput.Int64FieldBeString.Validator Recommended.Proto3.JsonInput.Int64MapFieldKeyNotQuoted @@ -284,6 +278,9 @@ Recommended.Proto3.JsonInput.OneofZeroUint32.JsonOutput Recommended.Proto3.JsonInput.OneofZeroUint32.ProtobufOutput Recommended.Proto3.JsonInput.OneofZeroUint64.JsonOutput Recommended.Proto3.JsonInput.OneofZeroUint64.ProtobufOutput +Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInMapValue +Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInOptionalField +Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInRepeatedField Recommended.Proto3.JsonInput.RepeatedFieldMessageElementIsNull Recommended.Proto3.JsonInput.RepeatedFieldPrimitiveElementIsNull Recommended.Proto3.JsonInput.RepeatedFieldTrailingComma @@ -518,6 +515,8 @@ Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.UINT32[9].ProtobufOutput Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.UINT64[0].ProtobufOutput Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.UINT64[1].ProtobufOutput Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.UINT64[2].ProtobufOutput +Recommended.ValueRejectInfNumberValue.JsonOutput +Recommended.ValueRejectNanNumberValue.JsonOutput Required.DurationProtoInputTooLarge.JsonOutput Required.DurationProtoInputTooSmall.JsonOutput Required.Proto2.JsonInput.StoresDefaultPrimitive.Validator @@ -525,436 +524,66 @@ Required.Proto2.ProtobufInput.IllegalZeroFieldNum_Case_0 Required.Proto2.ProtobufInput.IllegalZeroFieldNum_Case_1 Required.Proto2.ProtobufInput.IllegalZeroFieldNum_Case_2 Required.Proto2.ProtobufInput.IllegalZeroFieldNum_Case_3 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.BOOL -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.ENUM -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.FLOAT -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.INT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.INT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.SINT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.SINT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.STRING -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.UINT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownNonRepeatedValue.UINT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.BOOL -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.ENUM -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.FLOAT -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.INT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.INT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.SINT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.SINT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.STRING -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.UINT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeKnownRepeatedValue.UINT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.BOOL -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.ENUM -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.FLOAT -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.INT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.INT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.SINT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.SINT64 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.STRING -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.UINT32 -Required.Proto2.ProtobufInput.PrematureEofBeforeUnknownValue.UINT64 -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.STRING -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.STRING -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForUnknownValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForUnknownValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForUnknownValue.STRING -Required.Proto2.ProtobufInput.PrematureEofInPackedField.BOOL -Required.Proto2.ProtobufInput.PrematureEofInPackedField.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofInPackedField.ENUM -Required.Proto2.ProtobufInput.PrematureEofInPackedField.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.FLOAT -Required.Proto2.ProtobufInput.PrematureEofInPackedField.INT32 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.INT64 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT32 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT64 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT32 -Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT64 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.BOOL -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.ENUM -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.FLOAT -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.INT32 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.INT64 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.SINT32 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.SINT64 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.UINT32 -Required.Proto2.ProtobufInput.PrematureEofInPackedFieldValue.UINT64 -Required.Proto2.ProtobufInput.PrematureEofInSubmessageValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.BOOL -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.ENUM -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.FLOAT -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.INT32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.INT64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.SINT32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.SINT64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.STRING -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.UINT32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownNonRepeatedValue.UINT64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.BOOL -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.ENUM -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.FLOAT -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.INT32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.INT64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.SINT32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.SINT64 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.STRING -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.UINT32 -Required.Proto2.ProtobufInput.PrematureEofInsideKnownRepeatedValue.UINT64 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.BOOL -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.BYTES -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.DOUBLE -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.ENUM -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.FIXED32 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.FIXED64 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.FLOAT -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.INT32 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.INT64 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.SFIXED32 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.SFIXED64 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.SINT32 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.SINT64 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.STRING -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.UINT32 -Required.Proto2.ProtobufInput.PrematureEofInsideUnknownValue.UINT64 Required.Proto2.ProtobufInput.RepeatedScalarMessageMerge.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.BOOL.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.BYTES.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.DOUBLE.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.ENUM.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.FIXED32.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.FIXED64.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.FLOAT.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.INT32.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.INT64.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.SFIXED32.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.SFIXED64.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.SINT32.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.SINT64.ProtobufOutput -Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.STRING.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.UINT32.ProtobufOutput Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.UINT64.ProtobufOutput Required.Proto2.ProtobufInput.UnknownVarint.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.BOOL.BOOL.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.BOOL.BOOL.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.BOOL.BOOL.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.BOOL.BOOL.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.BOOL.BOOL.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.BOOL.BOOL.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.BOOL.BOOL.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED32.FIXED32.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED32.FIXED32.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED32.FIXED32.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED32.FIXED32.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED32.FIXED32.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED32.FIXED32.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED32.FIXED32.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED64.FIXED64.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED64.FIXED64.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED64.FIXED64.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED64.FIXED64.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED64.FIXED64.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED64.FIXED64.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.FIXED64.FIXED64.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.DOUBLE.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.DOUBLE.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.DOUBLE.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.DOUBLE.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.DOUBLE.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.DOUBLE.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.DOUBLE.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.FLOAT.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.FLOAT.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.FLOAT.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.FLOAT.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.FLOAT.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.FLOAT.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.FLOAT.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.INT32.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.INT32.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.INT32.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.INT32.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.INT32.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.INT32.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT32.INT32.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT64.INT64.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT64.INT64.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT64.INT64.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT64.INT64.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT64.INT64.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT64.INT64.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.INT64.INT64.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED32.SFIXED32.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED32.SFIXED32.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED32.SFIXED32.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED32.SFIXED32.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED32.SFIXED32.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED32.SFIXED32.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED32.SFIXED32.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED64.SFIXED64.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED64.SFIXED64.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED64.SFIXED64.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED64.SFIXED64.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED64.SFIXED64.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED64.SFIXED64.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SFIXED64.SFIXED64.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT32.SINT32.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT32.SINT32.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT32.SINT32.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT32.SINT32.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT32.SINT32.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT32.SINT32.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT32.SINT32.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT64.SINT64.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT64.SINT64.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT64.SINT64.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT64.SINT64.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT64.SINT64.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT64.SINT64.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.SINT64.SINT64.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.BYTES.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.BYTES.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.BYTES.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.BYTES.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.BYTES.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.BYTES.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.BYTES.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.ENUM.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.ENUM.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.ENUM.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.ENUM.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.ENUM.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.ENUM.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.ENUM.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.MergeValue.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.MESSAGE.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.STRING.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.STRING.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.STRING.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.STRING.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.STRING.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.STRING.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.STRING.STRING.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT32.UINT32.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT32.UINT32.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT32.UINT32.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT32.UINT32.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT32.UINT32.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT32.UINT32.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT32.UINT32.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT64.UINT64.Default.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT64.UINT64.DuplicateKey.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT64.UINT64.DuplicateKeyInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT64.UINT64.DuplicateValueInMapEntry.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT64.UINT64.MissingDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT64.UINT64.NonDefault.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataMap.UINT64.UINT64.Unordered.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BOOL.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BOOL.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BOOL.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BOOL.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BYTES.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BYTES.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BYTES.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.BYTES.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.DOUBLE.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.DOUBLE.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.DOUBLE.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.DOUBLE.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.ENUM.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.ENUM.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.ENUM.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.ENUM.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.FLOAT.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.FLOAT.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.FLOAT.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.FLOAT.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.MESSAGE.DefaultValue.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataOneof.MESSAGE.Merge.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.MESSAGE.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.MESSAGE.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.MESSAGE.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.STRING.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.STRING.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.STRING.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.STRING.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT32.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT32.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT32.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT32.NonDefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT64.DefaultValue.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT64.MultipleValuesForDifferentField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT64.MultipleValuesForSameField.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataOneof.UINT64.NonDefaultValue.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.BYTES.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.DOUBLE.PackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.DOUBLE.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.FIXED32.PackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.FIXED32.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.FLOAT.PackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.FLOAT.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.INT32.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.INT64.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.MESSAGE.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.SFIXED32.PackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.SFIXED32.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.SINT32.PackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.SINT32.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataRepeated.STRING.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[3].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[4].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[5].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[6].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.BYTES[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.BYTES[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.BYTES[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.BYTES[3].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.DOUBLE[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.DOUBLE[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.DOUBLE[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.DOUBLE[3].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[3].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[4].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[5].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.FIXED32[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.FIXED32[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.FIXED32[2].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.FIXED64[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.FIXED64[1].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.FIXED64[2].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.FLOAT[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.FLOAT[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.FLOAT[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.FLOAT[3].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.FLOAT[4].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.INT32[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT32[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT32[2].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.INT32[3].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT32[4].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT32[5].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.INT32[6].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT32[7].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.INT32[8].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT32[9].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.INT64[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT64[1].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.INT64[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.INT64[3].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.MESSAGE[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.MESSAGE[1].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED32[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED32[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED32[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED32[3].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED64[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED64[1].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED64[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED64[3].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.SINT32[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SINT32[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SINT32[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SINT32[3].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SINT32[4].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.SINT64[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SINT64[1].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.SINT64[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.SINT64[3].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.STRING[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.STRING[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.STRING[2].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.STRING[3].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.STRING[4].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.STRING[5].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.STRING[6].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[1].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[2].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[3].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[4].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[5].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[6].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[7].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[8].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[9].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[0].ProtobufOutput -Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[1].ProtobufOutput Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[2].ProtobufOutput Required.Proto3.JsonInput.AllFieldAcceptNull.JsonOutput Required.Proto3.JsonInput.AllFieldAcceptNull.ProtobufOutput @@ -1015,6 +644,10 @@ Required.Proto3.JsonInput.DurationMaxValue.ProtobufOutput Required.Proto3.JsonInput.DurationMinValue.JsonOutput Required.Proto3.JsonInput.DurationMinValue.ProtobufOutput Required.Proto3.JsonInput.DurationMissingS +Required.Proto3.JsonInput.DurationNegativeNanos.JsonOutput +Required.Proto3.JsonInput.DurationNegativeNanos.ProtobufOutput +Required.Proto3.JsonInput.DurationNegativeSeconds.JsonOutput +Required.Proto3.JsonInput.DurationNegativeSeconds.ProtobufOutput Required.Proto3.JsonInput.DurationNull.JsonOutput Required.Proto3.JsonInput.DurationNull.ProtobufOutput Required.Proto3.JsonInput.DurationRepeatedValue.JsonOutput @@ -1347,10 +980,13 @@ Required.Proto3.ProtobufInput.ValidDataScalar.INT32[8].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.INT32[8].ProtobufOutput Required.Proto3.ProtobufInput.ValidDataScalar.INT64[2].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.INT64[2].ProtobufOutput +Required.Proto3.ProtobufInput.ValidDataScalar.INT64[3].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.SFIXED64[2].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.SFIXED64[2].ProtobufOutput +Required.Proto3.ProtobufInput.ValidDataScalar.SFIXED64[3].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.SINT64[2].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.SINT64[2].ProtobufOutput +Required.Proto3.ProtobufInput.ValidDataScalar.SINT64[3].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.UINT32[3].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.UINT32[3].ProtobufOutput Required.Proto3.ProtobufInput.ValidDataScalar.UINT32[8].JsonOutput @@ -1359,18 +995,3 @@ Required.Proto3.ProtobufInput.ValidDataScalar.UINT64[2].JsonOutput Required.Proto3.ProtobufInput.ValidDataScalar.UINT64[2].ProtobufOutput Required.TimestampProtoInputTooLarge.JsonOutput Required.TimestampProtoInputTooSmall.JsonOutput -Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput -Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInOptionalField.ProtobufOutput -Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInRepeatedField.ProtobufOutput -Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInMapValue -Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInOptionalField -Recommended.Proto3.JsonInput.RejectUnknownEnumStringValueInRepeatedField -Recommended.ValueRejectInfNumberValue.JsonOutput -Recommended.ValueRejectNanNumberValue.JsonOutput -Required.Proto3.JsonInput.DurationNegativeNanos.JsonOutput -Required.Proto3.JsonInput.DurationNegativeNanos.ProtobufOutput -Required.Proto3.JsonInput.DurationNegativeSeconds.JsonOutput -Required.Proto3.JsonInput.DurationNegativeSeconds.ProtobufOutput -Required.Proto3.ProtobufInput.ValidDataScalar.INT64[3].JsonOutput -Required.Proto3.ProtobufInput.ValidDataScalar.SFIXED64[3].JsonOutput -Required.Proto3.ProtobufInput.ValidDataScalar.SINT64[3].JsonOutput diff --git a/impl/ts-proto/gen/google/protobuf/test_messages_proto2.ts b/impl/ts-proto/gen/google/protobuf/test_messages_proto2.ts new file mode 100644 index 00000000..eb8ea9da --- /dev/null +++ b/impl/ts-proto/gen/google/protobuf/test_messages_proto2.ts @@ -0,0 +1,7136 @@ +/* eslint-disable */ +import Long from "long"; +import _m0 from "protobufjs/minimal"; + +export const protobufPackage = "protobuf_test_messages.proto2"; + +export enum ForeignEnumProto2 { + FOREIGN_FOO = 0, + FOREIGN_BAR = 1, + FOREIGN_BAZ = 2, +} + +export function foreignEnumProto2FromJSON(object: any): ForeignEnumProto2 { + switch (object) { + case 0: + case "FOREIGN_FOO": + return ForeignEnumProto2.FOREIGN_FOO; + case 1: + case "FOREIGN_BAR": + return ForeignEnumProto2.FOREIGN_BAR; + case 2: + case "FOREIGN_BAZ": + return ForeignEnumProto2.FOREIGN_BAZ; + default: + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum ForeignEnumProto2"); + } +} + +export function foreignEnumProto2ToJSON(object: ForeignEnumProto2): string { + switch (object) { + case ForeignEnumProto2.FOREIGN_FOO: + return "FOREIGN_FOO"; + case ForeignEnumProto2.FOREIGN_BAR: + return "FOREIGN_BAR"; + case ForeignEnumProto2.FOREIGN_BAZ: + return "FOREIGN_BAZ"; + default: + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum ForeignEnumProto2"); + } +} + +/** + * This proto includes every type of field in both singular and repeated + * forms. + * + * Also, crucially, all messages and enums in this file are eventually + * submessages of this message. So for example, a fuzz test of TestAllTypes + * could trigger bugs that occur in any message type in this file. We verify + * this stays true in a unit test. + */ +export interface TestAllTypesProto2 { + /** Singular */ + optionalInt32: number; + optionalInt64: number; + optionalUint32: number; + optionalUint64: number; + optionalSint32: number; + optionalSint64: number; + optionalFixed32: number; + optionalFixed64: number; + optionalSfixed32: number; + optionalSfixed64: number; + optionalFloat: number; + optionalDouble: number; + optionalBool: boolean; + optionalString: string; + optionalBytes: Uint8Array; + optionalNestedMessage: TestAllTypesProto2_NestedMessage | undefined; + optionalForeignMessage: ForeignMessageProto2 | undefined; + optionalNestedEnum: TestAllTypesProto2_NestedEnum; + optionalForeignEnum: ForeignEnumProto2; + optionalStringPiece: string; + optionalCord: string; + recursiveMessage: + | TestAllTypesProto2 + | undefined; + /** Repeated */ + repeatedInt32: number[]; + repeatedInt64: number[]; + repeatedUint32: number[]; + repeatedUint64: number[]; + repeatedSint32: number[]; + repeatedSint64: number[]; + repeatedFixed32: number[]; + repeatedFixed64: number[]; + repeatedSfixed32: number[]; + repeatedSfixed64: number[]; + repeatedFloat: number[]; + repeatedDouble: number[]; + repeatedBool: boolean[]; + repeatedString: string[]; + repeatedBytes: Uint8Array[]; + repeatedNestedMessage: TestAllTypesProto2_NestedMessage[]; + repeatedForeignMessage: ForeignMessageProto2[]; + repeatedNestedEnum: TestAllTypesProto2_NestedEnum[]; + repeatedForeignEnum: ForeignEnumProto2[]; + repeatedStringPiece: string[]; + repeatedCord: string[]; + /** Packed */ + packedInt32: number[]; + packedInt64: number[]; + packedUint32: number[]; + packedUint64: number[]; + packedSint32: number[]; + packedSint64: number[]; + packedFixed32: number[]; + packedFixed64: number[]; + packedSfixed32: number[]; + packedSfixed64: number[]; + packedFloat: number[]; + packedDouble: number[]; + packedBool: boolean[]; + packedNestedEnum: TestAllTypesProto2_NestedEnum[]; + /** Unpacked */ + unpackedInt32: number[]; + unpackedInt64: number[]; + unpackedUint32: number[]; + unpackedUint64: number[]; + unpackedSint32: number[]; + unpackedSint64: number[]; + unpackedFixed32: number[]; + unpackedFixed64: number[]; + unpackedSfixed32: number[]; + unpackedSfixed64: number[]; + unpackedFloat: number[]; + unpackedDouble: number[]; + unpackedBool: boolean[]; + unpackedNestedEnum: TestAllTypesProto2_NestedEnum[]; + /** Map */ + mapInt32Int32: Map; + mapInt64Int64: Map; + mapUint32Uint32: Map; + mapUint64Uint64: Map; + mapSint32Sint32: Map; + mapSint64Sint64: Map; + mapFixed32Fixed32: Map; + mapFixed64Fixed64: Map; + mapSfixed32Sfixed32: Map; + mapSfixed64Sfixed64: Map; + mapInt32Float: Map; + mapInt32Double: Map; + mapBoolBool: Map; + mapStringString: Map; + mapStringBytes: Map; + mapStringNestedMessage: Map; + mapStringForeignMessage: Map; + mapStringNestedEnum: Map; + mapStringForeignEnum: Map; + oneofField?: + | { $case: "oneofUint32"; oneofUint32: number } + | { $case: "oneofNestedMessage"; oneofNestedMessage: TestAllTypesProto2_NestedMessage } + | { $case: "oneofString"; oneofString: string } + | { $case: "oneofBytes"; oneofBytes: Uint8Array } + | { $case: "oneofBool"; oneofBool: boolean } + | { $case: "oneofUint64"; oneofUint64: number } + | { $case: "oneofFloat"; oneofFloat: number } + | { $case: "oneofDouble"; oneofDouble: number } + | { $case: "oneofEnum"; oneofEnum: TestAllTypesProto2_NestedEnum } + | undefined; + data: + | TestAllTypesProto2_Data + | undefined; + /** default values */ + defaultInt32: number; + defaultInt64: number; + defaultUint32: number; + defaultUint64: number; + defaultSint32: number; + defaultSint64: number; + defaultFixed32: number; + defaultFixed64: number; + defaultSfixed32: number; + defaultSfixed64: number; + defaultFloat: number; + defaultDouble: number; + defaultBool: boolean; + defaultString: string; + defaultBytes: Uint8Array; + /** + * Test field-name-to-JSON-name convention. + * (protobuf says names can be any valid C/C++ identifier.) + */ + fieldname1: number; + fieldName2: number; + FieldName3: number; + fieldName4: number; + field0name5: number; + field0Name6: number; + fieldName7: number; + FieldName8: number; + fieldName9: number; + FieldName10: number; + fieldName11: number; + FIELDName12: number; + FieldName13: number; + FieldName14: number; + fieldName15: number; + fieldName16: number; + fieldName17: number; + FieldName18: number; +} + +export enum TestAllTypesProto2_NestedEnum { + FOO = 0, + BAR = 1, + BAZ = 2, + /** NEG - Intentionally negative. */ + NEG = -1, +} + +export function testAllTypesProto2_NestedEnumFromJSON(object: any): TestAllTypesProto2_NestedEnum { + switch (object) { + case 0: + case "FOO": + return TestAllTypesProto2_NestedEnum.FOO; + case 1: + case "BAR": + return TestAllTypesProto2_NestedEnum.BAR; + case 2: + case "BAZ": + return TestAllTypesProto2_NestedEnum.BAZ; + case -1: + case "NEG": + return TestAllTypesProto2_NestedEnum.NEG; + default: + throw new tsProtoGlobalThis.Error( + "Unrecognized enum value " + object + " for enum TestAllTypesProto2_NestedEnum", + ); + } +} + +export function testAllTypesProto2_NestedEnumToJSON(object: TestAllTypesProto2_NestedEnum): string { + switch (object) { + case TestAllTypesProto2_NestedEnum.FOO: + return "FOO"; + case TestAllTypesProto2_NestedEnum.BAR: + return "BAR"; + case TestAllTypesProto2_NestedEnum.BAZ: + return "BAZ"; + case TestAllTypesProto2_NestedEnum.NEG: + return "NEG"; + default: + throw new tsProtoGlobalThis.Error( + "Unrecognized enum value " + object + " for enum TestAllTypesProto2_NestedEnum", + ); + } +} + +export interface TestAllTypesProto2_NestedMessage { + a: number; + corecursive: TestAllTypesProto2 | undefined; +} + +export interface TestAllTypesProto2_MapInt32Int32Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapInt64Int64Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapUint32Uint32Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapUint64Uint64Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapSint32Sint32Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapSint64Sint64Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapFixed32Fixed32Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapFixed64Fixed64Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapSfixed32Sfixed32Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapSfixed64Sfixed64Entry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapInt32FloatEntry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapInt32DoubleEntry { + key: number; + value: number; +} + +export interface TestAllTypesProto2_MapBoolBoolEntry { + key: boolean; + value: boolean; +} + +export interface TestAllTypesProto2_MapStringStringEntry { + key: string; + value: string; +} + +export interface TestAllTypesProto2_MapStringBytesEntry { + key: string; + value: Uint8Array; +} + +export interface TestAllTypesProto2_MapStringNestedMessageEntry { + key: string; + value: TestAllTypesProto2_NestedMessage | undefined; +} + +export interface TestAllTypesProto2_MapStringForeignMessageEntry { + key: string; + value: ForeignMessageProto2 | undefined; +} + +export interface TestAllTypesProto2_MapStringNestedEnumEntry { + key: string; + value: TestAllTypesProto2_NestedEnum; +} + +export interface TestAllTypesProto2_MapStringForeignEnumEntry { + key: string; + value: ForeignEnumProto2; +} + +/** groups */ +export interface TestAllTypesProto2_Data { + groupInt32: number; + groupUint32: number; +} + +/** message_set test case. */ +export interface TestAllTypesProto2_MessageSetCorrect { +} + +export interface TestAllTypesProto2_MessageSetCorrectExtension1 { + str: string; +} + +export interface TestAllTypesProto2_MessageSetCorrectExtension2 { + i: number; +} + +export interface ForeignMessageProto2 { + c: number; +} + +export interface UnknownToTestAllTypes { + optionalInt32: number; + optionalString: string; + nestedMessage: ForeignMessageProto2 | undefined; + optionalgroup: UnknownToTestAllTypes_OptionalGroup | undefined; + optionalBool: boolean; + repeatedInt32: number[]; +} + +export interface UnknownToTestAllTypes_OptionalGroup { + a: number; +} + +export interface NullHypothesisProto2 { +} + +export interface EnumOnlyProto2 { +} + +export enum EnumOnlyProto2_Bool { + kFalse = 0, + kTrue = 1, +} + +export function enumOnlyProto2_BoolFromJSON(object: any): EnumOnlyProto2_Bool { + switch (object) { + case 0: + case "kFalse": + return EnumOnlyProto2_Bool.kFalse; + case 1: + case "kTrue": + return EnumOnlyProto2_Bool.kTrue; + default: + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum EnumOnlyProto2_Bool"); + } +} + +export function enumOnlyProto2_BoolToJSON(object: EnumOnlyProto2_Bool): string { + switch (object) { + case EnumOnlyProto2_Bool.kFalse: + return "kFalse"; + case EnumOnlyProto2_Bool.kTrue: + return "kTrue"; + default: + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum EnumOnlyProto2_Bool"); + } +} + +export interface OneStringProto2 { + data: string; +} + +export interface ProtoWithKeywords { + inline: number; + concept: string; + requires: string[]; +} + +export interface TestAllRequiredTypesProto2 { + /** Singular */ + requiredInt32: number; + requiredInt64: number; + requiredUint32: number; + requiredUint64: number; + requiredSint32: number; + requiredSint64: number; + requiredFixed32: number; + requiredFixed64: number; + requiredSfixed32: number; + requiredSfixed64: number; + requiredFloat: number; + requiredDouble: number; + requiredBool: boolean; + requiredString: string; + requiredBytes: Uint8Array; + requiredNestedMessage: TestAllRequiredTypesProto2_NestedMessage | undefined; + requiredForeignMessage: ForeignMessageProto2 | undefined; + requiredNestedEnum: TestAllRequiredTypesProto2_NestedEnum; + requiredForeignEnum: ForeignEnumProto2; + requiredStringPiece: string; + requiredCord: string; + recursiveMessage: TestAllRequiredTypesProto2 | undefined; + optionalRecursiveMessage: TestAllRequiredTypesProto2 | undefined; + data: + | TestAllRequiredTypesProto2_Data + | undefined; + /** default values */ + defaultInt32: number; + defaultInt64: number; + defaultUint32: number; + defaultUint64: number; + defaultSint32: number; + defaultSint64: number; + defaultFixed32: number; + defaultFixed64: number; + defaultSfixed32: number; + defaultSfixed64: number; + defaultFloat: number; + defaultDouble: number; + defaultBool: boolean; + defaultString: string; + defaultBytes: Uint8Array; +} + +export enum TestAllRequiredTypesProto2_NestedEnum { + FOO = 0, + BAR = 1, + BAZ = 2, + /** NEG - Intentionally negative. */ + NEG = -1, +} + +export function testAllRequiredTypesProto2_NestedEnumFromJSON(object: any): TestAllRequiredTypesProto2_NestedEnum { + switch (object) { + case 0: + case "FOO": + return TestAllRequiredTypesProto2_NestedEnum.FOO; + case 1: + case "BAR": + return TestAllRequiredTypesProto2_NestedEnum.BAR; + case 2: + case "BAZ": + return TestAllRequiredTypesProto2_NestedEnum.BAZ; + case -1: + case "NEG": + return TestAllRequiredTypesProto2_NestedEnum.NEG; + default: + throw new tsProtoGlobalThis.Error( + "Unrecognized enum value " + object + " for enum TestAllRequiredTypesProto2_NestedEnum", + ); + } +} + +export function testAllRequiredTypesProto2_NestedEnumToJSON(object: TestAllRequiredTypesProto2_NestedEnum): string { + switch (object) { + case TestAllRequiredTypesProto2_NestedEnum.FOO: + return "FOO"; + case TestAllRequiredTypesProto2_NestedEnum.BAR: + return "BAR"; + case TestAllRequiredTypesProto2_NestedEnum.BAZ: + return "BAZ"; + case TestAllRequiredTypesProto2_NestedEnum.NEG: + return "NEG"; + default: + throw new tsProtoGlobalThis.Error( + "Unrecognized enum value " + object + " for enum TestAllRequiredTypesProto2_NestedEnum", + ); + } +} + +export interface TestAllRequiredTypesProto2_NestedMessage { + a: number; + corecursive: TestAllRequiredTypesProto2 | undefined; + optionalCorecursive: TestAllRequiredTypesProto2 | undefined; +} + +/** groups */ +export interface TestAllRequiredTypesProto2_Data { + groupInt32: number; + groupUint32: number; +} + +/** message_set test case. */ +export interface TestAllRequiredTypesProto2_MessageSetCorrect { +} + +export interface TestAllRequiredTypesProto2_MessageSetCorrectExtension1 { + str: string; +} + +export interface TestAllRequiredTypesProto2_MessageSetCorrectExtension2 { + i: number; +} + +function createBaseTestAllTypesProto2(): TestAllTypesProto2 { + return { + optionalInt32: 0, + optionalInt64: 0, + optionalUint32: 0, + optionalUint64: 0, + optionalSint32: 0, + optionalSint64: 0, + optionalFixed32: 0, + optionalFixed64: 0, + optionalSfixed32: 0, + optionalSfixed64: 0, + optionalFloat: 0, + optionalDouble: 0, + optionalBool: false, + optionalString: "", + optionalBytes: new Uint8Array(0), + optionalNestedMessage: undefined, + optionalForeignMessage: undefined, + optionalNestedEnum: 0, + optionalForeignEnum: 0, + optionalStringPiece: "", + optionalCord: "", + recursiveMessage: undefined, + repeatedInt32: [], + repeatedInt64: [], + repeatedUint32: [], + repeatedUint64: [], + repeatedSint32: [], + repeatedSint64: [], + repeatedFixed32: [], + repeatedFixed64: [], + repeatedSfixed32: [], + repeatedSfixed64: [], + repeatedFloat: [], + repeatedDouble: [], + repeatedBool: [], + repeatedString: [], + repeatedBytes: [], + repeatedNestedMessage: [], + repeatedForeignMessage: [], + repeatedNestedEnum: [], + repeatedForeignEnum: [], + repeatedStringPiece: [], + repeatedCord: [], + packedInt32: [], + packedInt64: [], + packedUint32: [], + packedUint64: [], + packedSint32: [], + packedSint64: [], + packedFixed32: [], + packedFixed64: [], + packedSfixed32: [], + packedSfixed64: [], + packedFloat: [], + packedDouble: [], + packedBool: [], + packedNestedEnum: [], + unpackedInt32: [], + unpackedInt64: [], + unpackedUint32: [], + unpackedUint64: [], + unpackedSint32: [], + unpackedSint64: [], + unpackedFixed32: [], + unpackedFixed64: [], + unpackedSfixed32: [], + unpackedSfixed64: [], + unpackedFloat: [], + unpackedDouble: [], + unpackedBool: [], + unpackedNestedEnum: [], + mapInt32Int32: new Map(), + mapInt64Int64: new Map(), + mapUint32Uint32: new Map(), + mapUint64Uint64: new Map(), + mapSint32Sint32: new Map(), + mapSint64Sint64: new Map(), + mapFixed32Fixed32: new Map(), + mapFixed64Fixed64: new Map(), + mapSfixed32Sfixed32: new Map(), + mapSfixed64Sfixed64: new Map(), + mapInt32Float: new Map(), + mapInt32Double: new Map(), + mapBoolBool: new Map(), + mapStringString: new Map(), + mapStringBytes: new Map(), + mapStringNestedMessage: new Map(), + mapStringForeignMessage: new Map(), + mapStringNestedEnum: new Map(), + mapStringForeignEnum: new Map(), + oneofField: undefined, + data: undefined, + defaultInt32: 0, + defaultInt64: 0, + defaultUint32: 0, + defaultUint64: 0, + defaultSint32: 0, + defaultSint64: 0, + defaultFixed32: 0, + defaultFixed64: 0, + defaultSfixed32: 0, + defaultSfixed64: 0, + defaultFloat: 0, + defaultDouble: 0, + defaultBool: false, + defaultString: "", + defaultBytes: new Uint8Array(0), + fieldname1: 0, + fieldName2: 0, + FieldName3: 0, + fieldName4: 0, + field0name5: 0, + field0Name6: 0, + fieldName7: 0, + FieldName8: 0, + fieldName9: 0, + FieldName10: 0, + fieldName11: 0, + FIELDName12: 0, + FieldName13: 0, + FieldName14: 0, + fieldName15: 0, + fieldName16: 0, + fieldName17: 0, + FieldName18: 0, + }; +} + +export const TestAllTypesProto2 = { + encode(message: TestAllTypesProto2, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.optionalInt32 !== 0) { + writer.uint32(8).int32(message.optionalInt32); + } + if (message.optionalInt64 !== 0) { + writer.uint32(16).int64(message.optionalInt64); + } + if (message.optionalUint32 !== 0) { + writer.uint32(24).uint32(message.optionalUint32); + } + if (message.optionalUint64 !== 0) { + writer.uint32(32).uint64(message.optionalUint64); + } + if (message.optionalSint32 !== 0) { + writer.uint32(40).sint32(message.optionalSint32); + } + if (message.optionalSint64 !== 0) { + writer.uint32(48).sint64(message.optionalSint64); + } + if (message.optionalFixed32 !== 0) { + writer.uint32(61).fixed32(message.optionalFixed32); + } + if (message.optionalFixed64 !== 0) { + writer.uint32(65).fixed64(message.optionalFixed64); + } + if (message.optionalSfixed32 !== 0) { + writer.uint32(77).sfixed32(message.optionalSfixed32); + } + if (message.optionalSfixed64 !== 0) { + writer.uint32(81).sfixed64(message.optionalSfixed64); + } + if (message.optionalFloat !== 0) { + writer.uint32(93).float(message.optionalFloat); + } + if (message.optionalDouble !== 0) { + writer.uint32(97).double(message.optionalDouble); + } + if (message.optionalBool === true) { + writer.uint32(104).bool(message.optionalBool); + } + if (message.optionalString !== "") { + writer.uint32(114).string(message.optionalString); + } + if (message.optionalBytes.length !== 0) { + writer.uint32(122).bytes(message.optionalBytes); + } + if (message.optionalNestedMessage !== undefined) { + TestAllTypesProto2_NestedMessage.encode(message.optionalNestedMessage, writer.uint32(146).fork()).ldelim(); + } + if (message.optionalForeignMessage !== undefined) { + ForeignMessageProto2.encode(message.optionalForeignMessage, writer.uint32(154).fork()).ldelim(); + } + if (message.optionalNestedEnum !== 0) { + writer.uint32(168).int32(message.optionalNestedEnum); + } + if (message.optionalForeignEnum !== 0) { + writer.uint32(176).int32(message.optionalForeignEnum); + } + if (message.optionalStringPiece !== "") { + writer.uint32(194).string(message.optionalStringPiece); + } + if (message.optionalCord !== "") { + writer.uint32(202).string(message.optionalCord); + } + if (message.recursiveMessage !== undefined) { + TestAllTypesProto2.encode(message.recursiveMessage, writer.uint32(218).fork()).ldelim(); + } + writer.uint32(250).fork(); + for (const v of message.repeatedInt32) { + writer.int32(v); + } + writer.ldelim(); + writer.uint32(258).fork(); + for (const v of message.repeatedInt64) { + writer.int64(v); + } + writer.ldelim(); + writer.uint32(266).fork(); + for (const v of message.repeatedUint32) { + writer.uint32(v); + } + writer.ldelim(); + writer.uint32(274).fork(); + for (const v of message.repeatedUint64) { + writer.uint64(v); + } + writer.ldelim(); + writer.uint32(282).fork(); + for (const v of message.repeatedSint32) { + writer.sint32(v); + } + writer.ldelim(); + writer.uint32(290).fork(); + for (const v of message.repeatedSint64) { + writer.sint64(v); + } + writer.ldelim(); + writer.uint32(298).fork(); + for (const v of message.repeatedFixed32) { + writer.fixed32(v); + } + writer.ldelim(); + writer.uint32(306).fork(); + for (const v of message.repeatedFixed64) { + writer.fixed64(v); + } + writer.ldelim(); + writer.uint32(314).fork(); + for (const v of message.repeatedSfixed32) { + writer.sfixed32(v); + } + writer.ldelim(); + writer.uint32(322).fork(); + for (const v of message.repeatedSfixed64) { + writer.sfixed64(v); + } + writer.ldelim(); + writer.uint32(330).fork(); + for (const v of message.repeatedFloat) { + writer.float(v); + } + writer.ldelim(); + writer.uint32(338).fork(); + for (const v of message.repeatedDouble) { + writer.double(v); + } + writer.ldelim(); + writer.uint32(346).fork(); + for (const v of message.repeatedBool) { + writer.bool(v); + } + writer.ldelim(); + for (const v of message.repeatedString) { + writer.uint32(354).string(v!); + } + for (const v of message.repeatedBytes) { + writer.uint32(362).bytes(v!); + } + for (const v of message.repeatedNestedMessage) { + TestAllTypesProto2_NestedMessage.encode(v!, writer.uint32(386).fork()).ldelim(); + } + for (const v of message.repeatedForeignMessage) { + ForeignMessageProto2.encode(v!, writer.uint32(394).fork()).ldelim(); + } + writer.uint32(410).fork(); + for (const v of message.repeatedNestedEnum) { + writer.int32(v); + } + writer.ldelim(); + writer.uint32(418).fork(); + for (const v of message.repeatedForeignEnum) { + writer.int32(v); + } + writer.ldelim(); + for (const v of message.repeatedStringPiece) { + writer.uint32(434).string(v!); + } + for (const v of message.repeatedCord) { + writer.uint32(442).string(v!); + } + writer.uint32(602).fork(); + for (const v of message.packedInt32) { + writer.int32(v); + } + writer.ldelim(); + writer.uint32(610).fork(); + for (const v of message.packedInt64) { + writer.int64(v); + } + writer.ldelim(); + writer.uint32(618).fork(); + for (const v of message.packedUint32) { + writer.uint32(v); + } + writer.ldelim(); + writer.uint32(626).fork(); + for (const v of message.packedUint64) { + writer.uint64(v); + } + writer.ldelim(); + writer.uint32(634).fork(); + for (const v of message.packedSint32) { + writer.sint32(v); + } + writer.ldelim(); + writer.uint32(642).fork(); + for (const v of message.packedSint64) { + writer.sint64(v); + } + writer.ldelim(); + writer.uint32(650).fork(); + for (const v of message.packedFixed32) { + writer.fixed32(v); + } + writer.ldelim(); + writer.uint32(658).fork(); + for (const v of message.packedFixed64) { + writer.fixed64(v); + } + writer.ldelim(); + writer.uint32(666).fork(); + for (const v of message.packedSfixed32) { + writer.sfixed32(v); + } + writer.ldelim(); + writer.uint32(674).fork(); + for (const v of message.packedSfixed64) { + writer.sfixed64(v); + } + writer.ldelim(); + writer.uint32(682).fork(); + for (const v of message.packedFloat) { + writer.float(v); + } + writer.ldelim(); + writer.uint32(690).fork(); + for (const v of message.packedDouble) { + writer.double(v); + } + writer.ldelim(); + writer.uint32(698).fork(); + for (const v of message.packedBool) { + writer.bool(v); + } + writer.ldelim(); + writer.uint32(706).fork(); + for (const v of message.packedNestedEnum) { + writer.int32(v); + } + writer.ldelim(); + writer.uint32(714).fork(); + for (const v of message.unpackedInt32) { + writer.int32(v); + } + writer.ldelim(); + writer.uint32(722).fork(); + for (const v of message.unpackedInt64) { + writer.int64(v); + } + writer.ldelim(); + writer.uint32(730).fork(); + for (const v of message.unpackedUint32) { + writer.uint32(v); + } + writer.ldelim(); + writer.uint32(738).fork(); + for (const v of message.unpackedUint64) { + writer.uint64(v); + } + writer.ldelim(); + writer.uint32(746).fork(); + for (const v of message.unpackedSint32) { + writer.sint32(v); + } + writer.ldelim(); + writer.uint32(754).fork(); + for (const v of message.unpackedSint64) { + writer.sint64(v); + } + writer.ldelim(); + writer.uint32(762).fork(); + for (const v of message.unpackedFixed32) { + writer.fixed32(v); + } + writer.ldelim(); + writer.uint32(770).fork(); + for (const v of message.unpackedFixed64) { + writer.fixed64(v); + } + writer.ldelim(); + writer.uint32(778).fork(); + for (const v of message.unpackedSfixed32) { + writer.sfixed32(v); + } + writer.ldelim(); + writer.uint32(786).fork(); + for (const v of message.unpackedSfixed64) { + writer.sfixed64(v); + } + writer.ldelim(); + writer.uint32(794).fork(); + for (const v of message.unpackedFloat) { + writer.float(v); + } + writer.ldelim(); + writer.uint32(802).fork(); + for (const v of message.unpackedDouble) { + writer.double(v); + } + writer.ldelim(); + writer.uint32(810).fork(); + for (const v of message.unpackedBool) { + writer.bool(v); + } + writer.ldelim(); + writer.uint32(818).fork(); + for (const v of message.unpackedNestedEnum) { + writer.int32(v); + } + writer.ldelim(); + (message.mapInt32Int32).forEach((value, key) => { + TestAllTypesProto2_MapInt32Int32Entry.encode({ key: key as any, value }, writer.uint32(450).fork()).ldelim(); + }); + (message.mapInt64Int64).forEach((value, key) => { + TestAllTypesProto2_MapInt64Int64Entry.encode({ key: key as any, value }, writer.uint32(458).fork()).ldelim(); + }); + (message.mapUint32Uint32).forEach((value, key) => { + TestAllTypesProto2_MapUint32Uint32Entry.encode({ key: key as any, value }, writer.uint32(466).fork()).ldelim(); + }); + (message.mapUint64Uint64).forEach((value, key) => { + TestAllTypesProto2_MapUint64Uint64Entry.encode({ key: key as any, value }, writer.uint32(474).fork()).ldelim(); + }); + (message.mapSint32Sint32).forEach((value, key) => { + TestAllTypesProto2_MapSint32Sint32Entry.encode({ key: key as any, value }, writer.uint32(482).fork()).ldelim(); + }); + (message.mapSint64Sint64).forEach((value, key) => { + TestAllTypesProto2_MapSint64Sint64Entry.encode({ key: key as any, value }, writer.uint32(490).fork()).ldelim(); + }); + (message.mapFixed32Fixed32).forEach((value, key) => { + TestAllTypesProto2_MapFixed32Fixed32Entry.encode({ key: key as any, value }, writer.uint32(498).fork()).ldelim(); + }); + (message.mapFixed64Fixed64).forEach((value, key) => { + TestAllTypesProto2_MapFixed64Fixed64Entry.encode({ key: key as any, value }, writer.uint32(506).fork()).ldelim(); + }); + (message.mapSfixed32Sfixed32).forEach((value, key) => { + TestAllTypesProto2_MapSfixed32Sfixed32Entry.encode({ key: key as any, value }, writer.uint32(514).fork()) + .ldelim(); + }); + (message.mapSfixed64Sfixed64).forEach((value, key) => { + TestAllTypesProto2_MapSfixed64Sfixed64Entry.encode({ key: key as any, value }, writer.uint32(522).fork()) + .ldelim(); + }); + (message.mapInt32Float).forEach((value, key) => { + TestAllTypesProto2_MapInt32FloatEntry.encode({ key: key as any, value }, writer.uint32(530).fork()).ldelim(); + }); + (message.mapInt32Double).forEach((value, key) => { + TestAllTypesProto2_MapInt32DoubleEntry.encode({ key: key as any, value }, writer.uint32(538).fork()).ldelim(); + }); + (message.mapBoolBool).forEach((value, key) => { + TestAllTypesProto2_MapBoolBoolEntry.encode({ key: key as any, value }, writer.uint32(546).fork()).ldelim(); + }); + (message.mapStringString).forEach((value, key) => { + TestAllTypesProto2_MapStringStringEntry.encode({ key: key as any, value }, writer.uint32(554).fork()).ldelim(); + }); + (message.mapStringBytes).forEach((value, key) => { + TestAllTypesProto2_MapStringBytesEntry.encode({ key: key as any, value }, writer.uint32(562).fork()).ldelim(); + }); + (message.mapStringNestedMessage).forEach((value, key) => { + TestAllTypesProto2_MapStringNestedMessageEntry.encode({ key: key as any, value }, writer.uint32(570).fork()) + .ldelim(); + }); + (message.mapStringForeignMessage).forEach((value, key) => { + TestAllTypesProto2_MapStringForeignMessageEntry.encode({ key: key as any, value }, writer.uint32(578).fork()) + .ldelim(); + }); + (message.mapStringNestedEnum).forEach((value, key) => { + TestAllTypesProto2_MapStringNestedEnumEntry.encode({ key: key as any, value }, writer.uint32(586).fork()) + .ldelim(); + }); + (message.mapStringForeignEnum).forEach((value, key) => { + TestAllTypesProto2_MapStringForeignEnumEntry.encode({ key: key as any, value }, writer.uint32(594).fork()) + .ldelim(); + }); + switch (message.oneofField?.$case) { + case "oneofUint32": + writer.uint32(888).uint32(message.oneofField.oneofUint32); + break; + case "oneofNestedMessage": + TestAllTypesProto2_NestedMessage.encode(message.oneofField.oneofNestedMessage, writer.uint32(898).fork()) + .ldelim(); + break; + case "oneofString": + writer.uint32(906).string(message.oneofField.oneofString); + break; + case "oneofBytes": + writer.uint32(914).bytes(message.oneofField.oneofBytes); + break; + case "oneofBool": + writer.uint32(920).bool(message.oneofField.oneofBool); + break; + case "oneofUint64": + writer.uint32(928).uint64(message.oneofField.oneofUint64); + break; + case "oneofFloat": + writer.uint32(941).float(message.oneofField.oneofFloat); + break; + case "oneofDouble": + writer.uint32(945).double(message.oneofField.oneofDouble); + break; + case "oneofEnum": + writer.uint32(952).int32(message.oneofField.oneofEnum); + break; + } + if (message.data !== undefined) { + TestAllTypesProto2_Data.encode(message.data, writer.uint32(1611)).uint32(1612); + } + if (message.defaultInt32 !== 0) { + writer.uint32(1928).int32(message.defaultInt32); + } + if (message.defaultInt64 !== 0) { + writer.uint32(1936).int64(message.defaultInt64); + } + if (message.defaultUint32 !== 0) { + writer.uint32(1944).uint32(message.defaultUint32); + } + if (message.defaultUint64 !== 0) { + writer.uint32(1952).uint64(message.defaultUint64); + } + if (message.defaultSint32 !== 0) { + writer.uint32(1960).sint32(message.defaultSint32); + } + if (message.defaultSint64 !== 0) { + writer.uint32(1968).sint64(message.defaultSint64); + } + if (message.defaultFixed32 !== 0) { + writer.uint32(1981).fixed32(message.defaultFixed32); + } + if (message.defaultFixed64 !== 0) { + writer.uint32(1985).fixed64(message.defaultFixed64); + } + if (message.defaultSfixed32 !== 0) { + writer.uint32(1997).sfixed32(message.defaultSfixed32); + } + if (message.defaultSfixed64 !== 0) { + writer.uint32(2001).sfixed64(message.defaultSfixed64); + } + if (message.defaultFloat !== 0) { + writer.uint32(2013).float(message.defaultFloat); + } + if (message.defaultDouble !== 0) { + writer.uint32(2017).double(message.defaultDouble); + } + if (message.defaultBool === true) { + writer.uint32(2024).bool(message.defaultBool); + } + if (message.defaultString !== "") { + writer.uint32(2034).string(message.defaultString); + } + if (message.defaultBytes.length !== 0) { + writer.uint32(2042).bytes(message.defaultBytes); + } + if (message.fieldname1 !== 0) { + writer.uint32(3208).int32(message.fieldname1); + } + if (message.fieldName2 !== 0) { + writer.uint32(3216).int32(message.fieldName2); + } + if (message.FieldName3 !== 0) { + writer.uint32(3224).int32(message.FieldName3); + } + if (message.fieldName4 !== 0) { + writer.uint32(3232).int32(message.fieldName4); + } + if (message.field0name5 !== 0) { + writer.uint32(3240).int32(message.field0name5); + } + if (message.field0Name6 !== 0) { + writer.uint32(3248).int32(message.field0Name6); + } + if (message.fieldName7 !== 0) { + writer.uint32(3256).int32(message.fieldName7); + } + if (message.FieldName8 !== 0) { + writer.uint32(3264).int32(message.FieldName8); + } + if (message.fieldName9 !== 0) { + writer.uint32(3272).int32(message.fieldName9); + } + if (message.FieldName10 !== 0) { + writer.uint32(3280).int32(message.FieldName10); + } + if (message.fieldName11 !== 0) { + writer.uint32(3288).int32(message.fieldName11); + } + if (message.FIELDName12 !== 0) { + writer.uint32(3296).int32(message.FIELDName12); + } + if (message.FieldName13 !== 0) { + writer.uint32(3304).int32(message.FieldName13); + } + if (message.FieldName14 !== 0) { + writer.uint32(3312).int32(message.FieldName14); + } + if (message.fieldName15 !== 0) { + writer.uint32(3320).int32(message.fieldName15); + } + if (message.fieldName16 !== 0) { + writer.uint32(3328).int32(message.fieldName16); + } + if (message.fieldName17 !== 0) { + writer.uint32(3336).int32(message.fieldName17); + } + if (message.FieldName18 !== 0) { + writer.uint32(3344).int32(message.FieldName18); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.optionalInt32 = reader.int32(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.optionalInt64 = longToNumber(reader.int64() as Long); + continue; + case 3: + if (tag !== 24) { + break; + } + + message.optionalUint32 = reader.uint32(); + continue; + case 4: + if (tag !== 32) { + break; + } + + message.optionalUint64 = longToNumber(reader.uint64() as Long); + continue; + case 5: + if (tag !== 40) { + break; + } + + message.optionalSint32 = reader.sint32(); + continue; + case 6: + if (tag !== 48) { + break; + } + + message.optionalSint64 = longToNumber(reader.sint64() as Long); + continue; + case 7: + if (tag !== 61) { + break; + } + + message.optionalFixed32 = reader.fixed32(); + continue; + case 8: + if (tag !== 65) { + break; + } + + message.optionalFixed64 = longToNumber(reader.fixed64() as Long); + continue; + case 9: + if (tag !== 77) { + break; + } + + message.optionalSfixed32 = reader.sfixed32(); + continue; + case 10: + if (tag !== 81) { + break; + } + + message.optionalSfixed64 = longToNumber(reader.sfixed64() as Long); + continue; + case 11: + if (tag !== 93) { + break; + } + + message.optionalFloat = reader.float(); + continue; + case 12: + if (tag !== 97) { + break; + } + + message.optionalDouble = reader.double(); + continue; + case 13: + if (tag !== 104) { + break; + } + + message.optionalBool = reader.bool(); + continue; + case 14: + if (tag !== 114) { + break; + } + + message.optionalString = reader.string(); + continue; + case 15: + if (tag !== 122) { + break; + } + + message.optionalBytes = reader.bytes(); + continue; + case 18: + if (tag !== 146) { + break; + } + + message.optionalNestedMessage = TestAllTypesProto2_NestedMessage.decode(reader, reader.uint32()); + continue; + case 19: + if (tag !== 154) { + break; + } + + message.optionalForeignMessage = ForeignMessageProto2.decode(reader, reader.uint32()); + continue; + case 21: + if (tag !== 168) { + break; + } + + message.optionalNestedEnum = reader.int32() as any; + continue; + case 22: + if (tag !== 176) { + break; + } + + message.optionalForeignEnum = reader.int32() as any; + continue; + case 24: + if (tag !== 194) { + break; + } + + message.optionalStringPiece = reader.string(); + continue; + case 25: + if (tag !== 202) { + break; + } + + message.optionalCord = reader.string(); + continue; + case 27: + if (tag !== 218) { + break; + } + + message.recursiveMessage = TestAllTypesProto2.decode(reader, reader.uint32()); + continue; + case 31: + if (tag === 248) { + message.repeatedInt32.push(reader.int32()); + + continue; + } + + if (tag === 250) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedInt32.push(reader.int32()); + } + + continue; + } + + break; + case 32: + if (tag === 256) { + message.repeatedInt64.push(longToNumber(reader.int64() as Long)); + + continue; + } + + if (tag === 258) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedInt64.push(longToNumber(reader.int64() as Long)); + } + + continue; + } + + break; + case 33: + if (tag === 264) { + message.repeatedUint32.push(reader.uint32()); + + continue; + } + + if (tag === 266) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedUint32.push(reader.uint32()); + } + + continue; + } + + break; + case 34: + if (tag === 272) { + message.repeatedUint64.push(longToNumber(reader.uint64() as Long)); + + continue; + } + + if (tag === 274) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedUint64.push(longToNumber(reader.uint64() as Long)); + } + + continue; + } + + break; + case 35: + if (tag === 280) { + message.repeatedSint32.push(reader.sint32()); + + continue; + } + + if (tag === 282) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedSint32.push(reader.sint32()); + } + + continue; + } + + break; + case 36: + if (tag === 288) { + message.repeatedSint64.push(longToNumber(reader.sint64() as Long)); + + continue; + } + + if (tag === 290) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedSint64.push(longToNumber(reader.sint64() as Long)); + } + + continue; + } + + break; + case 37: + if (tag === 301) { + message.repeatedFixed32.push(reader.fixed32()); + + continue; + } + + if (tag === 298) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedFixed32.push(reader.fixed32()); + } + + continue; + } + + break; + case 38: + if (tag === 305) { + message.repeatedFixed64.push(longToNumber(reader.fixed64() as Long)); + + continue; + } + + if (tag === 306) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedFixed64.push(longToNumber(reader.fixed64() as Long)); + } + + continue; + } + + break; + case 39: + if (tag === 317) { + message.repeatedSfixed32.push(reader.sfixed32()); + + continue; + } + + if (tag === 314) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedSfixed32.push(reader.sfixed32()); + } + + continue; + } + + break; + case 40: + if (tag === 321) { + message.repeatedSfixed64.push(longToNumber(reader.sfixed64() as Long)); + + continue; + } + + if (tag === 322) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedSfixed64.push(longToNumber(reader.sfixed64() as Long)); + } + + continue; + } + + break; + case 41: + if (tag === 333) { + message.repeatedFloat.push(reader.float()); + + continue; + } + + if (tag === 330) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedFloat.push(reader.float()); + } + + continue; + } + + break; + case 42: + if (tag === 337) { + message.repeatedDouble.push(reader.double()); + + continue; + } + + if (tag === 338) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedDouble.push(reader.double()); + } + + continue; + } + + break; + case 43: + if (tag === 344) { + message.repeatedBool.push(reader.bool()); + + continue; + } + + if (tag === 346) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedBool.push(reader.bool()); + } + + continue; + } + + break; + case 44: + if (tag !== 354) { + break; + } + + message.repeatedString.push(reader.string()); + continue; + case 45: + if (tag !== 362) { + break; + } + + message.repeatedBytes.push(reader.bytes()); + continue; + case 48: + if (tag !== 386) { + break; + } + + message.repeatedNestedMessage.push(TestAllTypesProto2_NestedMessage.decode(reader, reader.uint32())); + continue; + case 49: + if (tag !== 394) { + break; + } + + message.repeatedForeignMessage.push(ForeignMessageProto2.decode(reader, reader.uint32())); + continue; + case 51: + if (tag === 408) { + message.repeatedNestedEnum.push(reader.int32() as any); + + continue; + } + + if (tag === 410) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedNestedEnum.push(reader.int32() as any); + } + + continue; + } + + break; + case 52: + if (tag === 416) { + message.repeatedForeignEnum.push(reader.int32() as any); + + continue; + } + + if (tag === 418) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedForeignEnum.push(reader.int32() as any); + } + + continue; + } + + break; + case 54: + if (tag !== 434) { + break; + } + + message.repeatedStringPiece.push(reader.string()); + continue; + case 55: + if (tag !== 442) { + break; + } + + message.repeatedCord.push(reader.string()); + continue; + case 75: + if (tag === 600) { + message.packedInt32.push(reader.int32()); + + continue; + } + + if (tag === 602) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedInt32.push(reader.int32()); + } + + continue; + } + + break; + case 76: + if (tag === 608) { + message.packedInt64.push(longToNumber(reader.int64() as Long)); + + continue; + } + + if (tag === 610) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedInt64.push(longToNumber(reader.int64() as Long)); + } + + continue; + } + + break; + case 77: + if (tag === 616) { + message.packedUint32.push(reader.uint32()); + + continue; + } + + if (tag === 618) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedUint32.push(reader.uint32()); + } + + continue; + } + + break; + case 78: + if (tag === 624) { + message.packedUint64.push(longToNumber(reader.uint64() as Long)); + + continue; + } + + if (tag === 626) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedUint64.push(longToNumber(reader.uint64() as Long)); + } + + continue; + } + + break; + case 79: + if (tag === 632) { + message.packedSint32.push(reader.sint32()); + + continue; + } + + if (tag === 634) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedSint32.push(reader.sint32()); + } + + continue; + } + + break; + case 80: + if (tag === 640) { + message.packedSint64.push(longToNumber(reader.sint64() as Long)); + + continue; + } + + if (tag === 642) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedSint64.push(longToNumber(reader.sint64() as Long)); + } + + continue; + } + + break; + case 81: + if (tag === 653) { + message.packedFixed32.push(reader.fixed32()); + + continue; + } + + if (tag === 650) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedFixed32.push(reader.fixed32()); + } + + continue; + } + + break; + case 82: + if (tag === 657) { + message.packedFixed64.push(longToNumber(reader.fixed64() as Long)); + + continue; + } + + if (tag === 658) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedFixed64.push(longToNumber(reader.fixed64() as Long)); + } + + continue; + } + + break; + case 83: + if (tag === 669) { + message.packedSfixed32.push(reader.sfixed32()); + + continue; + } + + if (tag === 666) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedSfixed32.push(reader.sfixed32()); + } + + continue; + } + + break; + case 84: + if (tag === 673) { + message.packedSfixed64.push(longToNumber(reader.sfixed64() as Long)); + + continue; + } + + if (tag === 674) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedSfixed64.push(longToNumber(reader.sfixed64() as Long)); + } + + continue; + } + + break; + case 85: + if (tag === 685) { + message.packedFloat.push(reader.float()); + + continue; + } + + if (tag === 682) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedFloat.push(reader.float()); + } + + continue; + } + + break; + case 86: + if (tag === 689) { + message.packedDouble.push(reader.double()); + + continue; + } + + if (tag === 690) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedDouble.push(reader.double()); + } + + continue; + } + + break; + case 87: + if (tag === 696) { + message.packedBool.push(reader.bool()); + + continue; + } + + if (tag === 698) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedBool.push(reader.bool()); + } + + continue; + } + + break; + case 88: + if (tag === 704) { + message.packedNestedEnum.push(reader.int32() as any); + + continue; + } + + if (tag === 706) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.packedNestedEnum.push(reader.int32() as any); + } + + continue; + } + + break; + case 89: + if (tag === 712) { + message.unpackedInt32.push(reader.int32()); + + continue; + } + + if (tag === 714) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedInt32.push(reader.int32()); + } + + continue; + } + + break; + case 90: + if (tag === 720) { + message.unpackedInt64.push(longToNumber(reader.int64() as Long)); + + continue; + } + + if (tag === 722) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedInt64.push(longToNumber(reader.int64() as Long)); + } + + continue; + } + + break; + case 91: + if (tag === 728) { + message.unpackedUint32.push(reader.uint32()); + + continue; + } + + if (tag === 730) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedUint32.push(reader.uint32()); + } + + continue; + } + + break; + case 92: + if (tag === 736) { + message.unpackedUint64.push(longToNumber(reader.uint64() as Long)); + + continue; + } + + if (tag === 738) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedUint64.push(longToNumber(reader.uint64() as Long)); + } + + continue; + } + + break; + case 93: + if (tag === 744) { + message.unpackedSint32.push(reader.sint32()); + + continue; + } + + if (tag === 746) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedSint32.push(reader.sint32()); + } + + continue; + } + + break; + case 94: + if (tag === 752) { + message.unpackedSint64.push(longToNumber(reader.sint64() as Long)); + + continue; + } + + if (tag === 754) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedSint64.push(longToNumber(reader.sint64() as Long)); + } + + continue; + } + + break; + case 95: + if (tag === 765) { + message.unpackedFixed32.push(reader.fixed32()); + + continue; + } + + if (tag === 762) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedFixed32.push(reader.fixed32()); + } + + continue; + } + + break; + case 96: + if (tag === 769) { + message.unpackedFixed64.push(longToNumber(reader.fixed64() as Long)); + + continue; + } + + if (tag === 770) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedFixed64.push(longToNumber(reader.fixed64() as Long)); + } + + continue; + } + + break; + case 97: + if (tag === 781) { + message.unpackedSfixed32.push(reader.sfixed32()); + + continue; + } + + if (tag === 778) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedSfixed32.push(reader.sfixed32()); + } + + continue; + } + + break; + case 98: + if (tag === 785) { + message.unpackedSfixed64.push(longToNumber(reader.sfixed64() as Long)); + + continue; + } + + if (tag === 786) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedSfixed64.push(longToNumber(reader.sfixed64() as Long)); + } + + continue; + } + + break; + case 99: + if (tag === 797) { + message.unpackedFloat.push(reader.float()); + + continue; + } + + if (tag === 794) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedFloat.push(reader.float()); + } + + continue; + } + + break; + case 100: + if (tag === 801) { + message.unpackedDouble.push(reader.double()); + + continue; + } + + if (tag === 802) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedDouble.push(reader.double()); + } + + continue; + } + + break; + case 101: + if (tag === 808) { + message.unpackedBool.push(reader.bool()); + + continue; + } + + if (tag === 810) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedBool.push(reader.bool()); + } + + continue; + } + + break; + case 102: + if (tag === 816) { + message.unpackedNestedEnum.push(reader.int32() as any); + + continue; + } + + if (tag === 818) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.unpackedNestedEnum.push(reader.int32() as any); + } + + continue; + } + + break; + case 56: + if (tag !== 450) { + break; + } + + const entry56 = TestAllTypesProto2_MapInt32Int32Entry.decode(reader, reader.uint32()); + if (entry56.value !== undefined) { + message.mapInt32Int32.set(entry56.key, entry56.value); + } + continue; + case 57: + if (tag !== 458) { + break; + } + + const entry57 = TestAllTypesProto2_MapInt64Int64Entry.decode(reader, reader.uint32()); + if (entry57.value !== undefined) { + message.mapInt64Int64.set(entry57.key, entry57.value); + } + continue; + case 58: + if (tag !== 466) { + break; + } + + const entry58 = TestAllTypesProto2_MapUint32Uint32Entry.decode(reader, reader.uint32()); + if (entry58.value !== undefined) { + message.mapUint32Uint32.set(entry58.key, entry58.value); + } + continue; + case 59: + if (tag !== 474) { + break; + } + + const entry59 = TestAllTypesProto2_MapUint64Uint64Entry.decode(reader, reader.uint32()); + if (entry59.value !== undefined) { + message.mapUint64Uint64.set(entry59.key, entry59.value); + } + continue; + case 60: + if (tag !== 482) { + break; + } + + const entry60 = TestAllTypesProto2_MapSint32Sint32Entry.decode(reader, reader.uint32()); + if (entry60.value !== undefined) { + message.mapSint32Sint32.set(entry60.key, entry60.value); + } + continue; + case 61: + if (tag !== 490) { + break; + } + + const entry61 = TestAllTypesProto2_MapSint64Sint64Entry.decode(reader, reader.uint32()); + if (entry61.value !== undefined) { + message.mapSint64Sint64.set(entry61.key, entry61.value); + } + continue; + case 62: + if (tag !== 498) { + break; + } + + const entry62 = TestAllTypesProto2_MapFixed32Fixed32Entry.decode(reader, reader.uint32()); + if (entry62.value !== undefined) { + message.mapFixed32Fixed32.set(entry62.key, entry62.value); + } + continue; + case 63: + if (tag !== 506) { + break; + } + + const entry63 = TestAllTypesProto2_MapFixed64Fixed64Entry.decode(reader, reader.uint32()); + if (entry63.value !== undefined) { + message.mapFixed64Fixed64.set(entry63.key, entry63.value); + } + continue; + case 64: + if (tag !== 514) { + break; + } + + const entry64 = TestAllTypesProto2_MapSfixed32Sfixed32Entry.decode(reader, reader.uint32()); + if (entry64.value !== undefined) { + message.mapSfixed32Sfixed32.set(entry64.key, entry64.value); + } + continue; + case 65: + if (tag !== 522) { + break; + } + + const entry65 = TestAllTypesProto2_MapSfixed64Sfixed64Entry.decode(reader, reader.uint32()); + if (entry65.value !== undefined) { + message.mapSfixed64Sfixed64.set(entry65.key, entry65.value); + } + continue; + case 66: + if (tag !== 530) { + break; + } + + const entry66 = TestAllTypesProto2_MapInt32FloatEntry.decode(reader, reader.uint32()); + if (entry66.value !== undefined) { + message.mapInt32Float.set(entry66.key, entry66.value); + } + continue; + case 67: + if (tag !== 538) { + break; + } + + const entry67 = TestAllTypesProto2_MapInt32DoubleEntry.decode(reader, reader.uint32()); + if (entry67.value !== undefined) { + message.mapInt32Double.set(entry67.key, entry67.value); + } + continue; + case 68: + if (tag !== 546) { + break; + } + + const entry68 = TestAllTypesProto2_MapBoolBoolEntry.decode(reader, reader.uint32()); + if (entry68.value !== undefined) { + message.mapBoolBool.set(entry68.key, entry68.value); + } + continue; + case 69: + if (tag !== 554) { + break; + } + + const entry69 = TestAllTypesProto2_MapStringStringEntry.decode(reader, reader.uint32()); + if (entry69.value !== undefined) { + message.mapStringString.set(entry69.key, entry69.value); + } + continue; + case 70: + if (tag !== 562) { + break; + } + + const entry70 = TestAllTypesProto2_MapStringBytesEntry.decode(reader, reader.uint32()); + if (entry70.value !== undefined) { + message.mapStringBytes.set(entry70.key, entry70.value); + } + continue; + case 71: + if (tag !== 570) { + break; + } + + const entry71 = TestAllTypesProto2_MapStringNestedMessageEntry.decode(reader, reader.uint32()); + if (entry71.value !== undefined) { + message.mapStringNestedMessage.set(entry71.key, entry71.value); + } + continue; + case 72: + if (tag !== 578) { + break; + } + + const entry72 = TestAllTypesProto2_MapStringForeignMessageEntry.decode(reader, reader.uint32()); + if (entry72.value !== undefined) { + message.mapStringForeignMessage.set(entry72.key, entry72.value); + } + continue; + case 73: + if (tag !== 586) { + break; + } + + const entry73 = TestAllTypesProto2_MapStringNestedEnumEntry.decode(reader, reader.uint32()); + if (entry73.value !== undefined) { + message.mapStringNestedEnum.set(entry73.key, entry73.value); + } + continue; + case 74: + if (tag !== 594) { + break; + } + + const entry74 = TestAllTypesProto2_MapStringForeignEnumEntry.decode(reader, reader.uint32()); + if (entry74.value !== undefined) { + message.mapStringForeignEnum.set(entry74.key, entry74.value); + } + continue; + case 111: + if (tag !== 888) { + break; + } + + message.oneofField = { $case: "oneofUint32", oneofUint32: reader.uint32() }; + continue; + case 112: + if (tag !== 898) { + break; + } + + message.oneofField = { + $case: "oneofNestedMessage", + oneofNestedMessage: TestAllTypesProto2_NestedMessage.decode(reader, reader.uint32()), + }; + continue; + case 113: + if (tag !== 906) { + break; + } + + message.oneofField = { $case: "oneofString", oneofString: reader.string() }; + continue; + case 114: + if (tag !== 914) { + break; + } + + message.oneofField = { $case: "oneofBytes", oneofBytes: reader.bytes() }; + continue; + case 115: + if (tag !== 920) { + break; + } + + message.oneofField = { $case: "oneofBool", oneofBool: reader.bool() }; + continue; + case 116: + if (tag !== 928) { + break; + } + + message.oneofField = { $case: "oneofUint64", oneofUint64: longToNumber(reader.uint64() as Long) }; + continue; + case 117: + if (tag !== 941) { + break; + } + + message.oneofField = { $case: "oneofFloat", oneofFloat: reader.float() }; + continue; + case 118: + if (tag !== 945) { + break; + } + + message.oneofField = { $case: "oneofDouble", oneofDouble: reader.double() }; + continue; + case 119: + if (tag !== 952) { + break; + } + + message.oneofField = { $case: "oneofEnum", oneofEnum: reader.int32() as any }; + continue; + case 201: + if (tag !== 1611) { + break; + } + + message.data = TestAllTypesProto2_Data.decode(reader); + continue; + case 241: + if (tag !== 1928) { + break; + } + + message.defaultInt32 = reader.int32(); + continue; + case 242: + if (tag !== 1936) { + break; + } + + message.defaultInt64 = longToNumber(reader.int64() as Long); + continue; + case 243: + if (tag !== 1944) { + break; + } + + message.defaultUint32 = reader.uint32(); + continue; + case 244: + if (tag !== 1952) { + break; + } + + message.defaultUint64 = longToNumber(reader.uint64() as Long); + continue; + case 245: + if (tag !== 1960) { + break; + } + + message.defaultSint32 = reader.sint32(); + continue; + case 246: + if (tag !== 1968) { + break; + } + + message.defaultSint64 = longToNumber(reader.sint64() as Long); + continue; + case 247: + if (tag !== 1981) { + break; + } + + message.defaultFixed32 = reader.fixed32(); + continue; + case 248: + if (tag !== 1985) { + break; + } + + message.defaultFixed64 = longToNumber(reader.fixed64() as Long); + continue; + case 249: + if (tag !== 1997) { + break; + } + + message.defaultSfixed32 = reader.sfixed32(); + continue; + case 250: + if (tag !== 2001) { + break; + } + + message.defaultSfixed64 = longToNumber(reader.sfixed64() as Long); + continue; + case 251: + if (tag !== 2013) { + break; + } + + message.defaultFloat = reader.float(); + continue; + case 252: + if (tag !== 2017) { + break; + } + + message.defaultDouble = reader.double(); + continue; + case 253: + if (tag !== 2024) { + break; + } + + message.defaultBool = reader.bool(); + continue; + case 254: + if (tag !== 2034) { + break; + } + + message.defaultString = reader.string(); + continue; + case 255: + if (tag !== 2042) { + break; + } + + message.defaultBytes = reader.bytes(); + continue; + case 401: + if (tag !== 3208) { + break; + } + + message.fieldname1 = reader.int32(); + continue; + case 402: + if (tag !== 3216) { + break; + } + + message.fieldName2 = reader.int32(); + continue; + case 403: + if (tag !== 3224) { + break; + } + + message.FieldName3 = reader.int32(); + continue; + case 404: + if (tag !== 3232) { + break; + } + + message.fieldName4 = reader.int32(); + continue; + case 405: + if (tag !== 3240) { + break; + } + + message.field0name5 = reader.int32(); + continue; + case 406: + if (tag !== 3248) { + break; + } + + message.field0Name6 = reader.int32(); + continue; + case 407: + if (tag !== 3256) { + break; + } + + message.fieldName7 = reader.int32(); + continue; + case 408: + if (tag !== 3264) { + break; + } + + message.FieldName8 = reader.int32(); + continue; + case 409: + if (tag !== 3272) { + break; + } + + message.fieldName9 = reader.int32(); + continue; + case 410: + if (tag !== 3280) { + break; + } + + message.FieldName10 = reader.int32(); + continue; + case 411: + if (tag !== 3288) { + break; + } + + message.fieldName11 = reader.int32(); + continue; + case 412: + if (tag !== 3296) { + break; + } + + message.FIELDName12 = reader.int32(); + continue; + case 413: + if (tag !== 3304) { + break; + } + + message.FieldName13 = reader.int32(); + continue; + case 414: + if (tag !== 3312) { + break; + } + + message.FieldName14 = reader.int32(); + continue; + case 415: + if (tag !== 3320) { + break; + } + + message.fieldName15 = reader.int32(); + continue; + case 416: + if (tag !== 3328) { + break; + } + + message.fieldName16 = reader.int32(); + continue; + case 417: + if (tag !== 3336) { + break; + } + + message.fieldName17 = reader.int32(); + continue; + case 418: + if (tag !== 3344) { + break; + } + + message.FieldName18 = reader.int32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2 { + return { + optionalInt32: isSet(object.optionalInt32) ? Number(object.optionalInt32) : 0, + optionalInt64: isSet(object.optionalInt64) ? Number(object.optionalInt64) : 0, + optionalUint32: isSet(object.optionalUint32) ? Number(object.optionalUint32) : 0, + optionalUint64: isSet(object.optionalUint64) ? Number(object.optionalUint64) : 0, + optionalSint32: isSet(object.optionalSint32) ? Number(object.optionalSint32) : 0, + optionalSint64: isSet(object.optionalSint64) ? Number(object.optionalSint64) : 0, + optionalFixed32: isSet(object.optionalFixed32) ? Number(object.optionalFixed32) : 0, + optionalFixed64: isSet(object.optionalFixed64) ? Number(object.optionalFixed64) : 0, + optionalSfixed32: isSet(object.optionalSfixed32) ? Number(object.optionalSfixed32) : 0, + optionalSfixed64: isSet(object.optionalSfixed64) ? Number(object.optionalSfixed64) : 0, + optionalFloat: isSet(object.optionalFloat) ? Number(object.optionalFloat) : 0, + optionalDouble: isSet(object.optionalDouble) ? Number(object.optionalDouble) : 0, + optionalBool: isSet(object.optionalBool) ? Boolean(object.optionalBool) : false, + optionalString: isSet(object.optionalString) ? String(object.optionalString) : "", + optionalBytes: isSet(object.optionalBytes) ? bytesFromBase64(object.optionalBytes) : new Uint8Array(0), + optionalNestedMessage: isSet(object.optionalNestedMessage) + ? TestAllTypesProto2_NestedMessage.fromJSON(object.optionalNestedMessage) + : undefined, + optionalForeignMessage: isSet(object.optionalForeignMessage) + ? ForeignMessageProto2.fromJSON(object.optionalForeignMessage) + : undefined, + optionalNestedEnum: isSet(object.optionalNestedEnum) + ? testAllTypesProto2_NestedEnumFromJSON(object.optionalNestedEnum) + : 0, + optionalForeignEnum: isSet(object.optionalForeignEnum) + ? foreignEnumProto2FromJSON(object.optionalForeignEnum) + : 0, + optionalStringPiece: isSet(object.optionalStringPiece) ? String(object.optionalStringPiece) : "", + optionalCord: isSet(object.optionalCord) ? String(object.optionalCord) : "", + recursiveMessage: isSet(object.recursiveMessage) + ? TestAllTypesProto2.fromJSON(object.recursiveMessage) + : undefined, + repeatedInt32: Array.isArray(object?.repeatedInt32) ? object.repeatedInt32.map((e: any) => Number(e)) : [], + repeatedInt64: Array.isArray(object?.repeatedInt64) ? object.repeatedInt64.map((e: any) => Number(e)) : [], + repeatedUint32: Array.isArray(object?.repeatedUint32) ? object.repeatedUint32.map((e: any) => Number(e)) : [], + repeatedUint64: Array.isArray(object?.repeatedUint64) ? object.repeatedUint64.map((e: any) => Number(e)) : [], + repeatedSint32: Array.isArray(object?.repeatedSint32) ? object.repeatedSint32.map((e: any) => Number(e)) : [], + repeatedSint64: Array.isArray(object?.repeatedSint64) ? object.repeatedSint64.map((e: any) => Number(e)) : [], + repeatedFixed32: Array.isArray(object?.repeatedFixed32) ? object.repeatedFixed32.map((e: any) => Number(e)) : [], + repeatedFixed64: Array.isArray(object?.repeatedFixed64) ? object.repeatedFixed64.map((e: any) => Number(e)) : [], + repeatedSfixed32: Array.isArray(object?.repeatedSfixed32) + ? object.repeatedSfixed32.map((e: any) => Number(e)) + : [], + repeatedSfixed64: Array.isArray(object?.repeatedSfixed64) + ? object.repeatedSfixed64.map((e: any) => Number(e)) + : [], + repeatedFloat: Array.isArray(object?.repeatedFloat) ? object.repeatedFloat.map((e: any) => Number(e)) : [], + repeatedDouble: Array.isArray(object?.repeatedDouble) ? object.repeatedDouble.map((e: any) => Number(e)) : [], + repeatedBool: Array.isArray(object?.repeatedBool) ? object.repeatedBool.map((e: any) => Boolean(e)) : [], + repeatedString: Array.isArray(object?.repeatedString) ? object.repeatedString.map((e: any) => String(e)) : [], + repeatedBytes: Array.isArray(object?.repeatedBytes) + ? object.repeatedBytes.map((e: any) => bytesFromBase64(e)) + : [], + repeatedNestedMessage: Array.isArray(object?.repeatedNestedMessage) + ? object.repeatedNestedMessage.map((e: any) => TestAllTypesProto2_NestedMessage.fromJSON(e)) + : [], + repeatedForeignMessage: Array.isArray(object?.repeatedForeignMessage) + ? object.repeatedForeignMessage.map((e: any) => ForeignMessageProto2.fromJSON(e)) + : [], + repeatedNestedEnum: Array.isArray(object?.repeatedNestedEnum) + ? object.repeatedNestedEnum.map((e: any) => testAllTypesProto2_NestedEnumFromJSON(e)) + : [], + repeatedForeignEnum: Array.isArray(object?.repeatedForeignEnum) + ? object.repeatedForeignEnum.map((e: any) => foreignEnumProto2FromJSON(e)) + : [], + repeatedStringPiece: Array.isArray(object?.repeatedStringPiece) + ? object.repeatedStringPiece.map((e: any) => String(e)) + : [], + repeatedCord: Array.isArray(object?.repeatedCord) ? object.repeatedCord.map((e: any) => String(e)) : [], + packedInt32: Array.isArray(object?.packedInt32) ? object.packedInt32.map((e: any) => Number(e)) : [], + packedInt64: Array.isArray(object?.packedInt64) ? object.packedInt64.map((e: any) => Number(e)) : [], + packedUint32: Array.isArray(object?.packedUint32) ? object.packedUint32.map((e: any) => Number(e)) : [], + packedUint64: Array.isArray(object?.packedUint64) ? object.packedUint64.map((e: any) => Number(e)) : [], + packedSint32: Array.isArray(object?.packedSint32) ? object.packedSint32.map((e: any) => Number(e)) : [], + packedSint64: Array.isArray(object?.packedSint64) ? object.packedSint64.map((e: any) => Number(e)) : [], + packedFixed32: Array.isArray(object?.packedFixed32) ? object.packedFixed32.map((e: any) => Number(e)) : [], + packedFixed64: Array.isArray(object?.packedFixed64) ? object.packedFixed64.map((e: any) => Number(e)) : [], + packedSfixed32: Array.isArray(object?.packedSfixed32) ? object.packedSfixed32.map((e: any) => Number(e)) : [], + packedSfixed64: Array.isArray(object?.packedSfixed64) ? object.packedSfixed64.map((e: any) => Number(e)) : [], + packedFloat: Array.isArray(object?.packedFloat) ? object.packedFloat.map((e: any) => Number(e)) : [], + packedDouble: Array.isArray(object?.packedDouble) ? object.packedDouble.map((e: any) => Number(e)) : [], + packedBool: Array.isArray(object?.packedBool) ? object.packedBool.map((e: any) => Boolean(e)) : [], + packedNestedEnum: Array.isArray(object?.packedNestedEnum) + ? object.packedNestedEnum.map((e: any) => testAllTypesProto2_NestedEnumFromJSON(e)) + : [], + unpackedInt32: Array.isArray(object?.unpackedInt32) ? object.unpackedInt32.map((e: any) => Number(e)) : [], + unpackedInt64: Array.isArray(object?.unpackedInt64) ? object.unpackedInt64.map((e: any) => Number(e)) : [], + unpackedUint32: Array.isArray(object?.unpackedUint32) ? object.unpackedUint32.map((e: any) => Number(e)) : [], + unpackedUint64: Array.isArray(object?.unpackedUint64) ? object.unpackedUint64.map((e: any) => Number(e)) : [], + unpackedSint32: Array.isArray(object?.unpackedSint32) ? object.unpackedSint32.map((e: any) => Number(e)) : [], + unpackedSint64: Array.isArray(object?.unpackedSint64) ? object.unpackedSint64.map((e: any) => Number(e)) : [], + unpackedFixed32: Array.isArray(object?.unpackedFixed32) ? object.unpackedFixed32.map((e: any) => Number(e)) : [], + unpackedFixed64: Array.isArray(object?.unpackedFixed64) ? object.unpackedFixed64.map((e: any) => Number(e)) : [], + unpackedSfixed32: Array.isArray(object?.unpackedSfixed32) + ? object.unpackedSfixed32.map((e: any) => Number(e)) + : [], + unpackedSfixed64: Array.isArray(object?.unpackedSfixed64) + ? object.unpackedSfixed64.map((e: any) => Number(e)) + : [], + unpackedFloat: Array.isArray(object?.unpackedFloat) ? object.unpackedFloat.map((e: any) => Number(e)) : [], + unpackedDouble: Array.isArray(object?.unpackedDouble) ? object.unpackedDouble.map((e: any) => Number(e)) : [], + unpackedBool: Array.isArray(object?.unpackedBool) ? object.unpackedBool.map((e: any) => Boolean(e)) : [], + unpackedNestedEnum: Array.isArray(object?.unpackedNestedEnum) + ? object.unpackedNestedEnum.map((e: any) => testAllTypesProto2_NestedEnumFromJSON(e)) + : [], + mapInt32Int32: isObject(object.mapInt32Int32) + ? Object.entries(object.mapInt32Int32).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapInt64Int64: isObject(object.mapInt64Int64) + ? Object.entries(object.mapInt64Int64).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapUint32Uint32: isObject(object.mapUint32Uint32) + ? Object.entries(object.mapUint32Uint32).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapUint64Uint64: isObject(object.mapUint64Uint64) + ? Object.entries(object.mapUint64Uint64).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapSint32Sint32: isObject(object.mapSint32Sint32) + ? Object.entries(object.mapSint32Sint32).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapSint64Sint64: isObject(object.mapSint64Sint64) + ? Object.entries(object.mapSint64Sint64).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapFixed32Fixed32: isObject(object.mapFixed32Fixed32) + ? Object.entries(object.mapFixed32Fixed32).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapFixed64Fixed64: isObject(object.mapFixed64Fixed64) + ? Object.entries(object.mapFixed64Fixed64).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapSfixed32Sfixed32: isObject(object.mapSfixed32Sfixed32) + ? Object.entries(object.mapSfixed32Sfixed32).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapSfixed64Sfixed64: isObject(object.mapSfixed64Sfixed64) + ? Object.entries(object.mapSfixed64Sfixed64).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapInt32Float: isObject(object.mapInt32Float) + ? Object.entries(object.mapInt32Float).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapInt32Double: isObject(object.mapInt32Double) + ? Object.entries(object.mapInt32Double).reduce>((acc, [key, value]) => { + acc.set(Number(key), Number(value)); + return acc; + }, new Map()) + : new Map(), + mapBoolBool: isObject(object.mapBoolBool) + ? Object.entries(object.mapBoolBool).reduce>((acc, [key, value]) => { + acc.set(Number(key), Boolean(value)); + return acc; + }, new Map()) + : new Map(), + mapStringString: isObject(object.mapStringString) + ? Object.entries(object.mapStringString).reduce>((acc, [key, value]) => { + acc.set(key, String(value)); + return acc; + }, new Map()) + : new Map(), + mapStringBytes: isObject(object.mapStringBytes) + ? Object.entries(object.mapStringBytes).reduce>((acc, [key, value]) => { + acc.set(key, bytesFromBase64(value as string)); + return acc; + }, new Map()) + : new Map(), + mapStringNestedMessage: isObject(object.mapStringNestedMessage) + ? Object.entries(object.mapStringNestedMessage).reduce>( + (acc, [key, value]) => { + acc.set(key, TestAllTypesProto2_NestedMessage.fromJSON(value)); + return acc; + }, + new Map(), + ) + : new Map(), + mapStringForeignMessage: isObject(object.mapStringForeignMessage) + ? Object.entries(object.mapStringForeignMessage).reduce>( + (acc, [key, value]) => { + acc.set(key, ForeignMessageProto2.fromJSON(value)); + return acc; + }, + new Map(), + ) + : new Map(), + mapStringNestedEnum: isObject(object.mapStringNestedEnum) + ? Object.entries(object.mapStringNestedEnum).reduce>( + (acc, [key, value]) => { + acc.set(key, testAllTypesProto2_NestedEnumFromJSON(value)); + return acc; + }, + new Map(), + ) + : new Map(), + mapStringForeignEnum: isObject(object.mapStringForeignEnum) + ? Object.entries(object.mapStringForeignEnum).reduce>((acc, [key, value]) => { + acc.set(key, foreignEnumProto2FromJSON(value)); + return acc; + }, new Map()) + : new Map(), + oneofField: isSet(object.oneofUint32) + ? { $case: "oneofUint32", oneofUint32: Number(object.oneofUint32) } + : isSet(object.oneofNestedMessage) + ? { + $case: "oneofNestedMessage", + oneofNestedMessage: TestAllTypesProto2_NestedMessage.fromJSON(object.oneofNestedMessage), + } + : isSet(object.oneofString) + ? { $case: "oneofString", oneofString: String(object.oneofString) } + : isSet(object.oneofBytes) + ? { $case: "oneofBytes", oneofBytes: bytesFromBase64(object.oneofBytes) } + : isSet(object.oneofBool) + ? { $case: "oneofBool", oneofBool: Boolean(object.oneofBool) } + : isSet(object.oneofUint64) + ? { $case: "oneofUint64", oneofUint64: Number(object.oneofUint64) } + : isSet(object.oneofFloat) + ? { $case: "oneofFloat", oneofFloat: Number(object.oneofFloat) } + : isSet(object.oneofDouble) + ? { $case: "oneofDouble", oneofDouble: Number(object.oneofDouble) } + : isSet(object.oneofEnum) + ? { $case: "oneofEnum", oneofEnum: testAllTypesProto2_NestedEnumFromJSON(object.oneofEnum) } + : undefined, + data: isSet(object.data) ? TestAllTypesProto2_Data.fromJSON(object.data) : undefined, + defaultInt32: isSet(object.defaultInt32) ? Number(object.defaultInt32) : 0, + defaultInt64: isSet(object.defaultInt64) ? Number(object.defaultInt64) : 0, + defaultUint32: isSet(object.defaultUint32) ? Number(object.defaultUint32) : 0, + defaultUint64: isSet(object.defaultUint64) ? Number(object.defaultUint64) : 0, + defaultSint32: isSet(object.defaultSint32) ? Number(object.defaultSint32) : 0, + defaultSint64: isSet(object.defaultSint64) ? Number(object.defaultSint64) : 0, + defaultFixed32: isSet(object.defaultFixed32) ? Number(object.defaultFixed32) : 0, + defaultFixed64: isSet(object.defaultFixed64) ? Number(object.defaultFixed64) : 0, + defaultSfixed32: isSet(object.defaultSfixed32) ? Number(object.defaultSfixed32) : 0, + defaultSfixed64: isSet(object.defaultSfixed64) ? Number(object.defaultSfixed64) : 0, + defaultFloat: isSet(object.defaultFloat) ? Number(object.defaultFloat) : 0, + defaultDouble: isSet(object.defaultDouble) ? Number(object.defaultDouble) : 0, + defaultBool: isSet(object.defaultBool) ? Boolean(object.defaultBool) : false, + defaultString: isSet(object.defaultString) ? String(object.defaultString) : "", + defaultBytes: isSet(object.defaultBytes) ? bytesFromBase64(object.defaultBytes) : new Uint8Array(0), + fieldname1: isSet(object.fieldname1) ? Number(object.fieldname1) : 0, + fieldName2: isSet(object.fieldName2) ? Number(object.fieldName2) : 0, + FieldName3: isSet(object.FieldName3) ? Number(object.FieldName3) : 0, + fieldName4: isSet(object.fieldName4) ? Number(object.fieldName4) : 0, + field0name5: isSet(object.field0name5) ? Number(object.field0name5) : 0, + field0Name6: isSet(object.field0Name6) ? Number(object.field0Name6) : 0, + fieldName7: isSet(object.fieldName7) ? Number(object.fieldName7) : 0, + FieldName8: isSet(object.FieldName8) ? Number(object.FieldName8) : 0, + fieldName9: isSet(object.fieldName9) ? Number(object.fieldName9) : 0, + FieldName10: isSet(object.FieldName10) ? Number(object.FieldName10) : 0, + fieldName11: isSet(object.FIELDNAME11) ? Number(object.FIELDNAME11) : 0, + FIELDName12: isSet(object.FIELDName12) ? Number(object.FIELDName12) : 0, + FieldName13: isSet(object.FieldName13) ? Number(object.FieldName13) : 0, + FieldName14: isSet(object.FieldName14) ? Number(object.FieldName14) : 0, + fieldName15: isSet(object.fieldName15) ? Number(object.fieldName15) : 0, + fieldName16: isSet(object.fieldName16) ? Number(object.fieldName16) : 0, + fieldName17: isSet(object.fieldName17) ? Number(object.fieldName17) : 0, + FieldName18: isSet(object.FieldName18) ? Number(object.FieldName18) : 0, + }; + }, + + toJSON(message: TestAllTypesProto2): unknown { + const obj: any = {}; + if (message.optionalInt32 !== 0) { + obj.optionalInt32 = Math.round(message.optionalInt32); + } + if (message.optionalInt64 !== 0) { + obj.optionalInt64 = Math.round(message.optionalInt64); + } + if (message.optionalUint32 !== 0) { + obj.optionalUint32 = Math.round(message.optionalUint32); + } + if (message.optionalUint64 !== 0) { + obj.optionalUint64 = Math.round(message.optionalUint64); + } + if (message.optionalSint32 !== 0) { + obj.optionalSint32 = Math.round(message.optionalSint32); + } + if (message.optionalSint64 !== 0) { + obj.optionalSint64 = Math.round(message.optionalSint64); + } + if (message.optionalFixed32 !== 0) { + obj.optionalFixed32 = Math.round(message.optionalFixed32); + } + if (message.optionalFixed64 !== 0) { + obj.optionalFixed64 = Math.round(message.optionalFixed64); + } + if (message.optionalSfixed32 !== 0) { + obj.optionalSfixed32 = Math.round(message.optionalSfixed32); + } + if (message.optionalSfixed64 !== 0) { + obj.optionalSfixed64 = Math.round(message.optionalSfixed64); + } + if (message.optionalFloat !== 0) { + obj.optionalFloat = message.optionalFloat; + } + if (message.optionalDouble !== 0) { + obj.optionalDouble = message.optionalDouble; + } + if (message.optionalBool === true) { + obj.optionalBool = message.optionalBool; + } + if (message.optionalString !== "") { + obj.optionalString = message.optionalString; + } + if (message.optionalBytes.length !== 0) { + obj.optionalBytes = base64FromBytes(message.optionalBytes); + } + if (message.optionalNestedMessage !== undefined) { + obj.optionalNestedMessage = TestAllTypesProto2_NestedMessage.toJSON(message.optionalNestedMessage); + } + if (message.optionalForeignMessage !== undefined) { + obj.optionalForeignMessage = ForeignMessageProto2.toJSON(message.optionalForeignMessage); + } + if (message.optionalNestedEnum !== 0) { + obj.optionalNestedEnum = testAllTypesProto2_NestedEnumToJSON(message.optionalNestedEnum); + } + if (message.optionalForeignEnum !== 0) { + obj.optionalForeignEnum = foreignEnumProto2ToJSON(message.optionalForeignEnum); + } + if (message.optionalStringPiece !== "") { + obj.optionalStringPiece = message.optionalStringPiece; + } + if (message.optionalCord !== "") { + obj.optionalCord = message.optionalCord; + } + if (message.recursiveMessage !== undefined) { + obj.recursiveMessage = TestAllTypesProto2.toJSON(message.recursiveMessage); + } + if (message.repeatedInt32?.length) { + obj.repeatedInt32 = message.repeatedInt32.map((e) => Math.round(e)); + } + if (message.repeatedInt64?.length) { + obj.repeatedInt64 = message.repeatedInt64.map((e) => Math.round(e)); + } + if (message.repeatedUint32?.length) { + obj.repeatedUint32 = message.repeatedUint32.map((e) => Math.round(e)); + } + if (message.repeatedUint64?.length) { + obj.repeatedUint64 = message.repeatedUint64.map((e) => Math.round(e)); + } + if (message.repeatedSint32?.length) { + obj.repeatedSint32 = message.repeatedSint32.map((e) => Math.round(e)); + } + if (message.repeatedSint64?.length) { + obj.repeatedSint64 = message.repeatedSint64.map((e) => Math.round(e)); + } + if (message.repeatedFixed32?.length) { + obj.repeatedFixed32 = message.repeatedFixed32.map((e) => Math.round(e)); + } + if (message.repeatedFixed64?.length) { + obj.repeatedFixed64 = message.repeatedFixed64.map((e) => Math.round(e)); + } + if (message.repeatedSfixed32?.length) { + obj.repeatedSfixed32 = message.repeatedSfixed32.map((e) => Math.round(e)); + } + if (message.repeatedSfixed64?.length) { + obj.repeatedSfixed64 = message.repeatedSfixed64.map((e) => Math.round(e)); + } + if (message.repeatedFloat?.length) { + obj.repeatedFloat = message.repeatedFloat; + } + if (message.repeatedDouble?.length) { + obj.repeatedDouble = message.repeatedDouble; + } + if (message.repeatedBool?.length) { + obj.repeatedBool = message.repeatedBool; + } + if (message.repeatedString?.length) { + obj.repeatedString = message.repeatedString; + } + if (message.repeatedBytes?.length) { + obj.repeatedBytes = message.repeatedBytes.map((e) => base64FromBytes(e)); + } + if (message.repeatedNestedMessage?.length) { + obj.repeatedNestedMessage = message.repeatedNestedMessage.map((e) => TestAllTypesProto2_NestedMessage.toJSON(e)); + } + if (message.repeatedForeignMessage?.length) { + obj.repeatedForeignMessage = message.repeatedForeignMessage.map((e) => ForeignMessageProto2.toJSON(e)); + } + if (message.repeatedNestedEnum?.length) { + obj.repeatedNestedEnum = message.repeatedNestedEnum.map((e) => testAllTypesProto2_NestedEnumToJSON(e)); + } + if (message.repeatedForeignEnum?.length) { + obj.repeatedForeignEnum = message.repeatedForeignEnum.map((e) => foreignEnumProto2ToJSON(e)); + } + if (message.repeatedStringPiece?.length) { + obj.repeatedStringPiece = message.repeatedStringPiece; + } + if (message.repeatedCord?.length) { + obj.repeatedCord = message.repeatedCord; + } + if (message.packedInt32?.length) { + obj.packedInt32 = message.packedInt32.map((e) => Math.round(e)); + } + if (message.packedInt64?.length) { + obj.packedInt64 = message.packedInt64.map((e) => Math.round(e)); + } + if (message.packedUint32?.length) { + obj.packedUint32 = message.packedUint32.map((e) => Math.round(e)); + } + if (message.packedUint64?.length) { + obj.packedUint64 = message.packedUint64.map((e) => Math.round(e)); + } + if (message.packedSint32?.length) { + obj.packedSint32 = message.packedSint32.map((e) => Math.round(e)); + } + if (message.packedSint64?.length) { + obj.packedSint64 = message.packedSint64.map((e) => Math.round(e)); + } + if (message.packedFixed32?.length) { + obj.packedFixed32 = message.packedFixed32.map((e) => Math.round(e)); + } + if (message.packedFixed64?.length) { + obj.packedFixed64 = message.packedFixed64.map((e) => Math.round(e)); + } + if (message.packedSfixed32?.length) { + obj.packedSfixed32 = message.packedSfixed32.map((e) => Math.round(e)); + } + if (message.packedSfixed64?.length) { + obj.packedSfixed64 = message.packedSfixed64.map((e) => Math.round(e)); + } + if (message.packedFloat?.length) { + obj.packedFloat = message.packedFloat; + } + if (message.packedDouble?.length) { + obj.packedDouble = message.packedDouble; + } + if (message.packedBool?.length) { + obj.packedBool = message.packedBool; + } + if (message.packedNestedEnum?.length) { + obj.packedNestedEnum = message.packedNestedEnum.map((e) => testAllTypesProto2_NestedEnumToJSON(e)); + } + if (message.unpackedInt32?.length) { + obj.unpackedInt32 = message.unpackedInt32.map((e) => Math.round(e)); + } + if (message.unpackedInt64?.length) { + obj.unpackedInt64 = message.unpackedInt64.map((e) => Math.round(e)); + } + if (message.unpackedUint32?.length) { + obj.unpackedUint32 = message.unpackedUint32.map((e) => Math.round(e)); + } + if (message.unpackedUint64?.length) { + obj.unpackedUint64 = message.unpackedUint64.map((e) => Math.round(e)); + } + if (message.unpackedSint32?.length) { + obj.unpackedSint32 = message.unpackedSint32.map((e) => Math.round(e)); + } + if (message.unpackedSint64?.length) { + obj.unpackedSint64 = message.unpackedSint64.map((e) => Math.round(e)); + } + if (message.unpackedFixed32?.length) { + obj.unpackedFixed32 = message.unpackedFixed32.map((e) => Math.round(e)); + } + if (message.unpackedFixed64?.length) { + obj.unpackedFixed64 = message.unpackedFixed64.map((e) => Math.round(e)); + } + if (message.unpackedSfixed32?.length) { + obj.unpackedSfixed32 = message.unpackedSfixed32.map((e) => Math.round(e)); + } + if (message.unpackedSfixed64?.length) { + obj.unpackedSfixed64 = message.unpackedSfixed64.map((e) => Math.round(e)); + } + if (message.unpackedFloat?.length) { + obj.unpackedFloat = message.unpackedFloat; + } + if (message.unpackedDouble?.length) { + obj.unpackedDouble = message.unpackedDouble; + } + if (message.unpackedBool?.length) { + obj.unpackedBool = message.unpackedBool; + } + if (message.unpackedNestedEnum?.length) { + obj.unpackedNestedEnum = message.unpackedNestedEnum.map((e) => testAllTypesProto2_NestedEnumToJSON(e)); + } + if (message.mapInt32Int32?.size) { + obj.mapInt32Int32 = {}; + message.mapInt32Int32.forEach((v, k) => { + obj.mapInt32Int32[k] = Math.round(v); + }); + } + if (message.mapInt64Int64?.size) { + obj.mapInt64Int64 = {}; + message.mapInt64Int64.forEach((v, k) => { + obj.mapInt64Int64[k] = Math.round(v); + }); + } + if (message.mapUint32Uint32?.size) { + obj.mapUint32Uint32 = {}; + message.mapUint32Uint32.forEach((v, k) => { + obj.mapUint32Uint32[k] = Math.round(v); + }); + } + if (message.mapUint64Uint64?.size) { + obj.mapUint64Uint64 = {}; + message.mapUint64Uint64.forEach((v, k) => { + obj.mapUint64Uint64[k] = Math.round(v); + }); + } + if (message.mapSint32Sint32?.size) { + obj.mapSint32Sint32 = {}; + message.mapSint32Sint32.forEach((v, k) => { + obj.mapSint32Sint32[k] = Math.round(v); + }); + } + if (message.mapSint64Sint64?.size) { + obj.mapSint64Sint64 = {}; + message.mapSint64Sint64.forEach((v, k) => { + obj.mapSint64Sint64[k] = Math.round(v); + }); + } + if (message.mapFixed32Fixed32?.size) { + obj.mapFixed32Fixed32 = {}; + message.mapFixed32Fixed32.forEach((v, k) => { + obj.mapFixed32Fixed32[k] = Math.round(v); + }); + } + if (message.mapFixed64Fixed64?.size) { + obj.mapFixed64Fixed64 = {}; + message.mapFixed64Fixed64.forEach((v, k) => { + obj.mapFixed64Fixed64[k] = Math.round(v); + }); + } + if (message.mapSfixed32Sfixed32?.size) { + obj.mapSfixed32Sfixed32 = {}; + message.mapSfixed32Sfixed32.forEach((v, k) => { + obj.mapSfixed32Sfixed32[k] = Math.round(v); + }); + } + if (message.mapSfixed64Sfixed64?.size) { + obj.mapSfixed64Sfixed64 = {}; + message.mapSfixed64Sfixed64.forEach((v, k) => { + obj.mapSfixed64Sfixed64[k] = Math.round(v); + }); + } + if (message.mapInt32Float?.size) { + obj.mapInt32Float = {}; + message.mapInt32Float.forEach((v, k) => { + obj.mapInt32Float[k] = v; + }); + } + if (message.mapInt32Double?.size) { + obj.mapInt32Double = {}; + message.mapInt32Double.forEach((v, k) => { + obj.mapInt32Double[k] = v; + }); + } + if (message.mapBoolBool?.size) { + obj.mapBoolBool = {}; + message.mapBoolBool.forEach((v, k) => { + obj.mapBoolBool[k] = v; + }); + } + if (message.mapStringString?.size) { + obj.mapStringString = {}; + message.mapStringString.forEach((v, k) => { + obj.mapStringString[k] = v; + }); + } + if (message.mapStringBytes?.size) { + obj.mapStringBytes = {}; + message.mapStringBytes.forEach((v, k) => { + obj.mapStringBytes[k] = base64FromBytes(v); + }); + } + if (message.mapStringNestedMessage?.size) { + obj.mapStringNestedMessage = {}; + message.mapStringNestedMessage.forEach((v, k) => { + obj.mapStringNestedMessage[k] = TestAllTypesProto2_NestedMessage.toJSON(v); + }); + } + if (message.mapStringForeignMessage?.size) { + obj.mapStringForeignMessage = {}; + message.mapStringForeignMessage.forEach((v, k) => { + obj.mapStringForeignMessage[k] = ForeignMessageProto2.toJSON(v); + }); + } + if (message.mapStringNestedEnum?.size) { + obj.mapStringNestedEnum = {}; + message.mapStringNestedEnum.forEach((v, k) => { + obj.mapStringNestedEnum[k] = testAllTypesProto2_NestedEnumToJSON(v); + }); + } + if (message.mapStringForeignEnum?.size) { + obj.mapStringForeignEnum = {}; + message.mapStringForeignEnum.forEach((v, k) => { + obj.mapStringForeignEnum[k] = foreignEnumProto2ToJSON(v); + }); + } + if (message.oneofField?.$case === "oneofUint32") { + obj.oneofUint32 = Math.round(message.oneofField.oneofUint32); + } + if (message.oneofField?.$case === "oneofNestedMessage") { + obj.oneofNestedMessage = TestAllTypesProto2_NestedMessage.toJSON(message.oneofField.oneofNestedMessage); + } + if (message.oneofField?.$case === "oneofString") { + obj.oneofString = message.oneofField.oneofString; + } + if (message.oneofField?.$case === "oneofBytes") { + obj.oneofBytes = base64FromBytes(message.oneofField.oneofBytes); + } + if (message.oneofField?.$case === "oneofBool") { + obj.oneofBool = message.oneofField.oneofBool; + } + if (message.oneofField?.$case === "oneofUint64") { + obj.oneofUint64 = Math.round(message.oneofField.oneofUint64); + } + if (message.oneofField?.$case === "oneofFloat") { + obj.oneofFloat = message.oneofField.oneofFloat; + } + if (message.oneofField?.$case === "oneofDouble") { + obj.oneofDouble = message.oneofField.oneofDouble; + } + if (message.oneofField?.$case === "oneofEnum") { + obj.oneofEnum = testAllTypesProto2_NestedEnumToJSON(message.oneofField.oneofEnum); + } + if (message.data !== undefined) { + obj.data = TestAllTypesProto2_Data.toJSON(message.data); + } + if (message.defaultInt32 !== 0) { + obj.defaultInt32 = Math.round(message.defaultInt32); + } + if (message.defaultInt64 !== 0) { + obj.defaultInt64 = Math.round(message.defaultInt64); + } + if (message.defaultUint32 !== 0) { + obj.defaultUint32 = Math.round(message.defaultUint32); + } + if (message.defaultUint64 !== 0) { + obj.defaultUint64 = Math.round(message.defaultUint64); + } + if (message.defaultSint32 !== 0) { + obj.defaultSint32 = Math.round(message.defaultSint32); + } + if (message.defaultSint64 !== 0) { + obj.defaultSint64 = Math.round(message.defaultSint64); + } + if (message.defaultFixed32 !== 0) { + obj.defaultFixed32 = Math.round(message.defaultFixed32); + } + if (message.defaultFixed64 !== 0) { + obj.defaultFixed64 = Math.round(message.defaultFixed64); + } + if (message.defaultSfixed32 !== 0) { + obj.defaultSfixed32 = Math.round(message.defaultSfixed32); + } + if (message.defaultSfixed64 !== 0) { + obj.defaultSfixed64 = Math.round(message.defaultSfixed64); + } + if (message.defaultFloat !== 0) { + obj.defaultFloat = message.defaultFloat; + } + if (message.defaultDouble !== 0) { + obj.defaultDouble = message.defaultDouble; + } + if (message.defaultBool === true) { + obj.defaultBool = message.defaultBool; + } + if (message.defaultString !== "") { + obj.defaultString = message.defaultString; + } + if (message.defaultBytes.length !== 0) { + obj.defaultBytes = base64FromBytes(message.defaultBytes); + } + if (message.fieldname1 !== 0) { + obj.fieldname1 = Math.round(message.fieldname1); + } + if (message.fieldName2 !== 0) { + obj.fieldName2 = Math.round(message.fieldName2); + } + if (message.FieldName3 !== 0) { + obj.FieldName3 = Math.round(message.FieldName3); + } + if (message.fieldName4 !== 0) { + obj.fieldName4 = Math.round(message.fieldName4); + } + if (message.field0name5 !== 0) { + obj.field0name5 = Math.round(message.field0name5); + } + if (message.field0Name6 !== 0) { + obj.field0Name6 = Math.round(message.field0Name6); + } + if (message.fieldName7 !== 0) { + obj.fieldName7 = Math.round(message.fieldName7); + } + if (message.FieldName8 !== 0) { + obj.FieldName8 = Math.round(message.FieldName8); + } + if (message.fieldName9 !== 0) { + obj.fieldName9 = Math.round(message.fieldName9); + } + if (message.FieldName10 !== 0) { + obj.FieldName10 = Math.round(message.FieldName10); + } + if (message.fieldName11 !== 0) { + obj.FIELDNAME11 = Math.round(message.fieldName11); + } + if (message.FIELDName12 !== 0) { + obj.FIELDName12 = Math.round(message.FIELDName12); + } + if (message.FieldName13 !== 0) { + obj.FieldName13 = Math.round(message.FieldName13); + } + if (message.FieldName14 !== 0) { + obj.FieldName14 = Math.round(message.FieldName14); + } + if (message.fieldName15 !== 0) { + obj.fieldName15 = Math.round(message.fieldName15); + } + if (message.fieldName16 !== 0) { + obj.fieldName16 = Math.round(message.fieldName16); + } + if (message.fieldName17 !== 0) { + obj.fieldName17 = Math.round(message.fieldName17); + } + if (message.FieldName18 !== 0) { + obj.FieldName18 = Math.round(message.FieldName18); + } + return obj; + }, + + create, I>>(base?: I): TestAllTypesProto2 { + return TestAllTypesProto2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(object: I): TestAllTypesProto2 { + const message = createBaseTestAllTypesProto2(); + message.optionalInt32 = object.optionalInt32 ?? 0; + message.optionalInt64 = object.optionalInt64 ?? 0; + message.optionalUint32 = object.optionalUint32 ?? 0; + message.optionalUint64 = object.optionalUint64 ?? 0; + message.optionalSint32 = object.optionalSint32 ?? 0; + message.optionalSint64 = object.optionalSint64 ?? 0; + message.optionalFixed32 = object.optionalFixed32 ?? 0; + message.optionalFixed64 = object.optionalFixed64 ?? 0; + message.optionalSfixed32 = object.optionalSfixed32 ?? 0; + message.optionalSfixed64 = object.optionalSfixed64 ?? 0; + message.optionalFloat = object.optionalFloat ?? 0; + message.optionalDouble = object.optionalDouble ?? 0; + message.optionalBool = object.optionalBool ?? false; + message.optionalString = object.optionalString ?? ""; + message.optionalBytes = object.optionalBytes ?? new Uint8Array(0); + message.optionalNestedMessage = + (object.optionalNestedMessage !== undefined && object.optionalNestedMessage !== null) + ? TestAllTypesProto2_NestedMessage.fromPartial(object.optionalNestedMessage) + : undefined; + message.optionalForeignMessage = + (object.optionalForeignMessage !== undefined && object.optionalForeignMessage !== null) + ? ForeignMessageProto2.fromPartial(object.optionalForeignMessage) + : undefined; + message.optionalNestedEnum = object.optionalNestedEnum ?? 0; + message.optionalForeignEnum = object.optionalForeignEnum ?? 0; + message.optionalStringPiece = object.optionalStringPiece ?? ""; + message.optionalCord = object.optionalCord ?? ""; + message.recursiveMessage = (object.recursiveMessage !== undefined && object.recursiveMessage !== null) + ? TestAllTypesProto2.fromPartial(object.recursiveMessage) + : undefined; + message.repeatedInt32 = object.repeatedInt32?.map((e) => e) || []; + message.repeatedInt64 = object.repeatedInt64?.map((e) => e) || []; + message.repeatedUint32 = object.repeatedUint32?.map((e) => e) || []; + message.repeatedUint64 = object.repeatedUint64?.map((e) => e) || []; + message.repeatedSint32 = object.repeatedSint32?.map((e) => e) || []; + message.repeatedSint64 = object.repeatedSint64?.map((e) => e) || []; + message.repeatedFixed32 = object.repeatedFixed32?.map((e) => e) || []; + message.repeatedFixed64 = object.repeatedFixed64?.map((e) => e) || []; + message.repeatedSfixed32 = object.repeatedSfixed32?.map((e) => e) || []; + message.repeatedSfixed64 = object.repeatedSfixed64?.map((e) => e) || []; + message.repeatedFloat = object.repeatedFloat?.map((e) => e) || []; + message.repeatedDouble = object.repeatedDouble?.map((e) => e) || []; + message.repeatedBool = object.repeatedBool?.map((e) => e) || []; + message.repeatedString = object.repeatedString?.map((e) => e) || []; + message.repeatedBytes = object.repeatedBytes?.map((e) => e) || []; + message.repeatedNestedMessage = + object.repeatedNestedMessage?.map((e) => TestAllTypesProto2_NestedMessage.fromPartial(e)) || []; + message.repeatedForeignMessage = object.repeatedForeignMessage?.map((e) => ForeignMessageProto2.fromPartial(e)) || + []; + message.repeatedNestedEnum = object.repeatedNestedEnum?.map((e) => e) || []; + message.repeatedForeignEnum = object.repeatedForeignEnum?.map((e) => e) || []; + message.repeatedStringPiece = object.repeatedStringPiece?.map((e) => e) || []; + message.repeatedCord = object.repeatedCord?.map((e) => e) || []; + message.packedInt32 = object.packedInt32?.map((e) => e) || []; + message.packedInt64 = object.packedInt64?.map((e) => e) || []; + message.packedUint32 = object.packedUint32?.map((e) => e) || []; + message.packedUint64 = object.packedUint64?.map((e) => e) || []; + message.packedSint32 = object.packedSint32?.map((e) => e) || []; + message.packedSint64 = object.packedSint64?.map((e) => e) || []; + message.packedFixed32 = object.packedFixed32?.map((e) => e) || []; + message.packedFixed64 = object.packedFixed64?.map((e) => e) || []; + message.packedSfixed32 = object.packedSfixed32?.map((e) => e) || []; + message.packedSfixed64 = object.packedSfixed64?.map((e) => e) || []; + message.packedFloat = object.packedFloat?.map((e) => e) || []; + message.packedDouble = object.packedDouble?.map((e) => e) || []; + message.packedBool = object.packedBool?.map((e) => e) || []; + message.packedNestedEnum = object.packedNestedEnum?.map((e) => e) || []; + message.unpackedInt32 = object.unpackedInt32?.map((e) => e) || []; + message.unpackedInt64 = object.unpackedInt64?.map((e) => e) || []; + message.unpackedUint32 = object.unpackedUint32?.map((e) => e) || []; + message.unpackedUint64 = object.unpackedUint64?.map((e) => e) || []; + message.unpackedSint32 = object.unpackedSint32?.map((e) => e) || []; + message.unpackedSint64 = object.unpackedSint64?.map((e) => e) || []; + message.unpackedFixed32 = object.unpackedFixed32?.map((e) => e) || []; + message.unpackedFixed64 = object.unpackedFixed64?.map((e) => e) || []; + message.unpackedSfixed32 = object.unpackedSfixed32?.map((e) => e) || []; + message.unpackedSfixed64 = object.unpackedSfixed64?.map((e) => e) || []; + message.unpackedFloat = object.unpackedFloat?.map((e) => e) || []; + message.unpackedDouble = object.unpackedDouble?.map((e) => e) || []; + message.unpackedBool = object.unpackedBool?.map((e) => e) || []; + message.unpackedNestedEnum = object.unpackedNestedEnum?.map((e) => e) || []; + message.mapInt32Int32 = (() => { + const m = new Map(); + (object.mapInt32Int32 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapInt64Int64 = (() => { + const m = new Map(); + (object.mapInt64Int64 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapUint32Uint32 = (() => { + const m = new Map(); + (object.mapUint32Uint32 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapUint64Uint64 = (() => { + const m = new Map(); + (object.mapUint64Uint64 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapSint32Sint32 = (() => { + const m = new Map(); + (object.mapSint32Sint32 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapSint64Sint64 = (() => { + const m = new Map(); + (object.mapSint64Sint64 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapFixed32Fixed32 = (() => { + const m = new Map(); + (object.mapFixed32Fixed32 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapFixed64Fixed64 = (() => { + const m = new Map(); + (object.mapFixed64Fixed64 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapSfixed32Sfixed32 = (() => { + const m = new Map(); + (object.mapSfixed32Sfixed32 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapSfixed64Sfixed64 = (() => { + const m = new Map(); + (object.mapSfixed64Sfixed64 as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapInt32Float = (() => { + const m = new Map(); + (object.mapInt32Float as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapInt32Double = (() => { + const m = new Map(); + (object.mapInt32Double as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Number(value)); + } + }); + return m; + })(); + message.mapBoolBool = (() => { + const m = new Map(); + (object.mapBoolBool as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, Boolean(value)); + } + }); + return m; + })(); + message.mapStringString = (() => { + const m = new Map(); + (object.mapStringString as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, String(value)); + } + }); + return m; + })(); + message.mapStringBytes = (() => { + const m = new Map(); + (object.mapStringBytes as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, value); + } + }); + return m; + })(); + message.mapStringNestedMessage = (() => { + const m = new Map(); + (object.mapStringNestedMessage as Map ?? new Map()).forEach( + (value, key) => { + if (value !== undefined) { + m.set(key, TestAllTypesProto2_NestedMessage.fromPartial(value)); + } + }, + ); + return m; + })(); + message.mapStringForeignMessage = (() => { + const m = new Map(); + (object.mapStringForeignMessage as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, ForeignMessageProto2.fromPartial(value)); + } + }); + return m; + })(); + message.mapStringNestedEnum = (() => { + const m = new Map(); + (object.mapStringNestedEnum as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, value as TestAllTypesProto2_NestedEnum); + } + }); + return m; + })(); + message.mapStringForeignEnum = (() => { + const m = new Map(); + (object.mapStringForeignEnum as Map ?? new Map()).forEach((value, key) => { + if (value !== undefined) { + m.set(key, value as ForeignEnumProto2); + } + }); + return m; + })(); + if ( + object.oneofField?.$case === "oneofUint32" && + object.oneofField?.oneofUint32 !== undefined && + object.oneofField?.oneofUint32 !== null + ) { + message.oneofField = { $case: "oneofUint32", oneofUint32: object.oneofField.oneofUint32 }; + } + if ( + object.oneofField?.$case === "oneofNestedMessage" && + object.oneofField?.oneofNestedMessage !== undefined && + object.oneofField?.oneofNestedMessage !== null + ) { + message.oneofField = { + $case: "oneofNestedMessage", + oneofNestedMessage: TestAllTypesProto2_NestedMessage.fromPartial(object.oneofField.oneofNestedMessage), + }; + } + if ( + object.oneofField?.$case === "oneofString" && + object.oneofField?.oneofString !== undefined && + object.oneofField?.oneofString !== null + ) { + message.oneofField = { $case: "oneofString", oneofString: object.oneofField.oneofString }; + } + if ( + object.oneofField?.$case === "oneofBytes" && + object.oneofField?.oneofBytes !== undefined && + object.oneofField?.oneofBytes !== null + ) { + message.oneofField = { $case: "oneofBytes", oneofBytes: object.oneofField.oneofBytes }; + } + if ( + object.oneofField?.$case === "oneofBool" && + object.oneofField?.oneofBool !== undefined && + object.oneofField?.oneofBool !== null + ) { + message.oneofField = { $case: "oneofBool", oneofBool: object.oneofField.oneofBool }; + } + if ( + object.oneofField?.$case === "oneofUint64" && + object.oneofField?.oneofUint64 !== undefined && + object.oneofField?.oneofUint64 !== null + ) { + message.oneofField = { $case: "oneofUint64", oneofUint64: object.oneofField.oneofUint64 }; + } + if ( + object.oneofField?.$case === "oneofFloat" && + object.oneofField?.oneofFloat !== undefined && + object.oneofField?.oneofFloat !== null + ) { + message.oneofField = { $case: "oneofFloat", oneofFloat: object.oneofField.oneofFloat }; + } + if ( + object.oneofField?.$case === "oneofDouble" && + object.oneofField?.oneofDouble !== undefined && + object.oneofField?.oneofDouble !== null + ) { + message.oneofField = { $case: "oneofDouble", oneofDouble: object.oneofField.oneofDouble }; + } + if ( + object.oneofField?.$case === "oneofEnum" && + object.oneofField?.oneofEnum !== undefined && + object.oneofField?.oneofEnum !== null + ) { + message.oneofField = { $case: "oneofEnum", oneofEnum: object.oneofField.oneofEnum }; + } + message.data = (object.data !== undefined && object.data !== null) + ? TestAllTypesProto2_Data.fromPartial(object.data) + : undefined; + message.defaultInt32 = object.defaultInt32 ?? 0; + message.defaultInt64 = object.defaultInt64 ?? 0; + message.defaultUint32 = object.defaultUint32 ?? 0; + message.defaultUint64 = object.defaultUint64 ?? 0; + message.defaultSint32 = object.defaultSint32 ?? 0; + message.defaultSint64 = object.defaultSint64 ?? 0; + message.defaultFixed32 = object.defaultFixed32 ?? 0; + message.defaultFixed64 = object.defaultFixed64 ?? 0; + message.defaultSfixed32 = object.defaultSfixed32 ?? 0; + message.defaultSfixed64 = object.defaultSfixed64 ?? 0; + message.defaultFloat = object.defaultFloat ?? 0; + message.defaultDouble = object.defaultDouble ?? 0; + message.defaultBool = object.defaultBool ?? false; + message.defaultString = object.defaultString ?? ""; + message.defaultBytes = object.defaultBytes ?? new Uint8Array(0); + message.fieldname1 = object.fieldname1 ?? 0; + message.fieldName2 = object.fieldName2 ?? 0; + message.FieldName3 = object.FieldName3 ?? 0; + message.fieldName4 = object.fieldName4 ?? 0; + message.field0name5 = object.field0name5 ?? 0; + message.field0Name6 = object.field0Name6 ?? 0; + message.fieldName7 = object.fieldName7 ?? 0; + message.FieldName8 = object.FieldName8 ?? 0; + message.fieldName9 = object.fieldName9 ?? 0; + message.FieldName10 = object.FieldName10 ?? 0; + message.fieldName11 = object.fieldName11 ?? 0; + message.FIELDName12 = object.FIELDName12 ?? 0; + message.FieldName13 = object.FieldName13 ?? 0; + message.FieldName14 = object.FieldName14 ?? 0; + message.fieldName15 = object.fieldName15 ?? 0; + message.fieldName16 = object.fieldName16 ?? 0; + message.fieldName17 = object.fieldName17 ?? 0; + message.FieldName18 = object.FieldName18 ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_NestedMessage(): TestAllTypesProto2_NestedMessage { + return { a: 0, corecursive: undefined }; +} + +export const TestAllTypesProto2_NestedMessage = { + encode(message: TestAllTypesProto2_NestedMessage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.a !== 0) { + writer.uint32(8).int32(message.a); + } + if (message.corecursive !== undefined) { + TestAllTypesProto2.encode(message.corecursive, writer.uint32(18).fork()).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_NestedMessage { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_NestedMessage(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.a = reader.int32(); + continue; + case 2: + if (tag !== 18) { + break; + } + + message.corecursive = TestAllTypesProto2.decode(reader, reader.uint32()); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_NestedMessage { + return { + a: isSet(object.a) ? Number(object.a) : 0, + corecursive: isSet(object.corecursive) ? TestAllTypesProto2.fromJSON(object.corecursive) : undefined, + }; + }, + + toJSON(message: TestAllTypesProto2_NestedMessage): unknown { + const obj: any = {}; + if (message.a !== 0) { + obj.a = Math.round(message.a); + } + if (message.corecursive !== undefined) { + obj.corecursive = TestAllTypesProto2.toJSON(message.corecursive); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_NestedMessage { + return TestAllTypesProto2_NestedMessage.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_NestedMessage { + const message = createBaseTestAllTypesProto2_NestedMessage(); + message.a = object.a ?? 0; + message.corecursive = (object.corecursive !== undefined && object.corecursive !== null) + ? TestAllTypesProto2.fromPartial(object.corecursive) + : undefined; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapInt32Int32Entry(): TestAllTypesProto2_MapInt32Int32Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapInt32Int32Entry = { + encode(message: TestAllTypesProto2_MapInt32Int32Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).int32(message.key); + } + if (message.value !== 0) { + writer.uint32(16).int32(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapInt32Int32Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapInt32Int32Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = reader.int32(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = reader.int32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapInt32Int32Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapInt32Int32Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapInt32Int32Entry { + return TestAllTypesProto2_MapInt32Int32Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapInt32Int32Entry { + const message = createBaseTestAllTypesProto2_MapInt32Int32Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapInt64Int64Entry(): TestAllTypesProto2_MapInt64Int64Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapInt64Int64Entry = { + encode(message: TestAllTypesProto2_MapInt64Int64Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).int64(message.key); + } + if (message.value !== 0) { + writer.uint32(16).int64(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapInt64Int64Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapInt64Int64Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = longToNumber(reader.int64() as Long); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = longToNumber(reader.int64() as Long); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapInt64Int64Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapInt64Int64Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapInt64Int64Entry { + return TestAllTypesProto2_MapInt64Int64Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapInt64Int64Entry { + const message = createBaseTestAllTypesProto2_MapInt64Int64Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapUint32Uint32Entry(): TestAllTypesProto2_MapUint32Uint32Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapUint32Uint32Entry = { + encode(message: TestAllTypesProto2_MapUint32Uint32Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).uint32(message.key); + } + if (message.value !== 0) { + writer.uint32(16).uint32(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapUint32Uint32Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapUint32Uint32Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = reader.uint32(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = reader.uint32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapUint32Uint32Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapUint32Uint32Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapUint32Uint32Entry { + return TestAllTypesProto2_MapUint32Uint32Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapUint32Uint32Entry { + const message = createBaseTestAllTypesProto2_MapUint32Uint32Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapUint64Uint64Entry(): TestAllTypesProto2_MapUint64Uint64Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapUint64Uint64Entry = { + encode(message: TestAllTypesProto2_MapUint64Uint64Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).uint64(message.key); + } + if (message.value !== 0) { + writer.uint32(16).uint64(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapUint64Uint64Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapUint64Uint64Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = longToNumber(reader.uint64() as Long); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = longToNumber(reader.uint64() as Long); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapUint64Uint64Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapUint64Uint64Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapUint64Uint64Entry { + return TestAllTypesProto2_MapUint64Uint64Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapUint64Uint64Entry { + const message = createBaseTestAllTypesProto2_MapUint64Uint64Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapSint32Sint32Entry(): TestAllTypesProto2_MapSint32Sint32Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapSint32Sint32Entry = { + encode(message: TestAllTypesProto2_MapSint32Sint32Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).sint32(message.key); + } + if (message.value !== 0) { + writer.uint32(16).sint32(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapSint32Sint32Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapSint32Sint32Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = reader.sint32(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = reader.sint32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapSint32Sint32Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapSint32Sint32Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapSint32Sint32Entry { + return TestAllTypesProto2_MapSint32Sint32Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapSint32Sint32Entry { + const message = createBaseTestAllTypesProto2_MapSint32Sint32Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapSint64Sint64Entry(): TestAllTypesProto2_MapSint64Sint64Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapSint64Sint64Entry = { + encode(message: TestAllTypesProto2_MapSint64Sint64Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).sint64(message.key); + } + if (message.value !== 0) { + writer.uint32(16).sint64(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapSint64Sint64Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapSint64Sint64Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = longToNumber(reader.sint64() as Long); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = longToNumber(reader.sint64() as Long); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapSint64Sint64Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapSint64Sint64Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapSint64Sint64Entry { + return TestAllTypesProto2_MapSint64Sint64Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapSint64Sint64Entry { + const message = createBaseTestAllTypesProto2_MapSint64Sint64Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapFixed32Fixed32Entry(): TestAllTypesProto2_MapFixed32Fixed32Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapFixed32Fixed32Entry = { + encode(message: TestAllTypesProto2_MapFixed32Fixed32Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(13).fixed32(message.key); + } + if (message.value !== 0) { + writer.uint32(21).fixed32(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapFixed32Fixed32Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapFixed32Fixed32Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 13) { + break; + } + + message.key = reader.fixed32(); + continue; + case 2: + if (tag !== 21) { + break; + } + + message.value = reader.fixed32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapFixed32Fixed32Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapFixed32Fixed32Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapFixed32Fixed32Entry { + return TestAllTypesProto2_MapFixed32Fixed32Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapFixed32Fixed32Entry { + const message = createBaseTestAllTypesProto2_MapFixed32Fixed32Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapFixed64Fixed64Entry(): TestAllTypesProto2_MapFixed64Fixed64Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapFixed64Fixed64Entry = { + encode(message: TestAllTypesProto2_MapFixed64Fixed64Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(9).fixed64(message.key); + } + if (message.value !== 0) { + writer.uint32(17).fixed64(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapFixed64Fixed64Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapFixed64Fixed64Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 9) { + break; + } + + message.key = longToNumber(reader.fixed64() as Long); + continue; + case 2: + if (tag !== 17) { + break; + } + + message.value = longToNumber(reader.fixed64() as Long); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapFixed64Fixed64Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapFixed64Fixed64Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapFixed64Fixed64Entry { + return TestAllTypesProto2_MapFixed64Fixed64Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapFixed64Fixed64Entry { + const message = createBaseTestAllTypesProto2_MapFixed64Fixed64Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapSfixed32Sfixed32Entry(): TestAllTypesProto2_MapSfixed32Sfixed32Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapSfixed32Sfixed32Entry = { + encode(message: TestAllTypesProto2_MapSfixed32Sfixed32Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(13).sfixed32(message.key); + } + if (message.value !== 0) { + writer.uint32(21).sfixed32(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapSfixed32Sfixed32Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapSfixed32Sfixed32Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 13) { + break; + } + + message.key = reader.sfixed32(); + continue; + case 2: + if (tag !== 21) { + break; + } + + message.value = reader.sfixed32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapSfixed32Sfixed32Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapSfixed32Sfixed32Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapSfixed32Sfixed32Entry { + return TestAllTypesProto2_MapSfixed32Sfixed32Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapSfixed32Sfixed32Entry { + const message = createBaseTestAllTypesProto2_MapSfixed32Sfixed32Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapSfixed64Sfixed64Entry(): TestAllTypesProto2_MapSfixed64Sfixed64Entry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapSfixed64Sfixed64Entry = { + encode(message: TestAllTypesProto2_MapSfixed64Sfixed64Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(9).sfixed64(message.key); + } + if (message.value !== 0) { + writer.uint32(17).sfixed64(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapSfixed64Sfixed64Entry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapSfixed64Sfixed64Entry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 9) { + break; + } + + message.key = longToNumber(reader.sfixed64() as Long); + continue; + case 2: + if (tag !== 17) { + break; + } + + message.value = longToNumber(reader.sfixed64() as Long); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapSfixed64Sfixed64Entry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapSfixed64Sfixed64Entry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = Math.round(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapSfixed64Sfixed64Entry { + return TestAllTypesProto2_MapSfixed64Sfixed64Entry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapSfixed64Sfixed64Entry { + const message = createBaseTestAllTypesProto2_MapSfixed64Sfixed64Entry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapInt32FloatEntry(): TestAllTypesProto2_MapInt32FloatEntry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapInt32FloatEntry = { + encode(message: TestAllTypesProto2_MapInt32FloatEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).int32(message.key); + } + if (message.value !== 0) { + writer.uint32(21).float(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapInt32FloatEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapInt32FloatEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = reader.int32(); + continue; + case 2: + if (tag !== 21) { + break; + } + + message.value = reader.float(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapInt32FloatEntry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapInt32FloatEntry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = message.value; + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapInt32FloatEntry { + return TestAllTypesProto2_MapInt32FloatEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapInt32FloatEntry { + const message = createBaseTestAllTypesProto2_MapInt32FloatEntry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapInt32DoubleEntry(): TestAllTypesProto2_MapInt32DoubleEntry { + return { key: 0, value: 0 }; +} + +export const TestAllTypesProto2_MapInt32DoubleEntry = { + encode(message: TestAllTypesProto2_MapInt32DoubleEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== 0) { + writer.uint32(8).int32(message.key); + } + if (message.value !== 0) { + writer.uint32(17).double(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapInt32DoubleEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapInt32DoubleEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = reader.int32(); + continue; + case 2: + if (tag !== 17) { + break; + } + + message.value = reader.double(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapInt32DoubleEntry { + return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MapInt32DoubleEntry): unknown { + const obj: any = {}; + if (message.key !== 0) { + obj.key = Math.round(message.key); + } + if (message.value !== 0) { + obj.value = message.value; + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapInt32DoubleEntry { + return TestAllTypesProto2_MapInt32DoubleEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapInt32DoubleEntry { + const message = createBaseTestAllTypesProto2_MapInt32DoubleEntry(); + message.key = object.key ?? 0; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapBoolBoolEntry(): TestAllTypesProto2_MapBoolBoolEntry { + return { key: false, value: false }; +} + +export const TestAllTypesProto2_MapBoolBoolEntry = { + encode(message: TestAllTypesProto2_MapBoolBoolEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key === true) { + writer.uint32(8).bool(message.key); + } + if (message.value === true) { + writer.uint32(16).bool(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapBoolBoolEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapBoolBoolEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.key = reader.bool(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = reader.bool(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapBoolBoolEntry { + return { + key: isSet(object.key) ? Boolean(object.key) : false, + value: isSet(object.value) ? Boolean(object.value) : false, + }; + }, + + toJSON(message: TestAllTypesProto2_MapBoolBoolEntry): unknown { + const obj: any = {}; + if (message.key === true) { + obj.key = message.key; + } + if (message.value === true) { + obj.value = message.value; + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapBoolBoolEntry { + return TestAllTypesProto2_MapBoolBoolEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapBoolBoolEntry { + const message = createBaseTestAllTypesProto2_MapBoolBoolEntry(); + message.key = object.key ?? false; + message.value = object.value ?? false; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapStringStringEntry(): TestAllTypesProto2_MapStringStringEntry { + return { key: "", value: "" }; +} + +export const TestAllTypesProto2_MapStringStringEntry = { + encode(message: TestAllTypesProto2_MapStringStringEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== "") { + writer.uint32(10).string(message.key); + } + if (message.value !== "") { + writer.uint32(18).string(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapStringStringEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapStringStringEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 10) { + break; + } + + message.key = reader.string(); + continue; + case 2: + if (tag !== 18) { + break; + } + + message.value = reader.string(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapStringStringEntry { + return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" }; + }, + + toJSON(message: TestAllTypesProto2_MapStringStringEntry): unknown { + const obj: any = {}; + if (message.key !== "") { + obj.key = message.key; + } + if (message.value !== "") { + obj.value = message.value; + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapStringStringEntry { + return TestAllTypesProto2_MapStringStringEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapStringStringEntry { + const message = createBaseTestAllTypesProto2_MapStringStringEntry(); + message.key = object.key ?? ""; + message.value = object.value ?? ""; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapStringBytesEntry(): TestAllTypesProto2_MapStringBytesEntry { + return { key: "", value: new Uint8Array(0) }; +} + +export const TestAllTypesProto2_MapStringBytesEntry = { + encode(message: TestAllTypesProto2_MapStringBytesEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== "") { + writer.uint32(10).string(message.key); + } + if (message.value.length !== 0) { + writer.uint32(18).bytes(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapStringBytesEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapStringBytesEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 10) { + break; + } + + message.key = reader.string(); + continue; + case 2: + if (tag !== 18) { + break; + } + + message.value = reader.bytes(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapStringBytesEntry { + return { + key: isSet(object.key) ? String(object.key) : "", + value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array(0), + }; + }, + + toJSON(message: TestAllTypesProto2_MapStringBytesEntry): unknown { + const obj: any = {}; + if (message.key !== "") { + obj.key = message.key; + } + if (message.value.length !== 0) { + obj.value = base64FromBytes(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapStringBytesEntry { + return TestAllTypesProto2_MapStringBytesEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapStringBytesEntry { + const message = createBaseTestAllTypesProto2_MapStringBytesEntry(); + message.key = object.key ?? ""; + message.value = object.value ?? new Uint8Array(0); + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapStringNestedMessageEntry(): TestAllTypesProto2_MapStringNestedMessageEntry { + return { key: "", value: undefined }; +} + +export const TestAllTypesProto2_MapStringNestedMessageEntry = { + encode( + message: TestAllTypesProto2_MapStringNestedMessageEntry, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.key !== "") { + writer.uint32(10).string(message.key); + } + if (message.value !== undefined) { + TestAllTypesProto2_NestedMessage.encode(message.value, writer.uint32(18).fork()).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapStringNestedMessageEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapStringNestedMessageEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 10) { + break; + } + + message.key = reader.string(); + continue; + case 2: + if (tag !== 18) { + break; + } + + message.value = TestAllTypesProto2_NestedMessage.decode(reader, reader.uint32()); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapStringNestedMessageEntry { + return { + key: isSet(object.key) ? String(object.key) : "", + value: isSet(object.value) ? TestAllTypesProto2_NestedMessage.fromJSON(object.value) : undefined, + }; + }, + + toJSON(message: TestAllTypesProto2_MapStringNestedMessageEntry): unknown { + const obj: any = {}; + if (message.key !== "") { + obj.key = message.key; + } + if (message.value !== undefined) { + obj.value = TestAllTypesProto2_NestedMessage.toJSON(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapStringNestedMessageEntry { + return TestAllTypesProto2_MapStringNestedMessageEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapStringNestedMessageEntry { + const message = createBaseTestAllTypesProto2_MapStringNestedMessageEntry(); + message.key = object.key ?? ""; + message.value = (object.value !== undefined && object.value !== null) + ? TestAllTypesProto2_NestedMessage.fromPartial(object.value) + : undefined; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapStringForeignMessageEntry(): TestAllTypesProto2_MapStringForeignMessageEntry { + return { key: "", value: undefined }; +} + +export const TestAllTypesProto2_MapStringForeignMessageEntry = { + encode( + message: TestAllTypesProto2_MapStringForeignMessageEntry, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.key !== "") { + writer.uint32(10).string(message.key); + } + if (message.value !== undefined) { + ForeignMessageProto2.encode(message.value, writer.uint32(18).fork()).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapStringForeignMessageEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapStringForeignMessageEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 10) { + break; + } + + message.key = reader.string(); + continue; + case 2: + if (tag !== 18) { + break; + } + + message.value = ForeignMessageProto2.decode(reader, reader.uint32()); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapStringForeignMessageEntry { + return { + key: isSet(object.key) ? String(object.key) : "", + value: isSet(object.value) ? ForeignMessageProto2.fromJSON(object.value) : undefined, + }; + }, + + toJSON(message: TestAllTypesProto2_MapStringForeignMessageEntry): unknown { + const obj: any = {}; + if (message.key !== "") { + obj.key = message.key; + } + if (message.value !== undefined) { + obj.value = ForeignMessageProto2.toJSON(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapStringForeignMessageEntry { + return TestAllTypesProto2_MapStringForeignMessageEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapStringForeignMessageEntry { + const message = createBaseTestAllTypesProto2_MapStringForeignMessageEntry(); + message.key = object.key ?? ""; + message.value = (object.value !== undefined && object.value !== null) + ? ForeignMessageProto2.fromPartial(object.value) + : undefined; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapStringNestedEnumEntry(): TestAllTypesProto2_MapStringNestedEnumEntry { + return { key: "", value: 0 }; +} + +export const TestAllTypesProto2_MapStringNestedEnumEntry = { + encode(message: TestAllTypesProto2_MapStringNestedEnumEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== "") { + writer.uint32(10).string(message.key); + } + if (message.value !== 0) { + writer.uint32(16).int32(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapStringNestedEnumEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapStringNestedEnumEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 10) { + break; + } + + message.key = reader.string(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = reader.int32() as any; + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapStringNestedEnumEntry { + return { + key: isSet(object.key) ? String(object.key) : "", + value: isSet(object.value) ? testAllTypesProto2_NestedEnumFromJSON(object.value) : 0, + }; + }, + + toJSON(message: TestAllTypesProto2_MapStringNestedEnumEntry): unknown { + const obj: any = {}; + if (message.key !== "") { + obj.key = message.key; + } + if (message.value !== 0) { + obj.value = testAllTypesProto2_NestedEnumToJSON(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapStringNestedEnumEntry { + return TestAllTypesProto2_MapStringNestedEnumEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapStringNestedEnumEntry { + const message = createBaseTestAllTypesProto2_MapStringNestedEnumEntry(); + message.key = object.key ?? ""; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MapStringForeignEnumEntry(): TestAllTypesProto2_MapStringForeignEnumEntry { + return { key: "", value: 0 }; +} + +export const TestAllTypesProto2_MapStringForeignEnumEntry = { + encode(message: TestAllTypesProto2_MapStringForeignEnumEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.key !== "") { + writer.uint32(10).string(message.key); + } + if (message.value !== 0) { + writer.uint32(16).int32(message.value); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MapStringForeignEnumEntry { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MapStringForeignEnumEntry(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 10) { + break; + } + + message.key = reader.string(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.value = reader.int32() as any; + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MapStringForeignEnumEntry { + return { + key: isSet(object.key) ? String(object.key) : "", + value: isSet(object.value) ? foreignEnumProto2FromJSON(object.value) : 0, + }; + }, + + toJSON(message: TestAllTypesProto2_MapStringForeignEnumEntry): unknown { + const obj: any = {}; + if (message.key !== "") { + obj.key = message.key; + } + if (message.value !== 0) { + obj.value = foreignEnumProto2ToJSON(message.value); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MapStringForeignEnumEntry { + return TestAllTypesProto2_MapStringForeignEnumEntry.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MapStringForeignEnumEntry { + const message = createBaseTestAllTypesProto2_MapStringForeignEnumEntry(); + message.key = object.key ?? ""; + message.value = object.value ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_Data(): TestAllTypesProto2_Data { + return { groupInt32: 0, groupUint32: 0 }; +} + +export const TestAllTypesProto2_Data = { + encode(message: TestAllTypesProto2_Data, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.groupInt32 !== 0) { + writer.uint32(1616).int32(message.groupInt32); + } + if (message.groupUint32 !== 0) { + writer.uint32(1624).uint32(message.groupUint32); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_Data { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_Data(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 202: + if (tag !== 1616) { + break; + } + + message.groupInt32 = reader.int32(); + continue; + case 203: + if (tag !== 1624) { + break; + } + + message.groupUint32 = reader.uint32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_Data { + return { + groupInt32: isSet(object.groupInt32) ? Number(object.groupInt32) : 0, + groupUint32: isSet(object.groupUint32) ? Number(object.groupUint32) : 0, + }; + }, + + toJSON(message: TestAllTypesProto2_Data): unknown { + const obj: any = {}; + if (message.groupInt32 !== 0) { + obj.groupInt32 = Math.round(message.groupInt32); + } + if (message.groupUint32 !== 0) { + obj.groupUint32 = Math.round(message.groupUint32); + } + return obj; + }, + + create, I>>(base?: I): TestAllTypesProto2_Data { + return TestAllTypesProto2_Data.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(object: I): TestAllTypesProto2_Data { + const message = createBaseTestAllTypesProto2_Data(); + message.groupInt32 = object.groupInt32 ?? 0; + message.groupUint32 = object.groupUint32 ?? 0; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MessageSetCorrect(): TestAllTypesProto2_MessageSetCorrect { + return {}; +} + +export const TestAllTypesProto2_MessageSetCorrect = { + encode(_: TestAllTypesProto2_MessageSetCorrect, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MessageSetCorrect { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MessageSetCorrect(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(_: any): TestAllTypesProto2_MessageSetCorrect { + return {}; + }, + + toJSON(_: TestAllTypesProto2_MessageSetCorrect): unknown { + const obj: any = {}; + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MessageSetCorrect { + return TestAllTypesProto2_MessageSetCorrect.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + _: I, + ): TestAllTypesProto2_MessageSetCorrect { + const message = createBaseTestAllTypesProto2_MessageSetCorrect(); + return message; + }, +}; + +function createBaseTestAllTypesProto2_MessageSetCorrectExtension1(): TestAllTypesProto2_MessageSetCorrectExtension1 { + return { str: "" }; +} + +export const TestAllTypesProto2_MessageSetCorrectExtension1 = { + encode( + message: TestAllTypesProto2_MessageSetCorrectExtension1, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.str !== "") { + writer.uint32(202).string(message.str); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MessageSetCorrectExtension1 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MessageSetCorrectExtension1(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 25: + if (tag !== 202) { + break; + } + + message.str = reader.string(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MessageSetCorrectExtension1 { + return { str: isSet(object.str) ? String(object.str) : "" }; + }, + + toJSON(message: TestAllTypesProto2_MessageSetCorrectExtension1): unknown { + const obj: any = {}; + if (message.str !== "") { + obj.str = message.str; + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MessageSetCorrectExtension1 { + return TestAllTypesProto2_MessageSetCorrectExtension1.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MessageSetCorrectExtension1 { + const message = createBaseTestAllTypesProto2_MessageSetCorrectExtension1(); + message.str = object.str ?? ""; + return message; + }, +}; + +function createBaseTestAllTypesProto2_MessageSetCorrectExtension2(): TestAllTypesProto2_MessageSetCorrectExtension2 { + return { i: 0 }; +} + +export const TestAllTypesProto2_MessageSetCorrectExtension2 = { + encode( + message: TestAllTypesProto2_MessageSetCorrectExtension2, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.i !== 0) { + writer.uint32(72).int32(message.i); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllTypesProto2_MessageSetCorrectExtension2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllTypesProto2_MessageSetCorrectExtension2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 9: + if (tag !== 72) { + break; + } + + message.i = reader.int32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllTypesProto2_MessageSetCorrectExtension2 { + return { i: isSet(object.i) ? Number(object.i) : 0 }; + }, + + toJSON(message: TestAllTypesProto2_MessageSetCorrectExtension2): unknown { + const obj: any = {}; + if (message.i !== 0) { + obj.i = Math.round(message.i); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllTypesProto2_MessageSetCorrectExtension2 { + return TestAllTypesProto2_MessageSetCorrectExtension2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllTypesProto2_MessageSetCorrectExtension2 { + const message = createBaseTestAllTypesProto2_MessageSetCorrectExtension2(); + message.i = object.i ?? 0; + return message; + }, +}; + +function createBaseForeignMessageProto2(): ForeignMessageProto2 { + return { c: 0 }; +} + +export const ForeignMessageProto2 = { + encode(message: ForeignMessageProto2, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.c !== 0) { + writer.uint32(8).int32(message.c); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): ForeignMessageProto2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseForeignMessageProto2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.c = reader.int32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): ForeignMessageProto2 { + return { c: isSet(object.c) ? Number(object.c) : 0 }; + }, + + toJSON(message: ForeignMessageProto2): unknown { + const obj: any = {}; + if (message.c !== 0) { + obj.c = Math.round(message.c); + } + return obj; + }, + + create, I>>(base?: I): ForeignMessageProto2 { + return ForeignMessageProto2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(object: I): ForeignMessageProto2 { + const message = createBaseForeignMessageProto2(); + message.c = object.c ?? 0; + return message; + }, +}; + +function createBaseUnknownToTestAllTypes(): UnknownToTestAllTypes { + return { + optionalInt32: 0, + optionalString: "", + nestedMessage: undefined, + optionalgroup: undefined, + optionalBool: false, + repeatedInt32: [], + }; +} + +export const UnknownToTestAllTypes = { + encode(message: UnknownToTestAllTypes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.optionalInt32 !== 0) { + writer.uint32(8008).int32(message.optionalInt32); + } + if (message.optionalString !== "") { + writer.uint32(8018).string(message.optionalString); + } + if (message.nestedMessage !== undefined) { + ForeignMessageProto2.encode(message.nestedMessage, writer.uint32(8026).fork()).ldelim(); + } + if (message.optionalgroup !== undefined) { + UnknownToTestAllTypes_OptionalGroup.encode(message.optionalgroup, writer.uint32(8035)).uint32(8036); + } + if (message.optionalBool === true) { + writer.uint32(8048).bool(message.optionalBool); + } + writer.uint32(8090).fork(); + for (const v of message.repeatedInt32) { + writer.int32(v); + } + writer.ldelim(); + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): UnknownToTestAllTypes { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseUnknownToTestAllTypes(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1001: + if (tag !== 8008) { + break; + } + + message.optionalInt32 = reader.int32(); + continue; + case 1002: + if (tag !== 8018) { + break; + } + + message.optionalString = reader.string(); + continue; + case 1003: + if (tag !== 8026) { + break; + } + + message.nestedMessage = ForeignMessageProto2.decode(reader, reader.uint32()); + continue; + case 1004: + if (tag !== 8035) { + break; + } + + message.optionalgroup = UnknownToTestAllTypes_OptionalGroup.decode(reader); + continue; + case 1006: + if (tag !== 8048) { + break; + } + + message.optionalBool = reader.bool(); + continue; + case 1011: + if (tag === 8088) { + message.repeatedInt32.push(reader.int32()); + + continue; + } + + if (tag === 8090) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.repeatedInt32.push(reader.int32()); + } + + continue; + } + + break; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): UnknownToTestAllTypes { + return { + optionalInt32: isSet(object.optionalInt32) ? Number(object.optionalInt32) : 0, + optionalString: isSet(object.optionalString) ? String(object.optionalString) : "", + nestedMessage: isSet(object.nestedMessage) ? ForeignMessageProto2.fromJSON(object.nestedMessage) : undefined, + optionalgroup: isSet(object.optionalgroup) + ? UnknownToTestAllTypes_OptionalGroup.fromJSON(object.optionalgroup) + : undefined, + optionalBool: isSet(object.optionalBool) ? Boolean(object.optionalBool) : false, + repeatedInt32: Array.isArray(object?.repeatedInt32) ? object.repeatedInt32.map((e: any) => Number(e)) : [], + }; + }, + + toJSON(message: UnknownToTestAllTypes): unknown { + const obj: any = {}; + if (message.optionalInt32 !== 0) { + obj.optionalInt32 = Math.round(message.optionalInt32); + } + if (message.optionalString !== "") { + obj.optionalString = message.optionalString; + } + if (message.nestedMessage !== undefined) { + obj.nestedMessage = ForeignMessageProto2.toJSON(message.nestedMessage); + } + if (message.optionalgroup !== undefined) { + obj.optionalgroup = UnknownToTestAllTypes_OptionalGroup.toJSON(message.optionalgroup); + } + if (message.optionalBool === true) { + obj.optionalBool = message.optionalBool; + } + if (message.repeatedInt32?.length) { + obj.repeatedInt32 = message.repeatedInt32.map((e) => Math.round(e)); + } + return obj; + }, + + create, I>>(base?: I): UnknownToTestAllTypes { + return UnknownToTestAllTypes.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(object: I): UnknownToTestAllTypes { + const message = createBaseUnknownToTestAllTypes(); + message.optionalInt32 = object.optionalInt32 ?? 0; + message.optionalString = object.optionalString ?? ""; + message.nestedMessage = (object.nestedMessage !== undefined && object.nestedMessage !== null) + ? ForeignMessageProto2.fromPartial(object.nestedMessage) + : undefined; + message.optionalgroup = (object.optionalgroup !== undefined && object.optionalgroup !== null) + ? UnknownToTestAllTypes_OptionalGroup.fromPartial(object.optionalgroup) + : undefined; + message.optionalBool = object.optionalBool ?? false; + message.repeatedInt32 = object.repeatedInt32?.map((e) => e) || []; + return message; + }, +}; + +function createBaseUnknownToTestAllTypes_OptionalGroup(): UnknownToTestAllTypes_OptionalGroup { + return { a: 0 }; +} + +export const UnknownToTestAllTypes_OptionalGroup = { + encode(message: UnknownToTestAllTypes_OptionalGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.a !== 0) { + writer.uint32(8).int32(message.a); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): UnknownToTestAllTypes_OptionalGroup { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseUnknownToTestAllTypes_OptionalGroup(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.a = reader.int32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): UnknownToTestAllTypes_OptionalGroup { + return { a: isSet(object.a) ? Number(object.a) : 0 }; + }, + + toJSON(message: UnknownToTestAllTypes_OptionalGroup): unknown { + const obj: any = {}; + if (message.a !== 0) { + obj.a = Math.round(message.a); + } + return obj; + }, + + create, I>>( + base?: I, + ): UnknownToTestAllTypes_OptionalGroup { + return UnknownToTestAllTypes_OptionalGroup.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): UnknownToTestAllTypes_OptionalGroup { + const message = createBaseUnknownToTestAllTypes_OptionalGroup(); + message.a = object.a ?? 0; + return message; + }, +}; + +function createBaseNullHypothesisProto2(): NullHypothesisProto2 { + return {}; +} + +export const NullHypothesisProto2 = { + encode(_: NullHypothesisProto2, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): NullHypothesisProto2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseNullHypothesisProto2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(_: any): NullHypothesisProto2 { + return {}; + }, + + toJSON(_: NullHypothesisProto2): unknown { + const obj: any = {}; + return obj; + }, + + create, I>>(base?: I): NullHypothesisProto2 { + return NullHypothesisProto2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(_: I): NullHypothesisProto2 { + const message = createBaseNullHypothesisProto2(); + return message; + }, +}; + +function createBaseEnumOnlyProto2(): EnumOnlyProto2 { + return {}; +} + +export const EnumOnlyProto2 = { + encode(_: EnumOnlyProto2, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): EnumOnlyProto2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseEnumOnlyProto2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(_: any): EnumOnlyProto2 { + return {}; + }, + + toJSON(_: EnumOnlyProto2): unknown { + const obj: any = {}; + return obj; + }, + + create, I>>(base?: I): EnumOnlyProto2 { + return EnumOnlyProto2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(_: I): EnumOnlyProto2 { + const message = createBaseEnumOnlyProto2(); + return message; + }, +}; + +function createBaseOneStringProto2(): OneStringProto2 { + return { data: "" }; +} + +export const OneStringProto2 = { + encode(message: OneStringProto2, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.data !== "") { + writer.uint32(10).string(message.data); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): OneStringProto2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseOneStringProto2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 10) { + break; + } + + message.data = reader.string(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): OneStringProto2 { + return { data: isSet(object.data) ? String(object.data) : "" }; + }, + + toJSON(message: OneStringProto2): unknown { + const obj: any = {}; + if (message.data !== "") { + obj.data = message.data; + } + return obj; + }, + + create, I>>(base?: I): OneStringProto2 { + return OneStringProto2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(object: I): OneStringProto2 { + const message = createBaseOneStringProto2(); + message.data = object.data ?? ""; + return message; + }, +}; + +function createBaseProtoWithKeywords(): ProtoWithKeywords { + return { inline: 0, concept: "", requires: [] }; +} + +export const ProtoWithKeywords = { + encode(message: ProtoWithKeywords, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.inline !== 0) { + writer.uint32(8).int32(message.inline); + } + if (message.concept !== "") { + writer.uint32(18).string(message.concept); + } + for (const v of message.requires) { + writer.uint32(26).string(v!); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): ProtoWithKeywords { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseProtoWithKeywords(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.inline = reader.int32(); + continue; + case 2: + if (tag !== 18) { + break; + } + + message.concept = reader.string(); + continue; + case 3: + if (tag !== 26) { + break; + } + + message.requires.push(reader.string()); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): ProtoWithKeywords { + return { + inline: isSet(object.inline) ? Number(object.inline) : 0, + concept: isSet(object.concept) ? String(object.concept) : "", + requires: Array.isArray(object?.requires) ? object.requires.map((e: any) => String(e)) : [], + }; + }, + + toJSON(message: ProtoWithKeywords): unknown { + const obj: any = {}; + if (message.inline !== 0) { + obj.inline = Math.round(message.inline); + } + if (message.concept !== "") { + obj.concept = message.concept; + } + if (message.requires?.length) { + obj.requires = message.requires; + } + return obj; + }, + + create, I>>(base?: I): ProtoWithKeywords { + return ProtoWithKeywords.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(object: I): ProtoWithKeywords { + const message = createBaseProtoWithKeywords(); + message.inline = object.inline ?? 0; + message.concept = object.concept ?? ""; + message.requires = object.requires?.map((e) => e) || []; + return message; + }, +}; + +function createBaseTestAllRequiredTypesProto2(): TestAllRequiredTypesProto2 { + return { + requiredInt32: 0, + requiredInt64: 0, + requiredUint32: 0, + requiredUint64: 0, + requiredSint32: 0, + requiredSint64: 0, + requiredFixed32: 0, + requiredFixed64: 0, + requiredSfixed32: 0, + requiredSfixed64: 0, + requiredFloat: 0, + requiredDouble: 0, + requiredBool: false, + requiredString: "", + requiredBytes: new Uint8Array(0), + requiredNestedMessage: undefined, + requiredForeignMessage: undefined, + requiredNestedEnum: 0, + requiredForeignEnum: 0, + requiredStringPiece: "", + requiredCord: "", + recursiveMessage: undefined, + optionalRecursiveMessage: undefined, + data: undefined, + defaultInt32: 0, + defaultInt64: 0, + defaultUint32: 0, + defaultUint64: 0, + defaultSint32: 0, + defaultSint64: 0, + defaultFixed32: 0, + defaultFixed64: 0, + defaultSfixed32: 0, + defaultSfixed64: 0, + defaultFloat: 0, + defaultDouble: 0, + defaultBool: false, + defaultString: "", + defaultBytes: new Uint8Array(0), + }; +} + +export const TestAllRequiredTypesProto2 = { + encode(message: TestAllRequiredTypesProto2, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.requiredInt32 !== 0) { + writer.uint32(8).int32(message.requiredInt32); + } + if (message.requiredInt64 !== 0) { + writer.uint32(16).int64(message.requiredInt64); + } + if (message.requiredUint32 !== 0) { + writer.uint32(24).uint32(message.requiredUint32); + } + if (message.requiredUint64 !== 0) { + writer.uint32(32).uint64(message.requiredUint64); + } + if (message.requiredSint32 !== 0) { + writer.uint32(40).sint32(message.requiredSint32); + } + if (message.requiredSint64 !== 0) { + writer.uint32(48).sint64(message.requiredSint64); + } + if (message.requiredFixed32 !== 0) { + writer.uint32(61).fixed32(message.requiredFixed32); + } + if (message.requiredFixed64 !== 0) { + writer.uint32(65).fixed64(message.requiredFixed64); + } + if (message.requiredSfixed32 !== 0) { + writer.uint32(77).sfixed32(message.requiredSfixed32); + } + if (message.requiredSfixed64 !== 0) { + writer.uint32(81).sfixed64(message.requiredSfixed64); + } + if (message.requiredFloat !== 0) { + writer.uint32(93).float(message.requiredFloat); + } + if (message.requiredDouble !== 0) { + writer.uint32(97).double(message.requiredDouble); + } + if (message.requiredBool === true) { + writer.uint32(104).bool(message.requiredBool); + } + if (message.requiredString !== "") { + writer.uint32(114).string(message.requiredString); + } + if (message.requiredBytes.length !== 0) { + writer.uint32(122).bytes(message.requiredBytes); + } + if (message.requiredNestedMessage !== undefined) { + TestAllRequiredTypesProto2_NestedMessage.encode(message.requiredNestedMessage, writer.uint32(146).fork()) + .ldelim(); + } + if (message.requiredForeignMessage !== undefined) { + ForeignMessageProto2.encode(message.requiredForeignMessage, writer.uint32(154).fork()).ldelim(); + } + if (message.requiredNestedEnum !== 0) { + writer.uint32(168).int32(message.requiredNestedEnum); + } + if (message.requiredForeignEnum !== 0) { + writer.uint32(176).int32(message.requiredForeignEnum); + } + if (message.requiredStringPiece !== "") { + writer.uint32(194).string(message.requiredStringPiece); + } + if (message.requiredCord !== "") { + writer.uint32(202).string(message.requiredCord); + } + if (message.recursiveMessage !== undefined) { + TestAllRequiredTypesProto2.encode(message.recursiveMessage, writer.uint32(218).fork()).ldelim(); + } + if (message.optionalRecursiveMessage !== undefined) { + TestAllRequiredTypesProto2.encode(message.optionalRecursiveMessage, writer.uint32(226).fork()).ldelim(); + } + if (message.data !== undefined) { + TestAllRequiredTypesProto2_Data.encode(message.data, writer.uint32(1611)).uint32(1612); + } + if (message.defaultInt32 !== 0) { + writer.uint32(1928).int32(message.defaultInt32); + } + if (message.defaultInt64 !== 0) { + writer.uint32(1936).int64(message.defaultInt64); + } + if (message.defaultUint32 !== 0) { + writer.uint32(1944).uint32(message.defaultUint32); + } + if (message.defaultUint64 !== 0) { + writer.uint32(1952).uint64(message.defaultUint64); + } + if (message.defaultSint32 !== 0) { + writer.uint32(1960).sint32(message.defaultSint32); + } + if (message.defaultSint64 !== 0) { + writer.uint32(1968).sint64(message.defaultSint64); + } + if (message.defaultFixed32 !== 0) { + writer.uint32(1981).fixed32(message.defaultFixed32); + } + if (message.defaultFixed64 !== 0) { + writer.uint32(1985).fixed64(message.defaultFixed64); + } + if (message.defaultSfixed32 !== 0) { + writer.uint32(1997).sfixed32(message.defaultSfixed32); + } + if (message.defaultSfixed64 !== 0) { + writer.uint32(2001).sfixed64(message.defaultSfixed64); + } + if (message.defaultFloat !== 0) { + writer.uint32(2013).float(message.defaultFloat); + } + if (message.defaultDouble !== 0) { + writer.uint32(2017).double(message.defaultDouble); + } + if (message.defaultBool === true) { + writer.uint32(2024).bool(message.defaultBool); + } + if (message.defaultString !== "") { + writer.uint32(2034).string(message.defaultString); + } + if (message.defaultBytes.length !== 0) { + writer.uint32(2042).bytes(message.defaultBytes); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllRequiredTypesProto2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllRequiredTypesProto2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.requiredInt32 = reader.int32(); + continue; + case 2: + if (tag !== 16) { + break; + } + + message.requiredInt64 = longToNumber(reader.int64() as Long); + continue; + case 3: + if (tag !== 24) { + break; + } + + message.requiredUint32 = reader.uint32(); + continue; + case 4: + if (tag !== 32) { + break; + } + + message.requiredUint64 = longToNumber(reader.uint64() as Long); + continue; + case 5: + if (tag !== 40) { + break; + } + + message.requiredSint32 = reader.sint32(); + continue; + case 6: + if (tag !== 48) { + break; + } + + message.requiredSint64 = longToNumber(reader.sint64() as Long); + continue; + case 7: + if (tag !== 61) { + break; + } + + message.requiredFixed32 = reader.fixed32(); + continue; + case 8: + if (tag !== 65) { + break; + } + + message.requiredFixed64 = longToNumber(reader.fixed64() as Long); + continue; + case 9: + if (tag !== 77) { + break; + } + + message.requiredSfixed32 = reader.sfixed32(); + continue; + case 10: + if (tag !== 81) { + break; + } + + message.requiredSfixed64 = longToNumber(reader.sfixed64() as Long); + continue; + case 11: + if (tag !== 93) { + break; + } + + message.requiredFloat = reader.float(); + continue; + case 12: + if (tag !== 97) { + break; + } + + message.requiredDouble = reader.double(); + continue; + case 13: + if (tag !== 104) { + break; + } + + message.requiredBool = reader.bool(); + continue; + case 14: + if (tag !== 114) { + break; + } + + message.requiredString = reader.string(); + continue; + case 15: + if (tag !== 122) { + break; + } + + message.requiredBytes = reader.bytes(); + continue; + case 18: + if (tag !== 146) { + break; + } + + message.requiredNestedMessage = TestAllRequiredTypesProto2_NestedMessage.decode(reader, reader.uint32()); + continue; + case 19: + if (tag !== 154) { + break; + } + + message.requiredForeignMessage = ForeignMessageProto2.decode(reader, reader.uint32()); + continue; + case 21: + if (tag !== 168) { + break; + } + + message.requiredNestedEnum = reader.int32() as any; + continue; + case 22: + if (tag !== 176) { + break; + } + + message.requiredForeignEnum = reader.int32() as any; + continue; + case 24: + if (tag !== 194) { + break; + } + + message.requiredStringPiece = reader.string(); + continue; + case 25: + if (tag !== 202) { + break; + } + + message.requiredCord = reader.string(); + continue; + case 27: + if (tag !== 218) { + break; + } + + message.recursiveMessage = TestAllRequiredTypesProto2.decode(reader, reader.uint32()); + continue; + case 28: + if (tag !== 226) { + break; + } + + message.optionalRecursiveMessage = TestAllRequiredTypesProto2.decode(reader, reader.uint32()); + continue; + case 201: + if (tag !== 1611) { + break; + } + + message.data = TestAllRequiredTypesProto2_Data.decode(reader); + continue; + case 241: + if (tag !== 1928) { + break; + } + + message.defaultInt32 = reader.int32(); + continue; + case 242: + if (tag !== 1936) { + break; + } + + message.defaultInt64 = longToNumber(reader.int64() as Long); + continue; + case 243: + if (tag !== 1944) { + break; + } + + message.defaultUint32 = reader.uint32(); + continue; + case 244: + if (tag !== 1952) { + break; + } + + message.defaultUint64 = longToNumber(reader.uint64() as Long); + continue; + case 245: + if (tag !== 1960) { + break; + } + + message.defaultSint32 = reader.sint32(); + continue; + case 246: + if (tag !== 1968) { + break; + } + + message.defaultSint64 = longToNumber(reader.sint64() as Long); + continue; + case 247: + if (tag !== 1981) { + break; + } + + message.defaultFixed32 = reader.fixed32(); + continue; + case 248: + if (tag !== 1985) { + break; + } + + message.defaultFixed64 = longToNumber(reader.fixed64() as Long); + continue; + case 249: + if (tag !== 1997) { + break; + } + + message.defaultSfixed32 = reader.sfixed32(); + continue; + case 250: + if (tag !== 2001) { + break; + } + + message.defaultSfixed64 = longToNumber(reader.sfixed64() as Long); + continue; + case 251: + if (tag !== 2013) { + break; + } + + message.defaultFloat = reader.float(); + continue; + case 252: + if (tag !== 2017) { + break; + } + + message.defaultDouble = reader.double(); + continue; + case 253: + if (tag !== 2024) { + break; + } + + message.defaultBool = reader.bool(); + continue; + case 254: + if (tag !== 2034) { + break; + } + + message.defaultString = reader.string(); + continue; + case 255: + if (tag !== 2042) { + break; + } + + message.defaultBytes = reader.bytes(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllRequiredTypesProto2 { + return { + requiredInt32: isSet(object.requiredInt32) ? Number(object.requiredInt32) : 0, + requiredInt64: isSet(object.requiredInt64) ? Number(object.requiredInt64) : 0, + requiredUint32: isSet(object.requiredUint32) ? Number(object.requiredUint32) : 0, + requiredUint64: isSet(object.requiredUint64) ? Number(object.requiredUint64) : 0, + requiredSint32: isSet(object.requiredSint32) ? Number(object.requiredSint32) : 0, + requiredSint64: isSet(object.requiredSint64) ? Number(object.requiredSint64) : 0, + requiredFixed32: isSet(object.requiredFixed32) ? Number(object.requiredFixed32) : 0, + requiredFixed64: isSet(object.requiredFixed64) ? Number(object.requiredFixed64) : 0, + requiredSfixed32: isSet(object.requiredSfixed32) ? Number(object.requiredSfixed32) : 0, + requiredSfixed64: isSet(object.requiredSfixed64) ? Number(object.requiredSfixed64) : 0, + requiredFloat: isSet(object.requiredFloat) ? Number(object.requiredFloat) : 0, + requiredDouble: isSet(object.requiredDouble) ? Number(object.requiredDouble) : 0, + requiredBool: isSet(object.requiredBool) ? Boolean(object.requiredBool) : false, + requiredString: isSet(object.requiredString) ? String(object.requiredString) : "", + requiredBytes: isSet(object.requiredBytes) ? bytesFromBase64(object.requiredBytes) : new Uint8Array(0), + requiredNestedMessage: isSet(object.requiredNestedMessage) + ? TestAllRequiredTypesProto2_NestedMessage.fromJSON(object.requiredNestedMessage) + : undefined, + requiredForeignMessage: isSet(object.requiredForeignMessage) + ? ForeignMessageProto2.fromJSON(object.requiredForeignMessage) + : undefined, + requiredNestedEnum: isSet(object.requiredNestedEnum) + ? testAllRequiredTypesProto2_NestedEnumFromJSON(object.requiredNestedEnum) + : 0, + requiredForeignEnum: isSet(object.requiredForeignEnum) + ? foreignEnumProto2FromJSON(object.requiredForeignEnum) + : 0, + requiredStringPiece: isSet(object.requiredStringPiece) ? String(object.requiredStringPiece) : "", + requiredCord: isSet(object.requiredCord) ? String(object.requiredCord) : "", + recursiveMessage: isSet(object.recursiveMessage) + ? TestAllRequiredTypesProto2.fromJSON(object.recursiveMessage) + : undefined, + optionalRecursiveMessage: isSet(object.optionalRecursiveMessage) + ? TestAllRequiredTypesProto2.fromJSON(object.optionalRecursiveMessage) + : undefined, + data: isSet(object.data) ? TestAllRequiredTypesProto2_Data.fromJSON(object.data) : undefined, + defaultInt32: isSet(object.defaultInt32) ? Number(object.defaultInt32) : 0, + defaultInt64: isSet(object.defaultInt64) ? Number(object.defaultInt64) : 0, + defaultUint32: isSet(object.defaultUint32) ? Number(object.defaultUint32) : 0, + defaultUint64: isSet(object.defaultUint64) ? Number(object.defaultUint64) : 0, + defaultSint32: isSet(object.defaultSint32) ? Number(object.defaultSint32) : 0, + defaultSint64: isSet(object.defaultSint64) ? Number(object.defaultSint64) : 0, + defaultFixed32: isSet(object.defaultFixed32) ? Number(object.defaultFixed32) : 0, + defaultFixed64: isSet(object.defaultFixed64) ? Number(object.defaultFixed64) : 0, + defaultSfixed32: isSet(object.defaultSfixed32) ? Number(object.defaultSfixed32) : 0, + defaultSfixed64: isSet(object.defaultSfixed64) ? Number(object.defaultSfixed64) : 0, + defaultFloat: isSet(object.defaultFloat) ? Number(object.defaultFloat) : 0, + defaultDouble: isSet(object.defaultDouble) ? Number(object.defaultDouble) : 0, + defaultBool: isSet(object.defaultBool) ? Boolean(object.defaultBool) : false, + defaultString: isSet(object.defaultString) ? String(object.defaultString) : "", + defaultBytes: isSet(object.defaultBytes) ? bytesFromBase64(object.defaultBytes) : new Uint8Array(0), + }; + }, + + toJSON(message: TestAllRequiredTypesProto2): unknown { + const obj: any = {}; + if (message.requiredInt32 !== 0) { + obj.requiredInt32 = Math.round(message.requiredInt32); + } + if (message.requiredInt64 !== 0) { + obj.requiredInt64 = Math.round(message.requiredInt64); + } + if (message.requiredUint32 !== 0) { + obj.requiredUint32 = Math.round(message.requiredUint32); + } + if (message.requiredUint64 !== 0) { + obj.requiredUint64 = Math.round(message.requiredUint64); + } + if (message.requiredSint32 !== 0) { + obj.requiredSint32 = Math.round(message.requiredSint32); + } + if (message.requiredSint64 !== 0) { + obj.requiredSint64 = Math.round(message.requiredSint64); + } + if (message.requiredFixed32 !== 0) { + obj.requiredFixed32 = Math.round(message.requiredFixed32); + } + if (message.requiredFixed64 !== 0) { + obj.requiredFixed64 = Math.round(message.requiredFixed64); + } + if (message.requiredSfixed32 !== 0) { + obj.requiredSfixed32 = Math.round(message.requiredSfixed32); + } + if (message.requiredSfixed64 !== 0) { + obj.requiredSfixed64 = Math.round(message.requiredSfixed64); + } + if (message.requiredFloat !== 0) { + obj.requiredFloat = message.requiredFloat; + } + if (message.requiredDouble !== 0) { + obj.requiredDouble = message.requiredDouble; + } + if (message.requiredBool === true) { + obj.requiredBool = message.requiredBool; + } + if (message.requiredString !== "") { + obj.requiredString = message.requiredString; + } + if (message.requiredBytes.length !== 0) { + obj.requiredBytes = base64FromBytes(message.requiredBytes); + } + if (message.requiredNestedMessage !== undefined) { + obj.requiredNestedMessage = TestAllRequiredTypesProto2_NestedMessage.toJSON(message.requiredNestedMessage); + } + if (message.requiredForeignMessage !== undefined) { + obj.requiredForeignMessage = ForeignMessageProto2.toJSON(message.requiredForeignMessage); + } + if (message.requiredNestedEnum !== 0) { + obj.requiredNestedEnum = testAllRequiredTypesProto2_NestedEnumToJSON(message.requiredNestedEnum); + } + if (message.requiredForeignEnum !== 0) { + obj.requiredForeignEnum = foreignEnumProto2ToJSON(message.requiredForeignEnum); + } + if (message.requiredStringPiece !== "") { + obj.requiredStringPiece = message.requiredStringPiece; + } + if (message.requiredCord !== "") { + obj.requiredCord = message.requiredCord; + } + if (message.recursiveMessage !== undefined) { + obj.recursiveMessage = TestAllRequiredTypesProto2.toJSON(message.recursiveMessage); + } + if (message.optionalRecursiveMessage !== undefined) { + obj.optionalRecursiveMessage = TestAllRequiredTypesProto2.toJSON(message.optionalRecursiveMessage); + } + if (message.data !== undefined) { + obj.data = TestAllRequiredTypesProto2_Data.toJSON(message.data); + } + if (message.defaultInt32 !== 0) { + obj.defaultInt32 = Math.round(message.defaultInt32); + } + if (message.defaultInt64 !== 0) { + obj.defaultInt64 = Math.round(message.defaultInt64); + } + if (message.defaultUint32 !== 0) { + obj.defaultUint32 = Math.round(message.defaultUint32); + } + if (message.defaultUint64 !== 0) { + obj.defaultUint64 = Math.round(message.defaultUint64); + } + if (message.defaultSint32 !== 0) { + obj.defaultSint32 = Math.round(message.defaultSint32); + } + if (message.defaultSint64 !== 0) { + obj.defaultSint64 = Math.round(message.defaultSint64); + } + if (message.defaultFixed32 !== 0) { + obj.defaultFixed32 = Math.round(message.defaultFixed32); + } + if (message.defaultFixed64 !== 0) { + obj.defaultFixed64 = Math.round(message.defaultFixed64); + } + if (message.defaultSfixed32 !== 0) { + obj.defaultSfixed32 = Math.round(message.defaultSfixed32); + } + if (message.defaultSfixed64 !== 0) { + obj.defaultSfixed64 = Math.round(message.defaultSfixed64); + } + if (message.defaultFloat !== 0) { + obj.defaultFloat = message.defaultFloat; + } + if (message.defaultDouble !== 0) { + obj.defaultDouble = message.defaultDouble; + } + if (message.defaultBool === true) { + obj.defaultBool = message.defaultBool; + } + if (message.defaultString !== "") { + obj.defaultString = message.defaultString; + } + if (message.defaultBytes.length !== 0) { + obj.defaultBytes = base64FromBytes(message.defaultBytes); + } + return obj; + }, + + create, I>>(base?: I): TestAllRequiredTypesProto2 { + return TestAllRequiredTypesProto2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>(object: I): TestAllRequiredTypesProto2 { + const message = createBaseTestAllRequiredTypesProto2(); + message.requiredInt32 = object.requiredInt32 ?? 0; + message.requiredInt64 = object.requiredInt64 ?? 0; + message.requiredUint32 = object.requiredUint32 ?? 0; + message.requiredUint64 = object.requiredUint64 ?? 0; + message.requiredSint32 = object.requiredSint32 ?? 0; + message.requiredSint64 = object.requiredSint64 ?? 0; + message.requiredFixed32 = object.requiredFixed32 ?? 0; + message.requiredFixed64 = object.requiredFixed64 ?? 0; + message.requiredSfixed32 = object.requiredSfixed32 ?? 0; + message.requiredSfixed64 = object.requiredSfixed64 ?? 0; + message.requiredFloat = object.requiredFloat ?? 0; + message.requiredDouble = object.requiredDouble ?? 0; + message.requiredBool = object.requiredBool ?? false; + message.requiredString = object.requiredString ?? ""; + message.requiredBytes = object.requiredBytes ?? new Uint8Array(0); + message.requiredNestedMessage = + (object.requiredNestedMessage !== undefined && object.requiredNestedMessage !== null) + ? TestAllRequiredTypesProto2_NestedMessage.fromPartial(object.requiredNestedMessage) + : undefined; + message.requiredForeignMessage = + (object.requiredForeignMessage !== undefined && object.requiredForeignMessage !== null) + ? ForeignMessageProto2.fromPartial(object.requiredForeignMessage) + : undefined; + message.requiredNestedEnum = object.requiredNestedEnum ?? 0; + message.requiredForeignEnum = object.requiredForeignEnum ?? 0; + message.requiredStringPiece = object.requiredStringPiece ?? ""; + message.requiredCord = object.requiredCord ?? ""; + message.recursiveMessage = (object.recursiveMessage !== undefined && object.recursiveMessage !== null) + ? TestAllRequiredTypesProto2.fromPartial(object.recursiveMessage) + : undefined; + message.optionalRecursiveMessage = + (object.optionalRecursiveMessage !== undefined && object.optionalRecursiveMessage !== null) + ? TestAllRequiredTypesProto2.fromPartial(object.optionalRecursiveMessage) + : undefined; + message.data = (object.data !== undefined && object.data !== null) + ? TestAllRequiredTypesProto2_Data.fromPartial(object.data) + : undefined; + message.defaultInt32 = object.defaultInt32 ?? 0; + message.defaultInt64 = object.defaultInt64 ?? 0; + message.defaultUint32 = object.defaultUint32 ?? 0; + message.defaultUint64 = object.defaultUint64 ?? 0; + message.defaultSint32 = object.defaultSint32 ?? 0; + message.defaultSint64 = object.defaultSint64 ?? 0; + message.defaultFixed32 = object.defaultFixed32 ?? 0; + message.defaultFixed64 = object.defaultFixed64 ?? 0; + message.defaultSfixed32 = object.defaultSfixed32 ?? 0; + message.defaultSfixed64 = object.defaultSfixed64 ?? 0; + message.defaultFloat = object.defaultFloat ?? 0; + message.defaultDouble = object.defaultDouble ?? 0; + message.defaultBool = object.defaultBool ?? false; + message.defaultString = object.defaultString ?? ""; + message.defaultBytes = object.defaultBytes ?? new Uint8Array(0); + return message; + }, +}; + +function createBaseTestAllRequiredTypesProto2_NestedMessage(): TestAllRequiredTypesProto2_NestedMessage { + return { a: 0, corecursive: undefined, optionalCorecursive: undefined }; +} + +export const TestAllRequiredTypesProto2_NestedMessage = { + encode(message: TestAllRequiredTypesProto2_NestedMessage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.a !== 0) { + writer.uint32(8).int32(message.a); + } + if (message.corecursive !== undefined) { + TestAllRequiredTypesProto2.encode(message.corecursive, writer.uint32(18).fork()).ldelim(); + } + if (message.optionalCorecursive !== undefined) { + TestAllRequiredTypesProto2.encode(message.optionalCorecursive, writer.uint32(26).fork()).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllRequiredTypesProto2_NestedMessage { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllRequiredTypesProto2_NestedMessage(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (tag !== 8) { + break; + } + + message.a = reader.int32(); + continue; + case 2: + if (tag !== 18) { + break; + } + + message.corecursive = TestAllRequiredTypesProto2.decode(reader, reader.uint32()); + continue; + case 3: + if (tag !== 26) { + break; + } + + message.optionalCorecursive = TestAllRequiredTypesProto2.decode(reader, reader.uint32()); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllRequiredTypesProto2_NestedMessage { + return { + a: isSet(object.a) ? Number(object.a) : 0, + corecursive: isSet(object.corecursive) ? TestAllRequiredTypesProto2.fromJSON(object.corecursive) : undefined, + optionalCorecursive: isSet(object.optionalCorecursive) + ? TestAllRequiredTypesProto2.fromJSON(object.optionalCorecursive) + : undefined, + }; + }, + + toJSON(message: TestAllRequiredTypesProto2_NestedMessage): unknown { + const obj: any = {}; + if (message.a !== 0) { + obj.a = Math.round(message.a); + } + if (message.corecursive !== undefined) { + obj.corecursive = TestAllRequiredTypesProto2.toJSON(message.corecursive); + } + if (message.optionalCorecursive !== undefined) { + obj.optionalCorecursive = TestAllRequiredTypesProto2.toJSON(message.optionalCorecursive); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllRequiredTypesProto2_NestedMessage { + return TestAllRequiredTypesProto2_NestedMessage.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllRequiredTypesProto2_NestedMessage { + const message = createBaseTestAllRequiredTypesProto2_NestedMessage(); + message.a = object.a ?? 0; + message.corecursive = (object.corecursive !== undefined && object.corecursive !== null) + ? TestAllRequiredTypesProto2.fromPartial(object.corecursive) + : undefined; + message.optionalCorecursive = (object.optionalCorecursive !== undefined && object.optionalCorecursive !== null) + ? TestAllRequiredTypesProto2.fromPartial(object.optionalCorecursive) + : undefined; + return message; + }, +}; + +function createBaseTestAllRequiredTypesProto2_Data(): TestAllRequiredTypesProto2_Data { + return { groupInt32: 0, groupUint32: 0 }; +} + +export const TestAllRequiredTypesProto2_Data = { + encode(message: TestAllRequiredTypesProto2_Data, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + if (message.groupInt32 !== 0) { + writer.uint32(1616).int32(message.groupInt32); + } + if (message.groupUint32 !== 0) { + writer.uint32(1624).uint32(message.groupUint32); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllRequiredTypesProto2_Data { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllRequiredTypesProto2_Data(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 202: + if (tag !== 1616) { + break; + } + + message.groupInt32 = reader.int32(); + continue; + case 203: + if (tag !== 1624) { + break; + } + + message.groupUint32 = reader.uint32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllRequiredTypesProto2_Data { + return { + groupInt32: isSet(object.groupInt32) ? Number(object.groupInt32) : 0, + groupUint32: isSet(object.groupUint32) ? Number(object.groupUint32) : 0, + }; + }, + + toJSON(message: TestAllRequiredTypesProto2_Data): unknown { + const obj: any = {}; + if (message.groupInt32 !== 0) { + obj.groupInt32 = Math.round(message.groupInt32); + } + if (message.groupUint32 !== 0) { + obj.groupUint32 = Math.round(message.groupUint32); + } + return obj; + }, + + create, I>>(base?: I): TestAllRequiredTypesProto2_Data { + return TestAllRequiredTypesProto2_Data.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllRequiredTypesProto2_Data { + const message = createBaseTestAllRequiredTypesProto2_Data(); + message.groupInt32 = object.groupInt32 ?? 0; + message.groupUint32 = object.groupUint32 ?? 0; + return message; + }, +}; + +function createBaseTestAllRequiredTypesProto2_MessageSetCorrect(): TestAllRequiredTypesProto2_MessageSetCorrect { + return {}; +} + +export const TestAllRequiredTypesProto2_MessageSetCorrect = { + encode(_: TestAllRequiredTypesProto2_MessageSetCorrect, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllRequiredTypesProto2_MessageSetCorrect { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllRequiredTypesProto2_MessageSetCorrect(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(_: any): TestAllRequiredTypesProto2_MessageSetCorrect { + return {}; + }, + + toJSON(_: TestAllRequiredTypesProto2_MessageSetCorrect): unknown { + const obj: any = {}; + return obj; + }, + + create, I>>( + base?: I, + ): TestAllRequiredTypesProto2_MessageSetCorrect { + return TestAllRequiredTypesProto2_MessageSetCorrect.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + _: I, + ): TestAllRequiredTypesProto2_MessageSetCorrect { + const message = createBaseTestAllRequiredTypesProto2_MessageSetCorrect(); + return message; + }, +}; + +function createBaseTestAllRequiredTypesProto2_MessageSetCorrectExtension1(): TestAllRequiredTypesProto2_MessageSetCorrectExtension1 { + return { str: "" }; +} + +export const TestAllRequiredTypesProto2_MessageSetCorrectExtension1 = { + encode( + message: TestAllRequiredTypesProto2_MessageSetCorrectExtension1, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.str !== "") { + writer.uint32(202).string(message.str); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllRequiredTypesProto2_MessageSetCorrectExtension1 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllRequiredTypesProto2_MessageSetCorrectExtension1(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 25: + if (tag !== 202) { + break; + } + + message.str = reader.string(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllRequiredTypesProto2_MessageSetCorrectExtension1 { + return { str: isSet(object.str) ? String(object.str) : "" }; + }, + + toJSON(message: TestAllRequiredTypesProto2_MessageSetCorrectExtension1): unknown { + const obj: any = {}; + if (message.str !== "") { + obj.str = message.str; + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllRequiredTypesProto2_MessageSetCorrectExtension1 { + return TestAllRequiredTypesProto2_MessageSetCorrectExtension1.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllRequiredTypesProto2_MessageSetCorrectExtension1 { + const message = createBaseTestAllRequiredTypesProto2_MessageSetCorrectExtension1(); + message.str = object.str ?? ""; + return message; + }, +}; + +function createBaseTestAllRequiredTypesProto2_MessageSetCorrectExtension2(): TestAllRequiredTypesProto2_MessageSetCorrectExtension2 { + return { i: 0 }; +} + +export const TestAllRequiredTypesProto2_MessageSetCorrectExtension2 = { + encode( + message: TestAllRequiredTypesProto2_MessageSetCorrectExtension2, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.i !== 0) { + writer.uint32(72).int32(message.i); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): TestAllRequiredTypesProto2_MessageSetCorrectExtension2 { + const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTestAllRequiredTypesProto2_MessageSetCorrectExtension2(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 9: + if (tag !== 72) { + break; + } + + message.i = reader.int32(); + continue; + } + if ((tag & 7) === 4 || tag === 0) { + break; + } + reader.skipType(tag & 7); + } + return message; + }, + + fromJSON(object: any): TestAllRequiredTypesProto2_MessageSetCorrectExtension2 { + return { i: isSet(object.i) ? Number(object.i) : 0 }; + }, + + toJSON(message: TestAllRequiredTypesProto2_MessageSetCorrectExtension2): unknown { + const obj: any = {}; + if (message.i !== 0) { + obj.i = Math.round(message.i); + } + return obj; + }, + + create, I>>( + base?: I, + ): TestAllRequiredTypesProto2_MessageSetCorrectExtension2 { + return TestAllRequiredTypesProto2_MessageSetCorrectExtension2.fromPartial(base ?? ({} as any)); + }, + fromPartial, I>>( + object: I, + ): TestAllRequiredTypesProto2_MessageSetCorrectExtension2 { + const message = createBaseTestAllRequiredTypesProto2_MessageSetCorrectExtension2(); + message.i = object.i ?? 0; + return message; + }, +}; + +declare const self: any | undefined; +declare const window: any | undefined; +declare const global: any | undefined; +const tsProtoGlobalThis: any = (() => { + if (typeof globalThis !== "undefined") { + return globalThis; + } + if (typeof self !== "undefined") { + return self; + } + if (typeof window !== "undefined") { + return window; + } + if (typeof global !== "undefined") { + return global; + } + throw "Unable to locate global object"; +})(); + +function bytesFromBase64(b64: string): Uint8Array { + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); + } else { + const bin = tsProtoGlobalThis.atob(b64); + const arr = new Uint8Array(bin.length); + for (let i = 0; i < bin.length; ++i) { + arr[i] = bin.charCodeAt(i); + } + return arr; + } +} + +function base64FromBytes(arr: Uint8Array): string { + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); + } else { + const bin: string[] = []; + arr.forEach((byte) => { + bin.push(String.fromCharCode(byte)); + }); + return tsProtoGlobalThis.btoa(bin.join("")); + } +} + +type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined; + +export type DeepPartial = T extends Builtin ? T + : T extends Array ? Array> : T extends ReadonlyArray ? ReadonlyArray> + : T extends { $case: string } ? { [K in keyof Omit]?: DeepPartial } & { $case: T["$case"] } + : T extends {} ? { [K in keyof T]?: DeepPartial } + : Partial; + +type KeysOfUnion = T extends T ? keyof T : never; +export type Exact = P extends Builtin ? P + : P & { [K in keyof P]: Exact } & { [K in Exclude>]: never }; + +function longToNumber(long: Long): number { + if (long.gt(Number.MAX_SAFE_INTEGER)) { + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + } + return long.toNumber(); +} + +if (_m0.util.Long !== Long) { + _m0.util.Long = Long as any; + _m0.configure(); +} + +function isObject(value: any): boolean { + return typeof value === "object" && value !== null; +} + +function isSet(value: any): boolean { + return value !== null && value !== undefined; +} diff --git a/impl/ts-proto/package-lock.json b/impl/ts-proto/package-lock.json index 309b73c4..18dfe051 100644 --- a/impl/ts-proto/package-lock.json +++ b/impl/ts-proto/package-lock.json @@ -1,18 +1,18 @@ { "name": "ts-proto-conformance", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ts-proto-conformance", "dependencies": { - "ts-proto": "^1.156.2" + "ts-proto": "^1.157.0" }, "devDependencies": { "@bufbuild/buf": "^1.26.1", - "@types/node": "^20.4.5", - "esbuild": "^0.18.17", - "typescript": "^5.1.6" + "@types/node": "^20.5.7", + "esbuild": "^0.19.2", + "typescript": "^5.2.2" } }, "node_modules/@bufbuild/buf": { @@ -135,9 +135,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz", - "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.2.tgz", + "integrity": "sha512-tM8yLeYVe7pRyAu9VMi/Q7aunpLwD139EY1S99xbQkT4/q2qa6eA4ige/WJQYdJ8GBL1K33pPFhPfPdJ/WzT8Q==", "cpu": [ "arm" ], @@ -151,9 +151,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz", - "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.2.tgz", + "integrity": "sha512-lsB65vAbe90I/Qe10OjkmrdxSX4UJDjosDgb8sZUKcg3oefEuW2OT2Vozz8ef7wrJbMcmhvCC+hciF8jY/uAkw==", "cpu": [ "arm64" ], @@ -167,9 +167,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz", - "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.2.tgz", + "integrity": "sha512-qK/TpmHt2M/Hg82WXHRc/W/2SGo/l1thtDHZWqFq7oi24AjZ4O/CpPSu6ZuYKFkEgmZlFoa7CooAyYmuvnaG8w==", "cpu": [ "x64" ], @@ -183,9 +183,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz", - "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.2.tgz", + "integrity": "sha512-Ora8JokrvrzEPEpZO18ZYXkH4asCdc1DLdcVy8TGf5eWtPO1Ie4WroEJzwI52ZGtpODy3+m0a2yEX9l+KUn0tA==", "cpu": [ "arm64" ], @@ -199,9 +199,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz", - "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.2.tgz", + "integrity": "sha512-tP+B5UuIbbFMj2hQaUr6EALlHOIOmlLM2FK7jeFBobPy2ERdohI4Ka6ZFjZ1ZYsrHE/hZimGuU90jusRE0pwDw==", "cpu": [ "x64" ], @@ -215,9 +215,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz", - "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.2.tgz", + "integrity": "sha512-YbPY2kc0acfzL1VPVK6EnAlig4f+l8xmq36OZkU0jzBVHcOTyQDhnKQaLzZudNJQyymd9OqQezeaBgkTGdTGeQ==", "cpu": [ "arm64" ], @@ -231,9 +231,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz", - "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.2.tgz", + "integrity": "sha512-nSO5uZT2clM6hosjWHAsS15hLrwCvIWx+b2e3lZ3MwbYSaXwvfO528OF+dLjas1g3bZonciivI8qKR/Hm7IWGw==", "cpu": [ "x64" ], @@ -247,9 +247,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz", - "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.2.tgz", + "integrity": "sha512-Odalh8hICg7SOD7XCj0YLpYCEc+6mkoq63UnExDCiRA2wXEmGlK5JVrW50vZR9Qz4qkvqnHcpH+OFEggO3PgTg==", "cpu": [ "arm" ], @@ -263,9 +263,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz", - "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.2.tgz", + "integrity": "sha512-ig2P7GeG//zWlU0AggA3pV1h5gdix0MA3wgB+NsnBXViwiGgY77fuN9Wr5uoCrs2YzaYfogXgsWZbm+HGr09xg==", "cpu": [ "arm64" ], @@ -279,9 +279,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz", - "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.2.tgz", + "integrity": "sha512-mLfp0ziRPOLSTek0Gd9T5B8AtzKAkoZE70fneiiyPlSnUKKI4lp+mGEnQXcQEHLJAcIYDPSyBvsUbKUG2ri/XQ==", "cpu": [ "ia32" ], @@ -295,9 +295,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz", - "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.2.tgz", + "integrity": "sha512-hn28+JNDTxxCpnYjdDYVMNTR3SKavyLlCHHkufHV91fkewpIyQchS1d8wSbmXhs1fiYDpNww8KTFlJ1dHsxeSw==", "cpu": [ "loong64" ], @@ -311,9 +311,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz", - "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.2.tgz", + "integrity": "sha512-KbXaC0Sejt7vD2fEgPoIKb6nxkfYW9OmFUK9XQE4//PvGIxNIfPk1NmlHmMg6f25x57rpmEFrn1OotASYIAaTg==", "cpu": [ "mips64el" ], @@ -327,9 +327,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz", - "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.2.tgz", + "integrity": "sha512-dJ0kE8KTqbiHtA3Fc/zn7lCd7pqVr4JcT0JqOnbj4LLzYnp+7h8Qi4yjfq42ZlHfhOCM42rBh0EwHYLL6LEzcw==", "cpu": [ "ppc64" ], @@ -343,9 +343,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz", - "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.2.tgz", + "integrity": "sha512-7Z/jKNFufZ/bbu4INqqCN6DDlrmOTmdw6D0gH+6Y7auok2r02Ur661qPuXidPOJ+FSgbEeQnnAGgsVynfLuOEw==", "cpu": [ "riscv64" ], @@ -359,9 +359,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz", - "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.2.tgz", + "integrity": "sha512-U+RinR6aXXABFCcAY4gSlv4CL1oOVvSSCdseQmGO66H+XyuQGZIUdhG56SZaDJQcLmrSfRmx5XZOWyCJPRqS7g==", "cpu": [ "s390x" ], @@ -375,9 +375,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz", - "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.2.tgz", + "integrity": "sha512-oxzHTEv6VPm3XXNaHPyUTTte+3wGv7qVQtqaZCrgstI16gCuhNOtBXLEBkBREP57YTd68P0VgDgG73jSD8bwXQ==", "cpu": [ "x64" ], @@ -391,9 +391,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz", - "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.2.tgz", + "integrity": "sha512-WNa5zZk1XpTTwMDompZmvQLHszDDDN7lYjEHCUmAGB83Bgs20EMs7ICD+oKeT6xt4phV4NDdSi/8OfjPbSbZfQ==", "cpu": [ "x64" ], @@ -407,9 +407,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz", - "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.2.tgz", + "integrity": "sha512-S6kI1aT3S++Dedb7vxIuUOb3oAxqxk2Rh5rOXOTYnzN8JzW1VzBd+IqPiSpgitu45042SYD3HCoEyhLKQcDFDw==", "cpu": [ "x64" ], @@ -423,9 +423,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz", - "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.2.tgz", + "integrity": "sha512-VXSSMsmb+Z8LbsQGcBMiM+fYObDNRm8p7tkUDMPG/g4fhFX5DEFmjxIEa3N8Zr96SjsJ1woAhF0DUnS3MF3ARw==", "cpu": [ "x64" ], @@ -439,9 +439,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz", - "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.2.tgz", + "integrity": "sha512-5NayUlSAyb5PQYFAU9x3bHdsqB88RC3aM9lKDAz4X1mo/EchMIT1Q+pSeBXNgkfNmRecLXA0O8xP+x8V+g/LKg==", "cpu": [ "arm64" ], @@ -455,9 +455,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz", - "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.2.tgz", + "integrity": "sha512-47gL/ek1v36iN0wL9L4Q2MFdujR0poLZMJwhO2/N3gA89jgHp4MR8DKCmwYtGNksbfJb9JoTtbkoe6sDhg2QTA==", "cpu": [ "ia32" ], @@ -471,9 +471,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz", - "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.2.tgz", + "integrity": "sha512-tcuhV7ncXBqbt/Ybf0IyrMcwVOAPDckMK9rXNHtF17UTK18OKLpg08glminN06pt2WCoALhXdLfSPbVvK/6fxw==", "cpu": [ "x64" ], @@ -541,9 +541,9 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "node_modules/@types/node": { - "version": "20.4.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz", - "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==" + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==" }, "node_modules/case-anything": { "version": "2.1.13", @@ -576,9 +576,9 @@ } }, "node_modules/esbuild": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz", - "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.2.tgz", + "integrity": "sha512-G6hPax8UbFakEj3hWO0Vs52LQ8k3lnBhxZWomUJDxfz3rZTLqF5k/FCzuNdLx2RbpBiQQF9H9onlDDH1lZsnjg==", "dev": true, "hasInstallScript": true, "bin": { @@ -588,28 +588,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.17", - "@esbuild/android-arm64": "0.18.17", - "@esbuild/android-x64": "0.18.17", - "@esbuild/darwin-arm64": "0.18.17", - "@esbuild/darwin-x64": "0.18.17", - "@esbuild/freebsd-arm64": "0.18.17", - "@esbuild/freebsd-x64": "0.18.17", - "@esbuild/linux-arm": "0.18.17", - "@esbuild/linux-arm64": "0.18.17", - "@esbuild/linux-ia32": "0.18.17", - "@esbuild/linux-loong64": "0.18.17", - "@esbuild/linux-mips64el": "0.18.17", - "@esbuild/linux-ppc64": "0.18.17", - "@esbuild/linux-riscv64": "0.18.17", - "@esbuild/linux-s390x": "0.18.17", - "@esbuild/linux-x64": "0.18.17", - "@esbuild/netbsd-x64": "0.18.17", - "@esbuild/openbsd-x64": "0.18.17", - "@esbuild/sunos-x64": "0.18.17", - "@esbuild/win32-arm64": "0.18.17", - "@esbuild/win32-ia32": "0.18.17", - "@esbuild/win32-x64": "0.18.17" + "@esbuild/android-arm": "0.19.2", + "@esbuild/android-arm64": "0.19.2", + "@esbuild/android-x64": "0.19.2", + "@esbuild/darwin-arm64": "0.19.2", + "@esbuild/darwin-x64": "0.19.2", + "@esbuild/freebsd-arm64": "0.19.2", + "@esbuild/freebsd-x64": "0.19.2", + "@esbuild/linux-arm": "0.19.2", + "@esbuild/linux-arm64": "0.19.2", + "@esbuild/linux-ia32": "0.19.2", + "@esbuild/linux-loong64": "0.19.2", + "@esbuild/linux-mips64el": "0.19.2", + "@esbuild/linux-ppc64": "0.19.2", + "@esbuild/linux-riscv64": "0.19.2", + "@esbuild/linux-s390x": "0.19.2", + "@esbuild/linux-x64": "0.19.2", + "@esbuild/netbsd-x64": "0.19.2", + "@esbuild/openbsd-x64": "0.19.2", + "@esbuild/sunos-x64": "0.19.2", + "@esbuild/win32-arm64": "0.19.2", + "@esbuild/win32-ia32": "0.19.2", + "@esbuild/win32-x64": "0.19.2" } }, "node_modules/long": { @@ -618,9 +618,9 @@ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, "node_modules/protobufjs": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", - "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", + "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -649,9 +649,9 @@ } }, "node_modules/ts-proto": { - "version": "1.156.2", - "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.156.2.tgz", - "integrity": "sha512-0ZAbGmfvB2R79QJfpTIk56T8xM4k9ZS+z77517HDpuFZFizCMceCIE3IhdYQWbmP1oSYLzw0AeVbVHi2PIigKQ==", + "version": "1.157.0", + "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.157.0.tgz", + "integrity": "sha512-0f9rvHb+1aLG66UpFHh1QbZ5SMvKqV5EudUerHRF+C47g2wd8ZYXiVrK3VmsmLcNxmMrdi4vWgFNCH6qRg1SrA==", "dependencies": { "case-anything": "^2.1.13", "protobufjs": "^7.2.4", @@ -672,9 +672,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -684,382 +684,5 @@ "node": ">=14.17" } } - }, - "dependencies": { - "@bufbuild/buf": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf/-/buf-1.26.1.tgz", - "integrity": "sha512-NyYx4T//3ndtFYV3BfqX9Xrm1NZEx3eChXniAKc/osCVViFooC5nuLQUbyqglMonH0w39RohiURMXN+e/oEB4g==", - "dev": true, - "requires": { - "@bufbuild/buf-darwin-arm64": "1.26.1", - "@bufbuild/buf-darwin-x64": "1.26.1", - "@bufbuild/buf-linux-aarch64": "1.26.1", - "@bufbuild/buf-linux-x64": "1.26.1", - "@bufbuild/buf-win32-arm64": "1.26.1", - "@bufbuild/buf-win32-x64": "1.26.1" - } - }, - "@bufbuild/buf-darwin-arm64": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.26.1.tgz", - "integrity": "sha512-nmyWiT/59RFja0ZuXFxjNGoAMDPTApU66CZUUevkFVWbNB9nzeQDjx2vsJyACY64k5fTgZiaelSiyppwObQknw==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-darwin-x64": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.26.1.tgz", - "integrity": "sha512-jl5WmUv30OW8JiRLid9+mVx1XVH0XttpUfkQfmqDFdUHGfdy4XWYK8kr84YyWu0SiMTIt1mPXkqG5UM3x+tdIQ==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-linux-aarch64": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.26.1.tgz", - "integrity": "sha512-EedR2KDW/yDIxQKWuq1Y/g7IuwTgvelqylGVO7muMxt2JWShobyUaU6GIU8JB4yhIbqRQYCL2KqBsvDJbJtCUw==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-linux-x64": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.26.1.tgz", - "integrity": "sha512-5iFL+MmWqR4cBLVNpgsjRecdHgcTxFaIkVYlQV9q8acbaJn5rgOIjUr1tzcBao9YsL3rdBhHvKkgnQ9gi1IiTw==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-win32-arm64": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.26.1.tgz", - "integrity": "sha512-/ayymSD12gBetN98ErkH0CBGRLTmtYAp4fmbPuvq8zuJcL0eiAnK6d7ZFjTc+vDMuKY/aelQN7dj9WhzdYAQSQ==", - "dev": true, - "optional": true - }, - "@bufbuild/buf-win32-x64": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.26.1.tgz", - "integrity": "sha512-k9Dy3Z9P96wYR43lUhUo0jbjMSo001+MRBlsadEYiw85POqx6RWVaGyHLrxC2Ly7g+aGMisey050OjqfCWtKTA==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz", - "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz", - "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz", - "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz", - "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz", - "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz", - "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz", - "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz", - "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz", - "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz", - "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz", - "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz", - "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz", - "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz", - "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz", - "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz", - "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz", - "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz", - "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz", - "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz", - "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz", - "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz", - "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==", - "dev": true, - "optional": true - }, - "@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" - }, - "@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" - }, - "@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", - "requires": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" - }, - "@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" - }, - "@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" - }, - "@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" - }, - "@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" - }, - "@types/node": { - "version": "20.4.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz", - "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==" - }, - "case-anything": { - "version": "2.1.13", - "resolved": "https://registry.npmjs.org/case-anything/-/case-anything-2.1.13.tgz", - "integrity": "sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==" - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==" - }, - "dprint-node": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/dprint-node/-/dprint-node-1.0.7.tgz", - "integrity": "sha512-NTZOW9A7ipb0n7z7nC3wftvsbceircwVHSgzobJsEQa+7RnOMbhrfX5IflA6CtC4GA63DSAiHYXa4JKEy9F7cA==", - "requires": { - "detect-libc": "^1.0.3" - } - }, - "esbuild": { - "version": "0.18.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz", - "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==", - "dev": true, - "requires": { - "@esbuild/android-arm": "0.18.17", - "@esbuild/android-arm64": "0.18.17", - "@esbuild/android-x64": "0.18.17", - "@esbuild/darwin-arm64": "0.18.17", - "@esbuild/darwin-x64": "0.18.17", - "@esbuild/freebsd-arm64": "0.18.17", - "@esbuild/freebsd-x64": "0.18.17", - "@esbuild/linux-arm": "0.18.17", - "@esbuild/linux-arm64": "0.18.17", - "@esbuild/linux-ia32": "0.18.17", - "@esbuild/linux-loong64": "0.18.17", - "@esbuild/linux-mips64el": "0.18.17", - "@esbuild/linux-ppc64": "0.18.17", - "@esbuild/linux-riscv64": "0.18.17", - "@esbuild/linux-s390x": "0.18.17", - "@esbuild/linux-x64": "0.18.17", - "@esbuild/netbsd-x64": "0.18.17", - "@esbuild/openbsd-x64": "0.18.17", - "@esbuild/sunos-x64": "0.18.17", - "@esbuild/win32-arm64": "0.18.17", - "@esbuild/win32-ia32": "0.18.17", - "@esbuild/win32-x64": "0.18.17" - } - }, - "long": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", - "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" - }, - "protobufjs": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", - "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/node": ">=13.7.0", - "long": "^5.0.0" - } - }, - "ts-poet": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/ts-poet/-/ts-poet-6.5.0.tgz", - "integrity": "sha512-44jURLT1HG6+NsDcadM826V6Ekux+wk07Go+MX5Gfx+8zcPKfUiFEtnjL9imuRVGSCRtloRLqw4bDGZVJYGZMQ==", - "requires": { - "dprint-node": "^1.0.7" - } - }, - "ts-proto": { - "version": "1.156.2", - "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.156.2.tgz", - "integrity": "sha512-0ZAbGmfvB2R79QJfpTIk56T8xM4k9ZS+z77517HDpuFZFizCMceCIE3IhdYQWbmP1oSYLzw0AeVbVHi2PIigKQ==", - "requires": { - "case-anything": "^2.1.13", - "protobufjs": "^7.2.4", - "ts-poet": "^6.5.0", - "ts-proto-descriptors": "1.15.0" - } - }, - "ts-proto-descriptors": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.15.0.tgz", - "integrity": "sha512-TYyJ7+H+7Jsqawdv+mfsEpZPTIj9siDHS6EMCzG/z3b/PZiphsX+mWtqFfFVe5/N0Th6V3elK9lQqjnrgTOfrg==", - "requires": { - "long": "^5.2.3", - "protobufjs": "^7.2.4" - } - }, - "typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "dev": true - } } } diff --git a/impl/ts-proto/package.json b/impl/ts-proto/package.json index 9605357b..277a4f3a 100644 --- a/impl/ts-proto/package.json +++ b/impl/ts-proto/package.json @@ -4,11 +4,11 @@ "type": "module", "devDependencies": { "@bufbuild/buf": "^1.26.1", - "@types/node": "^20.4.5", - "esbuild": "^0.18.17", - "typescript": "^5.1.6" + "@types/node": "^20.5.7", + "esbuild": "^0.19.2", + "typescript": "^5.2.2" }, "dependencies": { - "ts-proto": "^1.156.2" + "ts-proto": "^1.157.0" } } diff --git a/impl/ts-proto/runner.ts b/impl/ts-proto/runner.ts index 6a1a569b..3e39d9d2 100755 --- a/impl/ts-proto/runner.ts +++ b/impl/ts-proto/runner.ts @@ -20,6 +20,7 @@ import { WireFormat, } from "./gen/conformance/conformance.js"; import { TestAllTypesProto3 } from "./gen/google/protobuf/test_messages_proto3.js"; +import { TestAllTypesProto2 } from "./gen/google/protobuf/test_messages_proto2.js"; function main() { let testCount = 0; @@ -48,14 +49,19 @@ function test(request: ConformanceRequest): ConformanceResponse["result"] { }; } - // Only proto3 is supported because the proto2 test messages use a group, which ts_proto does not support - if ( - request.messageType !== "protobuf_test_messages.proto3.TestAllTypesProto3" - ) { - return { - $case: "runtimeError", - runtimeError: `unknown request message type ${request.messageType}`, - }; + let messageType: typeof TestAllTypesProto3 | typeof TestAllTypesProto2; + switch (request.messageType) { + case "protobuf_test_messages.proto3.TestAllTypesProto3": + messageType = TestAllTypesProto3; + break; + case "protobuf_test_messages.proto2.TestAllTypesProto2": + messageType = TestAllTypesProto2; + break; + default: + return { + $case: "runtimeError", + runtimeError: `unknown request message type ${request.messageType}`, + }; } // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -64,11 +70,11 @@ function test(request: ConformanceRequest): ConformanceResponse["result"] { try { switch (request?.payload?.$case) { case "protobufPayload": - payload = TestAllTypesProto3.decode(request.payload.protobufPayload); + payload = messageType.decode(request.payload.protobufPayload); break; case "jsonPayload": - TestAllTypesProto3.fromJSON(request.payload.jsonPayload); + messageType.fromJSON(request.payload.jsonPayload); break; default: @@ -92,13 +98,13 @@ function test(request: ConformanceRequest): ConformanceResponse["result"] { case WireFormat.PROTOBUF: return { $case: "protobufPayload", - protobufPayload: TestAllTypesProto3.encode(payload).finish(), + protobufPayload: messageType.encode(payload).finish(), }; case WireFormat.JSON: return { $case: "jsonPayload", - jsonPayload: JSON.stringify(TestAllTypesProto3.toJSON(payload)), + jsonPayload: JSON.stringify(messageType.toJSON(payload)), }; case WireFormat.JSPB: diff --git a/impl/ts-proto/test.sh b/impl/ts-proto/test.sh index e716f44d..67fc1c4f 100755 --- a/impl/ts-proto/test.sh +++ b/impl/ts-proto/test.sh @@ -4,14 +4,18 @@ set -euo pipefail # install dependencies npm ci -# ts-proto v1.139 crashes when compiling test_messages_proto2.proto +# generate code rm -rf gen/* -npx buf generate ../../proto --exclude-path ../../proto/google/protobuf/test_messages_proto2.proto +npx buf generate ../../proto -# ts-proto v1.139 generates duplicate case statements for AliasedEnum +# ts-proto v1.157.0 generates code with type errors - we ignore them to run the conformance suite +#gen/google/protobuf/test_messages_proto2.ts:2792:19 - error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'. +#gen/google/protobuf/test_messages_proto2.ts:3190:25 - error TS2538: Type 'boolean' cannot be used as an index type. +#gen/google/protobuf/test_messages_proto3.ts:2922:19 - error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'. +#gen/google/protobuf/test_messages_proto3.ts:3368:25 - error TS2538: Type 'boolean' cannot be used as an index type. npx tsc --noEmit || true -# we use esbuild to transpile and bundle for Node.js, silencing the warnings +# we use esbuild to transpile and bundle for Node.js echo > runner.js "#!/usr/bin/env node" chmod +x runner.js npx esbuild runner.ts --bundle --platform=node --format=esm --log-override:duplicate-case=silent >>runner.js