mock-service-cli 2.0.4 → 2.0.5

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.5](https://github.com/chandq/mock-service-cli/compare/v2.0.4...v2.0.5) (2021-12-28)
+
+
+### Bug Fixes
+
+* validate func parameter to avoid exception ([32e4d28](https://github.com/chandq/mock-service-cli/commit/32e4d28114a4907352491e16829d37345fbab9d9))
+
 ### [2.0.4](https://github.com/chandq/mock-service-cli/compare/v2.0.3...v2.0.4) (2021-12-27)
 
 

package/lib/manageMockFiles.js

@@ -2,16 +2,16 @@
  * @description: 生成Mock文件、获取mock数据统计
  * @Date: 2021-12-22 16:57:08
  * @LastEditors: chendq
- * @LastEditTime: 2021-12-27 10:15:01
+ * @LastEditTime: 2021-12-28 16:23:43
  * @Author: chendq
  */
 const fsa = require('fs-extra'),
   fs = require('fs'),
   path = require('path'),
-  _ = require('lodash');
-// colors = require('colors/safe');
-const { getFileLatestContent, SupportMethods, filePath2ApiUrl } = require('./utils');
-// const log = logger(process.env.SILENT);
+  _ = require('lodash'),
+  colors = require('colors/safe');
+const { getFileLatestContent, SupportMethods, filePath2ApiUrl, logger } = require('./utils');
+const log = logger(process.env.SILENT);
 
 const methodRegExp = new RegExp(`(${SupportMethods.join('|')}) +(.*)`, 'i');
 /**
@@ -24,6 +24,13 @@ const methodRegExp = new RegExp(`(${SupportMethods.join('|')}) +(.*)`, 'i');
  *
  */
 const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mockDir }) {
+  if (!apiUrl || !method || !resJsonData || !mockDir) {
+    log.info(
+      colors.red(`参数: apiUrl: ${apiUrl}, method: ${method}, resJsonData: ${resJsonData}, mockDir: ${mockDir}无效`)
+    );
+    return;
+  }
+  apiUrl = apiUrl.trim().split('?')[0];
   const normalizeApiUrl = filePath2ApiUrl(path.normalize(apiUrl));
   const mockListFilePath = path.resolve(process.cwd(), `${mockDir}/mock-list.json`);
   const mockFilePath = path.resolve(process.cwd(), `${mockDir}/${encodeURIComponent(path.normalize(apiUrl))}.json`);
@@ -43,7 +50,8 @@ const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mo
     newMockListContent[normalizeApiUrl].push(method);
   }
   if (!oldMockListContent || !_.isEqual(oldMockListContent, newMockListContent)) {
-    fsa.writeFileSync(mockListFilePath, JSON.stringify(newMockListContent, null, 2));
+    Object.keys(newMockListContent).length > 0 &&
+      fsa.writeFileSync(mockListFilePath, JSON.stringify(newMockListContent, null, 2));
   }
 
   // mock文件存在
@@ -58,10 +66,12 @@ const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mo
       return;
     }
     mockFileContent[method] = resJsonData ? resJsonData : {};
-    fsa.writeFileSync(mockFilePath, JSON.stringify(mockFileContent, null, 2));
+    Object.keys(mockFileContent).length > 0 &&
+      fsa.writeFileSync(mockFilePath, JSON.stringify(mockFileContent, null, 2));
   } else {
     // fsa.ensureFileSync(mockFilePath);
-    fsa.writeFileSync(mockFilePath, JSON.stringify({ [method]: resJsonData ? resJsonData : {} }, null, 2));
+    Object.keys(mockFilePath).length > 0 &&
+      fsa.writeFileSync(mockFilePath, JSON.stringify({ [method]: resJsonData ? resJsonData : {} }, null, 2));
   }
   // console.debug('file::', `${mockDir}/${apiUrl}`, newMockListContent);
 };
@@ -131,6 +141,9 @@ const deepCollectMockData = function (mockDataMap, specialDir = '../mock') {
  * @return {map} mock数据统计
  */
 const getMockStatFromDir = dirPath => {
+  if (!fsa.pathExistsSync(dirPath)) {
+    throw new Error(`如参无效，${dirPath} 目录不存在`);
+  }
   const mockDataMap = {};
   deepCollectMockData(mockDataMap, dirPath);
   return mockDataMap;
@@ -142,6 +155,9 @@ const getMockStatFromDir = dirPath => {
  * @return {map}  mock数据统计
  */
 const getMockStatFromFile = filePath => {
+  if (!fsa.pathExistsSync(filePath)) {
+    throw new Error(`如参无效，${filePath} 文件不存在`);
+  }
   const mockDataMap = {};
   collectMockDataFromJsFile(mockDataMap, filePath);
   return mockDataMap;
@@ -154,7 +170,7 @@ const getMockStatFromFile = filePath => {
  * @return {boolean}
  */
 const hasMockApi = function (mockDataMap, apiUrl, method) {
-  if (!mockDataMap || !(mockDataMap instanceof Object)) {
+  if (!apiUrl || !method || !mockDataMap || !(mockDataMap instanceof Object)) {
     throw new Error(`如参无效，${mockDataMap} 必须是 mock数据的Object对象`);
   }
   return mockDataMap.hasOwnProperty(`${method.toLocaleLowerCase()} ${path.normalize(apiUrl)}`);

package/package.json

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