Correct dynamic module loading/caching

karlseguin · karlseguin · commit f04754c254b2 · 2025-09-22T15:15:00.000+08:00
Refactors some of the module loading logic. Both normal modules import and
dynamic module import now share more of the same code - they both go through
the slightly modified `module` function.

Dynamic modules now check the cache first, before loading, and when cached,
resolve the correct promise. This can now happen regardless of the module
loading state.

Also tried to replace some page arenas with call arenas and added some basic
tests for both normal and dynamic module loading.
diff --git a/build.zig.zon b/build.zig.zon
@@ -5,8 +5,8 @@
     .fingerprint = 0xda130f3af836cea0,
     .dependencies = .{
         .v8 = .{
-            .url = "https://github.com/lightpanda-io/zig-v8-fork/archive/7177ee1ae267a44751a0e7e012e257177699a375.tar.gz",
-            .hash = "v8-0.0.0-xddH63TCAwC1D1hEiOtbEnLBbtz9ZPHrdiGWLcBcYQB7",
+            .url = "https://github.com/lightpanda-io/zig-v8-fork/archive/6018980ed7222bf7f568d058998f682dbee68ad3.tar.gz",
+            .hash = "v8-0.0.0-xddH6x_DAwBh0gSbFFv1fyiExhExXKzZpbmj5sFH4MRY",
         },
         // .v8 = .{ .path = "../zig-v8-fork" }
     },
diff --git a/src/browser/html/elements.zig b/src/browser/html/elements.zig
@@ -1343,6 +1343,8 @@ test "Browser: HTML.HtmlStyleElement" {
 test "Browser: HTML.HtmlScriptElement" {
     try testing.htmlRunner("html/script/script.html");
     try testing.htmlRunner("html/script/inline_defer.html");
+    try testing.htmlRunner("html/script/import.html");
+    try testing.htmlRunner("html/script/dynamic_import.html");
 }
 
 test "Browser: HTML.HtmlSlotElement" {
diff --git a/src/runtime/js.zig b/src/runtime/js.zig
diff --git a/src/tests/html/script/dynamic_import.html b/src/tests/html/script/dynamic_import.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+
+<script src="../../testing.js"></script>
+
+<script id=dynamic_import type=module>
+  const promise1 = new Promise((resolve) => {
+    Promise.all([
+      import('./import.js'),
+      import('./import.js'),
+      import('./import2.js'),
+    ]).then(resolve);
+  });
+
+  testing.async(promise1, (res) => {
+    testing.expectEqual('hello', res[0].greeting);
+    testing.expectEqual('hello', res[1].greeting);
+    testing.expectEqual('world', res[2].greeting);
+  })
+</script>
diff --git a/src/tests/html/script/import.html b/src/tests/html/script/import.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+
+<script src="../../testing.js"></script>
+
+<script id=import type=module>
+  import * as im from './import.js';
+  testing.expectEqual('hello', im.greeting);
+</script>
+
+<script id=cached type=module>
+  // hopefully cached, who knows, no real way to assert this
+  // but at least it works.
+  import * as im from './import.js';
+  testing.expectEqual('hello', im.greeting);
+</script>
diff --git a/src/tests/html/script/import.js b/src/tests/html/script/import.js
@@ -0,0 +1,2 @@
+let greeting = 'hello';
+export {greeting as 'greeting'};
diff --git a/src/tests/html/script/import2.js b/src/tests/html/script/import2.js
@@ -0,0 +1,2 @@
+let greeting = 'world';
+export {greeting as 'greeting'};
diff --git a/src/tests/testing.js b/src/tests/testing.js
@@ -93,7 +93,7 @@
   }
 
   async function async(promise, cb) {
-    const script_id = document.currentScript.id;
+    const script_id = document.currentScript ? document.currentScript.id : '<script id is unavailable in browsers>';
     const stack = new Error().stack;
     const value = await promise;
     this._captured = {script_id: script_id, stack: stack};

Original file line number	Diff line number	Diff line change
`@@ -1343,6 +1343,8 @@ test "Browser: HTML.HtmlStyleElement" {`
`1343`	`1343`	`test "Browser: HTML.HtmlScriptElement" {`
`1344`	`1344`	`try testing.htmlRunner("html/script/script.html");`
`1345`	`1345`	`try testing.htmlRunner("html/script/inline_defer.html");`
	`1346`	`+ try testing.htmlRunner("html/script/import.html");`
	`1347`	`+ try testing.htmlRunner("html/script/dynamic_import.html");`
`1346`	`1348`	`}`
`1347`	`1349`
`1348`	`1350`	`test "Browser: HTML.HtmlSlotElement" {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+let greeting = 'hello';`
	`2`	`+export {greeting as 'greeting'};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+let greeting = 'world';`
	`2`	`+export {greeting as 'greeting'};`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`async function async(promise, cb) {`
`96`		`- const script_id = document.currentScript.id;`
	`96`	`+ const script_id = document.currentScript ? document.currentScript.id : '<script id is unavailable in browsers>';`
`97`	`97`	`const stack = new Error().stack;`
`98`	`98`	`const value = await promise;`
`99`	`99`	`this._captured = {script_id: script_id, stack: stack};`