Keep resolving queued imports while there is progress

src/glue/js/node.d.ts

@@ -5,3 +5,6 @@
 
 declare const global: Record<string,unknown>;
 declare function require(name: string): unknown;
+declare namespace console {
+  function log(...args: unknown[]): void;
+}

src/program.ts

@@ -1020,50 +1020,69 @@ export class Program extends DiagnosticEmitter {
       }
     }
 
-    // queued imports should be resolvable now through traversing exports and queued exports
-    for (let i = 0, k = queuedImports.length; i < k; ++i) {
-      let queuedImport = queuedImports[i];
-      let localIdentifier = queuedImport.localIdentifier;
-      let foreignIdentifier = queuedImport.foreignIdentifier;
-      if (foreignIdentifier) { // i.e. import { foo [as bar] } from "./baz"
-        let element = this.lookupForeign(
-          foreignIdentifier.text,
-          queuedImport.foreignPath,
-          queuedImport.foreignPathAlt,
-          queuedExports
-        );
-        if (element) {
-          queuedImport.localFile.add(
-            localIdentifier.text,
-            element,
-            localIdentifier // isImport
-          );
-        } else {
-          // FIXME: file not found is not reported if this happens?
-          this.error(
-            DiagnosticCode.Module_0_has_no_exported_member_1,
-            foreignIdentifier.range, queuedImport.foreignPath, foreignIdentifier.text
+    // queued imports should be resolvable now through traversing exports and queued exports.
+    // note that imports may depend upon imports, so repeat until there's no more progress.
+    do {
+      let i = 0, madeProgress = false;
+      while (i < queuedImports.length) {
+        let queuedImport = queuedImports[i];
+        let localIdentifier = queuedImport.localIdentifier;
+        let foreignIdentifier = queuedImport.foreignIdentifier;
+        if (foreignIdentifier) { // i.e. import { foo [as bar] } from "./baz"
+          let element = this.lookupForeign(
+            foreignIdentifier.text,
+            queuedImport.foreignPath,
+            queuedImport.foreignPathAlt,
+            queuedExports
           );
-        }
-      } else { // i.e. import * as bar from "./bar"
-        let foreignFile = this.lookupForeignFile(queuedImport.foreignPath, queuedImport.foreignPathAlt);
-        if (foreignFile) {
-          let localFile = queuedImport.localFile;
-          let localName = localIdentifier.text;
-          localFile.add(
-            localName,
-            foreignFile.asImportedNamespace(
+          if (element) {
+            queuedImport.localFile.add(
+              localIdentifier.text,
+              element,
+              localIdentifier // isImport
+            );
+            queuedImports.splice(i, 1);
+            madeProgress = true;
+          } else {
+            ++i;
+          }
+        } else { // i.e. import * as bar from "./bar"
+          let foreignFile = this.lookupForeignFile(queuedImport.foreignPath, queuedImport.foreignPathAlt);
+          if (foreignFile) {
+            let localFile = queuedImport.localFile;
+            let localName = localIdentifier.text;
+            localFile.add(
               localName,
-              localFile,
-              localIdentifier
-            ),
-            localIdentifier // isImport
-          );
-        } else {
-          assert(false); // already reported by the parser not finding the file
+              foreignFile.asImportedNamespace(
+                localName,
+                localFile,
+                localIdentifier
+              ),
+              localIdentifier // isImport
+            );
+            queuedImports.splice(i, 1);
+            madeProgress = true;
+          } else {
+            ++i;
+            assert(false); // already reported by the parser not finding the file
+          }
         }
       }
-    }
+      if (!madeProgress) {
+        // report queued imports we were unable to resolve
+        for (let j = 0, l = queuedImports.length; j < l; ++j) {
+          let queuedImport = queuedImports[j];
+          let foreignIdentifier = queuedImport.foreignIdentifier;
+          if (foreignIdentifier) {
+            this.error(
+              DiagnosticCode.Module_0_has_no_exported_member_1,
+              foreignIdentifier.range, queuedImport.foreignPath, foreignIdentifier.text
+            );
+          }
+        }
+        break;
+      }
+    } while (true);
 
     // queued exports should be resolvable now that imports are finalized
     // TODO: for (let [file, exports] of queuedExports) {

tests/compiler/exportstar-rereexport.optimized.wat

@@ -0,0 +1,41 @@
+(module
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (memory $0 0)
+ (global $export/a i32 (i32.const 1))
+ (global $export/b i32 (i32.const 2))
+ (global $export/c i32 (i32.const 3))
+ (export "memory" (memory $0))
+ (export "a" (global $export/a))
+ (export "renamed_a" (global $export/a))
+ (export "renamed_b" (global $export/b))
+ (export "renamed_renamed_b" (global $export/b))
+ (export "default" (func $export-default/theDefault))
+ (export "renamed_default" (func $export-default/theDefault))
+ (export "exportstar.add" (func $export/add))
+ (export "exportstar.sub" (func $export/sub))
+ (export "exportstar.renamed_mul" (func $export/mul))
+ (export "exportstar.a" (global $export/a))
+ (export "exportstar.b" (global $export/b))
+ (export "exportstar.renamed_c" (global $export/c))
+ (export "exportstar.ns.two" (func $export-default/theDefault))
+ (export "exportstar.default.two" (func $export-default/theDefault))
+ (func $export/add (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.add
+ )
+ (func $export/mul (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.mul
+ )
+ (func $export-default/theDefault
+  nop
+ )
+ (func $export/sub (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.sub
+ )
+)

tests/compiler/wildcard-export.untouched.wat → tests/compiler/exportstar-rereexport.untouched.wat

@@ -13,6 +13,14 @@
  (export "renamed_renamed_b" (global $export/b))
  (export "default" (func $export-default/theDefault))
  (export "renamed_default" (func $export-default/theDefault))
+ (export "exportstar.add" (func $export/add))
+ (export "exportstar.sub" (func $export/sub))
+ (export "exportstar.renamed_mul" (func $export/mul))
+ (export "exportstar.a" (global $export/a))
+ (export "exportstar.b" (global $export/b))
+ (export "exportstar.renamed_c" (global $export/c))
+ (export "exportstar.ns.two" (func $export/ns.two))
+ (export "exportstar.default.two" (func $export/ns.two))
  (start $~start)
  (func $export/add (param $0 i32) (param $1 i32) (result i32)
   local.get $0
@@ -37,13 +45,24 @@
  (func $start:rereexport
   call $start:reexport
  )
- (func $start:wildcard-export
+ (func $start:exportstar-rereexport
   call $start:rereexport
  )
  (func $export-default/theDefault
   nop
  )
+ (func $export/sub (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.sub
+ )
+ (func $export/ns.one
+  nop
+ )
+ (func $export/ns.two
+  nop
+ )
  (func $~start
-  call $start:wildcard-export
+  call $start:exportstar-rereexport
  )
 )

tests/compiler/rereexport.optimized.wat

@@ -1,16 +1,41 @@
 (module
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $none_=>_none (func))
  (memory $0 0)
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
+ (global $export/c i32 (i32.const 3))
  (export "memory" (memory $0))
  (export "a" (global $export/a))
  (export "renamed_a" (global $export/a))
  (export "renamed_b" (global $export/b))
  (export "renamed_renamed_b" (global $export/b))
  (export "default" (func $export-default/theDefault))
  (export "renamed_default" (func $export-default/theDefault))
+ (export "exportstar.add" (func $export/add))
+ (export "exportstar.sub" (func $export/sub))
+ (export "exportstar.renamed_mul" (func $export/mul))
+ (export "exportstar.a" (global $export/a))
+ (export "exportstar.b" (global $export/b))
+ (export "exportstar.renamed_c" (global $export/c))
+ (export "exportstar.ns.two" (func $export-default/theDefault))
+ (export "exportstar.default.two" (func $export-default/theDefault))
+ (func $export/add (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.add
+ )
+ (func $export/mul (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.mul
+ )
  (func $export-default/theDefault
   nop
  )
+ (func $export/sub (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.sub
+ )
 )

tests/compiler/rereexport.ts

@@ -6,3 +6,6 @@ export {
   default,
   default as renamed_default
 } from "./reexport";
+
+import { exportstar } from "./reexport";
+export { exportstar };

tests/compiler/rereexport.untouched.wat

@@ -13,6 +13,14 @@
  (export "renamed_renamed_b" (global $export/b))
  (export "default" (func $export-default/theDefault))
  (export "renamed_default" (func $export-default/theDefault))
+ (export "exportstar.add" (func $export/add))
+ (export "exportstar.sub" (func $export/sub))
+ (export "exportstar.renamed_mul" (func $export/mul))
+ (export "exportstar.a" (global $export/a))
+ (export "exportstar.b" (global $export/b))
+ (export "exportstar.renamed_c" (global $export/c))
+ (export "exportstar.ns.two" (func $export/ns.two))
+ (export "exportstar.default.two" (func $export/ns.two))
  (start $~start)
  (func $export/add (param $0 i32) (param $1 i32) (result i32)
   local.get $0
@@ -40,6 +48,17 @@
  (func $export-default/theDefault
   nop
  )
+ (func $export/sub (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  local.get $1
+  i32.sub
+ )
+ (func $export/ns.one
+  nop
+ )
+ (func $export/ns.two
+  nop
+ )
  (func $~start
   call $start:rereexport
  )