fix: top-level-await module execution

cli/ops/worker_host.rs

@@ -153,9 +153,15 @@ fn run_worker_thread(
       rt.block_on(load_future)
     };
 
-    if let Err(e) = result {
-      let mut sender = worker.internal_channels.sender.clone();
+    let mut sender = worker.internal_channels.sender.clone();
 
+    // If sender is closed it means that worker has already been closed from
+    // within using "globalThis.close()"
+    if sender.is_closed() {
+      return;
+    }
+
+    if let Err(e) = result {
       sender
         .try_send(WorkerEvent::TerminalError(e))
         .expect("Failed to post message to host");

cli/tests/integration_tests.rs

@@ -2410,6 +2410,16 @@ itest!(wasm_unreachable {
   exit_code: 1,
 });
 
+itest!(top_level_await_order {
+  args: "run --allow-read top_level_await_order.js",
+  output: "top_level_await_order.out",
+});
+
+itest!(top_level_await_loop {
+  args: "run --allow-read top_level_await_loop.js",
+  output: "top_level_await_loop.out",
+});
+
 itest!(top_level_await {
   args: "run --allow-read top_level_await.js",
   output: "top_level_await.out",

cli/tests/tla/a.js

@@ -0,0 +1,3 @@
+import order from "./order.js";
+
+order.push("b");

cli/tests/tla/b.js

@@ -0,0 +1,7 @@
+import order from "./order.js";
+
+await new Promise((resolve) => {
+  setTimeout(resolve, 200);
+});
+
+order.push("a");

cli/tests/tla/c.js

@@ -0,0 +1,3 @@
+import order from "./order.js";
+
+order.push("c");

cli/tests/tla/d.js

@@ -0,0 +1,6 @@
+import order from "./order.js";
+
+const end = Date.now() + 500;
+while (end < Date.now()) {}
+
+order.push("d");

cli/tests/tla/order.js

@@ -0,0 +1 @@
+export default ["order"];

cli/tests/tla/parent.js

@@ -0,0 +1,9 @@
+import order from "./order.js";
+import "./a.js";
+import "./b.js";
+import "./c.js";
+import "./d.js";
+
+order.push("parent");
+
+export default order;

cli/tests/tla2/a.js

@@ -0,0 +1,5 @@
+export default class Foo {
+  constructor(message) {
+    this.message = message;
+  }
+}

cli/tests/tla2/b.js

@@ -0,0 +1,5 @@
+export default class Bar {
+  constructor(message) {
+    this.message = message;
+  }
+}

cli/tests/top_level_await_loop.js

@@ -0,0 +1,18 @@
+const importsDir = Deno.readDirSync(Deno.realPathSync("./tla2"));
+
+const resolvedPaths = [];
+
+for (const { name } of importsDir) {
+  const filePath = Deno.realPathSync(`./tla2/${name}`);
+  resolvedPaths.push(filePath);
+}
+
+resolvedPaths.sort();
+
+for (const filePath of resolvedPaths) {
+  console.log("loading", filePath);
+  const mod = await import(`file://${filePath}`);
+  console.log("loaded", mod);
+}
+
+console.log("all loaded");

cli/tests/top_level_await_loop.out

@@ -0,0 +1,5 @@
+loading [WILDCARD]a.js
+loaded Module { default: [Function: Foo], [Symbol(Symbol.toStringTag)]: "Module" }
+loading [WILDCARD]b.js
+loaded Module { default: [Function: Bar], [Symbol(Symbol.toStringTag)]: "Module" }
+all loaded

cli/tests/top_level_await_order.js

@@ -0,0 +1,21 @@
+// Ported from Node
+// https://github.com/nodejs/node/blob/54746bb763ebea0dc7e99d88ff4b379bcd680964/test/es-module/test-esm-tla.mjs
+
+const { default: order } = await import("./tla/parent.js");
+
+console.log("order", JSON.stringify(order));
+
+if (
+  !(
+    order[0] === "order" &&
+    order[1] === "b" &&
+    order[2] === "c" &&
+    order[3] === "d" &&
+    order[4] === "a" &&
+    order[5] === "parent"
+  )
+) {
+  throw new Error("TLA wrong order");
+}
+
+console.log("TLA order correct");

cli/tests/top_level_await_order.out

@@ -0,0 +1,2 @@
+order ["order","b","c","d","a","parent"]
+TLA order correct

cli/worker.rs

@@ -191,7 +191,7 @@ impl Worker {
   ) -> Result<(), AnyError> {
     let id = self.preload_module(module_specifier).await?;
     self.wait_for_inspector_session();
-    self.js_runtime.mod_evaluate(id)
+    self.js_runtime.mod_evaluate(id).await
   }
 
   /// Returns a way to communicate with the Worker from other threads.

core/modules.rs

@@ -667,7 +667,7 @@ mod tests {
     let a_id_fut = runtime.load_module(&spec, None);
     let a_id = futures::executor::block_on(a_id_fut).expect("Failed to load");
 
-    runtime.mod_evaluate(a_id).unwrap();
+    futures::executor::block_on(runtime.mod_evaluate(a_id)).unwrap();
     let l = loads.lock().unwrap();
     assert_eq!(
       l.to_vec(),
@@ -734,7 +734,7 @@ mod tests {
       let result = runtime.load_module(&spec, None).await;
       assert!(result.is_ok());
       let circular1_id = result.unwrap();
-      runtime.mod_evaluate(circular1_id).unwrap();
+      runtime.mod_evaluate(circular1_id).await.unwrap();
 
       let l = loads.lock().unwrap();
       assert_eq!(
@@ -811,7 +811,7 @@ mod tests {
       println!(">> result {:?}", result);
       assert!(result.is_ok());
       let redirect1_id = result.unwrap();
-      runtime.mod_evaluate(redirect1_id).unwrap();
+      runtime.mod_evaluate(redirect1_id).await.unwrap();
       let l = loads.lock().unwrap();
       assert_eq!(
         l.to_vec(),
@@ -961,7 +961,7 @@ mod tests {
     let main_id =
       futures::executor::block_on(main_id_fut).expect("Failed to load");
 
-    runtime.mod_evaluate(main_id).unwrap();
+    futures::executor::block_on(runtime.mod_evaluate(main_id)).unwrap();
 
     let l = loads.lock().unwrap();
     assert_eq!(