fix: import type definitions (#172)

guybedford · Apr 27, 2024 · 492a0aa · 492a0aa
1 parent c565b83
commit 492a0aa
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 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.h b/src/lexer.h
@@ -126,11 +126,11 @@ void addImport (const char16_t* statement_start, const char16_t* start, const ch
   }
   else if (dynamic == STANDARD_IMPORT) {
     import->statement_end = end + 1;
-    import->import_ty = Dynamic;
+    import->import_ty = Static;
   }
   else {
     import->statement_end = 0;
-    import->import_ty = Static;
+    import->import_ty = Dynamic;
   }
   import->start = start;
   import->end = end;

diff --git a/test/_unit.cjs b/test/_unit.cjs
@@ -39,6 +39,28 @@ function assertExportIs(source, actual, expected) {
 suite('Lexer', () => {
   beforeEach(async () => await init);
 
+  test('import types', () => {
+    const input = `
+      // dynamic
+      const { a } = await import('a');
+      const { b } = await import.source('b');
+      // static
+      import b from 'b';
+      import { c } from 'c';
+      import source z from 'z';
+      // meta
+      import.meta.url
+    `;
+
+    const [imports] = parse(input);
+    assert.strictEqual(imports[0].t, 2);
+    assert.strictEqual(imports[1].t, 5);
+    assert.strictEqual(imports[2].t, 1);
+    assert.strictEqual(imports[3].t, 1);
+    assert.strictEqual(imports[4].t, 4);
+    assert.strictEqual(imports[5].t, 3);
+  });
+
   test(`Regex case`, () => {
     const source = `for(let t of/[0-9]+/g.exec(e)){}`
     parse(source);