feat: Bump ts-proto-descriptors to latest ts-proto. (#1043)

Fixes #1042

integration/options-types-only/options.ts

@@ -301,7 +301,7 @@ export const protoMetadata: ProtoMetadata = {
       "pyGenericServices": false,
       "phpGenericServices": false,
       "deprecated": false,
-      "ccEnableArenas": false,
+      "ccEnableArenas": true,
       "objcClassPrefix": "",
       "csharpNamespace": "",
       "swiftPrefix": "",

integration/options/__snapshots__/options-test.ts.snap

@@ -10566,7 +10566,7 @@ exports[`options generates types correctly 1`] = `
     ],
     "name": "options.proto",
     "options": {
-      "ccEnableArenas": false,
+      "ccEnableArenas": true,
       "ccGenericServices": false,
       "csharpNamespace": "",
       "deprecated": false,

integration/options/options.ts

@@ -440,7 +440,7 @@ export const protoMetadata: ProtoMetadata = {
       "pyGenericServices": false,
       "phpGenericServices": false,
       "deprecated": false,
-      "ccEnableArenas": false,
+      "ccEnableArenas": true,
       "objcClassPrefix": "",
       "csharpNamespace": "",
       "swiftPrefix": "",

package.json

@@ -70,7 +70,7 @@
     "case-anything": "^2.1.13",
     "protobufjs": "^7.2.4",
     "ts-poet": "^6.7.0",
-    "ts-proto-descriptors": "1.15.0"
+    "ts-proto-descriptors": "1.16.0"
   },
   "packageManager": "yarn@3.6.0"
 }

protos/google/protobuf/compiler/plugin.ts

@@ -1,3 +1,9 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v1.175.1
+//   protoc               v3.21.12
+// source: google/protobuf/compiler/plugin.proto
+
 /* eslint-disable */
 import Long from "long";
 import _m0 from "protobufjs/minimal";
@@ -265,10 +271,10 @@ export const Version = {
 
   fromJSON(object: any): Version {
     return {
-      major: isSet(object.major) ? Number(object.major) : 0,
-      minor: isSet(object.minor) ? Number(object.minor) : 0,
-      patch: isSet(object.patch) ? Number(object.patch) : 0,
-      suffix: isSet(object.suffix) ? String(object.suffix) : "",
+      major: isSet(object.major) ? globalThis.Number(object.major) : 0,
+      minor: isSet(object.minor) ? globalThis.Number(object.minor) : 0,
+      patch: isSet(object.patch) ? globalThis.Number(object.patch) : 0,
+      suffix: isSet(object.suffix) ? globalThis.String(object.suffix) : "",
     };
   },
 
@@ -292,7 +298,6 @@ export const Version = {
   create(base?: DeepPartial<Version>): Version {
     return Version.fromPartial(base ?? {});
   },
-
   fromPartial(object: DeepPartial<Version>): Version {
     const message = Object.create(createBaseVersion()) as Version;
     message.major = object.major ?? 0;
@@ -397,9 +402,11 @@ export const CodeGeneratorRequest = {
 
   fromJSON(object: any): CodeGeneratorRequest {
     return {
-      fileToGenerate: Array.isArray(object?.fileToGenerate) ? object.fileToGenerate.map((e: any) => String(e)) : [],
-      parameter: isSet(object.parameter) ? String(object.parameter) : "",
-      protoFile: Array.isArray(object?.protoFile)
+      fileToGenerate: globalThis.Array.isArray(object?.fileToGenerate)
+        ? object.fileToGenerate.map((e: any) => globalThis.String(e))
+        : [],
+      parameter: isSet(object.parameter) ? globalThis.String(object.parameter) : "",
+      protoFile: globalThis.Array.isArray(object?.protoFile)
         ? object.protoFile.map((e: any) => FileDescriptorProto.fromJSON(e))
         : [],
       compilerVersion: isSet(object.compilerVersion) ? Version.fromJSON(object.compilerVersion) : undefined,
@@ -426,7 +433,6 @@ export const CodeGeneratorRequest = {
   create(base?: DeepPartial<CodeGeneratorRequest>): CodeGeneratorRequest {
     return CodeGeneratorRequest.fromPartial(base ?? {});
   },
-
   fromPartial(object: DeepPartial<CodeGeneratorRequest>): CodeGeneratorRequest {
     const message = Object.create(createBaseCodeGeneratorRequest()) as CodeGeneratorRequest;
     message.fileToGenerate = object.fileToGenerate?.map((e) => e) || [];
@@ -523,9 +529,11 @@ export const CodeGeneratorResponse = {
 
   fromJSON(object: any): CodeGeneratorResponse {
     return {
-      error: isSet(object.error) ? String(object.error) : "",
-      supportedFeatures: isSet(object.supportedFeatures) ? Number(object.supportedFeatures) : 0,
-      file: Array.isArray(object?.file) ? object.file.map((e: any) => CodeGeneratorResponse_File.fromJSON(e)) : [],
+      error: isSet(object.error) ? globalThis.String(object.error) : "",
+      supportedFeatures: isSet(object.supportedFeatures) ? globalThis.Number(object.supportedFeatures) : 0,
+      file: globalThis.Array.isArray(object?.file)
+        ? object.file.map((e: any) => CodeGeneratorResponse_File.fromJSON(e))
+        : [],
     };
   },
 
@@ -546,7 +554,6 @@ export const CodeGeneratorResponse = {
   create(base?: DeepPartial<CodeGeneratorResponse>): CodeGeneratorResponse {
     return CodeGeneratorResponse.fromPartial(base ?? {});
   },
-
   fromPartial(object: DeepPartial<CodeGeneratorResponse>): CodeGeneratorResponse {
     const message = Object.create(createBaseCodeGeneratorResponse()) as CodeGeneratorResponse;
     message.error = object.error ?? "";
@@ -650,9 +657,9 @@ export const CodeGeneratorResponse_File = {
 
   fromJSON(object: any): CodeGeneratorResponse_File {
     return {
-      name: isSet(object.name) ? String(object.name) : "",
-      insertionPoint: isSet(object.insertionPoint) ? String(object.insertionPoint) : "",
-      content: isSet(object.content) ? String(object.content) : "",
+      name: isSet(object.name) ? globalThis.String(object.name) : "",
+      insertionPoint: isSet(object.insertionPoint) ? globalThis.String(object.insertionPoint) : "",
+      content: isSet(object.content) ? globalThis.String(object.content) : "",
       generatedCodeInfo: isSet(object.generatedCodeInfo)
         ? GeneratedCodeInfo.fromJSON(object.generatedCodeInfo)
         : undefined,
@@ -679,7 +686,6 @@ export const CodeGeneratorResponse_File = {
   create(base?: DeepPartial<CodeGeneratorResponse_File>): CodeGeneratorResponse_File {
     return CodeGeneratorResponse_File.fromPartial(base ?? {});
   },
-
   fromPartial(object: DeepPartial<CodeGeneratorResponse_File>): CodeGeneratorResponse_File {
     const message = Object.create(createBaseCodeGeneratorResponse_File()) as CodeGeneratorResponse_File;
     message.name = object.name ?? "";
@@ -692,35 +698,17 @@ export const CodeGeneratorResponse_File = {
   },
 };
 
-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";
-})();
-
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
 type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
   : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
 
 function longToNumber(long: Long): number {
-  if (long.gt(Number.MAX_SAFE_INTEGER)) {
-    throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
+    throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
   return long.toNumber();
 }