unrun 0.2.9 → 0.2.10

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-Dsr1Mx3W.mjs";
 
 export { unrun, unrunCli, unrunSync };

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

@@ -111,18 +111,42 @@ 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
@@ -382,6 +406,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 +417,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-Dsr1Mx3W.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.10",
   "description": "A tool to load and execute any JavaScript or TypeScript code at runtime.",
   "type": "module",
   "license": "MIT",
@@ -72,18 +72,20 @@
     "reflect-metadata": "^0.2.2",
     "synckit": "^0.11.11",
     "tinyexec": "^1.0.2",
-    "tsdown": "^0.16.3",
+    "tsdown": "^0.16.4",
     "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.7",
     "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 +97,12 @@
     "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",
     "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",