unrun 0.2.9 → 0.2.11

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { n as unrunCli, r as unrunSync, t as unrun } from "./src-D87jO6Ui.mjs";
+import { n as unrunCli, r as unrunSync, t as unrun } from "./src-DyfW0b4_.mjs";
 
 export { unrun, unrunCli, unrunSync };

package/dist/{src-D87jO6Ui.mjs → src-DyfW0b4_.mjs}

@@ -111,99 +111,163 @@ function isPathWithinDirectory(parent, child) {
 * nested node_modules so they keep working once executed from .unrun.
 */
 function createExternalResolver(options) {
-	const projectNodeModules = path.resolve(process.cwd(), "node_modules");
+	const entryDir = path.dirname(options.path);
+	const entryRequire = createRequire(options.path);
+	const canResolveFromEntry = (specifier) => {
+		try {
+			entryRequire.resolve(specifier);
+			return true;
+		} catch {
+			return false;
+		}
+	};
 	return function external(id, importer) {
 		if (!id || id.startsWith("\0")) return false;
 		if (id.startsWith(".") || id.startsWith("#") || path.isAbsolute(id)) return false;
 		if (isBuiltinModuleSpecifier(id)) return true;
 		const importerPath = normalizeImporterPath(importer, options.path);
 		try {
-			if (!isPathWithinDirectory(projectNodeModules, createRequire(importerPath).resolve(id))) return false;
+			const containingNodeModules = findContainingNodeModules(createRequire(importerPath).resolve(id));
+			if (!containingNodeModules) return false;
+			const ownerDir = path.dirname(containingNodeModules);
+			const ownerInsideEntry = isPathWithinDirectory(entryDir, ownerDir);
+			const entryInsideOwner = isPathWithinDirectory(ownerDir, entryDir);
+			if (ownerInsideEntry && !entryInsideOwner) return false;
+			if (!canResolveFromEntry(id)) return false;
 		} catch {}
 		return true;
 	};
 }
+function findContainingNodeModules(filePath) {
+	let current = path.dirname(filePath);
+	const { root } = path.parse(current);
+	while (true) {
+		if (path.basename(current) === "node_modules") return current;
+		if (current === root) break;
+		current = path.dirname(current);
+	}
+}
 
 //#endregion
 //#region src/plugins/console-output-customizer.ts
-/**
-* Attach a util.inspect customizer to namespace-like module objects produced by rolldown helpers
-* so console.log prints concrete values instead of [Getter], while preserving live bindings.
-*
-* Cleaner strategy: inject a tiny helper at the top of the chunk and minimally augment
-* rolldown helpers (__export and __copyProps) right inside their definitions, before use.
-*/
+const INSPECT_HELPER_SNIPPET = `(function(){
+  function __unrun__fmt(names, getter, np){
+    var onlyDefault = names.length === 1 && names[0] === "default";
+    var o = np ? Object.create(null) : {};
+    for (var i = 0; i < names.length; i++) {
+      var n = names[i];
+      try { o[n] = getter(n) } catch {}
+    }
+    if (onlyDefault) {
+      try {
+          var s = JSON.stringify(o.default);
+        if (s !== undefined) {
+            s = s.replace(/"([^"]+)":/g, "$1: ").replace(/,/g, ", ").replace(/{/g, "{ ").replace(/}/g, " }");
+          return "[Module: null prototype] { default: " + s + " }";
+        }
+      } catch {}
+      return "[Module: null prototype] { default: " + String(o.default) + " }";
+    }
+    return o;
+  }
+  function __unrun__setInspect(obj, names, getter, np){
+    try {
+      var __insp = Symbol.for('nodejs.util.inspect.custom');
+      Object.defineProperty(obj, __insp, {
+        value: function(){ return __unrun__fmt(names, getter, np) },
+        enumerable: false, configurable: true
+      });
+    } catch {}
+    return obj;
+  }
+  try {
+    Object.defineProperty(globalThis, "__unrun__setInspect", {
+      value: __unrun__setInspect,
+      enumerable: false,
+    });
+  } catch {}
+})();`;
+const WRAPPER_SNIPPET = `(function __unrun__wrapRolldownHelpers(){
+  if (typeof __unrun__setInspect !== "function") return;
+  if (typeof __export === "function" && !__export.__unrunPatched) {
+    var __unrun__origExport = __export;
+    var __unrun__patchedExport = (...__unrun__args) => {
+      var __unrun__target = __unrun__origExport(...__unrun__args);
+      if (__unrun__target && typeof __unrun__target === "object") {
+        try {
+          var __unrun__map = (__unrun__args[0] && typeof __unrun__args[0] === "object") ? __unrun__args[0] : {};
+          var __unrun__names = Object.keys(__unrun__map).filter(function(n){ return n !== "__esModule" });
+          __unrun__setInspect(
+            __unrun__target,
+            __unrun__names,
+            function(n){
+              var getter = __unrun__map[n];
+              return typeof getter === "function" ? getter() : getter;
+            },
+            false,
+          );
+        } catch {}
+      }
+      return __unrun__target;
+    };
+    __unrun__patchedExport.__unrunPatched = true;
+    __export = __unrun__patchedExport;
+  }
+  if (typeof __copyProps === "function" && !__copyProps.__unrunPatched) {
+    var __unrun__origCopyProps = __copyProps;
+    var __unrun__patchedCopyProps = (...__unrun__args) => {
+      var __unrun__result = __unrun__origCopyProps(...__unrun__args);
+      if (__unrun__result && typeof __unrun__result === "object") {
+        try {
+          var __unrun__names = Object.keys(__unrun__result).filter(function(n){ return n !== "__esModule" });
+          __unrun__setInspect(__unrun__result, __unrun__names, function(n){ return __unrun__result[n] }, true);
+        } catch {}
+      }
+      return __unrun__result;
+    };
+    __unrun__patchedCopyProps.__unrunPatched = true;
+    __copyProps = __unrun__patchedCopyProps;
+  }
+})();`;
+const HELPER_DECLARATION_PATTERN = /__unrun__setInspect\b/;
+const WRAPPER_MARKER = "__unrun__wrapRolldownHelpers";
 function createConsoleOutputCustomizer() {
 	return {
 		name: "unrun-console-output-customizer",
 		generateBundle: { handler(_, bundle$1) {
 			for (const chunk of Object.values(bundle$1)) {
 				if (chunk.type !== "chunk") continue;
-				if (!/__unrun__setInspect\b/.test(chunk.code)) {
-					const helper = [
-						"(function(){",
-						"  function __unrun__fmt(names, getter, np){",
-						"    var onlyDefault = names.length === 1 && names[0] === \"default\";",
-						"    var o = np ? Object.create(null) : {};",
-						"    for (var i = 0; i < names.length; i++) {",
-						"      var n = names[i];",
-						"      try { o[n] = getter(n) } catch {}",
-						"    }",
-						"    if (onlyDefault) {",
-						"      try {",
-						"        var s = JSON.stringify(o.default);",
-						"        if (s !== undefined) {",
-						"          s = s.replace(/\"([^\"]+)\":/g, \"$1: \").replace(/,/g, \", \").replace(/{/g, \"{ \").replace(/}/g, \" }\");",
-						"          return \"[Module: null prototype] { default: \" + s + \" }\";",
-						"        }",
-						"      } catch {}",
-						"      return \"[Module: null prototype] { default: \" + String(o.default) + \" }\";",
-						"    }",
-						"    return o;",
-						"  }",
-						"  function __unrun__setInspect(obj, names, getter, np){",
-						"    try {",
-						"      var __insp = Symbol.for('nodejs.util.inspect.custom')",
-						"      Object.defineProperty(obj, __insp, {",
-						"        value: function(){ return __unrun__fmt(names, getter, np) },",
-						"        enumerable: false, configurable: true",
-						"      })",
-						"    } catch {}",
-						"    return obj;",
-						"  }",
-						"  try { Object.defineProperty(globalThis, \"__unrun__setInspect\", { value: __unrun__setInspect, enumerable: false }) } catch {}",
-						"})();"
-					].join("\n");
-					if (chunk.code.startsWith("#!")) {
-						const nl = chunk.code.indexOf("\n");
-						if (nl !== -1) chunk.code = `${chunk.code.slice(0, nl + 1)}${helper}\n${chunk.code.slice(nl + 1)}`;
-						else chunk.code = `${helper}\n${chunk.code}`;
-					} else chunk.code = `${helper}\n${chunk.code}`;
-				}
-				chunk.code = chunk.code.replace(/var\s+__export\s*=\s*\(all\)\s*=>\s*\{([\s\S]*?)return\s+target;\s*\}/, (_m, body) => {
-					return `var __export = (all) => {\n${[
-						body,
-						"  try {",
-						"    var __names = Object.keys(all).filter(function(n){ return n !== \"__esModule\" })",
-						"    __unrun__setInspect(target, __names, function(n){ return all[n]() }, false)",
-						"  } catch {}",
-						"  return target;"
-					].join("\n")}\n}`;
-				});
-				chunk.code = chunk.code.replace(/var\s+__copyProps\s*=\s*\(to,\s*from,\s*except,\s*desc\)\s*=>\s*\{([\s\S]*?)return\s+to;\s*\};/, (_m, body) => {
-					return `var __copyProps = (to, from, except, desc) => {\n${[
-						body,
-						"  try {",
-						"    var __names = Object.keys(to).filter(function(n){ return n !== \"__esModule\" })",
-						"    __unrun__setInspect(to, __names, function(n){ return to[n] }, true)",
-						"  } catch {}",
-						"  return to;"
-					].join("\n")}\n};`;
-				});
+				injectInspectHelper(chunk);
+				injectHelperWrappers(chunk);
 			}
 		} }
 	};
 }
+function injectInspectHelper(chunk) {
+	if (HELPER_DECLARATION_PATTERN.test(chunk.code)) return;
+	chunk.code = chunk.code.startsWith("#!") ? insertAfterShebang(chunk.code, `${INSPECT_HELPER_SNIPPET}\n`) : `${INSPECT_HELPER_SNIPPET}\n${chunk.code}`;
+}
+function injectHelperWrappers(chunk) {
+	if (chunk.code.includes(WRAPPER_MARKER)) return;
+	const insertIndex = findRuntimeBoundary(chunk.code);
+	const snippet = `${WRAPPER_SNIPPET}\n`;
+	if (insertIndex === -1) {
+		chunk.code = `${chunk.code}\n${snippet}`;
+		return;
+	}
+	chunk.code = `${chunk.code.slice(0, insertIndex)}${snippet}${chunk.code.slice(insertIndex)}`;
+}
+function findRuntimeBoundary(code) {
+	const markerIndex = code.indexOf("//#endregion");
+	if (markerIndex === -1) return -1;
+	const newlineIndex = code.indexOf("\n", markerIndex);
+	return newlineIndex === -1 ? code.length : newlineIndex + 1;
+}
+function insertAfterShebang(code, insertion) {
+	const nl = code.indexOf("\n");
+	if (nl === -1) return `${code}\n${insertion}`;
+	return `${code.slice(0, nl + 1)}${insertion}${code.slice(nl + 1)}`;
+}
 
 //#endregion
 //#region src/plugins/json-loader.ts
@@ -382,6 +446,7 @@ function createSourceContextShimsPlugin() {
 					return null;
 				}
 				let __MODIFIED_CODE__ = false;
+				if (id.replaceAll("\\", "/").includes("/node_modules/")) return null;
 				if (code.includes("import.meta.resolve")) {
 					const replaced = code.replaceAll(/import\.meta\.resolve!?\s*\(\s*(["'])([^"']+)\1\s*\)/g, (_m, _q, spec) => {
 						const url = pathToFileURL(path.resolve(path.dirname(id), spec)).href;
@@ -392,21 +457,36 @@ function createSourceContextShimsPlugin() {
 						__MODIFIED_CODE__ = true;
 					}
 				}
-				if (/__filename|__dirname|import\s*\.\s*meta\s*\.\s*url/.test(code)) {
+				const usesFilename = /\b__filename\b/.test(code);
+				const declaresFilename = /\b(?:const|let|var)\s+__filename\b/.test(code);
+				const usesDirname = /\b__dirname\b/.test(code);
+				const declaresDirname = /\b(?:const|let|var)\s+__dirname\b/.test(code);
+				const hasImportMetaUrl = /\bimport\s*\.\s*meta\s*\.\s*url\b/.test(code);
+				const needsFilenameShim = usesFilename && !declaresFilename;
+				const needsDirnameShim = usesDirname && !declaresDirname;
+				if (needsFilenameShim || needsDirnameShim || hasImportMetaUrl) {
 					const file = id;
 					const dir = path.dirname(id);
 					const url = pathToFileURL(id).href;
-					const prologue = `const __filename = ${JSON.stringify(file)}\nconst __dirname = ${JSON.stringify(dir)}\n`;
-					const protectedStrings = [];
-					let protectedCode = code.replaceAll(/(["'])[^"']*import\s*\.\s*meta\s*\.\s*url[^"']*\1\s*:/g, (match) => {
-						const placeholder = `__PROTECTED_STRING_${protectedStrings.length}__`;
-						protectedStrings.push(match);
-						return placeholder;
-					});
-					protectedCode = protectedCode.replaceAll(/\bimport\s*\.\s*meta\s*\.\s*url\b/g, JSON.stringify(url));
-					for (const [i, protectedString] of protectedStrings.entries()) protectedCode = protectedCode.replace(`__PROTECTED_STRING_${i}__`, protectedString);
-					code = prologue + protectedCode;
-					__MODIFIED_CODE__ = true;
+					const prologueLines = [];
+					if (needsFilenameShim) prologueLines.push(`const __filename = ${JSON.stringify(file)}`);
+					if (needsDirnameShim) prologueLines.push(`const __dirname = ${JSON.stringify(dir)}`);
+					let transformedCode = code;
+					if (hasImportMetaUrl) {
+						const protectedStrings = [];
+						transformedCode = transformedCode.replaceAll(/(["'])[^"']*import\s*\.\s*meta\s*\.\s*url[^"']*\1\s*:/g, (match) => {
+							const placeholder = `__PROTECTED_STRING_${protectedStrings.length}__`;
+							protectedStrings.push(match);
+							return placeholder;
+						});
+						transformedCode = transformedCode.replaceAll(/\bimport\s*\.\s*meta\s*\.\s*url\b/g, JSON.stringify(url));
+						for (const [i, protectedString] of protectedStrings.entries()) transformedCode = transformedCode.replace(`__PROTECTED_STRING_${i}__`, protectedString);
+					}
+					if (prologueLines.length > 0) transformedCode = `${prologueLines.join("\n")}\n${transformedCode}`;
+					if (transformedCode !== code) {
+						code = transformedCode;
+						__MODIFIED_CODE__ = true;
+					}
 				}
 				return __MODIFIED_CODE__ ? { code } : null;
 			}

package/dist/sync/worker.mjs

@@ -1,4 +1,4 @@
-import { t as unrun } from "../src-D87jO6Ui.mjs";
+import { t as unrun } from "../src-DyfW0b4_.mjs";
 import { runAsWorker } from "synckit";
 
 //#region src/sync/worker.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unrun",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "A tool to load and execute any JavaScript or TypeScript code at runtime.",
   "type": "module",
   "license": "MIT",
@@ -39,12 +39,12 @@
     }
   },
   "dependencies": {
-    "@oxc-project/runtime": "^0.97.0",
-    "rolldown": "1.0.0-beta.50"
+    "@oxc-project/runtime": "^0.96.0",
+    "rolldown": "1.0.0-beta.51"
   },
   "devDependencies": {
-    "@sxzz/eslint-config": "^7.2.10",
-    "@sxzz/prettier-config": "^2.2.4",
+    "@sxzz/eslint-config": "^7.3.0",
+    "@sxzz/prettier-config": "^2.2.5",
     "@types/node": "^24.10.1",
     "acorn": "^8.15.0",
     "bumpp": "^10.3.1",
@@ -53,7 +53,7 @@
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
-    "esbuild": "^0.27.0",
+    "esbuild": "^0.25.12",
     "eslint": "^9.39.1",
     "estree-walker": "^3.0.3",
     "etag": "^1.8.1",
@@ -71,19 +71,22 @@
     "react-dom": "^19.2.0",
     "reflect-metadata": "^0.2.2",
     "synckit": "^0.11.11",
+    "test-ecosystem-ci": "^0.0.1",
     "tinyexec": "^1.0.2",
-    "tsdown": "^0.16.3",
+    "tsdown": "^0.16.5",
     "tsx": "^4.20.6",
     "typedoc": "^0.28.14",
     "typedoc-plugin-markdown": "^4.9.0",
     "typedoc-vitepress-theme": "^1.1.2",
     "typescript": "^5.9.3",
     "unconfig": "^7.4.1",
+    "unplugin-vue": "^7.0.8",
     "vite": "^7.2.2",
     "vitepress": "2.0.0-alpha.12",
     "vitepress-plugin-group-icons": "^1.6.5",
     "vitest": "4.0.8",
     "vue": "^3.5.24",
+    "vue-tsc": "^3.1.4",
     "zod": "^4.1.12"
   },
   "engines": {
@@ -95,8 +98,14 @@
     "lint:fix": "pnpm run lint --fix",
     "build": "tsdown",
     "dev": "tsdown --watch",
+    "pretest": "node ./scripts/manage-pnpm-override.mjs add",
     "test": "vitest",
+    "posttest": "node ./scripts/manage-pnpm-override.mjs remove",
+    "pretest:run": "node ./scripts/manage-pnpm-override.mjs add",
     "test:run": "vitest run",
+    "posttest:run": "node ./scripts/manage-pnpm-override.mjs remove",
+    "ecosystem-ci": "ecosystem-ci",
+    "ecosystem-ci:force": "ecosystem-ci --force",
     "test:update-fixtures": "node ./dist/cli.mjs ./scripts/update-fixtures.ts",
     "benchmark": "tsdown -c benchmark/tsdown.config.ts && node ./benchmark/dist/benchmark.mjs",
     "typecheck": "tsc --noEmit",