vite-node 0.17.0 → 0.17.1

package/dist/chunk-client.cjs

@@ -91,31 +91,34 @@ class ViteNodeRunner {
     return await this.cachedRequest(id, []);
   }
   async cachedRequest(rawId, callstack) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const id = utils.normalizeRequestId(rawId, this.options.base);
     const fsPath = utils.toFilePath(id, this.root);
-    if ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.promise)
-      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.promise;
+    if (callstack.includes(fsPath) && ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.exports))
+      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.exports;
+    if ((_c = this.moduleCache.get(fsPath)) == null ? void 0 : _c.promise)
+      return (_d = this.moduleCache.get(fsPath)) == null ? void 0 : _d.promise;
     const promise = this.directRequest(id, fsPath, callstack);
     this.moduleCache.set(fsPath, { promise });
     return await promise;
   }
   async directRequest(id, fsPath, _callstack) {
-    const callstack = [..._callstack, utils.normalizeModuleId(id)];
+    const callstack = [..._callstack, fsPath];
     const request = async (dep) => {
       var _a;
+      const fsPath2 = utils.toFilePath(utils.normalizeRequestId(dep, this.options.base), this.root);
       const getStack = () => {
         return `stack:
-${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`;
+${[...callstack, fsPath2].reverse().map((p) => `- ${p}`).join("\n")}`;
       };
       let debugTimer;
       if (this.debug)
-        debugTimer = setTimeout(() => this.debugLog(() => `module ${dep} takes over 2s to load.
+        debugTimer = setTimeout(() => this.debugLog(() => `module ${fsPath2} takes over 2s to load.
 ${getStack()}`), 2e3);
       try {
-        if (callstack.includes(utils.normalizeModuleId(dep))) {
+        if (callstack.includes(fsPath2)) {
           this.debugLog(() => `circular dependency, ${getStack()}`);
-          const depExports = (_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports;
+          const depExports = (_a = this.moduleCache.get(fsPath2)) == null ? void 0 : _a.exports;
           if (depExports)
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
@@ -155,7 +158,7 @@ ${getStack()}`), 2e3);
     const meta = { url: url$1 };
     const exports = /* @__PURE__ */ Object.create(null);
     exports[Symbol.toStringTag] = "Module";
-    this.moduleCache.set(id, { code: transformed, exports });
+    this.moduleCache.set(fsPath, { code: transformed, exports });
     const __filename = url.fileURLToPath(url$1);
     const moduleProxy = {
       set exports(value) {

package/dist/chunk-client.mjs

@@ -66,31 +66,34 @@ class ViteNodeRunner {
     return await this.cachedRequest(id, []);
   }
   async cachedRequest(rawId, callstack) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const id = normalizeRequestId(rawId, this.options.base);
     const fsPath = toFilePath(id, this.root);
-    if ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.promise)
-      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.promise;
+    if (callstack.includes(fsPath) && ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.exports))
+      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.exports;
+    if ((_c = this.moduleCache.get(fsPath)) == null ? void 0 : _c.promise)
+      return (_d = this.moduleCache.get(fsPath)) == null ? void 0 : _d.promise;
     const promise = this.directRequest(id, fsPath, callstack);
     this.moduleCache.set(fsPath, { promise });
     return await promise;
   }
   async directRequest(id, fsPath, _callstack) {
-    const callstack = [..._callstack, normalizeModuleId(id)];
+    const callstack = [..._callstack, fsPath];
     const request = async (dep) => {
       var _a;
+      const fsPath2 = toFilePath(normalizeRequestId(dep, this.options.base), this.root);
       const getStack = () => {
         return `stack:
-${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`;
+${[...callstack, fsPath2].reverse().map((p) => `- ${p}`).join("\n")}`;
       };
       let debugTimer;
       if (this.debug)
-        debugTimer = setTimeout(() => this.debugLog(() => `module ${dep} takes over 2s to load.
+        debugTimer = setTimeout(() => this.debugLog(() => `module ${fsPath2} takes over 2s to load.
 ${getStack()}`), 2e3);
       try {
-        if (callstack.includes(normalizeModuleId(dep))) {
+        if (callstack.includes(fsPath2)) {
           this.debugLog(() => `circular dependency, ${getStack()}`);
-          const depExports = (_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports;
+          const depExports = (_a = this.moduleCache.get(fsPath2)) == null ? void 0 : _a.exports;
           if (depExports)
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
@@ -130,7 +133,7 @@ ${getStack()}`), 2e3);
     const meta = { url };
     const exports = /* @__PURE__ */ Object.create(null);
     exports[Symbol.toStringTag] = "Module";
-    this.moduleCache.set(id, { code: transformed, exports });
+    this.moduleCache.set(fsPath, { code: transformed, exports });
     const __filename = fileURLToPath(url);
     const moduleProxy = {
       set exports(value) {

package/dist/chunk-hmr.cjs

@@ -52,9 +52,9 @@ function sendMessageBuffer(runner, emitter) {
   maps.messageBuffer.length = 0;
 }
 async function reload(runner, files) {
-  Array.from(runner.moduleCache.keys()).forEach((i) => {
-    if (!i.includes("node_modules"))
-      runner.moduleCache.delete(i);
+  Array.from(runner.moduleCache.keys()).forEach((fsPath) => {
+    if (!fsPath.includes("node_modules"))
+      runner.moduleCache.delete(fsPath);
   });
   return Promise.all(files.map((file) => runner.executeId(file)));
 }

package/dist/chunk-hmr.mjs

@@ -46,9 +46,9 @@ function sendMessageBuffer(runner, emitter) {
   maps.messageBuffer.length = 0;
 }
 async function reload(runner, files) {
-  Array.from(runner.moduleCache.keys()).forEach((i) => {
-    if (!i.includes("node_modules"))
-      runner.moduleCache.delete(i);
+  Array.from(runner.moduleCache.keys()).forEach((fsPath) => {
+    if (!fsPath.includes("node_modules"))
+      runner.moduleCache.delete(fsPath);
   });
   return Promise.all(files.map((file) => runner.executeId(file)));
 }

package/dist/chunk-utils.cjs

@@ -22,10 +22,10 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(root) ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
+  let absolute = id.startsWith("/@fs/") ? id.slice(4) : id.startsWith(root) ? id : id.startsWith("/") ? pathe.resolve(root, id.slice(1)) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
-  return isWindows && absolute.startsWith("/") ? url.fileURLToPath(url.pathToFileURL(absolute.slice(1)).href) : absolute;
+  return isWindows && absolute.startsWith("/") ? slash(url.fileURLToPath(url.pathToFileURL(absolute.slice(1)).href)) : absolute;
 }
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";

package/dist/chunk-utils.mjs

@@ -20,10 +20,10 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(root) ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
+  let absolute = id.startsWith("/@fs/") ? id.slice(4) : id.startsWith(root) ? id : id.startsWith("/") ? resolve(root, id.slice(1)) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
-  return isWindows && absolute.startsWith("/") ? fileURLToPath(pathToFileURL(absolute.slice(1)).href) : absolute;
+  return isWindows && absolute.startsWith("/") ? slash(fileURLToPath(pathToFileURL(absolute.slice(1)).href)) : absolute;
 }
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";

package/dist/cli.cjs

@@ -628,7 +628,7 @@ class CAC extends events.EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.17.0";
+var version = "0.17.1";
 
 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.mjs

@@ -626,7 +626,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.17.0";
+var version = "0.17.1";
 
 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/package.json

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

package/cli.d.ts

@@ -1,8 +0,0 @@
-interface CliOptions {
-    files?: string[];
-    _?: string[];
-    root?: string;
-    config?: string;
-}
-
-export { CliOptions };

package/client.d.ts

@@ -1,37 +0,0 @@
-import { ViteNodeRunnerOptions, ModuleCache } from './types.js';
-
-declare const DEFAULT_REQUEST_STUBS: {
-    '/@vite/client': {
-        injectQuery: (id: string) => string;
-        createHotContext(): {
-            accept: () => void;
-            prune: () => void;
-        };
-        updateStyle(): void;
-    };
-};
-declare class ViteNodeRunner {
-    options: ViteNodeRunnerOptions;
-    root: string;
-    moduleCache: Map<string, ModuleCache>;
-    constructor(options: ViteNodeRunnerOptions);
-    executeFile(file: string): Promise<any>;
-    executeId(id: string): Promise<any>;
-    cachedRequest(rawId: string, callstack: string[]): Promise<any>;
-    directRequest(id: string, fsPath: string, callstack: string[]): Promise<any>;
-    prepareContext(context: Record<string, any>): Record<string, any>;
-    setCache(id: string, mod: Partial<ModuleCache>): void;
-    shouldResolveId(dep: string): boolean;
-    /**
-     * Define if a module should be interop-ed
-     * This function mostly for the ability to override by subclass
-     */
-    shouldInterop(path: string, mod: any): boolean;
-    /**
-     * Import a module and interop it
-     */
-    interopedImport(path: string): Promise<any>;
-    hasNestedDefault(target: any): any;
-}
-
-export { DEFAULT_REQUEST_STUBS, ViteNodeRunner };

package/index.d.ts

@@ -1 +0,0 @@
-export { DepsHandlingOptions, FetchFunction, FetchResult, ModuleCache, RawSourceMap, ResolveIdFunction, StartOfSourceMap, ViteNodeResolveId, ViteNodeRunnerOptions, ViteNodeServerOptions } from './types.js';

package/server.d.ts

@@ -1,26 +0,0 @@
-import { ViteDevServer, TransformResult } from 'vite';
-import { DepsHandlingOptions, ViteNodeServerOptions, FetchResult, ViteNodeResolveId } from './types.js';
-
-declare function guessCJSversion(id: string): string | undefined;
-declare function shouldExternalize(id: string, options?: DepsHandlingOptions, cache?: Map<string, Promise<string | false>>): Promise<string | false>;
-
-declare class ViteNodeServer {
-    server: ViteDevServer;
-    options: ViteNodeServerOptions;
-    private fetchPromiseMap;
-    private transformPromiseMap;
-    fetchCache: Map<string, {
-        timestamp: number;
-        result: FetchResult;
-    }>;
-    constructor(server: ViteDevServer, options?: ViteNodeServerOptions);
-    shouldExternalize(id: string): Promise<string | false>;
-    resolveId(id: string, importer?: string): Promise<ViteNodeResolveId | null>;
-    fetchModule(id: string): Promise<FetchResult>;
-    transformRequest(id: string): Promise<TransformResult | null | undefined>;
-    getTransformMode(id: string): "web" | "ssr";
-    private _fetchModule;
-    private _transformRequest;
-}
-
-export { ViteNodeServer, guessCJSversion, shouldExternalize };

package/types.d.ts

@@ -1,68 +0,0 @@
-interface DepsHandlingOptions {
-    external?: (string | RegExp)[];
-    inline?: (string | RegExp)[];
-    /**
-     * Try to guess the CJS version of a package when it's invalid ESM
-     * @default true
-     */
-    fallbackCJS?: boolean;
-}
-interface StartOfSourceMap {
-    file?: string;
-    sourceRoot?: string;
-}
-interface RawSourceMap extends StartOfSourceMap {
-    version: string;
-    sources: string[];
-    names: string[];
-    sourcesContent?: string[];
-    mappings: string;
-}
-interface FetchResult {
-    code?: string;
-    externalize?: string;
-    map?: RawSourceMap;
-}
-declare type FetchFunction = (id: string) => Promise<FetchResult>;
-declare type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
-interface ModuleCache {
-    promise?: Promise<any>;
-    exports?: any;
-    code?: string;
-}
-interface ViteNodeRunnerOptions {
-    fetchModule: FetchFunction;
-    resolveId: ResolveIdFunction;
-    root: string;
-    base?: string;
-    moduleCache?: Map<string, ModuleCache>;
-    interopDefault?: boolean;
-    requestStubs?: Record<string, any>;
-}
-interface ViteNodeResolveId {
-    external?: boolean | 'absolute' | 'relative';
-    id: string;
-    meta?: Record<string, any> | null;
-    moduleSideEffects?: boolean | 'no-treeshake' | null;
-    syntheticNamedExports?: boolean | string | null;
-}
-interface ViteNodeServerOptions {
-    /**
-     * Inject inline sourcemap to modules
-     * @default 'inline'
-     */
-    sourcemap?: 'inline' | boolean;
-    /**
-     * Deps handling
-     */
-    deps?: DepsHandlingOptions;
-    /**
-     * Transform method for modules
-     */
-    transformMode?: {
-        ssr?: RegExp[];
-        web?: RegExp[];
-    };
-}
-
-export { DepsHandlingOptions, FetchFunction, FetchResult, ModuleCache, RawSourceMap, ResolveIdFunction, StartOfSourceMap, ViteNodeResolveId, ViteNodeRunnerOptions, ViteNodeServerOptions };

package/utils.d.ts

@@ -1,10 +0,0 @@
-import { TransformResult } from 'vite';
-
-declare const isWindows: boolean;
-declare function slash(str: string): string;
-declare function normalizeId(id: string, base?: string): string;
-declare function isPrimitive(v: any): boolean;
-declare function toFilePath(id: string, root: string): string;
-declare function withInlineSourcemap(result: TransformResult): Promise<TransformResult>;
-
-export { isPrimitive, isWindows, normalizeId, slash, toFilePath, withInlineSourcemap };