vite-node 3.2.4 → 4.0.0-beta.10

package/dist/client.cjs

@@ -10,10 +10,7 @@ var utils = require('./utils.cjs');
 require('pathe');
 require('node:fs');
 
-const { setTimeout, clearTimeout } = globalThis;
-const debugExecute = createDebug("vite-node:client:execute");
-const debugNative = createDebug("vite-node:client:native");
-const clientStub = {
+const { setTimeout, clearTimeout } = globalThis, debugExecute = createDebug("vite-node:client:execute"), debugNative = createDebug("vite-node:client:native"), clientStub = {
 	injectQuery: (id) => id,
 	createHotContext: () => {
 		return {
@@ -28,8 +25,7 @@ const clientStub = {
 	},
 	updateStyle: () => {},
 	removeStyle: () => {}
-};
-const env = utils.createImportMetaEnvProxy();
+}, env = utils.createImportMetaEnvProxy();
 const DEFAULT_REQUEST_STUBS = {
 	"/@vite/client": clientStub,
 	"@vite/client": clientStub
@@ -42,8 +38,7 @@ class ModuleCacheMap extends Map {
 	* Assign partial data to the map
 	*/
 	update(fsPath, mod) {
-		fsPath = this.normalizePath(fsPath);
-		if (!super.has(fsPath)) this.setByModuleId(fsPath, mod);
+		if (fsPath = this.normalizePath(fsPath), !super.has(fsPath)) this.setByModuleId(fsPath, mod);
 		else Object.assign(super.get(fsPath), mod);
 		return this;
 	}
@@ -73,13 +68,7 @@ class ModuleCacheMap extends Map {
 	}
 	invalidateModule(mod) {
 		var _mod$importers, _mod$imports;
-		delete mod.evaluated;
-		delete mod.resolving;
-		delete mod.promise;
-		delete mod.exports;
-		(_mod$importers = mod.importers) === null || _mod$importers === void 0 || _mod$importers.clear();
-		(_mod$imports = mod.imports) === null || _mod$imports === void 0 || _mod$imports.clear();
-		return true;
+		return delete mod.evaluated, delete mod.resolving, delete mod.promise, delete mod.exports, (_mod$importers = mod.importers) === null || _mod$importers === void 0 || _mod$importers.clear(), (_mod$imports = mod.imports) === null || _mod$imports === void 0 || _mod$imports.clear(), true;
 	}
 	/**
 	* Invalidate modules that dependent on the given modules, up to the main entry
@@ -119,11 +108,7 @@ class ModuleCacheMap extends Map {
 		const cache = this.get(id);
 		if (cache.map) return cache.map;
 		const map = cache.code && sourceMap.extractSourceMap(cache.code);
-		if (map) {
-			cache.map = map;
-			return map;
-		}
-		return null;
+		return map ? (cache.map = map, map) : null;
 	}
 }
 class ViteNodeRunner {
@@ -154,10 +139,7 @@ class ViteNodeRunner {
 	// `performance` can be mocked, so make sure we're using the original function
 	performanceNow = performance.now.bind(performance);
 	constructor(options) {
-		this.options = options;
-		this.root = options.root ?? process.cwd();
-		this.moduleCache = options.moduleCache ?? new ModuleCacheMap();
-		this.debug = options.debug ?? (typeof process !== "undefined" ? !!process.env.VITE_NODE_DEBUG_RUNNER : false);
+		this.options = options, this.root = options.root ?? process.cwd(), this.moduleCache = options.moduleCache ?? new ModuleCacheMap(), this.debug = options.debug ?? (typeof process !== "undefined" ? !!process.env.VITE_NODE_DEBUG_RUNNER : false);
 	}
 	async executeFile(file) {
 		const url = `/@fs/${utils.slash(path.resolve(file))}`;
@@ -169,9 +151,7 @@ class ViteNodeRunner {
 	}
 	/** @internal */
 	async cachedRequest(id, fsPath, callstack) {
-		const importee = callstack[callstack.length - 1];
-		const mod = this.moduleCache.get(fsPath);
-		const { imports, importers } = mod;
+		const importee = callstack.at(-1), mod = this.moduleCache.get(fsPath), { imports, importers } = mod;
 		if (importee) importers.add(importee);
 		const getStack = () => `stack:\n${[...callstack, fsPath].reverse().map((p) => `  - ${p}`).join("\n")}`;
 		// check circular dependency
@@ -184,14 +164,12 @@ class ViteNodeRunner {
 			// cached module
 			if (mod.promise) return await mod.promise;
 			const promise = this.directRequest(id, fsPath, callstack);
-			Object.assign(mod, {
+			return Object.assign(mod, {
 				promise,
 				evaluated: false
-			});
-			return await promise;
+			}), await promise;
 		} finally {
-			mod.evaluated = true;
-			if (debugTimer) clearTimeout(debugTimer);
+			if (mod.evaluated = true, debugTimer) clearTimeout(debugTimer);
 		}
 	}
 	shouldResolveId(id, _importee) {
@@ -206,22 +184,20 @@ class ViteNodeRunner {
 		const resolved = await this.options.resolveId(dep, importer);
 		// supported since Vite 5-beta.19
 		if (resolved === null || resolved === void 0 || (_resolved$meta = resolved.meta) === null || _resolved$meta === void 0 || (_resolved$meta = _resolved$meta["vite:alias"]) === null || _resolved$meta === void 0 ? void 0 : _resolved$meta.noResolved) {
-			const error = new Error(`Cannot find module '${id}'${importer ? ` imported from '${importer}'` : ""}.
+			const error = /* @__PURE__ */ new Error(`Cannot find module '${id}'${importer ? ` imported from '${importer}'` : ""}.
 
 - If you rely on tsconfig.json's "paths" to resolve modules, please install "vite-tsconfig-paths" plugin to handle module resolution.
 - Make sure you don't have relative aliases in your Vitest config. Use absolute paths instead. Read more: https://vitest.dev/guide/common-errors`);
-			Object.defineProperty(error, "code", {
+			throw Object.defineProperty(error, "code", {
 				value: "ERR_MODULE_NOT_FOUND",
 				enumerable: true
-			});
-			Object.defineProperty(error, Symbol.for("vitest.error.not_found.data"), {
+			}), Object.defineProperty(error, Symbol.for("vitest.error.not_found.data"), {
 				value: {
 					id: dep,
 					importer
 				},
 				enumerable: false
-			});
-			throw error;
+			}), error;
 		}
 		const resolvedId = resolved ? utils.normalizeRequestId(resolved.id, this.options.base) : dep;
 		return [resolvedId, resolvedId];
@@ -247,47 +223,31 @@ class ViteNodeRunner {
 			// rethrow vite error if it cannot load the module because it's not resolved
 			if (typeof cause === "object" && cause.code === "ERR_LOAD_URL" || typeof (cause === null || cause === void 0 ? void 0 : cause.message) === "string" && cause.message.includes("Failed to load url")) {
 				const error = new Error(`Cannot find ${utils.isBareImport(id) ? "package" : "module"} '${id}'${importer ? ` imported from '${importer}'` : ""}`, { cause });
-				error.code = "ERR_MODULE_NOT_FOUND";
-				throw error;
+				throw error.code = "ERR_MODULE_NOT_FOUND", error;
 			}
 			throw cause;
 		}
 	}
 	/** @internal */
 	async directRequest(id, fsPath, _callstack) {
-		const moduleId = utils.normalizeModuleId(fsPath);
-		const callstack = [..._callstack, moduleId];
-		const mod = this.moduleCache.getByModuleId(moduleId);
-		const request = async (dep) => {
-			const [id, depFsPath] = await this.resolveUrl(String(dep), fsPath);
-			const depMod = this.moduleCache.getByModuleId(depFsPath);
-			depMod.importers.add(moduleId);
-			mod.imports.add(depFsPath);
-			return this.dependencyRequest(id, depFsPath, callstack);
-		};
-		const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
+		const moduleId = utils.normalizeModuleId(fsPath), callstack = [..._callstack, moduleId], mod = this.moduleCache.getByModuleId(moduleId), request = async (dep) => {
+			const [id, depFsPath] = await this.resolveUrl(String(dep), fsPath), depMod = this.moduleCache.getByModuleId(depFsPath);
+			return depMod.importers.add(moduleId), mod.imports.add(depFsPath), this.dependencyRequest(id, depFsPath, callstack);
+		}, requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
 		if (id in requestStubs) return requestStubs[id];
 		let { code: transformed, externalize } = await this._fetchModule(id, callstack[callstack.length - 2]);
 		if (externalize) {
 			debugNative(externalize);
 			const exports = await this.interopedImport(externalize);
-			mod.exports = exports;
-			return exports;
+			return mod.exports = exports, exports;
 		}
 		if (transformed == null) throw new Error(`[vite-node] Failed to load "${id}" imported from ${callstack[callstack.length - 2]}`);
-		const { Object, Reflect, Symbol } = this.getContextPrimitives();
-		const modulePath = utils.cleanUrl(moduleId);
-		// disambiguate the `<UNIT>:/` on windows: see nodejs/node#31710
-		const href = node_url.pathToFileURL(modulePath).href;
-		const __filename = node_url.fileURLToPath(href);
-		const __dirname = path.dirname(__filename);
-		const meta = {
+		const { Object, Reflect, Symbol } = this.getContextPrimitives(), modulePath = utils.cleanUrl(moduleId), href = node_url.pathToFileURL(modulePath).href, __filename = node_url.fileURLToPath(href), __dirname = path.dirname(__filename), meta = {
 			url: href,
 			env,
 			filename: __filename,
 			dirname: __dirname
-		};
-		const exports = Object.create(null);
+		}, exports = Object.create(null);
 		Object.defineProperty(exports, Symbol.toStringTag, {
 			value: "Module",
 			enumerable: false,
@@ -299,25 +259,17 @@ class ViteNodeRunner {
 		// inside the module itself. imported module is always "exports"
 		const cjsExports = new Proxy(exports, {
 			get: (target, p, receiver) => {
-				if (Reflect.has(target, p)) return Reflect.get(target, p, receiver);
-				return Reflect.get(Object.prototype, p, receiver);
+				return Reflect.has(target, p) ? Reflect.get(target, p, receiver) : Reflect.get(Object.prototype, p, receiver);
 			},
 			getPrototypeOf: () => Object.prototype,
 			set: (_, p, value) => {
 				// treat "module.exports =" the same as "exports.default =" to not have nested "default.default",
 				// so "exports.default" becomes the actual module
-				if (p === "default" && this.shouldInterop(modulePath, { default: value }) && cjsExports !== value) {
-					exportAll(cjsExports, value);
-					exports.default = value;
-					return true;
-				}
+				if (p === "default" && this.shouldInterop(modulePath, { default: value }) && cjsExports !== value) return exportAll(cjsExports, value), exports.default = value, true;
 				if (!Reflect.has(exports, "default")) exports.default = {};
 				// returns undefined, when accessing named exports, if default is not an object
 				// but is still present inside hasOwnKeys, this is Node behaviour for CJS
-				if (moduleExports !== SYMBOL_NOT_DEFINED && utils.isPrimitive(moduleExports)) {
-					defineExport(exports, p, () => void 0);
-					return true;
-				}
+				if (moduleExports !== SYMBOL_NOT_DEFINED && utils.isPrimitive(moduleExports)) return defineExport(exports, p, () => void 0), true;
 				if (!utils.isPrimitive(exports.default)) exports.default[p] = value;
 				if (p !== "default") defineExport(exports, p, () => value);
 				return true;
@@ -329,9 +281,7 @@ class ViteNodeRunner {
 		});
 		const moduleProxy = {
 			set exports(value) {
-				exportAll(cjsExports, value);
-				exports.default = value;
-				moduleExports = value;
+				exportAll(cjsExports, value), exports.default = value, moduleExports = value;
 			},
 			get exports() {
 				return cjsExports;
@@ -343,8 +293,7 @@ class ViteNodeRunner {
 			enumerable: true,
 			get: () => {
 				var _this$options$createH, _this$options;
-				hotContext || (hotContext = (_this$options$createH = (_this$options = this.options).createHotContext) === null || _this$options$createH === void 0 ? void 0 : _this$options$createH.call(_this$options, this, moduleId));
-				return hotContext;
+				return hotContext || (hotContext = (_this$options$createH = (_this$options = this.options).createHotContext) === null || _this$options$createH === void 0 ? void 0 : _this$options$createH.call(_this$options, this, moduleId)), hotContext;
 			},
 			set: (value) => {
 				hotContext = value;
@@ -371,11 +320,9 @@ class ViteNodeRunner {
 			__filename,
 			__dirname
 		});
-		debugExecute(__filename);
 		// remove shebang
-		if (transformed[0] === "#") transformed = transformed.replace(/^#!.*/, (s) => " ".repeat(s.length));
-		await this.runModule(context, transformed);
-		return exports;
+		if (debugExecute(__filename), transformed[0] === "#") transformed = transformed.replace(/^#!.*/, (s) => " ".repeat(s.length));
+		return await this.runModule(context, transformed), exports;
 	}
 	getContextPrimitives() {
 		return {
@@ -386,14 +333,11 @@ class ViteNodeRunner {
 	}
 	async runModule(context, transformed) {
 		// add 'use strict' since ESM enables it by default
-		const codeDefinition = `'use strict';async (${Object.keys(context).join(",")})=>{{`;
-		const code = `${codeDefinition}${transformed}\n}}`;
-		const options = {
+		const codeDefinition = `'use strict';async (${Object.keys(context).join(",")})=>{{`, code = `${codeDefinition}${transformed}\n}}`, options = {
 			filename: context.__filename,
 			lineOffset: 0,
 			columnOffset: -codeDefinition.length
-		};
-		const finishModuleExecutionInfo = this.startCalculateModuleExecutionInfo(options.filename, codeDefinition.length);
+		}, finishModuleExecutionInfo = this.startCalculateModuleExecutionInfo(options.filename, codeDefinition.length);
 		try {
 			const fn = vm.runInThisContext(code, options);
 			await fn(...Object.values(context));
@@ -408,14 +352,12 @@ class ViteNodeRunner {
 	*/
 	startCalculateModuleExecutionInfo(filename, startOffset) {
 		const startTime = this.performanceNow();
-		this.executionStack.push({
+		return this.executionStack.push({
 			filename,
 			startTime,
 			subImportTime: 0
-		});
-		return () => {
-			const duration = this.performanceNow() - startTime;
-			const currentExecution = this.executionStack.pop();
+		}), () => {
+			const duration = this.performanceNow() - startTime, currentExecution = this.executionStack.pop();
 			if (currentExecution == null) throw new Error("Execution stack is empty, this should never happen");
 			const selfTime = duration - currentExecution.subImportTime;
 			if (this.executionStack.length > 0) this.executionStack.at(-1).subImportTime += duration;
@@ -434,10 +376,9 @@ class ViteNodeRunner {
 	* This function mostly for the ability to override by subclass
 	*/
 	shouldInterop(path, mod) {
-		if (this.options.interopDefault === false) return false;
 		// never interop ESM modules
 		// TODO: should also skip for `.js` with `type="module"`
-		return !path.endsWith(".mjs") && "default" in mod;
+		return this.options.interopDefault === false ? false : !path.endsWith(".mjs") && "default" in mod;
 	}
 	importExternalModule(path) {
 		return import(
@@ -454,12 +395,10 @@ class ViteNodeRunner {
 		const { mod, defaultExport } = interopModule(importedModule);
 		return new Proxy(mod, {
 			get(mod, prop) {
-				if (prop === "default") return defaultExport;
-				return mod[prop] ?? (defaultExport === null || defaultExport === void 0 ? void 0 : defaultExport[prop]);
+				return prop === "default" ? defaultExport : mod[prop] ?? (defaultExport === null || defaultExport === void 0 ? void 0 : defaultExport[prop]);
 			},
 			has(mod, prop) {
-				if (prop === "default") return defaultExport !== void 0;
-				return prop in mod || defaultExport && prop in defaultExport;
+				return prop === "default" ? defaultExport !== void 0 : prop in mod || defaultExport && prop in defaultExport;
 			},
 			getOwnPropertyDescriptor(mod, prop) {
 				const descriptor = Reflect.getOwnPropertyDescriptor(mod, prop);
@@ -480,8 +419,7 @@ function interopModule(mod) {
 	};
 	let defaultExport = "default" in mod ? mod.default : mod;
 	if (!utils.isPrimitive(defaultExport) && "__esModule" in defaultExport) {
-		mod = defaultExport;
-		if ("default" in defaultExport) defaultExport = defaultExport.default;
+		if (mod = defaultExport, "default" in defaultExport) defaultExport = defaultExport.default;
 	}
 	return {
 		mod,
@@ -497,13 +435,11 @@ function defineExport(exports, key, value) {
 	});
 }
 function exportAll(exports, sourceModule) {
-	// #1120 when a module exports itself it causes
-	// call stack error
-	if (exports === sourceModule) return;
-	if (utils.isPrimitive(sourceModule) || Array.isArray(sourceModule) || sourceModule instanceof Promise) return;
-	for (const key in sourceModule) if (key !== "default" && !(key in exports)) try {
-		defineExport(exports, key, () => sourceModule[key]);
-	} catch {}
+	if (exports !== sourceModule && !(utils.isPrimitive(sourceModule) || Array.isArray(sourceModule) || sourceModule instanceof Promise)) {
+		for (const key in sourceModule) if (key !== "default" && !(key in exports)) try {
+			defineExport(exports, key, () => sourceModule[key]);
+		} catch {}
+	}
 }
 
 exports.DEFAULT_REQUEST_STUBS = DEFAULT_REQUEST_STUBS;

package/dist/client.d.ts

@@ -1,2 +1,2 @@
-import './trace-mapping.d-DLVdEqOp.js';
-export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, f as ModuleExecutionInfo, g as ModuleExecutionInfoEntry, a as ViteNodeRunner } from './index.d-DGmxD2U7.js';
+import './trace-mapping.d-BWFx6tPc.js';
+export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, f as ModuleExecutionInfo, g as ModuleExecutionInfoEntry, a as ViteNodeRunner } from './index.d-uN06xifv.js';