vite-node 3.2.0-beta.2 → 3.2.0

package/dist/source-map.mjs

@@ -581,10 +581,15 @@ function traceSegmentInternal(segments, memo, line, column, bias) {
     return index;
 }
 
+// Only install once if called multiple times
 let errorFormatterInstalled = false;
+// Maps a file path to a string containing the file contents
 const fileContentsCache = {};
+// Maps a file path to a source map for that file
 const sourceMapCache = {};
+// Regex for detecting source maps
 const reSourceMap = /^data:application\/json[^,]+base64,/;
+// Priority list of retrieve handlers
 let retrieveFileHandlers = [];
 let retrieveMapHandlers = [];
 function globalProcessVersion() {
@@ -602,8 +607,11 @@ function handlerExec(list) {
 }
 let retrieveFile = handlerExec(retrieveFileHandlers);
 retrieveFileHandlers.push((path) => {
+	// Trim the path to make sure there is no extra whitespace.
 	path = path.trim();
-	if (path.startsWith("file:")) path = path.replace(/file:\/\/\/(\w:)?/, (protocol, drive) => {
+	if (path.startsWith("file:"))
+ // existsSync/readFileSync can't handle file protocol, but once stripped, it works
+	path = path.replace(/file:\/\/\/(\w:)?/, (protocol, drive) => {
 		return drive ? "" : "/";
 	});
 	if (path in fileContentsCache) return fileContentsCache[path];
@@ -613,6 +621,7 @@ retrieveFileHandlers.push((path) => {
 	} catch {}
 	return fileContentsCache[path] = contents;
 });
+// Support URLs relative to a directory, but be careful about a protocol prefix
 function supportRelativeURL(file, url) {
 	if (!file) return url;
 	const dir = path.dirname(file);
@@ -620,30 +629,43 @@ function supportRelativeURL(file, url) {
 	let protocol = match ? match[0] : "";
 	const startPath = dir.slice(protocol.length);
 	if (protocol && /^\/\w:/.test(startPath)) {
+		// handle file:///C:/ paths
 		protocol += "/";
 		return protocol + path.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
 	}
 	return protocol + path.resolve(dir.slice(protocol.length), url);
 }
 function retrieveSourceMapURL(source) {
+	// Get the URL of the source map
 	const fileData = retrieveFile(source);
 	if (!fileData) return null;
 	const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
+	// Keep executing the search to find the *last* sourceMappingURL to avoid
+	// picking up sourceMappingURLs from comments, strings, etc.
 	let lastMatch, match;
+	// eslint-disable-next-line no-cond-assign
 	while (match = re.exec(fileData)) lastMatch = match;
 	if (!lastMatch) return null;
 	return lastMatch[1];
 }
+// Can be overridden by the retrieveSourceMap option to install. Takes a
+// generated source filename; returns a {map, optional url} object, or null if
+// there is no source map.  The map field may be either a string or the parsed
+// JSON object (ie, it must be a valid argument to the SourceMapConsumer
+// constructor).
 let retrieveSourceMap = handlerExec(retrieveMapHandlers);
 retrieveMapHandlers.push((source) => {
 	let sourceMappingURL = retrieveSourceMapURL(source);
 	if (!sourceMappingURL) return null;
+	// Read the contents of the source map
 	let sourceMapData;
 	if (reSourceMap.test(sourceMappingURL)) {
+		// Support source map URL as a data url
 		const rawData = sourceMappingURL.slice(sourceMappingURL.indexOf(",") + 1);
 		sourceMapData = Buffer.from(rawData, "base64").toString();
 		sourceMappingURL = source;
 	} else {
+		// Support source map URLs relative to the source URL
 		sourceMappingURL = supportRelativeURL(source, sourceMappingURL);
 		sourceMapData = retrieveFile(sourceMappingURL);
 	}
@@ -653,10 +675,16 @@ retrieveMapHandlers.push((source) => {
 		map: sourceMapData
 	};
 });
+// interface Position {
+//   source: string
+//   line: number
+//   column: number
+// }
 function mapSourcePosition(position) {
 	if (!position.source) return position;
 	let sourceMap = sourceMapCache[position.source];
 	if (!sourceMap) {
+		// Call the (overridable) retrieveSourceMap function to get the source map.
 		const urlAndMap = retrieveSourceMap(position.source);
 		if (urlAndMap && urlAndMap.map) {
 			var _sourceMap$map;
@@ -664,6 +692,8 @@ function mapSourcePosition(position) {
 				url: urlAndMap.url,
 				map: new TraceMap(urlAndMap.map)
 			};
+			// Load all sources stored inline with the source map into the file cache
+			// to pretend like they are already loaded. They may not exist on disk.
 			if ((_sourceMap$map = sourceMap.map) === null || _sourceMap$map === void 0 ? void 0 : _sourceMap$map.sourcesContent) sourceMap.map.sources.forEach((source, i) => {
 				var _sourceMap$map2;
 				const contents = (_sourceMap$map2 = sourceMap.map) === null || _sourceMap$map2 === void 0 || (_sourceMap$map2 = _sourceMap$map2.sourcesContent) === null || _sourceMap$map2 === void 0 ? void 0 : _sourceMap$map2[i];
@@ -677,8 +707,14 @@ function mapSourcePosition(position) {
 			map: null
 		};
 	}
+	// Resolve the source URL relative to the URL of the source map
 	if (sourceMap && sourceMap.map && sourceMap.url) {
 		const originalPosition = originalPositionFor(sourceMap.map, position);
+		// Only return the original position if a matching line was found. If no
+		// matching line is found then we return position instead, which will cause
+		// the stack trace to print the path and line for the compiled file. It is
+		// better to give a precise location in the compiled file than a vague
+		// location in the original file.
 		if (originalPosition.source !== null) {
 			originalPosition.source = supportRelativeURL(sourceMap.url, originalPosition.source);
 			return originalPosition;
@@ -686,7 +722,10 @@ function mapSourcePosition(position) {
 	}
 	return position;
 }
+// Parses code generated by FormatEvalOrigin(), a function inside V8:
+// https://code.google.com/p/v8/source/browse/trunk/src/messages.js
 function mapEvalOrigin(origin) {
+	// Most eval() calls are in this format
 	let match = /^eval at ([^(]+) \((.+):(\d+):(\d+)\)$/.exec(origin);
 	if (match) {
 		const position = mapSourcePosition({
@@ -697,10 +736,18 @@ function mapEvalOrigin(origin) {
 		});
 		return `eval at ${match[1]} (${position.source}:${position.line}:${position.column + 1})`;
 	}
+	// Parse nested eval() calls using recursion
 	match = /^eval at ([^(]+) \((.+)\)$/.exec(origin);
 	if (match) return `eval at ${match[1]} (${mapEvalOrigin(match[2])})`;
+	// Make sure we still return useful information if we didn't find anything
 	return origin;
 }
+// This is copied almost verbatim from the V8 source code at
+// https://code.google.com/p/v8/source/browse/trunk/src/messages.js. The
+// implementation of wrapCallSite() used to just forward to the actual source
+// code of CallSite.prototype.toString but unfortunately a new release of V8
+// did something to the prototype chain and broke the shim. The only fix I
+// could find was copy/paste.
 function CallSiteToString() {
 	let fileName;
 	let fileLocation = "";
@@ -712,7 +759,11 @@ function CallSiteToString() {
 			fileLocation += ", ";
 		}
 		if (fileName) fileLocation += fileName;
-		else fileLocation += "<anonymous>";
+		else
+ // Source code does not originate from a file and is not native, but we
+		// can still get the source position inside the source string, e.g. in
+		// an eval string.
+		fileLocation += "<anonymous>";
 		const lineNumber = this.getLineNumber();
 		if (lineNumber != null) {
 			fileLocation += `:${lineNumber}`;
@@ -727,6 +778,7 @@ function CallSiteToString() {
 	const isMethodCall = !(this.isToplevel() || isConstructor);
 	if (isMethodCall) {
 		let typeName = this.getTypeName();
+		// Fixes shim to be backward compatible with Node v0 to v4
 		if (typeName === "[object Object]") typeName = "null";
 		const methodName = this.getMethodName();
 		if (functionName) {
@@ -747,7 +799,9 @@ function cloneCallSite(frame) {
 	const object = {};
 	Object.getOwnPropertyNames(Object.getPrototypeOf(frame)).forEach((name) => {
 		const key = name;
+		// @ts-expect-error difficult to type
 		object[key] = /^(?:is|get)/.test(name) ? function() {
+			// eslint-disable-next-line no-useless-call
 			return frame[key].call(frame);
 		} : frame[key];
 	});
@@ -755,6 +809,7 @@ function cloneCallSite(frame) {
 	return object;
 }
 function wrapCallSite(frame, state) {
+	// provides interface backward compatibility
 	if (state === void 0) state = {
 		nextPosition: null,
 		curPosition: null
@@ -763,10 +818,18 @@ function wrapCallSite(frame, state) {
 		state.curPosition = null;
 		return frame;
 	}
+	// Most call sites will return the source file from getFileName(), but code
+	// passed to eval() ending in "//# sourceURL=..." will return the source file
+	// from getScriptNameOrSourceURL() instead
 	const source = frame.getFileName() || frame.getScriptNameOrSourceURL();
 	if (source) {
 		const line = frame.getLineNumber();
 		let column = frame.getColumnNumber() - 1;
+		// Fix position in Node where some (internal) code is prepended.
+		// See https://github.com/evanw/node-source-map-support/issues/36
+		// Header removed in node at ^10.16 || >=11.11.0
+		// v11 is not an LTS candidate, we can just test the one version with it.
+		// Test node versions for: 10.16-19, 10.20+, 12-19, 20-99, 100+, or 11.11
 		const noHeader = /^v(?:10\.1[6-9]|10\.[2-9]\d|10\.\d{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
 		const headerLength = noHeader.test(globalProcessVersion()) ? 0 : 62;
 		if (line === 1 && column > headerLength && !frame.isEval()) column -= headerLength;
@@ -784,7 +847,7 @@ function wrapCallSite(frame, state) {
 			return state.nextPosition.name || originalFunctionName();
 		};
 		frame.getFileName = function() {
-			return position.source ?? void 0;
+			return position.source ?? null;
 		};
 		frame.getLineNumber = function() {
 			return position.line;
@@ -797,6 +860,7 @@ function wrapCallSite(frame, state) {
 		};
 		return frame;
 	}
+	// Code called using eval() needs special handling
 	let origin = frame.isEval() && frame.getEvalOrigin();
 	if (origin) {
 		origin = mapEvalOrigin(origin);
@@ -806,8 +870,11 @@ function wrapCallSite(frame, state) {
 		};
 		return frame;
 	}
+	// If we get here then we were unable to change the source position
 	return frame;
 }
+// This function is part of the V8 stack trace API, for more info see:
+// https://v8.dev/docs/stack-trace-api
 function prepareStackTrace(error, stack) {
 	const name = error.name || "Error";
 	const message = error.message || "";
@@ -828,14 +895,19 @@ retrieveFileHandlers.slice(0);
 retrieveMapHandlers.slice(0);
 function install(options) {
 	options = options || {};
+	// Allow sources to be found by methods other than reading the files
+	// directly from disk.
 	if (options.retrieveFile) {
 		if (options.overrideRetrieveFile) retrieveFileHandlers.length = 0;
 		retrieveFileHandlers.unshift(options.retrieveFile);
 	}
+	// Allow source maps to be found by methods other than reading the files
+	// directly from disk.
 	if (options.retrieveSourceMap) {
 		if (options.overrideRetrieveSourceMap) retrieveMapHandlers.length = 0;
 		retrieveMapHandlers.unshift(options.retrieveSourceMap);
 	}
+	// Install the error reformatter
 	if (!errorFormatterInstalled) {
 		errorFormatterInstalled = true;
 		Error.prepareStackTrace = prepareStackTrace;
@@ -846,7 +918,6 @@ let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
 const VITE_NODE_SOURCEMAPPING_SOURCE = "//# sourceMappingSource=vite-node";
 const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8`;
-const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
 function withInlineSourcemap(result, options) {
 	const map = result.map;
 	let code = result.code;
@@ -855,6 +926,10 @@ function withInlineSourcemap(result, options) {
 		var _map$sources;
 		map.sources = (_map$sources = map.sources) === null || _map$sources === void 0 ? void 0 : _map$sources.map((source) => {
 			if (!source) return source;
+			// sometimes files here are absolute,
+			// but they are considered absolute to the server url, not the file system
+			// this is a bug in Vite
+			// all files should be either absolute to the file system or relative to the source map file
 			if (isAbsolute(source)) {
 				const actualPath = !source.startsWith(withTrailingSlash(options.root)) && source.startsWith("/") ? resolve$2(options.root, source.slice(1)) : source;
 				return relative(dirname(options.filepath), actualPath);
@@ -862,17 +937,25 @@ function withInlineSourcemap(result, options) {
 			return source;
 		});
 	}
+	// to reduce the payload size, we only inline vite node source map, because it's also the only one we use
 	const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`, "gm");
 	while (OTHER_SOURCE_MAP_REGEXP.test(code)) code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
+	// If the first line is not present on source maps, add simple 1:1 mapping ([0,0,0,0], [1,0,0,0])
+	// so that debuggers can be set to break on first line
+	// Since Vite 6, import statements at the top of the file are preserved correctly,
+	// so we don't need to add this mapping anymore.
 	if (!options.noFirstLineMapping && map.mappings.startsWith(";")) map.mappings = `AAAA,CAAA${map.mappings}`;
 	const sourceMap = Buffer.from(JSON.stringify(map), "utf-8").toString("base64");
 	result.code = `${code.trimEnd()}\n\n${VITE_NODE_SOURCEMAPPING_SOURCE}\n//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${sourceMap}\n`;
 	return result;
 }
 function extractSourceMap(code) {
-	var _code$match;
-	const mapString = (_code$match = code.match(VITE_NODE_SOURCEMAPPING_REGEXP)) === null || _code$match === void 0 ? void 0 : _code$match[1];
-	if (mapString) return JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+	const regexp = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`, "gm");
+	let lastMatch, match;
+	// eslint-disable-next-line no-cond-assign
+	while (match = regexp.exec(code)) lastMatch = match;
+	// pick only the last source map keeping user strings that look like maps
+	if (lastMatch) return JSON.parse(Buffer.from(lastMatch[1], "base64").toString("utf-8"));
 	return null;
 }
 function installSourcemapsSupport(options) {

package/dist/types.d.ts

@@ -1,2 +1,2 @@
 export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-DLVdEqOp.js';
-export { A as Arrayable, g as Awaitable, j as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, h as FetchFunction, F as FetchResult, b as HotContext, k as ModuleCache, M as ModuleCacheMap, f as ModuleExecutionInfo, N as Nullable, R as RawSourceMap, i as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, m as ViteNodeResolveModule, l as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index.d-CWZbpOcv.js';
+export { A as Arrayable, h as Awaitable, k as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, i as FetchFunction, F as FetchResult, b as HotContext, l as ModuleCache, M as ModuleCacheMap, f as ModuleExecutionInfo, N as Nullable, R as RawSourceMap, j as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, n as ViteNodeResolveModule, m as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index.d-DGmxD2U7.js';

package/dist/utils.cjs

@@ -20,8 +20,12 @@ function isBareImport(id) {
 const VALID_ID_PREFIX = "/@id/";
 function normalizeRequestId(id, base) {
 	if (base && id.startsWith(withTrailingSlash(base))) id = `/${id.slice(base.length)}`;
+	// keep drive the same as in process cwd. ideally, this should be resolved on Vite side
+	// Vite always resolves drive letters to the upper case because of the use of `realpathSync`
+	// https://github.com/vitejs/vite/blob/0ab20a3ee26eacf302415b3087732497d0a2f358/packages/vite/src/node/utils.ts#L635
 	if (driveRegexp && !(driveRegexp === null || driveRegexp === void 0 ? void 0 : driveRegexp.test(id)) && (driveOppositeRegext === null || driveOppositeRegext === void 0 ? void 0 : driveOppositeRegext.test(id))) id = id.replace(driveOppositeRegext, `${drive}$1`);
 	if (id.startsWith("file://")) {
+		// preserve hash/query
 		const { file, postfix } = splitFileAndPostfix(id);
 		return node_url.fileURLToPath(file) + postfix;
 	}
@@ -43,6 +47,7 @@ const internalRequestRegexp = new RegExp(`^/?(?:${internalRequests.join("|")})$`
 function isInternalRequest(id) {
 	return internalRequestRegexp.test(id);
 }
+// https://nodejs.org/api/modules.html#built-in-modules-with-mandatory-node-prefix
 const prefixedBuiltins = new Set([
 	"node:sea",
 	"node:sqlite",
@@ -66,6 +71,7 @@ const builtins = new Set([
 	"wasi"
 ]);
 function normalizeModuleId(id) {
+	// unique id that is not available as "test"
 	if (prefixedBuiltins.has(id)) return id;
 	if (id.startsWith("file://")) return node_url.fileURLToPath(id);
 	return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
@@ -79,6 +85,7 @@ function toFilePath(id, root) {
 			absolute: id.slice(4),
 			exists: true
 		};
+		// check if /src/module.js -> <root>/src/module.js
 		if (!id.startsWith(withTrailingSlash(root)) && id.startsWith("/")) {
 			const resolved = pathe.resolve(root, id.slice(1));
 			if (fs.existsSync(cleanUrl(resolved))) return {
@@ -95,6 +102,7 @@ function toFilePath(id, root) {
 		};
 	})();
 	if (absolute.startsWith("//")) absolute = absolute.slice(1);
+	// disambiguate the `<UNIT>:/` on windows: see nodejs/node#31710
 	return {
 		path: isWindows && absolute.startsWith("/") ? slash(node_url.fileURLToPath(node_url.pathToFileURL(absolute.slice(1)).href)) : absolute,
 		exists
@@ -149,6 +157,7 @@ function withTrailingSlash(path) {
 	return path;
 }
 function createImportMetaEnvProxy() {
+	// packages/vitest/src/node/plugins/index.ts:146
 	const booleanKeys = [
 		"DEV",
 		"PROD",
@@ -168,7 +177,7 @@ function createImportMetaEnvProxy() {
 		}
 	});
 }
-const packageCache = new Map();
+const packageCache = /* @__PURE__ */ new Map();
 async function findNearestPackageData(basedir) {
 	const originalBasedir = basedir;
 	while (basedir) {

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import { N as Nullable, A as Arrayable } from './index.d-CWZbpOcv.js';
+import { N as Nullable, A as Arrayable } from './index.d-DGmxD2U7.js';
 import './trace-mapping.d-DLVdEqOp.js';
 
 declare const isWindows: boolean;

package/dist/utils.mjs

@@ -18,8 +18,12 @@ function isBareImport(id) {
 const VALID_ID_PREFIX = "/@id/";
 function normalizeRequestId(id, base) {
 	if (base && id.startsWith(withTrailingSlash(base))) id = `/${id.slice(base.length)}`;
+	// keep drive the same as in process cwd. ideally, this should be resolved on Vite side
+	// Vite always resolves drive letters to the upper case because of the use of `realpathSync`
+	// https://github.com/vitejs/vite/blob/0ab20a3ee26eacf302415b3087732497d0a2f358/packages/vite/src/node/utils.ts#L635
 	if (driveRegexp && !(driveRegexp === null || driveRegexp === void 0 ? void 0 : driveRegexp.test(id)) && (driveOppositeRegext === null || driveOppositeRegext === void 0 ? void 0 : driveOppositeRegext.test(id))) id = id.replace(driveOppositeRegext, `${drive}$1`);
 	if (id.startsWith("file://")) {
+		// preserve hash/query
 		const { file, postfix } = splitFileAndPostfix(id);
 		return fileURLToPath(file) + postfix;
 	}
@@ -41,6 +45,7 @@ const internalRequestRegexp = new RegExp(`^/?(?:${internalRequests.join("|")})$`
 function isInternalRequest(id) {
 	return internalRequestRegexp.test(id);
 }
+// https://nodejs.org/api/modules.html#built-in-modules-with-mandatory-node-prefix
 const prefixedBuiltins = new Set([
 	"node:sea",
 	"node:sqlite",
@@ -64,6 +69,7 @@ const builtins = new Set([
 	"wasi"
 ]);
 function normalizeModuleId(id) {
+	// unique id that is not available as "test"
 	if (prefixedBuiltins.has(id)) return id;
 	if (id.startsWith("file://")) return fileURLToPath(id);
 	return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
@@ -77,6 +83,7 @@ function toFilePath(id, root) {
 			absolute: id.slice(4),
 			exists: true
 		};
+		// check if /src/module.js -> <root>/src/module.js
 		if (!id.startsWith(withTrailingSlash(root)) && id.startsWith("/")) {
 			const resolved = resolve(root, id.slice(1));
 			if (existsSync(cleanUrl(resolved))) return {
@@ -93,6 +100,7 @@ function toFilePath(id, root) {
 		};
 	})();
 	if (absolute.startsWith("//")) absolute = absolute.slice(1);
+	// disambiguate the `<UNIT>:/` on windows: see nodejs/node#31710
 	return {
 		path: isWindows && absolute.startsWith("/") ? slash(fileURLToPath(pathToFileURL(absolute.slice(1)).href)) : absolute,
 		exists
@@ -147,6 +155,7 @@ function withTrailingSlash(path) {
 	return path;
 }
 function createImportMetaEnvProxy() {
+	// packages/vitest/src/node/plugins/index.ts:146
 	const booleanKeys = [
 		"DEV",
 		"PROD",
@@ -166,7 +175,7 @@ function createImportMetaEnvProxy() {
 		}
 	});
 }
-const packageCache = new Map();
+const packageCache = /* @__PURE__ */ new Map();
 async function findNearestPackageData(basedir) {
 	const originalBasedir = basedir;
 	while (basedir) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-node",
   "type": "module",
-  "version": "3.2.0-beta.2",
+  "version": "3.2.0",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -78,10 +78,10 @@
   },
   "dependencies": {
     "cac": "^6.7.14",
-    "debug": "^4.4.0",
+    "debug": "^4.4.1",
     "es-module-lexer": "^1.7.0",
     "pathe": "^2.0.3",
-    "vite": "^5.0.0 || ^6.0.0"
+    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.25",