feat: skip trailing white space in dynamic import (#162)

* feat: skip trailing white space in dynamic import * test: add more test cases
guybedford · Nov 10, 2023 · 2911914 · 2911914
1 parent d41c1c8
commit 2911914
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
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/src/lexer.c b/src/lexer.c
@@ -133,7 +133,7 @@ bool parse () {
         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;
+            cur_dynamic_import->end = lastTokenPos + 1;
           cur_dynamic_import->statement_end = pos + 1;
           dynamicImportStackDepth--;
         }

diff --git a/test/_unit.cjs b/test/_unit.cjs
@@ -46,6 +46,41 @@ suite('Lexer', () => {
     assert.strictEqual(source.slice(impt.s, impt.e), '("asdf")');
   });
 
+  test(`Dynamic import expression range 2`, () => {
+    const source = 'import(/* comment */ `asdf` /* comment */)';
+    const [[impt]] = parse(source);
+    assert.strictEqual(source.slice(impt.ss, impt.se), 'import(/* comment */ `asdf` /* comment */)');
+    assert.strictEqual(source.slice(impt.s, impt.e), '`asdf`');
+  });
+
+  test(`Dynamic import expression range 3`, () => {
+    const source = 'import(`asdf` // comment\n)';
+    const [[impt]] = parse(source);
+    assert.strictEqual(source.slice(impt.ss, impt.se), 'import(`asdf` // comment\n)');
+    assert.strictEqual(source.slice(impt.s, impt.e), '`asdf`');
+  });
+
+  test(`Dynamic import expression range 4`, () => {
+    const source = 'import("foo" + /* comment */ "bar")';
+    const [[impt]] = parse(source);
+    assert.strictEqual(source.slice(impt.ss, impt.se), 'import("foo" + /* comment */ "bar")');
+    assert.strictEqual(source.slice(impt.s, impt.e), '"foo" + /* comment */ "bar"');
+  });
+
+  test(`Dynamic import expression range 5`, () => {
+    const source = 'import((() => { return "foo" })() /* comment */)';
+    const [[impt]] = parse(source);
+    assert.strictEqual(source.slice(impt.ss, impt.se), 'import((() => { return "foo" })() /* comment */)');
+    assert.strictEqual(source.slice(impt.s, impt.e), '(() => { return "foo" })()');
+  });
+
+  test(`Dynamic import expression range 6`, () => {
+    const source = 'import(/* comment */ `asdf` /* comment */ /* comment 2 */)';
+    const [[impt]] = parse(source);
+    assert.strictEqual(source.slice(impt.ss, impt.se), 'import(/* comment */ `asdf` /* comment */ /* comment 2 */)');
+    assert.strictEqual(source.slice(impt.s, impt.e), '`asdf`');
+  });
+
   test(`Simple export destructuring`, () => {
     const source = `
       export const{URI,Utils,...Another}=LIB