vite-plugin-mock-dev-server 1.4.2 → 1.4.3

package/dist/index.cjs

@@ -6,8 +6,8 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name2 in all)
-    __defProp(target, name2, { get: all[name2], enumerable: true });
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -60,10 +60,7 @@ var import_utils3 = require("@pengzhanbo/utils");
 var import_fast_glob = __toESM(require("fast-glob"), 1);
 var import_is_core_module = __toESM(require("is-core-module"), 1);
 var import_pluginutils = require("@rollup/pluginutils");
-
-// package.json
-var name = "vite-plugin-mock-dev-server";
-var version = "1.4.2";
+var import_picocolors3 = __toESM(require("picocolors"), 1);
 
 // src/compiler.ts
 var import_node_fs2 = __toESM(require("fs"), 1);
@@ -420,11 +417,19 @@ async function generateMockServer(ctx, config, options) {
   ];
   try {
     if (import_node_path3.default.isAbsolute(outputDir)) {
-      for (const { filename } of outputList)
-        await import_promises.default.rm(filename);
-      import_node_fs3.default.mkdirSync(outputDir, { recursive: true });
-      for (const { filename, source } of outputList)
+      for (const { filename } of outputList) {
+        if (import_node_fs3.default.existsSync(filename))
+          await import_promises.default.rm(filename);
+      }
+      config.logger.info(`${import_picocolors3.default.green("\u2713")} generate mock server in ${import_picocolors3.default.cyan(outputDir)}`);
+      for (const { filename, source } of outputList) {
+        import_node_fs3.default.mkdirSync(import_node_path3.default.dirname(filename), { recursive: true });
         await import_promises.default.writeFile(filename, source, "utf-8");
+        const sourceSize = (source.length / 1024).toFixed(2);
+        const name = import_node_path3.default.relative(outputDir, filename);
+        const space = name.length < 30 ? " ".repeat(30 - name.length) : "";
+        config.logger.info(`  ${import_picocolors3.default.green(name)}${space}${import_picocolors3.default.bold(import_picocolors3.default.dim(`${sourceSize} kB`))}`);
+      }
     } else {
       for (const { filename, source } of outputList) {
         ctx.emitFile({
@@ -434,12 +439,13 @@ async function generateMockServer(ctx, config, options) {
         });
       }
     }
-  } catch {
+  } catch (e) {
+    console.error(e);
   }
 }
 function getMockDependencies(deps, alias) {
   const list = /* @__PURE__ */ new Set();
-  const excludeDeps = [name, "connect", "cors"];
+  const excludeDeps = ["vite-plugin-mock-dev-server", "connect", "cors"];
   const isAlias = (p) => alias.find(({ find }) => aliasMatches(find, p));
   Object.keys(deps).forEach((mPath) => {
     const imports = deps[mPath].imports.filter((_) => _.external && !_.path.startsWith("<define:") && !isAlias(_.path)).map((_) => _.path);
@@ -461,7 +467,7 @@ function generatePackageJson(pkg, mockDeps) {
     },
     dependencies: {
       "connect": "^3.7.0",
-      "vite-plugin-mock-dev-server": `^${version}`,
+      "vite-plugin-mock-dev-server": `^${"1.4.3"}`,
       "cors": "^2.8.5"
     },
     pnpm: { peerDependencyRules: { ignoreMissing: ["vite"] } }
@@ -476,7 +482,7 @@ function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, p
   return `import { createServer } from 'node:http';
 import connect from 'connect';
 import corsMiddleware from 'cors';
-import { baseMiddleware, mockWebSocket, createLogger } from 'vite-plugin-mock-dev-server';
+import { baseMiddleware, createLogger, mockWebSocket } from 'vite-plugin-mock-dev-server';
 import mockData from './mock-data.js';
 
 const app = connect();
@@ -555,7 +561,7 @@ var import_cookies = __toESM(require("cookies"), 1);
 var import_http_status = __toESM(require("http-status"), 1);
 var mime = __toESM(require("mime-types"), 1);
 var import_path_to_regexp3 = require("path-to-regexp");
-var import_picocolors3 = __toESM(require("picocolors"), 1);
+var import_picocolors4 = __toESM(require("picocolors"), 1);
 
 // src/matchingWeight.ts
 var import_utils5 = require("@pengzhanbo/utils");
@@ -627,11 +633,11 @@ function defaultPriority(rules) {
         pattern = "",
         modifier,
         prefix,
-        name: name2
+        name
       } = isDynamic ? token : {};
       const isGlob = pattern && pattern.includes(".*");
       const isSlash = prefix === "/";
-      const isNamed = (0, import_utils5.isString)(name2);
+      const isNamed = (0, import_utils5.isString)(name);
       exp += isDynamic && isSlash ? 1 : 0;
       if (i === tokens.length - 1 && isGlob) {
         weight += 5 * 10 ** (tokens.length === 1 ? highest + 1 : highest);
@@ -853,10 +859,10 @@ function baseMiddleware(mockLoader, {
     }
     if (!mock) {
       const matched = mockUrls.map(
-        (m) => m === _mockUrl ? import_picocolors3.default.underline(import_picocolors3.default.bold(m)) : import_picocolors3.default.dim(m)
+        (m) => m === _mockUrl ? import_picocolors4.default.underline(import_picocolors4.default.bold(m)) : import_picocolors4.default.dim(m)
       ).join(", ");
       logger.warn(
-        `${import_picocolors3.default.green(
+        `${import_picocolors4.default.green(
           pathname
         )} matches  ${matched} , but mock data is not found.`
       );
@@ -885,10 +891,10 @@ function baseMiddleware(mockLoader, {
     await provideCookies(request, response, mock, logger);
     logger.info(requestLog(request, filepath), logLevel);
     logger.debug(
-      `${import_picocolors3.default.magenta("DEBUG")} ${import_picocolors3.default.underline(
+      `${import_picocolors4.default.magenta("DEBUG")} ${import_picocolors4.default.underline(
         pathname
       )}  matches: [ ${mockUrls.map(
-        (m) => m === _mockUrl ? import_picocolors3.default.underline(import_picocolors3.default.bold(m)) : import_picocolors3.default.dim(m)
+        (m) => m === _mockUrl ? import_picocolors4.default.underline(import_picocolors4.default.bold(m)) : import_picocolors4.default.dim(m)
       ).join(", ")} ]
 `
     );
@@ -899,11 +905,11 @@ function baseMiddleware(mockLoader, {
         sendData(response, content, type);
       } catch (e) {
         logger.error(
-          `${import_picocolors3.default.red(
+          `${import_picocolors4.default.red(
             `mock error at ${pathname}`
           )}
 ${e}
-  at body (${import_picocolors3.default.underline(filepath)})`,
+  at body (${import_picocolors4.default.underline(filepath)})`,
           logLevel
         );
         responseStatus(response, 500);
@@ -917,11 +923,11 @@ ${e}
         await responseFn(request, response, next);
       } catch (e) {
         logger.error(
-          `${import_picocolors3.default.red(
+          `${import_picocolors4.default.red(
             `mock error at ${pathname}`
           )}
 ${e}
-  at response (${import_picocolors3.default.underline(filepath)})`,
+  at response (${import_picocolors4.default.underline(filepath)})`,
           logLevel
         );
         responseStatus(response, 500);
@@ -954,11 +960,11 @@ function fineMock(mockList, logger, {
         } catch (e) {
           const file = mock.__filepath__;
           logger.error(
-            `${import_picocolors3.default.red(
+            `${import_picocolors4.default.red(
               `mock error at ${pathname}`
             )}
 ${e}
-  at validator (${import_picocolors3.default.underline(file)})`,
+  at validator (${import_picocolors4.default.underline(file)})`,
             mock.log
           );
           return false;
@@ -989,11 +995,11 @@ async function provideHeaders(req, res, mock, logger) {
     });
   } catch (e) {
     logger.error(
-      `${import_picocolors3.default.red(
+      `${import_picocolors4.default.red(
         `mock error at ${req.url.split("?")[0]}`
       )}
 ${e}
-  at headers (${import_picocolors3.default.underline(filepath)})`,
+  at headers (${import_picocolors4.default.underline(filepath)})`,
       mock.log
     );
   }
@@ -1016,11 +1022,11 @@ async function provideCookies(req, res, mock, logger) {
     });
   } catch (e) {
     logger.error(
-      `${import_picocolors3.default.red(
+      `${import_picocolors4.default.red(
         `mock error at ${req.url.split("?")[0]}`
       )}
 ${e}
-  at cookies (${import_picocolors3.default.underline(filepath)})`,
+  at cookies (${import_picocolors4.default.underline(filepath)})`,
       mock.log
     );
   }
@@ -1054,15 +1060,15 @@ function getHTTPStatusText(status) {
 function requestLog(request, filepath) {
   const { url, method, query, params, body } = request;
   let { pathname } = new URL(url, "http://example.com");
-  pathname = import_picocolors3.default.green(decodeURIComponent(pathname));
+  pathname = import_picocolors4.default.green(decodeURIComponent(pathname));
   const format = (prefix, data) => {
-    return !data || (0, import_utils7.isEmptyObject)(data) ? "" : `  ${import_picocolors3.default.gray(`${prefix}:`)}${JSON.stringify(data)}`;
+    return !data || (0, import_utils7.isEmptyObject)(data) ? "" : `  ${import_picocolors4.default.gray(`${prefix}:`)}${JSON.stringify(data)}`;
   };
-  const ms = import_picocolors3.default.magenta(import_picocolors3.default.bold(method));
+  const ms = import_picocolors4.default.magenta(import_picocolors4.default.bold(method));
   const qs = format("query", query);
   const ps = format("params", params);
   const bs = format("body", body);
-  const file = `  ${import_picocolors3.default.dim(import_picocolors3.default.underline(`(${filepath})`))}`;
+  const file = `  ${import_picocolors4.default.dim(import_picocolors4.default.underline(`(${filepath})`))}`;
   return `${ms} ${pathname}${qs}${ps}${bs}${file}`;
 }
 
@@ -1305,7 +1311,7 @@ var MockLoader = class extends import_node_events.default {
 // src/ws.ts
 var import_cookies2 = __toESM(require("cookies"), 1);
 var import_path_to_regexp4 = require("path-to-regexp");
-var import_picocolors4 = __toESM(require("picocolors"), 1);
+var import_picocolors5 = __toESM(require("picocolors"), 1);
 var import_ws = require("ws");
 function mockWebSocket({
   loader,
@@ -1340,7 +1346,7 @@ function mockWebSocket({
       wss.on("close", () => wssMap.delete(pathname));
       wss.on("error", (e) => {
         logger.error(
-          `${import_picocolors4.default.red(
+          `${import_picocolors5.default.red(
             `WebSocket mock error at ${wss.path}`
           )}
 ${e}
@@ -1350,7 +1356,7 @@ ${e}
       });
     } catch (e) {
       logger.error(
-        `${import_picocolors4.default.red(
+        `${import_picocolors5.default.red(
           `WebSocket mock error at ${wss.path}`
         )}
 ${e}
@@ -1431,9 +1437,9 @@ ${e}
     request.getCookie = cookies.get.bind(cookies);
     wss.handleUpgrade(request, socket, head, (ws) => {
       logger.info(
-        `${import_picocolors4.default.magenta(import_picocolors4.default.bold("WebSocket"))} ${import_picocolors4.default.green(
+        `${import_picocolors5.default.magenta(import_picocolors5.default.bold("WebSocket"))} ${import_picocolors5.default.green(
           req.url
-        )} connected ${import_picocolors4.default.dim(`(${filepath})`)}`,
+        )} connected ${import_picocolors5.default.dim(`(${filepath})`)}`,
         mock.log
       );
       wssContext.connectionList.push({ req: request, ws });

package/dist/index.js

@@ -10,10 +10,7 @@ import { toArray } from "@pengzhanbo/utils";
 import fg from "fast-glob";
 import isCore from "is-core-module";
 import { createFilter } from "@rollup/pluginutils";
-
-// package.json
-var name = "vite-plugin-mock-dev-server";
-var version = "1.4.2";
+import c from "picocolors";
 
 // src/compiler.ts
 import fs2, { promises as fsp } from "node:fs";
@@ -370,11 +367,19 @@ async function generateMockServer(ctx, config, options) {
   ];
   try {
     if (path3.isAbsolute(outputDir)) {
-      for (const { filename } of outputList)
-        await fsp2.rm(filename);
-      fs3.mkdirSync(outputDir, { recursive: true });
-      for (const { filename, source } of outputList)
+      for (const { filename } of outputList) {
+        if (fs3.existsSync(filename))
+          await fsp2.rm(filename);
+      }
+      config.logger.info(`${c.green("\u2713")} generate mock server in ${c.cyan(outputDir)}`);
+      for (const { filename, source } of outputList) {
+        fs3.mkdirSync(path3.dirname(filename), { recursive: true });
         await fsp2.writeFile(filename, source, "utf-8");
+        const sourceSize = (source.length / 1024).toFixed(2);
+        const name = path3.relative(outputDir, filename);
+        const space = name.length < 30 ? " ".repeat(30 - name.length) : "";
+        config.logger.info(`  ${c.green(name)}${space}${c.bold(c.dim(`${sourceSize} kB`))}`);
+      }
     } else {
       for (const { filename, source } of outputList) {
         ctx.emitFile({
@@ -384,12 +389,13 @@ async function generateMockServer(ctx, config, options) {
         });
       }
     }
-  } catch {
+  } catch (e) {
+    console.error(e);
   }
 }
 function getMockDependencies(deps, alias) {
   const list = /* @__PURE__ */ new Set();
-  const excludeDeps = [name, "connect", "cors"];
+  const excludeDeps = ["vite-plugin-mock-dev-server", "connect", "cors"];
   const isAlias = (p) => alias.find(({ find }) => aliasMatches(find, p));
   Object.keys(deps).forEach((mPath) => {
     const imports = deps[mPath].imports.filter((_) => _.external && !_.path.startsWith("<define:") && !isAlias(_.path)).map((_) => _.path);
@@ -411,7 +417,7 @@ function generatePackageJson(pkg, mockDeps) {
     },
     dependencies: {
       "connect": "^3.7.0",
-      "vite-plugin-mock-dev-server": `^${version}`,
+      "vite-plugin-mock-dev-server": `^${"1.4.3"}`,
       "cors": "^2.8.5"
     },
     pnpm: { peerDependencyRules: { ignoreMissing: ["vite"] } }
@@ -426,7 +432,7 @@ function generatorServerEntryCode(httpProxies, wsProxies, cookiesOptions = {}, p
   return `import { createServer } from 'node:http';
 import connect from 'connect';
 import corsMiddleware from 'cors';
-import { baseMiddleware, mockWebSocket, createLogger } from 'vite-plugin-mock-dev-server';
+import { baseMiddleware, createLogger, mockWebSocket } from 'vite-plugin-mock-dev-server';
 import mockData from './mock-data.js';
 
 const app = connect();
@@ -590,11 +596,11 @@ function defaultPriority(rules) {
         pattern = "",
         modifier,
         prefix,
-        name: name2
+        name
       } = isDynamic ? token : {};
       const isGlob = pattern && pattern.includes(".*");
       const isSlash = prefix === "/";
-      const isNamed = isString(name2);
+      const isNamed = isString(name);
       exp += isDynamic && isSlash ? 1 : 0;
       if (i === tokens.length - 1 && isGlob) {
         weight += 5 * 10 ** (tokens.length === 1 ? highest + 1 : highest);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-mock-dev-server",
   "type": "module",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "packageManager": "pnpm@8.11.0",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github.com/pengzhanbo)",
   "license": "MIT",