vite-node 0.1.26 → 0.2.2

package/client.d.ts

@@ -1,7 +1,8 @@
-declare type FetchFunction = (id: string) => Promise<{
+interface FetchResult {
     code?: string;
     externalize?: string;
-}>;
+}
+declare type FetchFunction = (id: string) => Promise<FetchResult>;
 declare type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
 interface ModuleCache {
     promise?: Promise<any>;

package/dist/cli.cjs

@@ -51,6 +51,19 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? 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;
+}
 
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
@@ -135,34 +148,35 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
-let SOURCEMAPPING_URL = "sourceMa";
-SOURCEMAPPING_URL += "ppingURL";
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
     this.options = options;
-    this.promiseMap = new Map();
+    this.fetchPromiseMap = new Map();
+    this.transformPromiseMap = new Map();
+    this.fetchCache = new Map();
   }
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps);
   }
-  async fetchModule(id) {
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
-    if (externalize)
-      return { externalize };
-    const r = await this.transformRequest(id);
-    return { code: r == null ? void 0 : r.code };
-  }
   async resolveId(id, importer) {
     return this.server.pluginContainer.resolveId(id, importer, { ssr: true });
   }
+  async fetchModule(id) {
+    if (!this.fetchPromiseMap.has(id)) {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+        this.fetchPromiseMap.delete(id);
+      }));
+    }
+    return this.fetchPromiseMap.get(id);
+  }
   async transformRequest(id) {
-    if (!this.promiseMap.has(id)) {
-      this.promiseMap.set(id, this._transformRequest(id).finally(() => {
-        this.promiseMap.delete(id);
+    if (!this.transformPromiseMap.has(id)) {
+      this.transformPromiseMap.set(id, this._transformRequest(id).finally(() => {
+        this.transformPromiseMap.delete(id);
       }));
     }
-    return this.promiseMap.get(id);
+    return this.transformPromiseMap.get(id);
   }
   getTransformMode(id) {
     var _a, _b, _c, _d;
@@ -175,10 +189,31 @@ class ViteNodeServer {
       return "ssr";
     return "web";
   }
+  async _fetchModule(id) {
+    var _a;
+    let result;
+    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
+    const cache = this.fetchCache.get(id);
+    if (timestamp && cache && cache.timestamp >= timestamp)
+      return cache.result;
+    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    if (externalize) {
+      result = { externalize };
+    } else {
+      const r = await this._transformRequest(id);
+      result = { code: r == null ? void 0 : r.code };
+    }
+    if (timestamp) {
+      this.fetchCache.set(id, {
+        timestamp,
+        result
+      });
+    }
+    return result;
+  }
   async _transformRequest(id) {
     let result = null;
-    const mode = this.getTransformMode(id);
-    if (mode === "web") {
+    if (this.getTransformMode(id) === "web") {
       result = await this.server.transformRequest(id);
       if (result)
         result = await this.server.ssrTransform(result.code, result.map, id);
@@ -190,17 +225,6 @@ class ViteNodeServer {
     return result;
   }
 }
-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;
-}
 
 const DEFAULT_REQUEST_STUBS = {
   "/@vite/client": {

package/dist/cli.js

@@ -26,6 +26,19 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? 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;
+}
 
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
@@ -110,34 +123,35 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
-let SOURCEMAPPING_URL = "sourceMa";
-SOURCEMAPPING_URL += "ppingURL";
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
     this.options = options;
-    this.promiseMap = new Map();
+    this.fetchPromiseMap = new Map();
+    this.transformPromiseMap = new Map();
+    this.fetchCache = new Map();
   }
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps);
   }
-  async fetchModule(id) {
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
-    if (externalize)
-      return { externalize };
-    const r = await this.transformRequest(id);
-    return { code: r == null ? void 0 : r.code };
-  }
   async resolveId(id, importer) {
     return this.server.pluginContainer.resolveId(id, importer, { ssr: true });
   }
+  async fetchModule(id) {
+    if (!this.fetchPromiseMap.has(id)) {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+        this.fetchPromiseMap.delete(id);
+      }));
+    }
+    return this.fetchPromiseMap.get(id);
+  }
   async transformRequest(id) {
-    if (!this.promiseMap.has(id)) {
-      this.promiseMap.set(id, this._transformRequest(id).finally(() => {
-        this.promiseMap.delete(id);
+    if (!this.transformPromiseMap.has(id)) {
+      this.transformPromiseMap.set(id, this._transformRequest(id).finally(() => {
+        this.transformPromiseMap.delete(id);
       }));
     }
-    return this.promiseMap.get(id);
+    return this.transformPromiseMap.get(id);
   }
   getTransformMode(id) {
     var _a, _b, _c, _d;
@@ -150,10 +164,31 @@ class ViteNodeServer {
       return "ssr";
     return "web";
   }
+  async _fetchModule(id) {
+    var _a;
+    let result;
+    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
+    const cache = this.fetchCache.get(id);
+    if (timestamp && cache && cache.timestamp >= timestamp)
+      return cache.result;
+    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    if (externalize) {
+      result = { externalize };
+    } else {
+      const r = await this._transformRequest(id);
+      result = { code: r == null ? void 0 : r.code };
+    }
+    if (timestamp) {
+      this.fetchCache.set(id, {
+        timestamp,
+        result
+      });
+    }
+    return result;
+  }
   async _transformRequest(id) {
     let result = null;
-    const mode = this.getTransformMode(id);
-    if (mode === "web") {
+    if (this.getTransformMode(id) === "web") {
       result = await this.server.transformRequest(id);
       if (result)
         result = await this.server.ssrTransform(result.code, result.map, id);
@@ -165,17 +200,6 @@ class ViteNodeServer {
     return result;
   }
 }
-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;
-}
 
 const DEFAULT_REQUEST_STUBS = {
   "/@vite/client": {

package/dist/server.cjs

@@ -17,6 +17,19 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? 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;
+}
 
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
@@ -101,34 +114,35 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
-let SOURCEMAPPING_URL = "sourceMa";
-SOURCEMAPPING_URL += "ppingURL";
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
     this.options = options;
-    this.promiseMap = new Map();
+    this.fetchPromiseMap = new Map();
+    this.transformPromiseMap = new Map();
+    this.fetchCache = new Map();
   }
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps);
   }
-  async fetchModule(id) {
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
-    if (externalize)
-      return { externalize };
-    const r = await this.transformRequest(id);
-    return { code: r == null ? void 0 : r.code };
-  }
   async resolveId(id, importer) {
     return this.server.pluginContainer.resolveId(id, importer, { ssr: true });
   }
+  async fetchModule(id) {
+    if (!this.fetchPromiseMap.has(id)) {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+        this.fetchPromiseMap.delete(id);
+      }));
+    }
+    return this.fetchPromiseMap.get(id);
+  }
   async transformRequest(id) {
-    if (!this.promiseMap.has(id)) {
-      this.promiseMap.set(id, this._transformRequest(id).finally(() => {
-        this.promiseMap.delete(id);
+    if (!this.transformPromiseMap.has(id)) {
+      this.transformPromiseMap.set(id, this._transformRequest(id).finally(() => {
+        this.transformPromiseMap.delete(id);
       }));
     }
-    return this.promiseMap.get(id);
+    return this.transformPromiseMap.get(id);
   }
   getTransformMode(id) {
     var _a, _b, _c, _d;
@@ -141,10 +155,31 @@ class ViteNodeServer {
       return "ssr";
     return "web";
   }
+  async _fetchModule(id) {
+    var _a;
+    let result;
+    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
+    const cache = this.fetchCache.get(id);
+    if (timestamp && cache && cache.timestamp >= timestamp)
+      return cache.result;
+    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    if (externalize) {
+      result = { externalize };
+    } else {
+      const r = await this._transformRequest(id);
+      result = { code: r == null ? void 0 : r.code };
+    }
+    if (timestamp) {
+      this.fetchCache.set(id, {
+        timestamp,
+        result
+      });
+    }
+    return result;
+  }
   async _transformRequest(id) {
     let result = null;
-    const mode = this.getTransformMode(id);
-    if (mode === "web") {
+    if (this.getTransformMode(id) === "web") {
       result = await this.server.transformRequest(id);
       if (result)
         result = await this.server.ssrTransform(result.code, result.map, id);
@@ -156,19 +191,7 @@ class ViteNodeServer {
     return result;
   }
 }
-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;
-}
 
 exports.ViteNodeServer = ViteNodeServer;
 exports.guessCJSversion = guessCJSversion;
 exports.shouldExternalize = shouldExternalize;
-exports.withInlineSourcemap = withInlineSourcemap;

package/dist/server.js

@@ -13,6 +13,19 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? 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;
+}
 
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
@@ -97,34 +110,35 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
-let SOURCEMAPPING_URL = "sourceMa";
-SOURCEMAPPING_URL += "ppingURL";
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
     this.options = options;
-    this.promiseMap = new Map();
+    this.fetchPromiseMap = new Map();
+    this.transformPromiseMap = new Map();
+    this.fetchCache = new Map();
   }
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps);
   }
-  async fetchModule(id) {
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
-    if (externalize)
-      return { externalize };
-    const r = await this.transformRequest(id);
-    return { code: r == null ? void 0 : r.code };
-  }
   async resolveId(id, importer) {
     return this.server.pluginContainer.resolveId(id, importer, { ssr: true });
   }
+  async fetchModule(id) {
+    if (!this.fetchPromiseMap.has(id)) {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+        this.fetchPromiseMap.delete(id);
+      }));
+    }
+    return this.fetchPromiseMap.get(id);
+  }
   async transformRequest(id) {
-    if (!this.promiseMap.has(id)) {
-      this.promiseMap.set(id, this._transformRequest(id).finally(() => {
-        this.promiseMap.delete(id);
+    if (!this.transformPromiseMap.has(id)) {
+      this.transformPromiseMap.set(id, this._transformRequest(id).finally(() => {
+        this.transformPromiseMap.delete(id);
       }));
     }
-    return this.promiseMap.get(id);
+    return this.transformPromiseMap.get(id);
   }
   getTransformMode(id) {
     var _a, _b, _c, _d;
@@ -137,10 +151,31 @@ class ViteNodeServer {
       return "ssr";
     return "web";
   }
+  async _fetchModule(id) {
+    var _a;
+    let result;
+    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
+    const cache = this.fetchCache.get(id);
+    if (timestamp && cache && cache.timestamp >= timestamp)
+      return cache.result;
+    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    if (externalize) {
+      result = { externalize };
+    } else {
+      const r = await this._transformRequest(id);
+      result = { code: r == null ? void 0 : r.code };
+    }
+    if (timestamp) {
+      this.fetchCache.set(id, {
+        timestamp,
+        result
+      });
+    }
+    return result;
+  }
   async _transformRequest(id) {
     let result = null;
-    const mode = this.getTransformMode(id);
-    if (mode === "web") {
+    if (this.getTransformMode(id) === "web") {
       result = await this.server.transformRequest(id);
       if (result)
         result = await this.server.ssrTransform(result.code, result.map, id);
@@ -152,16 +187,5 @@ class ViteNodeServer {
     return result;
   }
 }
-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;
-}
 
-export { ViteNodeServer, guessCJSversion, shouldExternalize, withInlineSourcemap };
+export { ViteNodeServer, guessCJSversion, shouldExternalize };

package/dist/utils.cjs

@@ -23,9 +23,23 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? 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;
+}
 
 exports.isPrimitive = isPrimitive;
 exports.isWindows = isWindows;
 exports.normalizeId = normalizeId;
 exports.slash = slash;
 exports.toFilePath = toFilePath;
+exports.withInlineSourcemap = withInlineSourcemap;

package/dist/utils.js

@@ -19,5 +19,18 @@ function toFilePath(id, root) {
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? 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}
 
-export { isPrimitive, isWindows, normalizeId, slash, toFilePath };
+//# ${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}
+`;
+  return result;
+}
+
+export { isPrimitive, isWindows, normalizeId, slash, toFilePath, withInlineSourcemap };

package/index.d.ts

@@ -7,10 +7,11 @@ interface DepsHandlingOptions {
      */
     fallbackCJS?: boolean;
 }
-declare type FetchFunction = (id: string) => Promise<{
+interface FetchResult {
     code?: string;
     externalize?: string;
-}>;
+}
+declare type FetchFunction = (id: string) => Promise<FetchResult>;
 declare type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
 interface ModuleCache {
     promise?: Promise<any>;
@@ -52,4 +53,4 @@ interface ViteNodeServerOptions {
     };
 }
 
-export { DepsHandlingOptions, FetchFunction, ModuleCache, ResolveIdFunction, ViteNodeResolveId, ViteNodeRunnerOptions, ViteNodeServerOptions };
+export { DepsHandlingOptions, FetchFunction, FetchResult, ModuleCache, ResolveIdFunction, ViteNodeResolveId, ViteNodeRunnerOptions, ViteNodeServerOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.1.26",
+  "version": "0.2.2",
   "description": "Vite as Node.js runtime",
   "homepage": "https://github.com/vitest-dev/vitest#readme",
   "bugs": {

package/server.d.ts

@@ -1,5 +1,10 @@
 import { ViteDevServer, TransformResult } from 'vite';
 
+interface FetchResult {
+    code?: string;
+    externalize?: string;
+}
+
 interface DepsHandlingOptions {
     external?: (string | RegExp)[];
     inline?: (string | RegExp)[];
@@ -41,21 +46,17 @@ declare function shouldExternalize(id: string, options?: DepsHandlingOptions, ca
 declare class ViteNodeServer {
     server: ViteDevServer;
     options: ViteNodeServerOptions;
-    promiseMap: Map<string, Promise<TransformResult | null | undefined>>;
+    private fetchPromiseMap;
+    private transformPromiseMap;
+    private fetchCache;
     constructor(server: ViteDevServer, options?: ViteNodeServerOptions);
     shouldExternalize(id: string): Promise<string | false>;
-    fetchModule(id: string): Promise<{
-        externalize: string;
-        code?: undefined;
-    } | {
-        code: string | undefined;
-        externalize?: undefined;
-    }>;
     resolveId(id: string, importer?: string): Promise<ViteNodeResolveId | null>;
+    fetchModule(id: string): Promise<FetchResult>;
     transformRequest(id: string): Promise<TransformResult | null | undefined>;
-    private getTransformMode;
+    getTransformMode(id: string): "web" | "ssr";
+    private _fetchModule;
     private _transformRequest;
 }
-declare function withInlineSourcemap(result: TransformResult): Promise<TransformResult>;
 
-export { ViteNodeServer, guessCJSversion, shouldExternalize, withInlineSourcemap };
+export { ViteNodeServer, guessCJSversion, shouldExternalize };

package/utils.d.ts

@@ -1,7 +1,10 @@
+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 };
+export { isPrimitive, isWindows, normalizeId, slash, toFilePath, withInlineSourcemap };