mock-service-cli 2.4.0 → 2.4.1

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.4.1](https://github.com/chandq/mock-service-cli/compare/v2.4.0...v2.4.1) (2022-01-06)
+
+
+### Bug Fixes
+
+* 修复无法同时保留相同url不同请求类型的响应数据 ([90326dc](https://github.com/chandq/mock-service-cli/commit/90326dc556760eb81efadd76b031366452c95d2b))
+
 ## [2.4.0](https://github.com/chandq/mock-service-cli/compare/v2.3.2...v2.4.0) (2022-01-05)
 
 

package/lib/asyncTaskQueue.js

@@ -2,21 +2,25 @@
  * @description: 异步任务队列
  * @Date: 2022-01-04 10:46:20
  * @LastEditors: chendq
- * @LastEditTime: 2022-01-05 18:45:36
+ * @LastEditTime: 2022-01-06 13:17:21
  * @Author: chendq
  */
 // const { getDataType } = require('./utils');
 class AsyncTaskQueue {
-  constructor() {
+  constructor(isSaveItem = false) {
     this.list = [];
     this.index = 0;
     this.isStop = false;
     this.isParallel = false;
+    this.isSaveItem = isSaveItem; // 执行完成后的数据是否保留
   }
 
   next() {
     // 加限制
     if (this.index >= this.list.length - 1 || this.isStop) return;
+    if (!this.isSaveItem) {
+      this.list.splice(this.index, 1, '');
+    }
     const cur = this.list[++this.index];
     cur(this.next.bind(this));
   }

package/lib/manageMockFiles.js

@@ -2,12 +2,13 @@
  * @description: 生成Mock文件、获取mock数据统计
  * @Date: 2021-12-22 16:57:08
  * @LastEditors: chendq
- * @LastEditTime: 2022-01-05 20:39:08
+ * @LastEditTime: 2022-01-06 13:09:42
  * @Author: chendq
  */
 const fsa = require('fs-extra'),
   fs = require('fs'),
   path = require('path'),
+  _ = require('lodash'),
   colors = require('colors/safe');
 const {
   getFileLatestContent,
@@ -93,7 +94,15 @@ const genMockFiles = async function ({ url: apiUrl, method, data: resJsonData, d
 
   // mock文件存在
   if (fsa.pathExistsSync(mockFilePath)) {
-    const mockFileContent = {};
+    const mockFileContent = getFileLatestContent(mockFilePath);
+    // 内容一样不作修改
+    if (mockFileContent.hasOwnProperty(method) && _.isEqual(mockFileContent[method], resJsonData)) {
+      // log.assert(
+      //   !_.isEqual(mockFileContent[method], resJsonData),
+      //   colors.bgYellow(`${method} ${apiUrl}, Mock data is same`)
+      // );
+      return;
+    }
     mockFileContent[method] = resJsonData;
     try {
       await writeStream(mockFilePath, JSON.stringify(mockFileContent, null, 2));
@@ -178,7 +187,8 @@ const deepCollectMockData = function (mockDataMap, specialDir = '../mock') {
  */
 const getMockStatFromDir = dirPath => {
   if (!fsa.pathExistsSync(dirPath)) {
-    throw new Error(`入参无效，${dirPath} 目录不存在`);
+    getLogger(path.resolve(process.cwd())).error(`入参无效，${dirPath} 目录不存在`);
+    return;
   }
   const mockDataMap = {};
   deepCollectMockData(mockDataMap, dirPath);
@@ -212,7 +222,8 @@ const getMockStatFromDir = dirPath => {
  */
 const getMockStatFromFile = filePath => {
   if (!fsa.pathExistsSync(filePath)) {
-    throw new Error(`入参无效，${filePath} 文件不存在`);
+    getLogger(path.resolve(process.cwd())).error(`入参无效，${filePath} 文件不存在`);
+    return;
   }
   const mockDataMap = {};
   collectMockDataFromJsFile(mockDataMap, filePath);
@@ -227,7 +238,8 @@ const getMockStatFromFile = filePath => {
  */
 const hasMockApi = function (mockDataMap, apiUrl, method) {
   if (!apiUrl || !method || !mockDataMap || !(mockDataMap instanceof Object)) {
-    throw new Error(`入参无效，${mockDataMap} 必须是 mock数据的Object对象`);
+    getLogger(path.resolve(process.cwd())).error(`入参无效，${mockDataMap} 必须是 mock数据的Object对象`);
+    return;
   }
   return mockDataMap.hasOwnProperty(`${method.toLocaleLowerCase()} ${path.normalize(apiUrl)}`);
 };

package/lib/utils.js

@@ -136,7 +136,9 @@ const writeStream = function (filePath, data) {
     writerStream.end();
     writerStream.on('finish', () => {});
     writerStream.on('close', () => {
-      resolve(data);
+      setTimeout(() => {
+        resolve(data);
+      });
     });
 
     writerStream.on('error', err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mock-service-cli",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "🦅 Local mock server",
   "main": "./lib/mockServer.js",
   "bin": {
@@ -49,6 +49,7 @@
     "deasync": "^0.1.23",
     "express": "^4.17.1",
     "fs-extra": "^10.0.0",
+    "lodash": "^4.17.21",
     "minimist": "^1.2.5",
     "nodemon": "^2.0.14",
     "portfinder": "^1.0.28",