fix: require long instead of import (#1313)

We'll need to figure out the `Long` stuff once and forever. Pin the dependency for now.
googleapis · Aug 17, 2022 · 325f497 · 325f497
1 parent 5898da6
commit 325f497
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/test/unit/compileProtos.ts b/test/unit/compileProtos.ts
@@ -79,7 +79,8 @@ describe('compileProtos tool', () => {
     const ts = await readFile(expectedTSResultFile);
     assert(ts.toString().includes('TestMessage'));
     assert(ts.toString().includes('LibraryService'));
-    assert(ts.toString().includes('import * as Long'));
+    assert(ts.toString().includes('import Long = require'));
+    assert(!ts.toString().includes('import * as Long'));
     assert(
       ts.toString().includes('http://www.apache.org/licenses/LICENSE-2.0')
     );
@@ -114,7 +115,8 @@ describe('compileProtos tool', () => {
     const ts = await readFile(expectedTSResultFile);
     assert(ts.toString().includes('TestMessage'));
     assert(ts.toString().includes('LibraryService'));
-    assert(ts.toString().includes('import * as Long'));
+    assert(ts.toString().includes('import Long = require'));
+    assert(!ts.toString().includes('import * as Long'));
     assert(
       ts.toString().includes('http://www.apache.org/licenses/LICENSE-2.0')
     );
@@ -146,7 +148,8 @@ describe('compileProtos tool', () => {
     assert(fs.existsSync(expectedTSResultFile));
     const ts = await readFile(expectedTSResultFile);
 
-    assert(ts.toString().includes('import * as Long'));
+    assert(ts.toString().includes('import Long = require'));
+    assert(!ts.toString().includes('import * as Long'));
     assert(
       ts.toString().includes('http://www.apache.org/licenses/LICENSE-2.0')
     );

diff --git a/tools/compileProtos.ts b/tools/compileProtos.ts
@@ -176,8 +176,12 @@ function fixDtsFile(dts: string): string {
   // 1. fix for pbts output: the corresponding protobufjs PR
   // https://github.com/protobufjs/protobuf.js/pull/1166
   // is merged but not yet released.
-  if (!dts.match(/import \* as Long/)) {
-    dts = 'import * as Long from "long";\n' + dts;
+  dts = dts.replace(
+    'import * as Long from "long";',
+    'import Long = require("long");'
+  );
+  if (!dts.match(/import Long = require/)) {
+    dts = 'import Long = require("long");' + dts;
   }
 
   // 2. fix protobufjs import: we don't want the libraries to