Continue to use Long.gt and lt

stephenh · Jun 7, 2024 · 8ee95c0 · 8ee95c0
1 parent 4a3c229
commit 8ee95c0
Show file tree

Hide file tree

Showing 70 changed files with 210 additions and 280 deletions.
diff --git a/integration/before-after-request-streaming/google/protobuf/wrappers.ts b/integration/before-after-request-streaming/google/protobuf/wrappers.ts
@@ -648,14 +648,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/bytes-node/google/protobuf/wrappers.ts b/integration/bytes-node/google/protobuf/wrappers.ts
@@ -631,14 +631,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/emit-default-values-json/google/protobuf/timestamp.ts b/integration/emit-default-values-json/google/protobuf/timestamp.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/emit-default-values-json/test.ts b/integration/emit-default-values-json/test.ts
@@ -751,14 +751,13 @@ function fromJsonTimestamp(o: any): Date {
 }
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/...tion/fieldoption-jstype-with-forcelong-bigint/fieldoption-jstype-with-forcelong-bigint.ts b/...tion/fieldoption-jstype-with-forcelong-bigint/fieldoption-jstype-with-forcelong-bigint.ts
@@ -124,14 +124,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 function longToString(long: Long) {

diff --git a/integration/fieldoption-jstype-with-forcelong-long/fieldoption-jstype-with-forcelong-long.ts b/integration/fieldoption-jstype-with-forcelong-long/fieldoption-jstype-with-forcelong-long.ts
@@ -117,14 +117,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 function longToString(long: Long) {

diff --git a/...tion/fieldoption-jstype-with-forcelong-number/fieldoption-jstype-with-forcelong-number.ts b/...tion/fieldoption-jstype-with-forcelong-number/fieldoption-jstype-with-forcelong-number.ts
@@ -115,14 +115,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 function longToString(long: Long) {

diff --git a/...tion/fieldoption-jstype-with-forcelong-string/fieldoption-jstype-with-forcelong-string.ts b/...tion/fieldoption-jstype-with-forcelong-string/fieldoption-jstype-with-forcelong-string.ts
@@ -115,14 +115,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 function longToString(long: Long) {

diff --git a/integration/fieldoption-jstype/fieldoption-jstype.ts b/integration/fieldoption-jstype/fieldoption-jstype.ts
@@ -495,14 +495,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 function longToString(long: Long) {

diff --git a/integration/file-suffix/google/protobuf/timestamp.pb.ts b/integration/file-suffix/google/protobuf/timestamp.pb.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/grpc-js-use-date-false/google/protobuf/timestamp.ts b/integration/grpc-js-use-date-false/google/protobuf/timestamp.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/grpc-js-use-date-string-nano/google/protobuf/timestamp.ts b/integration/grpc-js-use-date-string-nano/google/protobuf/timestamp.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/grpc-js-use-date-string/google/protobuf/timestamp.ts b/integration/grpc-js-use-date-string/google/protobuf/timestamp.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/grpc-js-use-date-true/google/protobuf/timestamp.ts b/integration/grpc-js-use-date-true/google/protobuf/timestamp.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/grpc-js/google/protobuf/timestamp.ts b/integration/grpc-js/google/protobuf/timestamp.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/grpc-js/google/protobuf/wrappers.ts b/integration/grpc-js/google/protobuf/wrappers.ts
@@ -648,14 +648,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/grpc-web/google/protobuf/wrappers.ts b/integration/grpc-web/google/protobuf/wrappers.ts
@@ -648,14 +648,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/import-mapping/google/protobuf/timestamp.ts b/integration/import-mapping/google/protobuf/timestamp.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/import-suffix/google/protobuf/timestamp.pb.ts b/integration/import-suffix/google/protobuf/timestamp.pb.ts
@@ -201,14 +201,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/map-long-optional/test.ts b/integration/map-long-optional/test.ts
@@ -240,14 +240,13 @@ export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/meta-typings/google/protobuf/timestamp.ts b/integration/meta-typings/google/protobuf/timestamp.ts
@@ -282,14 +282,13 @@ export const protoMetadata: ProtoMetadata = {
 };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {

diff --git a/integration/meta-typings/google/protobuf/wrappers.ts b/integration/meta-typings/google/protobuf/wrappers.ts
@@ -821,14 +821,13 @@ export const protoMetadata: ProtoMetadata = {
 };
 
 function longToNumber(long: Long): number {
-  const num = long.toNumber();
-  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+  if (long.gt(globalThis.Number.MAX_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
-  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+  if (long.lt(globalThis.Number.MIN_SAFE_INTEGER)) {
     throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
   }
-  return num;
+  return long.toNumber();
 }
 
 if (_m0.util.Long !== Long) {