back to the non-promise version & port some webpack tests

crates/turbopack-ecmascript-runtime/js/src/shared/runtime-types.d.ts

@@ -47,8 +47,9 @@ type AsyncModule = (
   body: (
     handleAsyncDependencies: (
       deps: Dep[]
-    ) => Exports[] | Promise<() => Exports[]>
-  ) => Promise<void>,
+    ) => Exports[] | Promise<() => Exports[]>,
+    asyncResult: (err?: any) => void
+  ) => void,
   hasAwait: boolean
 ) => void;
 

crates/turbopack-ecmascript-runtime/js/src/shared/runtime-utils.ts

@@ -333,12 +333,20 @@ const turbopackQueues = Symbol("turbopack queues");
 const turbopackExports = Symbol("turbopack exports");
 const turbopackError = Symbol("turbopack error");
 
+const enum QueueStatus {
+  Unknown = -1,
+  Unresolved = 0,
+  Resolved = 1,
+}
+
 type AsyncQueueFn = (() => void) & { queueCount: number };
-type AsyncQueue = AsyncQueueFn[] & { resolved: boolean };
+type AsyncQueue = AsyncQueueFn[] & {
+  status: QueueStatus;
+};
 
 function resolveQueue(queue?: AsyncQueue) {
-  if (queue && !queue.resolved) {
-    queue.resolved = true;
+  if (queue && queue.status !== QueueStatus.Resolved) {
+    queue.status = QueueStatus.Resolved;
     queue.forEach((fn) => fn.queueCount--);
     queue.forEach((fn) => (fn.queueCount-- ? fn.queueCount++ : fn()));
   }
@@ -359,7 +367,9 @@ function wrapDeps(deps: Dep[]): AsyncModuleExt[] {
     if (dep !== null && typeof dep === "object") {
       if (isAsyncModuleExt(dep)) return dep;
       if (isPromise(dep)) {
-        const queue: AsyncQueue = Object.assign([], { resolved: false });
+        const queue: AsyncQueue = Object.assign([], {
+          status: QueueStatus.Unresolved,
+        });
 
         const obj: AsyncModuleExt = {
           [turbopackExports]: {},
@@ -393,12 +403,13 @@ function asyncModule(
   body: (
     handleAsyncDependencies: (
       deps: Dep[]
-    ) => Exports[] | Promise<() => Exports[]>
-  ) => Promise<void>,
+    ) => Exports[] | Promise<() => Exports[]>,
+    asyncResult: (err?: any) => void
+  ) => void,
   hasAwait: boolean
 ) {
   const queue: AsyncQueue | undefined = hasAwait
-    ? Object.assign([], { resolved: true })
+    ? Object.assign([], { status: QueueStatus.Unknown })
     : undefined;
 
   const depQueues: Set<AsyncQueue> = new Set();
@@ -447,7 +458,7 @@ function asyncModule(
     function fnQueue(q: AsyncQueue) {
       if (q !== queue && !depQueues.has(q)) {
         depQueues.add(q);
-        if (q && !q.resolved) {
+        if (q && q.status === QueueStatus.Unresolved) {
           fn.queueCount++;
           q.push(fn);
         }
@@ -459,19 +470,20 @@ function asyncModule(
     return fn.queueCount ? promise : getResult();
   }
 
-  Promise.resolve(body(handleAsyncDependencies)).then(
-    () => {
-      resolve(promise[turbopackExports]);
-      resolveQueue(queue);
-    },
-    (err) => {
+  function asyncResult(err?: any) {
+    if (err) {
       reject((promise[turbopackError] = err));
-      resolveQueue(queue);
+    } else {
+      resolve(promise[turbopackExports]);
     }
-  );
 
-  if (queue) {
-    queue.resolved = false;
+    resolveQueue(queue);
+  }
+
+  body(handleAsyncDependencies, asyncResult);
+
+  if (queue && queue.status === QueueStatus.Unknown) {
+    queue.status = QueueStatus.Unresolved;
   }
 }
 

crates/turbopack-ecmascript/src/chunk/item.rs

@@ -136,13 +136,18 @@ impl EcmascriptChunkItemContent {
 
         if this.options.async_module.is_some() {
             code += "__turbopack_async_module__(async (__turbopack_handle_async_dependencies__, \
-                     __turbopack_async_result__) => {\n";
+                     __turbopack_async_result__) => { try {\n";
         }
 
         code.push_source(&this.inner_code, this.source_map);
 
         if let Some(opts) = &this.options.async_module {
-            write!(code, "}}, {});", opts.has_top_level_await)?;
+            write!(
+                code,
+                "__turbopack_async_result__();\n}} catch(e) {{ __turbopack_async_result__(e); }} \
+                 }}, {});",
+                opts.has_top_level_await
+            )?;
         }
 
         if this.options.this {

crates/turbopack-tests/tests/execution/turbopack/wasm/complex/input/index.js

@@ -1,4 +1,4 @@
-const magicAsyncModule = require("./magic")
+const magicAsyncModule = require("./magic");
 
 describe("complex wasm", () => {
   it("should be possible to use imported memory", async () => {

crates/turbopack-tests/tests/execution/turbopack/wasm/simple/input/math.js

@@ -5,11 +5,11 @@ import { fibonacci } from "./fibonacci.wasm";
 export { add, factorial, fibonacci };
 
 export function factorialJavascript(i) {
-	if (i < 1) return 1;
-	return i * factorialJavascript(i - 1);
+  if (i < 1) return 1;
+  return i * factorialJavascript(i - 1);
 }
 
 export function fibonacciJavascript(i) {
-	if (i < 2) return 1;
-	return fibonacciJavascript(i - 1) + fibonacciJavascript(i - 2);
+  if (i < 2) return 1;
+  return fibonacciJavascript(i - 1) + fibonacciJavascript(i - 2);
 }

crates/turbopack-tests/tests/execution/webpack/async-modules/.reexport-unknown/input/async-unknown.js

@@ -0,0 +1,3 @@
+export * from "./unknown.js";
+
+await 1;

crates/turbopack-tests/tests/execution/webpack/async-modules/.reexport-unknown/input/index.js

@@ -0,0 +1,3 @@
+it("should handle re-export from async modules correctly", async () => {
+  await import("./test.js");
+});

crates/turbopack-tests/tests/execution/webpack/async-modules/.reexport-unknown/input/reexport-async-unknown.js

@@ -0,0 +1,3 @@
+export * from "./async-unknown.js";
+export { a } from "./async-unknown.js";
+export default "default";

crates/turbopack-tests/tests/execution/webpack/async-modules/.reexport-unknown/input/test.js

@@ -0,0 +1,23 @@
+import * as ns from "./reexport-async-unknown.js?ns";
+import { a, b, c } from "./reexport-async-unknown.js?named";
+import value from "./reexport-async-unknown.js?default";
+
+function nsObj(m) {
+  Object.defineProperty(m, Symbol.toStringTag, { value: "Module" });
+  return m;
+}
+
+expect(ns).toEqual(
+  nsObj({
+    default: "default",
+    a: "a",
+    b: "b",
+    c: "c",
+  })
+);
+
+expect(a).toBe("a");
+expect(b).toBe("b");
+expect(c).toBe("c");
+
+expect(value).toBe("default");

crates/turbopack-tests/tests/execution/webpack/async-modules/.reexport-unknown/input/unknown.js

@@ -0,0 +1,7 @@
+const o = {
+  a: "a",
+  b: "b",
+  c: "c",
+};
+
+module.exports = Object(o);

crates/turbopack-tests/tests/execution/webpack/async-modules/double-import/input/a.js

@@ -0,0 +1,3 @@
+import x from "./shared";
+
+export default x + " world";

crates/turbopack-tests/tests/execution/webpack/async-modules/double-import/input/b.js

@@ -0,0 +1,3 @@
+import x from "./shared";
+
+export default x + " world";

crates/turbopack-tests/tests/execution/webpack/async-modules/double-import/input/index.js

@@ -0,0 +1,4 @@
+it("should allow to import an async module twice", async () => {
+  const result = await require("./main");
+  expect(result.default).toBe("hello world, hello world");
+});

crates/turbopack-tests/tests/execution/webpack/async-modules/double-import/input/main.js

@@ -0,0 +1,4 @@
+import a from "./a";
+import b from "./b";
+
+export default a + ", " + b;

crates/turbopack-tests/tests/execution/webpack/async-modules/double-import/input/shared.js

@@ -0,0 +1,3 @@
+await 1;
+await 1;
+export default "hello";

crates/turbopack-tests/tests/execution/webpack/async-modules/issue-16097/input/index.js

@@ -0,0 +1,6 @@
+import i, { foo } from "./won't-run-tla";
+
+it("should have value imported from won't-run-tla", async () => {
+  expect(i).toBe(42);
+  expect(foo).toBe(undefined);
+});

crates/turbopack-tests/tests/execution/webpack/async-modules/issue-16097/input/won't-run-tla.js

@@ -0,0 +1,4 @@
+global.someNonExistentVariable && (await "test");
+const foo = global.otherSomeNonExistentVariable && (await 43);
+export default 42;
+export { foo };

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/a.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./async";
+
+report("a");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/async.js

@@ -0,0 +1,7 @@
+import { report } from "../tick";
+
+report("async before");
+await 0;
+report("async middle");
+await 0;
+report("async after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/async2.js

@@ -0,0 +1,8 @@
+import { report } from "../tick";
+import "./d";
+
+report("async2 before");
+await 0;
+report("async2 middle");
+await 0;
+report("async2 after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/b.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./async";
+
+report("b");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/c.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./b";
+
+report("c");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/d.js

@@ -0,0 +1,5 @@
+import { report } from "../tick";
+import "./c";
+import "./a";
+
+report("d");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/e.js

@@ -0,0 +1,3 @@
+import { report } from "../tick";
+
+report("e");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-a/f.js

@@ -0,0 +1,5 @@
+import { report } from "../tick";
+import "./e";
+import "./async2";
+
+report("f");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-b/a.js

@@ -0,0 +1,5 @@
+import { report } from "../tick";
+import "./async";
+import "./b";
+
+report("a");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-b/async.js

@@ -0,0 +1,7 @@
+import { report } from "../tick";
+
+report("async before");
+await 0;
+report("async middle");
+await 0;
+report("async after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-b/b.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./c";
+
+report("b");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-b/c.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./async";
+
+report("c");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-b/d.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./c";
+
+report("d");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-b/e.js

@@ -0,0 +1,9 @@
+import { report } from "../tick";
+import "./a";
+import "./d";
+
+report("async before");
+await 0;
+report("async middle");
+await 0;
+report("async after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-c/a.js

@@ -0,0 +1,7 @@
+import { report } from "../tick";
+import "./b";
+import "./a";
+
+report("a before");
+await 0;
+report("a after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-c/b.js

@@ -0,0 +1,3 @@
+import { report } from "../tick";
+
+report("b");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-d/a.js

@@ -0,0 +1,6 @@
+import { report } from "../tick";
+import "./b";
+
+report("a before");
+await 0;
+report("a after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-d/b.js

@@ -0,0 +1,6 @@
+import { report } from "../tick";
+import "./c";
+
+report("b before");
+await 0;
+report("b after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-d/c.js

@@ -0,0 +1,6 @@
+import { report } from "../tick";
+import "./a";
+
+report("c before");
+await 0;
+report("c after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-d/index.js

@@ -0,0 +1,5 @@
+import { report } from "../tick";
+import "./x";
+import "./y";
+
+report("index");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-d/x.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./a";
+
+report("x");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-d/y.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./b";
+
+report("y");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-e/a.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./async";
+
+report("a");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-e/async.js

@@ -0,0 +1,7 @@
+import { report } from "../tick";
+
+report("async before");
+await 0;
+report("async middle");
+await 0;
+report("async after");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-e/b.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./async";
+
+report("b");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-e/index.js

@@ -0,0 +1,6 @@
+import { report } from "../tick";
+import "./a";
+import "./b";
+import "./x";
+
+report("index");

crates/turbopack-tests/tests/execution/webpack/async-modules/micro-ticks-parents/input/case-e/x.js

@@ -0,0 +1,4 @@
+import { report } from "../tick";
+import "./a";
+
+report("x");