vite-plugin-mock-dev-server 1.0.2 → 1.0.4

package/README.md

@@ -40,7 +40,7 @@
 - 🍕 Support `viteConfig.define` in mock file
 - 📤 Support `multipart` content-type，mock upload file.
 - 🌈 Support `vite preview` mode
-- 🗂 Support for building small mock services that can be deployed independently
+- 🗂 Support for building independently deployed mock services
 
 
 ## Documentation
@@ -171,7 +171,7 @@ export default defineConfig({
   
   **Type:** `boolean`
 
-  When mock resources are hot updated, only the data content is updated, but the page is not refreshed by default.
+  When mock resources are hot reload, only the data content is updated, but the page is not refreshed by default.
   Turn this on when you want to refresh the page every time you modify the mock file.
 
 

package/dist/index.cjs

@@ -33,7 +33,8 @@ __export(src_exports, {
   baseMiddleware: () => baseMiddleware,
   default: () => src_default,
   defineMock: () => defineMock,
-  mockDevServerPlugin: () => mockDevServerPlugin
+  mockDevServerPlugin: () => mockDevServerPlugin,
+  transformMockData: () => transformMockData
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -52,7 +53,7 @@ var import_vite = require("vite");
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.0.2";
+var version = "1.0.4";
 
 // src/esbuildPlugin.ts
 var import_promises = __toESM(require("fs/promises"), 1);
@@ -269,7 +270,7 @@ async function generateMockEntryCode(cwd, include, exclude) {
     resolve: false
   });
   const mockFiles = includePaths.filter(includeFilter);
-  let importers = "import { parse as urlParse } from 'node:url';\n";
+  let importers = "";
   let exporters = "";
   mockFiles.forEach((filepath, index) => {
     const file = import_node_path3.default.join(cwd, filepath);
@@ -277,42 +278,15 @@ async function generateMockEntryCode(cwd, include, exclude) {
 `;
     exporters += `m${index}, `;
   });
-  return `${importers}const mockData = [${exporters}];
-
-const data = [];
-const mocks = {};
-mockData.forEach(mock => {
-  Object.keys(mock).forEach(key => {
-    const mockData = mock[key];
-    if (Array.isArray(mockData)) {
-      data.push(...mockData);
-    } else {
-      if (typeof mockData === 'object' && Object.prototype.hasOwnProperty.call(mockData, 'url')) {
-        data.push(mockData);
-      }
-    }
-  })
-})
-data
-  .filter((mock) => mock.enabled || typeof mock.enabled === "undefined")
-  .forEach((mock) => {
-    const { pathname, query } = urlParse(mock.url, true);
-    if (!mocks[pathname]) {
-      mocks[pathname] = [];
-    }
-    mock.url = pathname;
-    const list = mocks[pathname];
-    if (query && typeof mock.validator === 'function') {
-      mock.validator ??= {};
-      mock.validator.query = Object.assign(
-        query,
-        mock.validator.query || {},
-      );
-    }
-    mock.validator ? list.unshift(mock) : list.push(mock);
-  });
-export default mocks;
-  `;
+  return `import { transformMockData } from 'vite-plugin-mock-dev-server';
+${importers}
+const exporters = [${exporters}];
+const mockList = exporters.map((raw) => raw && raw.default
+  ? raw.default
+  : Object.keys(raw || {}).map((key) => raw[key])
+)
+export default transformMockData(mockList);
+`;
 }
 async function buildMockEntry(inputFile, define) {
   var _a;
@@ -520,12 +494,42 @@ var import_node_events = __toESM(require("events"), 1);
 var import_node_fs3 = __toESM(require("fs"), 1);
 var import_node_module = require("module");
 var import_node_path4 = __toESM(require("path"), 1);
-var import_node_url3 = require("url");
+var import_node_url4 = require("url");
 var import_chokidar = __toESM(require("chokidar"), 1);
 var import_esbuild2 = require("esbuild");
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
 var import_json52 = __toESM(require("json5"), 1);
 var import_vite2 = require("vite");
+
+// src/transform.ts
+var import_node_url3 = require("url");
+function transformMockData(mockList) {
+  const list = [];
+  for (const [, handle] of mockList.entries()) {
+    if (handle) {
+      isArray(handle) ? list.push(...handle) : list.push(handle);
+    }
+  }
+  const mocks = {};
+  list.filter(
+    (mock) => (mock.enabled || typeof mock.enabled === "undefined") && mock.url
+  ).forEach((mock) => {
+    const { pathname, query } = (0, import_node_url3.parse)(mock.url, true);
+    const list2 = mocks[pathname] ?? (mocks[pathname] = []);
+    const current = Object.assign({}, mock, { url: pathname });
+    if (query && !isFunction(current.validator)) {
+      current.validator = Object.assign({}, current.validator || {});
+      current.validator.query = Object.assign(
+        query,
+        current.validator.query || {}
+      );
+    }
+    current.validator ? list2.unshift(current) : list2.push(current);
+  });
+  return mocks;
+}
+
+// src/MockLoader.ts
 var _dirname = getDirname(importMetaUrl);
 var _require = (0, import_node_module.createRequire)(_dirname);
 var _MockLoader = class extends import_node_events.default {
@@ -636,28 +640,7 @@ var _MockLoader = class extends import_node_events.default {
     (_b = this.depsWatcher) == null ? void 0 : _b.close();
   }
   updateMockList() {
-    const mockList = [];
-    for (const [, handle] of this.moduleCache.entries()) {
-      isArray(handle) ? mockList.push(...handle) : mockList.push(handle);
-    }
-    const mocks = {};
-    mockList.filter((mock) => mock.enabled || typeof mock.enabled === "undefined").forEach((mock) => {
-      const { pathname, query } = (0, import_node_url3.parse)(mock.url, true);
-      if (!mocks[pathname]) {
-        mocks[pathname] = [];
-      }
-      mock.url = pathname;
-      const list = mocks[pathname];
-      if (query && !isFunction(mock.validator)) {
-        mock.validator ?? (mock.validator = {});
-        mock.validator.query = Object.assign(
-          query,
-          mock.validator.query || {}
-        );
-      }
-      mock.validator ? list.unshift(mock) : list.push(mock);
-    });
-    this._mockData = mocks;
+    this._mockData = transformMockData(this.moduleCache);
   }
   updateModuleDeps(filepath, deps) {
     Object.keys(deps).forEach((mPath) => {
@@ -714,7 +697,7 @@ var _MockLoader = class extends import_node_events.default {
     if (isESM) {
       const fileBase = `${filepath}.timestamp-${Date.now()}`;
       const fileNameTmp = `${fileBase}.mjs`;
-      const fileUrl = `${(0, import_node_url3.pathToFileURL)(fileBase)}.mjs`;
+      const fileUrl = `${(0, import_node_url4.pathToFileURL)(fileBase)}.mjs`;
       await import_node_fs3.default.promises.writeFile(fileNameTmp, code, "utf8");
       try {
         return await import(fileUrl);
@@ -904,5 +887,6 @@ var src_default = mockDevServerPlugin;
 0 && (module.exports = {
   baseMiddleware,
   defineMock,
-  mockDevServerPlugin
+  mockDevServerPlugin,
+  transformMockData
 });

package/dist/index.d.ts

@@ -158,7 +158,7 @@ declare function mockDevServerPlugin({ prefix, include, exclude, reload, formida
 /**
  * mock config helper
  *
- * mock配置帮助函数
+ * mock配置辅助函数
  *
  * @param config
  * @example
@@ -217,4 +217,6 @@ interface BaseMiddlewareOptions {
 }
 declare function baseMiddleware(mockLoader: MockLoader, { formidableOptions, proxies }: BaseMiddlewareOptions): Connect.NextHandleFunction;
 
-export { BaseMiddlewareOptions, FormidableFile, MockOptions, MockOptionsItem, MockServerPluginOptions, baseMiddleware, mockDevServerPlugin as default, defineMock, mockDevServerPlugin };
+declare function transformMockData(mockList: Map<string, MockOptionsItem | MockOptions> | (MockOptionsItem | MockOptions)[]): Record<string, MockOptions>;
+
+export { BaseMiddlewareOptions, FormidableFile, MockOptions, MockOptionsItem, MockServerPluginOptions, baseMiddleware, mockDevServerPlugin as default, defineMock, mockDevServerPlugin, transformMockData };

package/dist/index.js

@@ -9,7 +9,7 @@ import { createFilter } from "vite";
 
 // package.json
 var name = "vite-plugin-mock-dev-server";
-var version = "1.0.2";
+var version = "1.0.4";
 
 // src/esbuildPlugin.ts
 import fsp from "fs/promises";
@@ -226,7 +226,7 @@ async function generateMockEntryCode(cwd, include, exclude) {
     resolve: false
   });
   const mockFiles = includePaths.filter(includeFilter);
-  let importers = "import { parse as urlParse } from 'node:url';\n";
+  let importers = "";
   let exporters = "";
   mockFiles.forEach((filepath, index) => {
     const file = path3.join(cwd, filepath);
@@ -234,42 +234,15 @@ async function generateMockEntryCode(cwd, include, exclude) {
 `;
     exporters += `m${index}, `;
   });
-  return `${importers}const mockData = [${exporters}];
-
-const data = [];
-const mocks = {};
-mockData.forEach(mock => {
-  Object.keys(mock).forEach(key => {
-    const mockData = mock[key];
-    if (Array.isArray(mockData)) {
-      data.push(...mockData);
-    } else {
-      if (typeof mockData === 'object' && Object.prototype.hasOwnProperty.call(mockData, 'url')) {
-        data.push(mockData);
-      }
-    }
-  })
-})
-data
-  .filter((mock) => mock.enabled || typeof mock.enabled === "undefined")
-  .forEach((mock) => {
-    const { pathname, query } = urlParse(mock.url, true);
-    if (!mocks[pathname]) {
-      mocks[pathname] = [];
-    }
-    mock.url = pathname;
-    const list = mocks[pathname];
-    if (query && typeof mock.validator === 'function') {
-      mock.validator ??= {};
-      mock.validator.query = Object.assign(
-        query,
-        mock.validator.query || {},
-      );
-    }
-    mock.validator ? list.unshift(mock) : list.push(mock);
-  });
-export default mocks;
-  `;
+  return `import { transformMockData } from 'vite-plugin-mock-dev-server';
+${importers}
+const exporters = [${exporters}];
+const mockList = exporters.map((raw) => raw && raw.default
+  ? raw.default
+  : Object.keys(raw || {}).map((key) => raw[key])
+)
+export default transformMockData(mockList);
+`;
 }
 async function buildMockEntry(inputFile, define) {
   var _a;
@@ -477,12 +450,42 @@ import EventEmitter from "events";
 import fs3 from "fs";
 import { createRequire } from "module";
 import path4 from "path";
-import { pathToFileURL, parse as urlParse2 } from "url";
+import { pathToFileURL } from "url";
 import chokidar from "chokidar";
 import { build as build2 } from "esbuild";
 import fastGlob from "fast-glob";
 import JSON52 from "json5";
 import { createFilter as createFilter2, normalizePath } from "vite";
+
+// src/transform.ts
+import { parse as urlParse2 } from "url";
+function transformMockData(mockList) {
+  const list = [];
+  for (const [, handle] of mockList.entries()) {
+    if (handle) {
+      isArray(handle) ? list.push(...handle) : list.push(handle);
+    }
+  }
+  const mocks = {};
+  list.filter(
+    (mock) => (mock.enabled || typeof mock.enabled === "undefined") && mock.url
+  ).forEach((mock) => {
+    const { pathname, query } = urlParse2(mock.url, true);
+    const list2 = mocks[pathname] ?? (mocks[pathname] = []);
+    const current = Object.assign({}, mock, { url: pathname });
+    if (query && !isFunction(current.validator)) {
+      current.validator = Object.assign({}, current.validator || {});
+      current.validator.query = Object.assign(
+        query,
+        current.validator.query || {}
+      );
+    }
+    current.validator ? list2.unshift(current) : list2.push(current);
+  });
+  return mocks;
+}
+
+// src/MockLoader.ts
 var _dirname = getDirname(import.meta.url);
 var _require = createRequire(_dirname);
 var _MockLoader = class extends EventEmitter {
@@ -593,28 +596,7 @@ var _MockLoader = class extends EventEmitter {
     (_b = this.depsWatcher) == null ? void 0 : _b.close();
   }
   updateMockList() {
-    const mockList = [];
-    for (const [, handle] of this.moduleCache.entries()) {
-      isArray(handle) ? mockList.push(...handle) : mockList.push(handle);
-    }
-    const mocks = {};
-    mockList.filter((mock) => mock.enabled || typeof mock.enabled === "undefined").forEach((mock) => {
-      const { pathname, query } = urlParse2(mock.url, true);
-      if (!mocks[pathname]) {
-        mocks[pathname] = [];
-      }
-      mock.url = pathname;
-      const list = mocks[pathname];
-      if (query && !isFunction(mock.validator)) {
-        mock.validator ?? (mock.validator = {});
-        mock.validator.query = Object.assign(
-          query,
-          mock.validator.query || {}
-        );
-      }
-      mock.validator ? list.unshift(mock) : list.push(mock);
-    });
-    this._mockData = mocks;
+    this._mockData = transformMockData(this.moduleCache);
   }
   updateModuleDeps(filepath, deps) {
     Object.keys(deps).forEach((mPath) => {
@@ -861,5 +843,6 @@ export {
   baseMiddleware,
   src_default as default,
   defineMock,
-  mockDevServerPlugin
+  mockDevServerPlugin,
+  transformMockData
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-mock-dev-server",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "keywords": [
     "vite",
     "plugin",