fix: remove Long import statement when Long was unused (#599)

* use conditional output to detect that Long is used * yarn build:test * add comment
stephenh · Jun 22, 2022 · 58dc10c · 58dc10c
1 parent 5644ec5
commit 58dc10c
Show file tree

Hide file tree

Showing 97 changed files with 57 additions and 753 deletions.
diff --git a/integration/angular/simple-message.ts b/integration/angular/simple-message.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'angular';
@@ -74,13 +73,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/avoid-import-conflicts/simple.ts b/integration/avoid-import-conflicts/simple.ts
@@ -1,12 +1,11 @@
 /* eslint-disable */
-import * as Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
 import {
   SimpleEnum as SimpleEnum1,
   Simple as Simple2,
   simpleEnumFromJSON as simpleEnumFromJSON3,
   simpleEnumToJSON as simpleEnumToJSON4,
 } from './simple2';
+import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';
 
@@ -196,13 +195,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/avoid-import-conflicts/simple2.ts b/integration/avoid-import-conflicts/simple2.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple2';
@@ -123,13 +122,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/barrel-imports/bar.ts b/integration/barrel-imports/bar.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export interface Bar {
@@ -82,13 +81,6 @@ type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/barrel-imports/foo.ts b/integration/barrel-imports/foo.ts
@@ -1,7 +1,6 @@
 /* eslint-disable */
-import * as Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
 import { Bar } from './bar';
+import * as _m0 from 'protobufjs/minimal';
 
 export interface Foo {
   name: string;
@@ -83,13 +82,6 @@ type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/batching-with-context/batching.ts b/integration/batching-with-context/batching.ts
@@ -1,8 +1,7 @@
 /* eslint-disable */
-import * as Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
 import * as DataLoader from 'dataloader';
 import * as hash from 'object-hash';
+import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'batching';
 
@@ -691,13 +690,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isObject(value: any): boolean {
   return typeof value === 'object' && value !== null;
 }

diff --git a/integration/batching/batching.ts b/integration/batching/batching.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'batching';
@@ -639,13 +638,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isObject(value: any): boolean {
   return typeof value === 'object' && value !== null;
 }

diff --git a/integration/bytes-as-base64/message.ts b/integration/bytes-as-base64/message.ts
@@ -1,7 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
-
 export const protobufPackage = '';
 
 export interface Message {
@@ -82,13 +79,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/bytes-node/point.ts b/integration/bytes-node/point.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 import { BytesValue } from './google/protobuf/wrappers';
 
@@ -118,13 +117,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/const-enum/const-enum.ts b/integration/const-enum/const-enum.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = '';
@@ -229,13 +228,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isObject(value: any): boolean {
   return typeof value === 'object' && value !== null;
 }

diff --git a/integration/enums-as-literals-with-string-enums/enums-as-literals-with-string-enums.ts b/integration/enums-as-literals-with-string-enums/enums-as-literals-with-string-enums.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = '';
@@ -137,13 +136,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/enums-as-literals/enums-as-literals.ts b/integration/enums-as-literals/enums-as-literals.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = '';
@@ -121,13 +120,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/fieldmask/fieldmask.ts b/integration/fieldmask/fieldmask.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 import { FieldMask } from './google/protobuf/field_mask';
 
@@ -75,13 +74,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/fieldmask/google/protobuf/field_mask.ts b/integration/fieldmask/google/protobuf/field_mask.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'google.protobuf';
@@ -286,10 +285,3 @@ type KeysOfUnion<T> = T extends T ? keyof T : never;
 export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
-
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
diff --git a/integration/file-suffix/child.pb.ts b/integration/file-suffix/child.pb.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'file_suffix';
@@ -107,13 +106,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/file-suffix/parent.pb.ts b/integration/file-suffix/parent.pb.ts
@@ -1,8 +1,7 @@
 /* eslint-disable */
-import * as Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
 import { ChildEnum, Child, childEnumFromJSON, childEnumToJSON } from './child.pb';
 import { Timestamp } from './google/protobuf/timestamp.pb';
+import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'file_suffix';
 
@@ -118,13 +117,6 @@ function fromJsonTimestamp(o: any): Date {
   }
 }
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/generic-metadata/hero.ts b/integration/generic-metadata/hero.ts
@@ -1,9 +1,8 @@
 /* eslint-disable */
-import * as Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
 import { Observable } from 'rxjs';
 import { Foo } from './some-file';
 import { map } from 'rxjs/operators';
+import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'hero';
 
@@ -328,13 +327,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
diff --git a/integration/generic-service-definitions-and-services/simple.ts b/integration/generic-service-definitions-and-services/simple.ts
@@ -1,5 +1,4 @@
 /* eslint-disable */
-import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';
@@ -144,13 +143,6 @@ export type Exact<P, I extends P> = P extends Builtin
   ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
 
-// If you get a compile-error about 'Constructor<Long> and ... have no overlap',
-// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.
-if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any;
-  _m0.configure();
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }