fix: Fix type errors, support command line multi-file listeners #144 #…

…145
jaywcjlove · Oct 27, 2020 · 2c4dd5c · 2c4dd5c
1 parent b233b66
commit 2c4dd5c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -37,6 +37,7 @@
     "@types/detect-port": "1.3.0",
     "@types/express": "4.17.8",
     "@types/http-proxy": "1.17.4",
+    "@types/minimist": "1.2.0",
     "@types/node": "13.13.23",
     "body-parser": "1.19.0",
     "chokidar": "3.4.2",

diff --git a/packages/core/src/bin/mocker.ts b/packages/core/src/bin/mocker.ts
@@ -19,7 +19,8 @@ interface MockerConfig {
 
   const argvs = minimist(process.argv.slice(2));
   const paths = argvs['_'];
-  let mockPath = paths[0] || DEFAULTMOCKPATH;
+
+  let mockPath = paths || DEFAULTMOCKPATH;
   let mockConfigPath = DEFAULTMOCKERCONFIGPATH;
   let mockerConfig: MockerConfig = {
       host: process.env.HOST || '0.0.0.0',
@@ -33,20 +34,17 @@ interface MockerConfig {
   }
 
   if (argvs.config) {
-      mockConfigPath = paths.config;
+    mockConfigPath = argvs.config;
   }
 
   if (!existsSync(path.resolve(mockConfigPath))) {
-      mockerConfig.host = process.env.HOST ? process.env.HOST : mockerConfig.host;
-      mockerConfig.port = await detect(mockerConfig.port);
+    mockerConfig.host = process.env.HOST ? process.env.HOST : mockerConfig.host;
+    mockerConfig.port = await detect(mockerConfig.port);
   } else {
-      mockerConfig = require(path.resolve(mockConfigPath));
+    mockerConfig = require(path.resolve(mockConfigPath));
   }
 
-  const mockDir = require.resolve(path.resolve(mockPath));
-
   const DEFAULT_PORT = mockerConfig.port;
-
   const app = express();
 
   app.all('/*', (req, res, next) => {
@@ -56,8 +54,7 @@ interface MockerConfig {
     res.header('Access-Control-Allow-Methods', 'PUT,POST,GET,DELETE,OPTIONS');
     next();
   });
-
-  apiMocker(app, mockDir);
+  apiMocker(app, mockPath);
 
   app.listen(DEFAULT_PORT, () => {
     const localIpUrl = prepareUrls({

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -198,7 +198,7 @@ function pathMatch(options: TokensToRegexpOptions & ParseOptions) {
 }
 
 export default function (app: Application, watchFile: string | string[] | MockerProxyRoute, conf: MockerOption = {}) {
-  const watchFiles = Array.isArray(watchFile) ? watchFile : typeof watchFile === 'string' ? [watchFile] : [];
+  const watchFiles = (Array.isArray(watchFile) ? watchFile : typeof watchFile === 'string' ? [watchFile] : []).map(str => PATH.resolve(str));
 
   if (watchFiles.some(file => !file)) {
     throw new Error('Mocker file does not exist!.');
@@ -245,6 +245,7 @@ export default function (app: Application, watchFile: string | string[] | Mocker
   // header = {}
 
   if (isWatchFilePath) {
+    console.log('isWatchFilePath:', isWatchFilePath)
     // 监听配置入口文件所在的目录，一般为认为在配置文件/mock 目录下的所有文件
     // 加上require.resolve，保证 `./mock/`能够找到`./mock/index.js`，要不然就要监控到上一级目录了
     const watcher = chokidar.watch(watchFiles.map(watchFile => PATH.dirname(require.resolve(watchFile))), options.watchOptions);

diff --git a/yarn.lock b/yarn.lock
@@ -1407,6 +1407,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimist@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
+  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
+
 "@types/node@*":
   version "14.11.1"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz#56af902ad157e763f9ba63d671c39cda3193c835"