mock-service-cli 2.0.2 → 2.0.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.0.3](https://github.com/chandq/mock-service-cli/compare/v2.0.2...v2.0.3) (2021-12-27)
+
+
+### Bug Fixes
+
+* convert windows file path to api url ([1f15b33](https://github.com/chandq/mock-service-cli/commit/1f15b334ab5374bc102e5e11fbfaae994569bca5))
+
 ### [2.0.2](https://github.com/chandq/mock-service-cli/compare/v2.0.1...v2.0.2) (2021-12-27)
 
 

package/lib/manageMockFiles.js

@@ -8,10 +8,10 @@
 const fsa = require('fs-extra'),
   fs = require('fs'),
   path = require('path'),
-  _ = require('lodash'),
-  colors = require('colors/safe');
-const { getFileLatestContent, SupportMethods, logger } = require('./utils');
-const log = logger(process.env.SILENT);
+  _ = require('lodash');
+// colors = require('colors/safe');
+const { getFileLatestContent, SupportMethods, filePath2ApiUrl } = require('./utils');
+// const log = logger(process.env.SILENT);
 
 const methodRegExp = new RegExp(`(${SupportMethods.join('|')}) +(.*)`, 'i');
 /**
@@ -24,9 +24,9 @@ const methodRegExp = new RegExp(`(${SupportMethods.join('|')}) +(.*)`, 'i');
  *
  */
 const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mockDir }) {
-  const normalizeUrl = path.normalize(apiUrl);
+  const normalizeApiUrl = filePath2ApiUrl(path.normalize(apiUrl));
   const mockListFilePath = path.resolve(process.cwd(), `${mockDir}/mock-list.json`);
-  const mockFilePath = path.resolve(process.cwd(), `${mockDir}/${encodeURIComponent(normalizeUrl)}.json`);
+  const mockFilePath = path.resolve(process.cwd(), `${mockDir}/${encodeURIComponent(path.normalize(apiUrl))}.json`);
   let newMockListContent = {},
     oldMockListContent = null;
   if (fsa.pathExistsSync(mockListFilePath)) {
@@ -37,10 +37,10 @@ const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mo
   }
 
   // update mock-list.json file
-  if (!newMockListContent.hasOwnProperty(normalizeUrl)) {
-    newMockListContent[normalizeUrl] = [method];
-  } else if (!newMockListContent[normalizeUrl].includes(method)) {
-    newMockListContent[normalizeUrl].push(method);
+  if (!newMockListContent.hasOwnProperty(normalizeApiUrl)) {
+    newMockListContent[normalizeApiUrl] = [method];
+  } else if (!newMockListContent[normalizeApiUrl].includes(method)) {
+    newMockListContent[normalizeApiUrl].push(method);
   }
   if (!oldMockListContent || !_.isEqual(oldMockListContent, newMockListContent)) {
     fsa.writeFileSync(mockListFilePath, JSON.stringify(newMockListContent, null, 2));
@@ -63,7 +63,7 @@ const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mo
     // fsa.ensureFileSync(mockFilePath);
     fsa.writeFileSync(mockFilePath, JSON.stringify({ [method]: resJsonData ? resJsonData : {} }, null, 2));
   }
-  // console.debug('file::', `${mockDir}/${normalizeUrl}`, newMockListContent);
+  // console.debug('file::', `${mockDir}/${apiUrl}`, newMockListContent);
 };
 /**
  * @description: 从js文件中收集mock数据

package/lib/mockServer.js

@@ -60,7 +60,7 @@ const crossDomain = () => (req, res, next) => {
  * @param {*} file
  * @returns {*}
  */
-const composeRoute = function (file) {
+const composeRouteFromJsFile = function (file) {
   // 先删除require之前导入的缓存文件,否则获取到的文件内容还是旧内容
   const fileObject = getFileLatestContent(file);
 
@@ -121,12 +121,12 @@ const parseMockFiles = function (specialDir = '../mock') {
     if (!el.name.endsWith('.js')) {
       continue;
     }
-    composeRoute(filePath);
+    composeRouteFromJsFile(filePath);
   }
 };
 app.use(crossDomain());
 if (process.env.SPECIFIED_FILE) {
-  composeRoute(process.env.SPECIFIED_FILE);
+  composeRouteFromJsFile(process.env.SPECIFIED_FILE);
 } else {
   parseMockFiles(process.env.SPECIFIED_DIR);
 }
@@ -201,6 +201,6 @@ process.on('SIGTERM', function () {
 });
 
 module.exports = {
-  composeRoute,
+  composeRouteFromJsFile,
   parseMockFiles
 };

package/lib/utils.js

@@ -1,3 +1,10 @@
+/*
+ * @description:
+ * @Date: 2021-12-25 17:52:48
+ * @LastEditors: chendq
+ * @LastEditTime: 2021-12-27 13:12:16
+ * @Author: chendq
+ */
 /**
  * @description: 输出和错误输出写入不同文件
  * @param {*}
@@ -78,5 +85,21 @@ const getFileLatestContent = function (filePath) {
   delete require.cache[require.resolve(filePath)];
   return require(path.resolve(process.cwd(), filePath));
 };
+/**
+ * @description: 文件路径转成API的url
+ * @param {string} filePath
+ * @return {string} apiUrl
+ */
+const filePath2ApiUrl = function (filePath) {
+  return filePath.split(path.sep).join('/');
+};
 
-module.exports = { getLogger, dateFormat, logger, SupportMethods, isValidMethod, getFileLatestContent };
+module.exports = {
+  getLogger,
+  dateFormat,
+  logger,
+  SupportMethods,
+  isValidMethod,
+  getFileLatestContent,
+  filePath2ApiUrl
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mock-service-cli",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "🦅 Local mock server",
   "main": "./lib/mockServer.js",
   "bin": {