fix: dynamic import paren ranges (#157)

guybedford · Sep 10, 2023 · 842c16c · 842c16c
1 parent d44ad4a
commit 842c16c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/chompfile.toml b/chompfile.toml
@@ -52,7 +52,7 @@ dep = 'src/lexer.ts'
 # even when we set "source-maps = false", so for now we have ejected the
 # template to its raw "run" command, and added an "rm" step.
 run = '''
-node ./node_modules/@swc/cli/bin/swc.js $DEP -o $TARGET --no-swcrc -C jsc.parser.syntax=typescript -C jsc.parser.importAssertions=true -C jsc.parser.topLevelAwait=true -C jsc.parser.importMeta=true -C jsc.parser.privateMethod=true -C jsc.parser.dynamicImport=true -C jsc.target=es2016 -C jsc.experimental.keepImportAssertions=true
+node ./node_modules/@swc/cli/bin/swc.js $DEP -o $TARGET --no-swcrc -C jsc.parser.syntax=typescript -C jsc.parser.importAssertions=true -C jsc.parser.topLevelAwait=true -C jsc.parser.importMeta=true -C jsc.parser.privateMethod=true -C jsc.parser.dynamicImport=true -C jsc.target=es2016 -C jsc.experimental.keepImportAttributes=true
 '''
 
 [[task]]

diff --git a/lib/lexer.asm.js b/lib/lexer.asm.js
diff --git a/lib/lexer.emcc.asm.js b/lib/lexer.emcc.asm.js
diff --git a/lib/lexer.wasm b/lib/lexer.wasm
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "@types/node": "^18.7.1",
     "kleur": "^2.0.2",
     "mocha": "^5.2.0",
-    "terser": "^5.14.2",
+    "terser": "^5.19.4",
     "typescript": "^4.7.4"
   },
   "files": [

diff --git a/src/lexer.c b/src/lexer.c
@@ -129,7 +129,7 @@ bool parse () {
         if (openTokenDepth == 0)
           return syntaxError(), false;
         openTokenDepth--;
-        if (dynamicImportStackDepth > 0 && dynamicImportStack[dynamicImportStackDepth - 1]->dynamic == openTokenStack[openTokenDepth].pos) {
+        if (dynamicImportStackDepth > 0 && openTokenStack[openTokenDepth].token == ImportParen) {
           Import* cur_dynamic_import = dynamicImportStack[dynamicImportStackDepth - 1];
           if (cur_dynamic_import->end == 0)
             cur_dynamic_import->end = pos;

diff --git a/test/_unit.cjs b/test/_unit.cjs
@@ -39,6 +39,13 @@ function assertExportIs(source, actual, expected) {
 suite('Lexer', () => {
   beforeEach(async () => await init);
 
+  test(`Dynamic import expression range`, () => {
+    const source = `import(("asdf"))  aaaa`;
+    const [[impt]] = parse(source);
+    assert.strictEqual(source.slice(impt.ss, impt.se), 'import(("asdf"))');
+    assert.strictEqual(source.slice(impt.s, impt.e), '("asdf")');
+  });
+
   test(`Simple export destructuring`, () => {
     const source = `
       export const{URI,Utils,...Another}=LIB