file-lane 2.0.3-beta.1 → 2.0.3-beta.3

package/lib/FileLane.d.ts

@@ -44,6 +44,7 @@ declare class FileLane<O = any> {
      * @param compilerOption 编译参数，不同语言的项目具有的参数不同，即使同一项目开发者也会设置不同的参数
      */
     constructor(config: IFileLaneConfig<O>, projectPath?: string, compilerOption?: O | undefined, events?: IFileLaneEvents | undefined);
+    private addProcessListener;
     /**
      * 运行
      * @param params
@@ -58,9 +59,8 @@ declare class FileLane<O = any> {
         watch?: boolean;
     }): Promise<void>;
     private validateConfig;
-    private processExitHandler;
+    private processBeforeExitHandler;
     private sigintHandler;
-    stop(): Promise<void>;
     dispose(): Promise<void>;
     /**
      *

package/lib/FileLane.js

@@ -61,11 +61,18 @@ class FileLane {
         this.events = events;
         this.changeFileList = [];
         this.triggerCount = 0;
-        this.processExitHandler = () => {
+        this.processBeforeExitHandler = () => {
             this.dispose();
         };
+        this.sigintHandler = () => __awaiter(this, void 0, void 0, function* () {
+            yield this.dispose();
+            process.exit();
+        });
         this.context = FileLaneUtil_1.default.createContext(config.output, projectPath);
-        process.on('exit', this.processExitHandler);
+        this.addProcessListener();
+    }
+    addProcessListener() {
+        process.on('beforeExit', this.processBeforeExitHandler);
         process.on('SIGINT', this.sigintHandler);
     }
     /**
@@ -77,7 +84,14 @@ class FileLane {
         return __awaiter(this, void 0, void 0, function* () {
             const errorList = this.validateConfig();
             if (errorList && errorList.length) {
-                shared_utils_1.ColorConsole.error(`### file-lane ### ${errorList.map((item, index) => `${index + 1}. ${item}`).join('\r\n')}`);
+                this.handlerLogs([
+                    {
+                        level: shared_utils_1.Loglevel.ERROR,
+                        message: `### file-lane ### ${errorList.map((item, index) => `${index + 1}. ${item}`).join('\r\n')}`
+                    }
+                ], () => {
+                    throw new Error(`validate error`);
+                });
                 return;
             }
             yield this.complyBeforeWorks();
@@ -138,22 +152,14 @@ class FileLane {
         }
         return result;
     }
-    sigintHandler() {
-        process.exit();
-    }
-    stop() {
+    dispose() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.watcher) {
                 this.watcher.removeAllListeners();
                 yield this.watcher.close();
             }
-        });
-    }
-    dispose() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.complyAfterWork();
-            yield this.stop();
-            this.cleanOutput();
+            yield this.complyAfterWork();
+            yield this.cleanOutput();
         });
     }
     /**
@@ -179,14 +185,12 @@ class FileLane {
                 this.triggerPlugins(new CompilationEvent_1.default(CompilationEvent_1.default.FLLOW_WORK_START));
                 yield this.complyAfterCompile();
                 this.triggerPlugins(new CompilationEvent_1.default(CompilationEvent_1.default.FLLOW_WORK_END));
-                onBuildSuccess === null || onBuildSuccess === void 0 ? void 0 : onBuildSuccess({
-                    costTime: Date.now() - t1,
-                    info: (_a = this.compilation) === null || _a === void 0 ? void 0 : _a.info
-                });
-                shared_utils_1.ColorConsole.success({
-                    word: 'Success: build finish!',
-                    style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.SUCCESS)
-                });
+                if (onBuildSuccess) {
+                    onBuildSuccess === null || onBuildSuccess === void 0 ? void 0 : onBuildSuccess({
+                        costTime: Date.now() - t1,
+                        info: (_a = this.compilation) === null || _a === void 0 ? void 0 : _a.info
+                    });
+                }
             }
             catch (error) {
                 if (onBuildError) {
@@ -195,10 +199,6 @@ class FileLane {
                 else {
                     shared_utils_1.ColorConsole.throw(`ERROR: `, { word: 'build error' }, `, ${error || 'unknown error'}`);
                 }
-                // 非监听模式，则结束任务
-                if (!this.watcher) {
-                    process.exit();
-                }
             }
         });
     }
@@ -279,7 +279,7 @@ class FileLane {
         }
         const hasError = logs.find((item) => item.level && [shared_utils_1.Loglevel.ERROR, shared_utils_1.Loglevel.THROW].includes(item.level));
         if (hasError) {
-            onError();
+            onError === null || onError === void 0 ? void 0 : onError();
         }
     }
     writeFiles(fileList) {
@@ -385,18 +385,27 @@ class FileLane {
             if (afterCompile) {
                 for (let item of afterCompile) {
                     try {
-                        shared_utils_1.ColorConsole.info(`FollowWork: ${item.workerDescribe} start`);
+                        this.handlerLogs([
+                            {
+                                level: shared_utils_1.Loglevel.INFO,
+                                message: `FollowWork: ${item.workerDescribe} start`
+                            }
+                        ]);
                         yield item.worker({
                             context: this.context,
                             config: this.config,
                             compilerOption: this.compilerOption,
                             compalition: this.compilation
                         });
-                        shared_utils_1.ColorConsole.info(`FollowWork: ${item.workerDescribe} end`);
+                        this.handlerLogs([
+                            {
+                                level: shared_utils_1.Loglevel.INFO,
+                                message: `FollowWork: ${item.workerDescribe} end`
+                            }
+                        ]);
                     }
                     catch (error) {
-                        shared_utils_1.ColorConsole.throw(`FollowWork: ${item.workerDescribe} error, ${error}`);
-                        process.exit();
+                        throw new Error(`FollowWork: ${item.workerDescribe} error,`);
                     }
                 }
             }
@@ -463,7 +472,6 @@ class FileLane {
         };
         watcher
             .on('ready', () => {
-            shared_utils_1.ColorConsole.log(`### file-lane ### Initial scan complete. Ready for Watch.`);
             watcher
                 .on('add', (path) => {
                 // 监听文件添加事件
@@ -493,7 +501,7 @@ class FileLane {
      */
     cleanOutput() {
         return __awaiter(this, void 0, void 0, function* () {
-            shared_utils_1.FileUtil.del(FileLaneUtil_1.default.getOutputPath(this.context));
+            return shared_utils_1.FileUtil.del(FileLaneUtil_1.default.getOutputPath(this.context));
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "file-lane",
-  "version": "2.0.3-beta.1",
+  "version": "2.0.3-beta.3",
   "description": "File conversion tool, can be one-to-one, one to N, N to one",
   "keywords": [
     "file",
@@ -20,7 +20,7 @@
     "test": "node ./__tests__/file-lane.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.3-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.3",
     "chokidar": "^3.6.0",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21"
@@ -28,5 +28,5 @@
   "devDependencies": {
     "@types/fs-extra": "^11.0.4"
   },
-  "gitHead": "77b1b0aab9b5c227b5cc355b585a7c93761cc9a3"
+  "gitHead": "a4cad870b23d9e4142d22e59aa5618d7f123e1ab"
 }