vite-node 0.25.3 → 0.25.4

package/dist/cli.cjs

@@ -15,9 +15,9 @@ require('debug');
 require('fs');
 require('mlly');
 require('url');
+require('source-map-support');
 require('module');
 require('vm');
-require('source-map-support');
 
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
@@ -632,7 +632,7 @@ class CAC extends events.EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.3";
+var version = "0.25.4";
 
 const cli = cac("vite-node");
 cli.version(version).option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--options <options>", "Use specified Vite server options").help();

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { e as ViteNodeServerOptions } from './types-257c4f87.js';
+import { e as ViteNodeServerOptions } from './types-60eb9672.js';
 
 interface CliOptions {
     root?: string;

package/dist/cli.mjs

@@ -13,9 +13,9 @@ import 'debug';
 import 'fs';
 import 'mlly';
 import 'url';
+import 'source-map-support';
 import 'module';
 import 'vm';
-import 'source-map-support';
 
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
@@ -630,7 +630,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.3";
+var version = "0.25.4";
 
 const cli = cac("vite-node");
 cli.version(version).option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--options <options>", "Use specified Vite server options").help();

package/dist/client.cjs

@@ -9,7 +9,9 @@ var pathe = require('pathe');
 var mlly = require('mlly');
 var createDebug = require('debug');
 var utils = require('./utils.cjs');
+var sourceMap = require('./source-map.cjs');
 require('fs');
+require('source-map-support');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -125,14 +127,11 @@ class ModuleCacheMap extends Map {
     return invalidated;
   }
   getSourceMap(id) {
-    var _a, _b;
-    const fsPath = this.normalizePath(id);
-    const cache = this.get(fsPath);
+    const cache = this.get(id);
     if (cache.map)
       return cache.map;
-    const mapString = (_b = (_a = cache == null ? void 0 : cache.code) == null ? void 0 : _a.match(/\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,(.+)/)) == null ? void 0 : _b[1];
-    if (mapString) {
-      const map = JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+    const map = cache.code && sourceMap.extractSourceMap(cache.code);
+    if (map) {
       cache.map = map;
       return map;
     }
@@ -169,7 +168,10 @@ class ViteNodeRunner {
     if (mod.promise)
       return mod.promise;
     const promise = this.directRequest(id, fsPath, callstack);
-    Object.assign(mod, { promise });
+    Object.assign(mod, { promise, evaluated: false });
+    promise.finally(() => {
+      mod.evaluated = true;
+    });
     return await promise;
   }
   async directRequest(id, fsPath, _callstack) {
@@ -248,7 +250,7 @@ ${getStack()}`), 2e3);
         return true;
       }
     });
-    Object.assign(mod, { code: transformed, exports });
+    Object.assign(mod, { code: transformed, exports, evaluated: false });
     const __filename = url.fileURLToPath(url$1);
     const moduleProxy = {
       set exports(value) {
@@ -347,7 +349,7 @@ function defineExport(exports, key, value) {
 function exportAll(exports, sourceModule) {
   if (exports === sourceModule)
     return;
-  if (typeof sourceModule !== "object" || Array.isArray(sourceModule) || !sourceModule)
+  if (utils.isPrimitive(sourceModule) || Array.isArray(sourceModule))
     return;
   for (const key in sourceModule) {
     if (key !== "default") {

package/dist/client.d.ts

@@ -1 +1 @@
-export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-257c4f87.js';
+export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-60eb9672.js';

package/dist/client.mjs

@@ -5,7 +5,9 @@ import { resolve, dirname, isAbsolute, extname } from 'pathe';
 import { isNodeBuiltin } from 'mlly';
 import createDebug from 'debug';
 import { normalizeModuleId, slash, normalizeRequestId, toFilePath, isPrimitive, mergeSlashes } from './utils.mjs';
+import { extractSourceMap } from './source-map.mjs';
 import 'fs';
+import 'source-map-support';
 
 const debugExecute = createDebug("vite-node:client:execute");
 const debugNative = createDebug("vite-node:client:native");
@@ -98,14 +100,11 @@ class ModuleCacheMap extends Map {
     return invalidated;
   }
   getSourceMap(id) {
-    var _a, _b;
-    const fsPath = this.normalizePath(id);
-    const cache = this.get(fsPath);
+    const cache = this.get(id);
     if (cache.map)
       return cache.map;
-    const mapString = (_b = (_a = cache == null ? void 0 : cache.code) == null ? void 0 : _a.match(/\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,(.+)/)) == null ? void 0 : _b[1];
-    if (mapString) {
-      const map = JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+    const map = cache.code && extractSourceMap(cache.code);
+    if (map) {
       cache.map = map;
       return map;
     }
@@ -142,7 +141,10 @@ class ViteNodeRunner {
     if (mod.promise)
       return mod.promise;
     const promise = this.directRequest(id, fsPath, callstack);
-    Object.assign(mod, { promise });
+    Object.assign(mod, { promise, evaluated: false });
+    promise.finally(() => {
+      mod.evaluated = true;
+    });
     return await promise;
   }
   async directRequest(id, fsPath, _callstack) {
@@ -221,7 +223,7 @@ ${getStack()}`), 2e3);
         return true;
       }
     });
-    Object.assign(mod, { code: transformed, exports });
+    Object.assign(mod, { code: transformed, exports, evaluated: false });
     const __filename = fileURLToPath(url);
     const moduleProxy = {
       set exports(value) {
@@ -320,7 +322,7 @@ function defineExport(exports, key, value) {
 function exportAll(exports, sourceModule) {
   if (exports === sourceModule)
     return;
-  if (typeof sourceModule !== "object" || Array.isArray(sourceModule) || !sourceModule)
+  if (isPrimitive(sourceModule) || Array.isArray(sourceModule))
     return;
   for (const key in sourceModule) {
     if (key !== "default") {

package/dist/hmr.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import { HMRPayload, Plugin } from 'vite';
-import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-257c4f87.js';
+import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-60eb9672.js';
 
 declare type EventType = string | symbol;
 declare type Handler<T = unknown> = (event: T) => void;

package/dist/index.d.ts

@@ -1 +1 @@
-export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-257c4f87.js';
+export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-60eb9672.js';

package/dist/server.cjs

@@ -9,8 +9,10 @@ var fs = require('fs');
 var mlly = require('mlly');
 var utils = require('./utils.cjs');
 var picocolors = require('./chunk-picocolors.cjs');
+var sourceMap = require('./source-map.cjs');
 require('url');
 require('tty');
+require('source-map-support');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -299,7 +301,7 @@ class ViteNodeServer {
     }
     const sourcemap = this.options.sourcemap ?? "inline";
     if (sourcemap === "inline" && result && !id.includes("node_modules"))
-      utils.withInlineSourcemap(result);
+      sourceMap.withInlineSourcemap(result);
     if ((_c = this.options.debug) == null ? void 0 : _c.dumpModules)
       await ((_d = this.debugger) == null ? void 0 : _d.dumpFile(id, result));
     return result;

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId, R as RawSourceMap } from './types-257c4f87.js';
+import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId, R as RawSourceMap } from './types-60eb9672.js';
 
 declare class Debugger {
     options: DebuggerOptions;

package/dist/server.mjs

@@ -3,10 +3,12 @@ import { resolve, join } from 'pathe';
 import createDebug from 'debug';
 import { existsSync, promises } from 'fs';
 import { isNodeBuiltin, isValidNodeImport } from 'mlly';
-import { slash, toArray, toFilePath, withInlineSourcemap } from './utils.mjs';
+import { slash, toArray, toFilePath } from './utils.mjs';
 import { p as picocolors } from './chunk-picocolors.mjs';
+import { withInlineSourcemap } from './source-map.mjs';
 import 'url';
 import 'tty';
+import 'source-map-support';
 
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/(es|esm)\/(.*\.js)$/;

package/dist/source-map.cjs

@@ -4,6 +4,30 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var sourceMapSupport = require('source-map-support');
 
+let SOURCEMAPPING_URL = "sourceMa";
+SOURCEMAPPING_URL += "ppingURL";
+const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;source=vite-node`;
+const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
+const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`);
+async function withInlineSourcemap(result) {
+  const { code, map } = result;
+  if (!map || code.includes(VITE_NODE_SOURCEMAPPING_URL))
+    return result;
+  if (OTHER_SOURCE_MAP_REGEXP.test(code))
+    result.code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
+  result.code = `${code}
+
+//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}
+`;
+  return result;
+}
+function extractSourceMap(code) {
+  var _a;
+  const mapString = (_a = code.match(VITE_NODE_SOURCEMAPPING_REGEXP)) == null ? void 0 : _a[1];
+  if (mapString)
+    return JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+  return null;
+}
 function installSourcemapsSupport(options) {
   sourceMapSupport.install({
     environment: "node",
@@ -21,4 +45,6 @@ function installSourcemapsSupport(options) {
   });
 }
 
+exports.extractSourceMap = extractSourceMap;
 exports.installSourcemapsSupport = installSourcemapsSupport;
+exports.withInlineSourcemap = withInlineSourcemap;

package/dist/source-map.d.ts

@@ -1,8 +1,11 @@
-import { R as RawSourceMap } from './types-257c4f87.js';
+import { TransformResult } from 'vite';
+import { R as RawSourceMap } from './types-60eb9672.js';
 
 interface InstallSourceMapSupportOptions {
     getSourceMap: (source: string) => RawSourceMap | null | undefined;
 }
+declare function withInlineSourcemap(result: TransformResult): Promise<TransformResult>;
+declare function extractSourceMap(code: string): RawSourceMap | null;
 declare function installSourcemapsSupport(options: InstallSourceMapSupportOptions): void;
 
-export { installSourcemapsSupport };
+export { extractSourceMap, installSourcemapsSupport, withInlineSourcemap };

package/dist/source-map.mjs

@@ -1,5 +1,29 @@
 import { install } from 'source-map-support';
 
+let SOURCEMAPPING_URL = "sourceMa";
+SOURCEMAPPING_URL += "ppingURL";
+const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;source=vite-node`;
+const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
+const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`);
+async function withInlineSourcemap(result) {
+  const { code, map } = result;
+  if (!map || code.includes(VITE_NODE_SOURCEMAPPING_URL))
+    return result;
+  if (OTHER_SOURCE_MAP_REGEXP.test(code))
+    result.code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
+  result.code = `${code}
+
+//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}
+`;
+  return result;
+}
+function extractSourceMap(code) {
+  var _a;
+  const mapString = (_a = code.match(VITE_NODE_SOURCEMAPPING_REGEXP)) == null ? void 0 : _a[1];
+  if (mapString)
+    return JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+  return null;
+}
 function installSourcemapsSupport(options) {
   install({
     environment: "node",
@@ -17,4 +41,4 @@ function installSourcemapsSupport(options) {
   });
 }
 
-export { installSourcemapsSupport };
+export { extractSourceMap, installSourcemapsSupport, withInlineSourcemap };

package/dist/{types-257c4f87.d.ts → types-60eb9672.d.ts}

@@ -142,7 +142,7 @@ declare class ModuleCacheMap extends Map<string, ModuleCache> {
     /**
      * Return parsed source map based on inlined source map of the module
      */
-    getSourceMap(id: string): any;
+    getSourceMap(id: string): RawSourceMap | null;
 }
 declare class ViteNodeRunner {
     options: ViteNodeRunnerOptions;
@@ -156,7 +156,7 @@ declare class ViteNodeRunner {
     constructor(options: ViteNodeRunnerOptions);
     executeFile(file: string): Promise<any>;
     executeId(id: string): Promise<any>;
-    getSourceMap(id: string): any;
+    getSourceMap(id: string): RawSourceMap | null;
     /** @internal */
     cachedRequest(rawId: string, callstack: string[]): Promise<any>;
     /** @internal */
@@ -209,6 +209,7 @@ declare type CreateHotContextFunction = (runner: ViteNodeRunner, url: string) =>
 interface ModuleCache {
     promise?: Promise<any>;
     exports?: any;
+    evaluated?: boolean;
     code?: string;
     map?: RawSourceMap;
     /**

package/dist/types.d.ts

@@ -1 +1 @@
-export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-257c4f87.js';
+export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-60eb9672.js';

package/dist/utils.cjs

@@ -51,19 +51,6 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? slash(url.fileURLToPath(url.pathToFileURL(absolute.slice(1)).href)) : absolute;
 }
-let SOURCEMAPPING_URL = "sourceMa";
-SOURCEMAPPING_URL += "ppingURL";
-async function withInlineSourcemap(result) {
-  const { code, map } = result;
-  if (code.includes(`${SOURCEMAPPING_URL}=`))
-    return result;
-  if (map)
-    result.code = `${code}
-
-//# ${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}
-`;
-  return result;
-}
 function toArray(array) {
   if (array === null || array === void 0)
     array = [];
@@ -81,4 +68,3 @@ exports.pathFromRoot = pathFromRoot;
 exports.slash = slash;
 exports.toArray = toArray;
 exports.toFilePath = toFilePath;
-exports.withInlineSourcemap = withInlineSourcemap;

package/dist/utils.d.ts

@@ -1,5 +1,4 @@
-import { TransformResult } from 'vite';
-import { N as Nullable, A as Arrayable } from './types-257c4f87.js';
+import { N as Nullable, A as Arrayable } from './types-60eb9672.js';
 
 declare const isWindows: boolean;
 declare function slash(str: string): string;
@@ -9,7 +8,6 @@ declare function normalizeModuleId(id: string): string;
 declare function isPrimitive(v: any): boolean;
 declare function pathFromRoot(root: string, filename: string): string;
 declare function toFilePath(id: string, root: string): string;
-declare function withInlineSourcemap(result: TransformResult): Promise<TransformResult>;
 /**
  * Convert `Arrayable<T>` to `Array<T>`
  *
@@ -17,4 +15,4 @@ declare function withInlineSourcemap(result: TransformResult): Promise<Transform
  */
 declare function toArray<T>(array?: Nullable<Arrayable<T>>): Array<T>;
 
-export { isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, slash, toArray, toFilePath, withInlineSourcemap };
+export { isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, slash, toArray, toFilePath };

package/dist/utils.mjs

@@ -47,19 +47,6 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? slash(fileURLToPath(pathToFileURL(absolute.slice(1)).href)) : absolute;
 }
-let SOURCEMAPPING_URL = "sourceMa";
-SOURCEMAPPING_URL += "ppingURL";
-async function withInlineSourcemap(result) {
-  const { code, map } = result;
-  if (code.includes(`${SOURCEMAPPING_URL}=`))
-    return result;
-  if (map)
-    result.code = `${code}
-
-//# ${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}
-`;
-  return result;
-}
 function toArray(array) {
   if (array === null || array === void 0)
     array = [];
@@ -68,4 +55,4 @@ function toArray(array) {
   return [array];
 }
 
-export { isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, slash, toArray, toFilePath, withInlineSourcemap };
+export { isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, slash, toArray, toFilePath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.25.3",
+  "version": "0.25.4",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",