fix

hai-x · hai-x · commit 0fd75ea54f59 · 2026-01-25T03:58:10.000+08:00
diff --git a/cspell.json b/cspell.json
@@ -318,7 +318,8 @@
     "thelarkinn",
     "behaviour",
     "WHATWG",
-    "publicpath"
+    "publicpath",
+    "Uninstantiated"
   ],
   "ignoreRegExpList": [
     "/Author.+/",
diff --git a/test/runner/RunnerHelpers.js b/test/runner/RunnerHelpers.js
@@ -60,7 +60,14 @@ const getNodeVersion = () => process.versions.node.split(".").map(Number);
 
 const ESModuleStatus = Object.freeze({
 	Unlinked: "unlinked",
-	Evaluated: "evaluated"
+	Linked: "linked",
+	Evaluated: "evaluated",
+	/**
+	 * Present in `module.linkingStatus`
+	 * Compatible with Node.js v10
+	 * https://nodejs.org/docs/latest-v10.x/api/vm.html#vm_module_status
+	 */
+	Uninstantiated: "uninstantiated"
 });
 
 module.exports = {
diff --git a/test/runner/asModule.js b/test/runner/asModule.js
@@ -38,9 +38,17 @@ module.exports = async (something, context, options = {}) => {
 	});
 	if (options.esmReturnStatus === ESModuleStatus.Unlinked) return esm;
 
-	await esm.link(LINKER);
-	// Node.js 10 needs instantiate
-	if (major === 10 && esm.instantiate) esm.instantiate();
+	if (major === 10) {
+		if (esm.linkingStatus === ESModuleStatus.Unlinked) {
+			await esm.link(LINKER);
+		}
+		if (esm.linkingStatus === ESModuleStatus.Linked) {
+			esm.instantiate();
+		}
+	} else {
+		await esm.link(LINKER);
+	}
+
 	await esm.evaluate();
 	return esm;
 };
diff --git a/test/runner/index.js b/test/runner/index.js
@@ -447,40 +447,49 @@ class TestRunner {
 			const esm = getModuleInstance(modulePath, content);
 			if (esmReturnStatus === ESModuleStatus.Unlinked) return esm;
 
-			const evaluate = async () => {
-				// 1. Link all deps
-				if (esm.status === ESModuleStatus.Unlinked) {
-					await esm.link(
-						async (specifier, referrer) =>
-							// `linker` should return `vm.SourceTextModule`
-							await asModule(
-								await this.require(
-									path.dirname(
-										referrer.identifier || fileURLToPath(referrer.url)
-									),
-									specifier,
-									{ esmReturnStatus: ESModuleStatus.Unlinked }
+			const link = async () => {
+				await esm.link(
+					async (specifier, referencingModule) =>
+						// `linker` should return `vm.SourceTextModule`
+						await asModule(
+							await this.require(
+								path.dirname(
+									referencingModule.identifier ||
+										fileURLToPath(referencingModule.url)
 								),
-								referrer.context,
-								{
-									esmReturnStatus: ESModuleStatus.Unlinked
-								}
-							)
-					);
+								specifier,
+								{ esmReturnStatus: ESModuleStatus.Unlinked }
+							),
+							referencingModule.context,
+							{
+								esmReturnStatus: ESModuleStatus.Unlinked
+							}
+						)
+				);
+			};
+
+			const run = async () => {
+				// Link module dependencies
+				if (major === 10) {
+					if (esm.linkingStatus === ESModuleStatus.Unlinked) {
+						await link();
+					}
+					if (esm.linkingStatus === ESModuleStatus.Linked) {
+						esm.instantiate();
+					}
+				} else {
+					await link();
 				}
 
-				// 2. Evaluate the module
-				// Node.js 10 needs instantiate
-				if (major === 10 && esm.instantiate) esm.instantiate();
+				// Evaluate the module
 				await esm.evaluate();
 				if (esmReturnStatus === ESModuleStatus.Evaluated) return esm;
 
-				// 3. Return module namespace
 				const ns = esm.namespace;
 				return ns.default && ns.default instanceof Promise ? ns.default : ns;
 			};
 
-			return evaluate();
+			return run();
 		};
 	}
 
