mock-service-cli 3.3.0 → 3.3.1

package/README.md

@@ -24,6 +24,8 @@
 
 #### Mock Server - 本地 Mock 服务器
 
+> Mock File 仅支持 commonjs 规范的 js、cjs 文件，不支持 ES Module
+
 支持以下常见业务场景：
 
 - [x] 无服务端演示项目的数据 Mock

package/bin/mock-service-cli

@@ -16,6 +16,7 @@ if (argv.h || argv.help) {
     [
       'usage: mock-service-cli [options]',
       '',
+      'PS: Mock File仅支持commonjs规范的js、cjs文件，不支持ES Module',
       'options:',
       '  -p --port    Mock server port to use. If 0, look for open port. [8090]',
       '  -d           Specify mock directory, default [./mock] directory,',
@@ -146,7 +147,7 @@ const watchMockFiles = function (watchDir) {
   nodemon({
     script: resolve(__dirname, '../lib/mockServer.js'),
     watch: [watchDir],
-    ext: 'js,json'
+    ext: 'cjs,js,json'
   });
 
   nodemon

package/lib/mockServer.js

@@ -92,8 +92,8 @@ const composeRouteFromJsFile = function (file) {
   const fileObject = getFileLatestContent(file);
 
   argv.a && log.info(colors.green(`Mockfile ${++fileCount}: `), file, colors.yellow('all API URL is follows: '));
-  if (!fileObject) {
-    console.error(colors.red(`[warning] "${file}" 文件解析失败，请检查并确保文件中的js语法正确`));
+  if (fileObject === 'getFileLatestContent_ERROR') {
+    // console.error(colors.red(`[warning] "${file}" 文件解析失败，请检查并确保文件中的js语法正确`));
     return;
   }
   Object.keys(fileObject).forEach(item => {
@@ -143,8 +143,8 @@ const parseMockFiles = function (specialDir = '../mock') {
       argv.a &&
         log.info(colors.green(`Mockfile ${++fileCount}: `), filePath, colors.yellow('all API URL is follows: '));
       const fileObject = getFileLatestContent(filePath);
-      if (!fileObject) {
-        console.error(colors.red(`[warning] "${filePath}" 文件解析失败，请检查并确保文件中的js语法正确`));
+      if (fileObject === 'getFileLatestContent_ERROR') {
+        // console.error(colors.red(`[warning] "${filePath}" 文件解析失败，请检查并确保文件中的js语法正确`));
         continue;
       }
       // eslint-disable-next-line no-loop-func
@@ -166,7 +166,7 @@ const parseMockFiles = function (specialDir = '../mock') {
     }
 
     // 非js文件跳过
-    if (!el.name.endsWith('.js')) {
+    if (!el.name.endsWith('.js') && !el.name.endsWith('.cjs')) {
       continue;
     }
     composeRouteFromJsFile(filePath);
@@ -291,6 +291,8 @@ if (process.env.SOCKET_SERVER) {
 }
 
 http.listen(Number.parseInt(process.env.PORT, 10), () => {
+  console.info(colors.red('\n Mock File仅支持commonjs规范的js、cjs文件，不支持ES Module'));
+
   console.info(
     [
       colors.yellow(`\n${process.env.RESTARTED ? 'Restarting' : 'Starting'} up mock-server, serving `),
@@ -315,6 +317,7 @@ http.listen(Number.parseInt(process.env.PORT, 10), () => {
 });
 
 if (webApp && !process.env.RESTARTED) {
+  console.info(colors.red('\n Mock File仅支持commonjs规范的js、cjs文件，不支持ES Module'));
   webApp.listen(Number.parseInt(process.env.WEB_PORT, 10), () => {
     console.info(colors.yellow(`\n Web server available on:\n`));
     console.info('    http://localhost:' + colors.green(process.env.WEB_PORT) + webPublicPath);

package/lib/utils.js

@@ -2,10 +2,11 @@
  * @description: 工具函数库
  * @Date: 2021-12-25 17:52:48
  * @LastEditors: chendq
- * @LastEditTime: 2022-01-05 20:21:07
+ * @LastEditTime: 2024-01-16 22:28:37
  * @Author: chendq
  */
 const fs = require('fs');
+const colors = require('colors/safe');
 const path = require('path');
 // const JSONStream = require('JSONStream');
 /**
@@ -102,9 +103,12 @@ const getFileLatestContent = function (filePath) {
     delete require.cache[require.resolve(filePath)];
     return require(path.resolve(process.cwd(), filePath));
   } catch (error) {
-    getLogger(path.resolve(process.cwd())).error(filePath, require.cache[require.resolve(filePath)], error);
+    // getLogger(path.resolve(process.cwd())).error(filePath, require.cache[require.resolve(filePath)], error);
+    console.error(colors.red('[error]:'), error);
+    return 'getFileLatestContent_ERROR';
   }
 };
+
 /**
  * @description: 文件路径转成API的url
  * @param {string} filePath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mock-service-cli",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "🦅 Local mock server",
   "main": "./lib/mockServer.js",
   "bin": {
@@ -98,6 +98,5 @@
     "doc": "docs",
     "lib": "lib",
     "test": "test"
-  },
-  "optionalDependencies": {}
+  }
 }