diff --git a/integration/bytes-as-base64/message.ts b/integration/bytes-as-base64/message.ts index 11eda8f8d..7ed86903b 100644 --- a/integration/bytes-as-base64/message.ts +++ b/integration/bytes-as-base64/message.ts @@ -32,7 +32,7 @@ export const Message = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -49,10 +49,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -62,14 +62,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } diff --git a/integration/bytes-node/google/protobuf/wrappers.ts b/integration/bytes-node/google/protobuf/wrappers.ts index d1b77e648..312848ba5 100644 --- a/integration/bytes-node/google/protobuf/wrappers.ts +++ b/integration/bytes-node/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/bytes-node/point.ts b/integration/bytes-node/point.ts index ee299e099..24c353441 100644 --- a/integration/bytes-node/point.ts +++ b/integration/bytes-node/point.ts @@ -71,7 +71,7 @@ export const Point = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -88,10 +88,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -101,14 +101,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } diff --git a/integration/file-suffix/google/protobuf/timestamp.pb.ts b/integration/file-suffix/google/protobuf/timestamp.pb.ts index 5497f7183..1825e1607 100644 --- a/integration/file-suffix/google/protobuf/timestamp.pb.ts +++ b/integration/file-suffix/google/protobuf/timestamp.pb.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/grpc-js/google/protobuf/timestamp.ts b/integration/grpc-js/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/grpc-js/google/protobuf/timestamp.ts +++ b/integration/grpc-js/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/grpc-js/google/protobuf/wrappers.ts b/integration/grpc-js/google/protobuf/wrappers.ts index 3145298cb..901cd737e 100644 --- a/integration/grpc-js/google/protobuf/wrappers.ts +++ b/integration/grpc-js/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/grpc-web-no-streaming-observable/example.ts b/integration/grpc-web-no-streaming-observable/example.ts index 1bfdb4221..2de2723d8 100644 --- a/integration/grpc-web-no-streaming-observable/example.ts +++ b/integration/grpc-web-no-streaming-observable/example.ts @@ -415,6 +415,25 @@ export class GrpcWebImpl { } } +declare var self: any | undefined; +declare var window: any | undefined; +declare var global: any | undefined; +var 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; export type DeepPartial = T extends Builtin ? T @@ -430,7 +449,7 @@ function isSet(value: any): boolean { return value !== null && value !== undefined; } -export class GrpcWebError extends globalThis.Error { +export class GrpcWebError extends tsProtoGlobalThis.Error { constructor(message: string, public code: grpc.Code, public metadata: grpc.Metadata) { super(message); } diff --git a/integration/grpc-web-no-streaming/example.ts b/integration/grpc-web-no-streaming/example.ts index 17bc4bab3..da77c277c 100644 --- a/integration/grpc-web-no-streaming/example.ts +++ b/integration/grpc-web-no-streaming/example.ts @@ -412,6 +412,25 @@ export class GrpcWebImpl { } } +declare var self: any | undefined; +declare var window: any | undefined; +declare var global: any | undefined; +var 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; export type DeepPartial = T extends Builtin ? T @@ -427,7 +446,7 @@ function isSet(value: any): boolean { return value !== null && value !== undefined; } -export class GrpcWebError extends globalThis.Error { +export class GrpcWebError extends tsProtoGlobalThis.Error { constructor(message: string, public code: grpc.Code, public metadata: grpc.Metadata) { super(message); } diff --git a/integration/grpc-web/example.ts b/integration/grpc-web/example.ts index ae32731ea..b1ec8a3a5 100644 --- a/integration/grpc-web/example.ts +++ b/integration/grpc-web/example.ts @@ -893,6 +893,25 @@ export class GrpcWebImpl { } } +declare var self: any | undefined; +declare var window: any | undefined; +declare var global: any | undefined; +var 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; export type DeepPartial = T extends Builtin ? T @@ -908,7 +927,7 @@ function isSet(value: any): boolean { return value !== null && value !== undefined; } -export class GrpcWebError extends globalThis.Error { +export class GrpcWebError extends tsProtoGlobalThis.Error { constructor(message: string, public code: grpc.Code, public metadata: grpc.Metadata) { super(message); } diff --git a/integration/import-mapping/google/protobuf/timestamp.ts b/integration/import-mapping/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/import-mapping/google/protobuf/timestamp.ts +++ b/integration/import-mapping/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/import-suffix/google/protobuf/timestamp.pb.ts b/integration/import-suffix/google/protobuf/timestamp.pb.ts index 5d5da9d85..edab16743 100644 --- a/integration/import-suffix/google/protobuf/timestamp.pb.ts +++ b/integration/import-suffix/google/protobuf/timestamp.pb.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/meta-typings/google/protobuf/timestamp.ts b/integration/meta-typings/google/protobuf/timestamp.ts index 7a575724e..872fdb6f4 100644 --- a/integration/meta-typings/google/protobuf/timestamp.ts +++ b/integration/meta-typings/google/protobuf/timestamp.ts @@ -272,7 +272,7 @@ export const protoMetadata: ProtoMetadata = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -290,7 +290,7 @@ var globalThis: any = (() => { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/meta-typings/google/protobuf/wrappers.ts b/integration/meta-typings/google/protobuf/wrappers.ts index fd7b093af..f57ca984b 100644 --- a/integration/meta-typings/google/protobuf/wrappers.ts +++ b/integration/meta-typings/google/protobuf/wrappers.ts @@ -775,7 +775,7 @@ export const protoMetadata: ProtoMetadata = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -793,7 +793,7 @@ var globalThis: any = (() => { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/meta-typings/simple.ts b/integration/meta-typings/simple.ts index 70dbde53a..e8cdaef83 100644 --- a/integration/meta-typings/simple.ts +++ b/integration/meta-typings/simple.ts @@ -2639,7 +2639,7 @@ export const protoMetadata: ProtoMetadata = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -2669,7 +2669,7 @@ function fromTimestamp(t: Timestamp): Date { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/nice-grpc/google/protobuf/timestamp.ts b/integration/nice-grpc/google/protobuf/timestamp.ts index 637f54483..5893b6808 100644 --- a/integration/nice-grpc/google/protobuf/timestamp.ts +++ b/integration/nice-grpc/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -197,7 +197,7 @@ export type DeepPartial = T extends Builtin ? T function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/nice-grpc/google/protobuf/wrappers.ts b/integration/nice-grpc/google/protobuf/wrappers.ts index 21a0c1424..9a2e58387 100644 --- a/integration/nice-grpc/google/protobuf/wrappers.ts +++ b/integration/nice-grpc/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -571,7 +571,7 @@ export type DeepPartial = T extends Builtin ? T function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/oneof-properties/oneof.ts b/integration/oneof-properties/oneof.ts index d371b089d..b2c4cb4af 100644 --- a/integration/oneof-properties/oneof.ts +++ b/integration/oneof-properties/oneof.ts @@ -282,7 +282,7 @@ export const PleaseChoose_Submessage = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -299,10 +299,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -312,14 +312,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } diff --git a/integration/oneof-unions/oneof.ts b/integration/oneof-unions/oneof.ts index e89ecca74..7fbacfe1a 100644 --- a/integration/oneof-unions/oneof.ts +++ b/integration/oneof-unions/oneof.ts @@ -383,7 +383,7 @@ export const SimpleButOptional = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -400,10 +400,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -413,14 +413,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } diff --git a/integration/options/google/protobuf/descriptor.ts b/integration/options/google/protobuf/descriptor.ts index 919f4e5b9..6469a46d9 100644 --- a/integration/options/google/protobuf/descriptor.ts +++ b/integration/options/google/protobuf/descriptor.ts @@ -5243,7 +5243,7 @@ export const protoMetadata: ProtoMetadata = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -5261,7 +5261,7 @@ var globalThis: any = (() => { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-esmodule-interop/simple.ts b/integration/simple-esmodule-interop/simple.ts index 42cb50832..8adfceb53 100644 --- a/integration/simple-esmodule-interop/simple.ts +++ b/integration/simple-esmodule-interop/simple.ts @@ -243,7 +243,7 @@ export const Numbers = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -272,7 +272,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-json-name/google/protobuf/timestamp.ts b/integration/simple-json-name/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/simple-json-name/google/protobuf/timestamp.ts +++ b/integration/simple-json-name/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-long-string/google/protobuf/wrappers.ts b/integration/simple-long-string/google/protobuf/wrappers.ts index 9deb01d20..2029208a1 100644 --- a/integration/simple-long-string/google/protobuf/wrappers.ts +++ b/integration/simple-long-string/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } diff --git a/integration/simple-long/google/protobuf/wrappers.ts b/integration/simple-long/google/protobuf/wrappers.ts index c7b5789ab..eaf84d7a0 100644 --- a/integration/simple-long/google/protobuf/wrappers.ts +++ b/integration/simple-long/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } diff --git a/integration/simple-optionals/google/protobuf/timestamp.ts b/integration/simple-optionals/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/simple-optionals/google/protobuf/timestamp.ts +++ b/integration/simple-optionals/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-optionals/google/protobuf/wrappers.ts b/integration/simple-optionals/google/protobuf/wrappers.ts index 3145298cb..901cd737e 100644 --- a/integration/simple-optionals/google/protobuf/wrappers.ts +++ b/integration/simple-optionals/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-optionals/simple.ts b/integration/simple-optionals/simple.ts index d3e4dfd82..ec5c85c95 100644 --- a/integration/simple-optionals/simple.ts +++ b/integration/simple-optionals/simple.ts @@ -1570,7 +1570,7 @@ interface Rpc { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -1621,7 +1621,7 @@ function fromJsonTimestamp(o: any): Date { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-prototype-defaults/google/protobuf/timestamp.ts b/integration/simple-prototype-defaults/google/protobuf/timestamp.ts index fb745da37..92b995c77 100644 --- a/integration/simple-prototype-defaults/google/protobuf/timestamp.ts +++ b/integration/simple-prototype-defaults/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-prototype-defaults/google/protobuf/wrappers.ts b/integration/simple-prototype-defaults/google/protobuf/wrappers.ts index e6fb1977d..607c1bcce 100644 --- a/integration/simple-prototype-defaults/google/protobuf/wrappers.ts +++ b/integration/simple-prototype-defaults/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-prototype-defaults/simple.ts b/integration/simple-prototype-defaults/simple.ts index 6671674e5..79486a125 100644 --- a/integration/simple-prototype-defaults/simple.ts +++ b/integration/simple-prototype-defaults/simple.ts @@ -2347,7 +2347,7 @@ interface Rpc { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -2364,10 +2364,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -2377,14 +2377,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -2423,7 +2423,7 @@ function fromJsonTimestamp(o: any): Date { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-snake/google/protobuf/timestamp.ts b/integration/simple-snake/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/simple-snake/google/protobuf/timestamp.ts +++ b/integration/simple-snake/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-snake/google/protobuf/wrappers.ts b/integration/simple-snake/google/protobuf/wrappers.ts index 3145298cb..901cd737e 100644 --- a/integration/simple-snake/google/protobuf/wrappers.ts +++ b/integration/simple-snake/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-snake/simple.ts b/integration/simple-snake/simple.ts index 5d416272c..b7fbc7d77 100644 --- a/integration/simple-snake/simple.ts +++ b/integration/simple-snake/simple.ts @@ -1622,7 +1622,7 @@ interface Rpc { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -1673,7 +1673,7 @@ function fromJsonTimestamp(o: any): Date { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts b/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts +++ b/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts b/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts index 3145298cb..901cd737e 100644 --- a/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts +++ b/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple-unrecognized-enum/simple.ts b/integration/simple-unrecognized-enum/simple.ts index e0a1ad32a..73cc1e711 100644 --- a/integration/simple-unrecognized-enum/simple.ts +++ b/integration/simple-unrecognized-enum/simple.ts @@ -30,7 +30,7 @@ export function stateEnumFromJSON(object: any): StateEnum { case "OFF": return StateEnum.OFF; default: - throw new globalThis.Error("Unrecognized enum value " + object + " for enum StateEnum"); + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum StateEnum"); } } @@ -43,7 +43,7 @@ export function stateEnumToJSON(object: StateEnum): string { case StateEnum.OFF: return "OFF"; default: - throw new globalThis.Error("Unrecognized enum value " + object + " for enum StateEnum"); + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum StateEnum"); } } @@ -88,7 +88,7 @@ export function child_TypeFromJSON(object: any): Child_Type { case "BAD": return Child_Type.BAD; default: - throw new globalThis.Error("Unrecognized enum value " + object + " for enum Child_Type"); + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum Child_Type"); } } @@ -101,7 +101,7 @@ export function child_TypeToJSON(object: Child_Type): string { case Child_Type.BAD: return "BAD"; default: - throw new globalThis.Error("Unrecognized enum value " + object + " for enum Child_Type"); + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum Child_Type"); } } @@ -129,7 +129,7 @@ export function nested_InnerEnumFromJSON(object: any): Nested_InnerEnum { case "BAD": return Nested_InnerEnum.BAD; default: - throw new globalThis.Error("Unrecognized enum value " + object + " for enum Nested_InnerEnum"); + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum Nested_InnerEnum"); } } @@ -142,7 +142,7 @@ export function nested_InnerEnumToJSON(object: Nested_InnerEnum): string { case Nested_InnerEnum.BAD: return "BAD"; default: - throw new globalThis.Error("Unrecognized enum value " + object + " for enum Nested_InnerEnum"); + throw new tsProtoGlobalThis.Error("Unrecognized enum value " + object + " for enum Nested_InnerEnum"); } } @@ -1558,7 +1558,7 @@ interface Rpc { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -1609,7 +1609,7 @@ function fromJsonTimestamp(o: any): Date { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple/google/protobuf/timestamp.ts b/integration/simple/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/simple/google/protobuf/timestamp.ts +++ b/integration/simple/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple/google/protobuf/wrappers.ts b/integration/simple/google/protobuf/wrappers.ts index 3145298cb..901cd737e 100644 --- a/integration/simple/google/protobuf/wrappers.ts +++ b/integration/simple/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/simple/simple.ts b/integration/simple/simple.ts index b0881b28b..debfe590e 100644 --- a/integration/simple/simple.ts +++ b/integration/simple/simple.ts @@ -2346,7 +2346,7 @@ interface Rpc { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -2363,10 +2363,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -2376,14 +2376,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -2422,7 +2422,7 @@ function fromJsonTimestamp(o: any): Date { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/type-registry/google/protobuf/timestamp.ts b/integration/type-registry/google/protobuf/timestamp.ts index bec2e71ed..c3ccbe66a 100644 --- a/integration/type-registry/google/protobuf/timestamp.ts +++ b/integration/type-registry/google/protobuf/timestamp.ts @@ -179,7 +179,7 @@ messageTypeRegistry.set(Timestamp.$type, Timestamp); declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -208,7 +208,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/unknown-fields/google/protobuf/compiler/plugin.ts b/integration/unknown-fields/google/protobuf/compiler/plugin.ts index 81b022549..21528d58c 100644 --- a/integration/unknown-fields/google/protobuf/compiler/plugin.ts +++ b/integration/unknown-fields/google/protobuf/compiler/plugin.ts @@ -415,7 +415,7 @@ export const CodeGeneratorResponse_File = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -433,7 +433,7 @@ var globalThis: any = (() => { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/unknown-fields/google/protobuf/descriptor.ts b/integration/unknown-fields/google/protobuf/descriptor.ts index 86529d1af..fcf9f0783 100644 --- a/integration/unknown-fields/google/protobuf/descriptor.ts +++ b/integration/unknown-fields/google/protobuf/descriptor.ts @@ -2952,7 +2952,7 @@ export const GeneratedCodeInfo_Annotation = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -2970,7 +2970,7 @@ var globalThis: any = (() => { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/use-date-false/google/protobuf/timestamp.ts b/integration/use-date-false/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/use-date-false/google/protobuf/timestamp.ts +++ b/integration/use-date-false/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/use-date-string/google/protobuf/timestamp.ts b/integration/use-date-string/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/use-date-string/google/protobuf/timestamp.ts +++ b/integration/use-date-string/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/use-date-true/google/protobuf/timestamp.ts b/integration/use-date-true/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/use-date-true/google/protobuf/timestamp.ts +++ b/integration/use-date-true/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/use-map-type/google/protobuf/timestamp.ts b/integration/use-map-type/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/use-map-type/google/protobuf/timestamp.ts +++ b/integration/use-map-type/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/use-map-type/use-map-type.ts b/integration/use-map-type/use-map-type.ts index c05fd502f..158713474 100644 --- a/integration/use-map-type/use-map-type.ts +++ b/integration/use-map-type/use-map-type.ts @@ -575,7 +575,7 @@ export const Maps_MapOfTimestampsEntry = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -592,10 +592,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -605,14 +605,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -651,7 +651,7 @@ function fromJsonTimestamp(o: any): Date { function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/use-optionals-all/test.ts b/integration/use-optionals-all/test.ts index 3cf686dd6..6e18858f9 100644 --- a/integration/use-optionals-all/test.ts +++ b/integration/use-optionals-all/test.ts @@ -540,7 +540,7 @@ export const Child = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -557,10 +557,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -570,14 +570,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -594,7 +594,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/value/google/protobuf/wrappers.ts b/integration/value/google/protobuf/wrappers.ts index 3145298cb..901cd737e 100644 --- a/integration/value/google/protobuf/wrappers.ts +++ b/integration/value/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/vector-tile/vector_tile.ts b/integration/vector-tile/vector_tile.ts index d8b628bb4..a8a77a25d 100644 --- a/integration/vector-tile/vector_tile.ts +++ b/integration/vector-tile/vector_tile.ts @@ -444,7 +444,7 @@ export const Tile_Layer = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -473,7 +473,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/wrappers-regression/google/protobuf/timestamp.ts b/integration/wrappers-regression/google/protobuf/timestamp.ts index 5497f7183..1825e1607 100644 --- a/integration/wrappers-regression/google/protobuf/timestamp.ts +++ b/integration/wrappers-regression/google/protobuf/timestamp.ts @@ -172,7 +172,7 @@ export const Timestamp = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -201,7 +201,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/integration/wrappers-regression/google/protobuf/wrappers.ts b/integration/wrappers-regression/google/protobuf/wrappers.ts index 3145298cb..901cd737e 100644 --- a/integration/wrappers-regression/google/protobuf/wrappers.ts +++ b/integration/wrappers-regression/google/protobuf/wrappers.ts @@ -521,7 +521,7 @@ export const BytesValue = { declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; -var globalThis: any = (() => { +var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") { return globalThis; } @@ -538,10 +538,10 @@ var globalThis: any = (() => { })(); function bytesFromBase64(b64: string): Uint8Array { - if (globalThis.Buffer) { - return Uint8Array.from(globalThis.Buffer.from(b64, "base64")); + if (tsProtoGlobalThis.Buffer) { + return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, "base64")); } else { - const bin = globalThis.atob(b64); + const bin = tsProtoGlobalThis.atob(b64); const arr = new Uint8Array(bin.length); for (let i = 0; i < bin.length; ++i) { arr[i] = bin.charCodeAt(i); @@ -551,14 +551,14 @@ function bytesFromBase64(b64: string): Uint8Array { } function base64FromBytes(arr: Uint8Array): string { - if (globalThis.Buffer) { - return globalThis.Buffer.from(arr).toString("base64"); + if (tsProtoGlobalThis.Buffer) { + return tsProtoGlobalThis.Buffer.from(arr).toString("base64"); } else { const bin: string[] = []; arr.forEach((byte) => { bin.push(String.fromCharCode(byte)); }); - return globalThis.btoa(bin.join("")); + return tsProtoGlobalThis.btoa(bin.join("")); } } @@ -575,7 +575,7 @@ export type Exact = P extends Builtin ? P function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) { - throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); + throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER"); } return long.toNumber(); } diff --git a/src/main.ts b/src/main.ts index 548c33e27..7828fee65 100644 --- a/src/main.ts +++ b/src/main.ts @@ -340,7 +340,7 @@ export function makeUtils(options: Options): Utils { ...longs, ...makeComparisonUtils(), ...makeNiceGrpcServerStreamingMethodResult(), - ...makeGrpcWebErrorClass(), + ...makeGrpcWebErrorClass(bytes), }; } @@ -434,12 +434,12 @@ function makeLongUtils(options: Options, bytes: ReturnType function makeByteUtils() { const globalThis = conditionalOutput( - "globalThis", + "tsProtoGlobalThis", code` declare var self: any | undefined; declare var window: any | undefined; declare var global: any | undefined; - var globalThis: any = (() => { + var tsProtoGlobalThis: any = (() => { if (typeof globalThis !== "undefined") return globalThis; if (typeof self !== "undefined") return self; if (typeof window !== "undefined") return window; @@ -698,11 +698,11 @@ function makeNiceGrpcServerStreamingMethodResult() { return { NiceGrpcServerStreamingMethodResult }; } -function makeGrpcWebErrorClass() { +function makeGrpcWebErrorClass(bytes: ReturnType) { const GrpcWebError = conditionalOutput( "GrpcWebError", code` - export class GrpcWebError extends globalThis.Error { + export class GrpcWebError extends ${bytes.globalThis}.Error { constructor(message: string, public code: grpc.Code, public metadata: grpc.Metadata) { super(message); }