file-lane 2.0.3-beta.5 → 2.0.3-beta.7

package/lib/FileLane.d.ts

@@ -1,15 +1,15 @@
 import IFileLaneConfig from './interface/IFileLaneConfig';
+import FileLaneTriggerType from './enum/FileLaneTriggerType';
 import IFileLaneEvents from './interface/IFileLaneEvents';
+export interface IBuilderParam {
+    fileList: string[];
+    trigger: FileLaneTriggerType;
+}
 /**
  * FileLane
  *
  * 文件车道，用于将文件进行对应转换，支持1对1、1对N、N对1
  *
- * 打包过程中，有以下事件
- * 1. 打包成功：onBuildSuccess
- * 2. 打包失败: onBuildError
- * 3. 产生日志: onLog
- *
  * @example
  * ```
  * new FileLane<IJavascriptCompileOption>(
@@ -37,11 +37,14 @@ declare class FileLane<O = any> {
     private compilation?;
     private changeFileList;
     private triggerCount;
+    private building;
+    private nextBuildParam;
     /**
      * 实例化FileLane
      * @param config fileLane 配置
      * @param projectPath 项目路径
      * @param compilerOption 编译参数，不同语言的项目具有的参数不同，即使同一项目开发者也会设置不同的参数
+     * @param events 事件监听器
      */
     constructor(config: IFileLaneConfig<O>, projectPath?: string, compilerOption?: O | undefined, events?: IFileLaneEvents | undefined);
     private addProcessListener;
@@ -62,6 +65,13 @@ declare class FileLane<O = any> {
     private processBeforeExitHandler;
     private sigintHandler;
     dispose(): Promise<void>;
+    /**
+     * 触发编译
+     *
+     * 如果：在编译过程中，则记录统参数，待本次 build 完成后，开始下一次
+     * 否则：直接触发编译
+     */
+    private triggerBuild;
     /**
      *
      * @param fileList 原始文件列表

package/lib/FileLane.js

@@ -28,11 +28,6 @@ const FileLaneTriggerType_1 = __importDefault(require("./enum/FileLaneTriggerTyp
  *
  * 文件车道，用于将文件进行对应转换，支持1对1、1对N、N对1
  *
- * 打包过程中，有以下事件
- * 1. 打包成功：onBuildSuccess
- * 2. 打包失败: onBuildError
- * 3. 产生日志: onLog
- *
  * @example
  * ```
  * new FileLane<IJavascriptCompileOption>(
@@ -54,6 +49,7 @@ class FileLane {
      * @param config fileLane 配置
      * @param projectPath 项目路径
      * @param compilerOption 编译参数，不同语言的项目具有的参数不同，即使同一项目开发者也会设置不同的参数
+     * @param events 事件监听器
      */
     constructor(config, projectPath, compilerOption, events) {
         this.config = config;
@@ -61,6 +57,8 @@ class FileLane {
         this.events = events;
         this.changeFileList = [];
         this.triggerCount = 0;
+        this.building = false;
+        this.nextBuildParam = null;
         this.processBeforeExitHandler = () => {
             this.dispose();
         };
@@ -102,7 +100,10 @@ class FileLane {
             if (params === null || params === void 0 ? void 0 : params.watch) {
                 this.watch();
             }
-            yield this.build(fileList, FileLaneTriggerType_1.default.START);
+            yield this.build({
+                fileList,
+                trigger: FileLaneTriggerType_1.default.START
+            });
         });
     }
     validateConfig() {
@@ -162,16 +163,35 @@ class FileLane {
             yield this.cleanOutput();
         });
     }
+    /**
+     * 触发编译
+     *
+     * 如果：在编译过程中，则记录统参数，待本次 build 完成后，开始下一次
+     * 否则：直接触发编译
+     */
+    triggerBuild(param) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.building) {
+                this.nextBuildParam = param;
+            }
+            else {
+                this.build(param);
+            }
+        });
+    }
     /**
      *
      * @param fileList 原始文件列表
      */
-    build(fileList, trigger) {
+    build(param) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const { onBuildSuccess, onBuildError } = this.events || {};
-            const t1 = Date.now();
+            const { fileList, trigger } = param;
+            const { onBuildSuccess, onBuildError, onBuildStart } = this.events || {};
+            const timeStart = Date.now();
             this.initCompilation(trigger);
+            this.building = true;
+            onBuildStart === null || onBuildStart === void 0 ? void 0 : onBuildStart();
             try {
                 yield this.complyBeforeCompile();
                 this.triggerPlugins(new CompilationEvent_1.default(CompilationEvent_1.default.PROJECT_START));
@@ -185,12 +205,18 @@ 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));
+                const costTime = Date.now() - timeStart;
                 if (onBuildSuccess) {
-                    onBuildSuccess === null || onBuildSuccess === void 0 ? void 0 : onBuildSuccess({
-                        costTime: Date.now() - t1,
+                    onBuildSuccess({
+                        costTime,
                         info: (_a = this.compilation) === null || _a === void 0 ? void 0 : _a.info
                     });
                 }
+                else {
+                    shared_utils_1.ColorConsole.success({
+                        word: 'build success:'
+                    }, `${costTime}ms`);
+                }
             }
             catch (error) {
                 if (onBuildError) {
@@ -200,6 +226,13 @@ class FileLane {
                     shared_utils_1.ColorConsole.throw(`ERROR: `, { word: 'build error' }, `, ${error || 'unknown error'}`);
                 }
             }
+            finally {
+                this.building = false;
+                if (this.nextBuildParam) {
+                    this.build(this.nextBuildParam);
+                    this.nextBuildParam = null;
+                }
+            }
         });
     }
     initCompilation(trigger) {
@@ -405,7 +438,7 @@ class FileLane {
                         ]);
                     }
                     catch (error) {
-                        throw new Error(`FollowWork: ${item.workerDescribe} error,`);
+                        throw new Error(`FollowWork: ${item.workerDescribe} error: ${error}`);
                     }
                 }
             }
@@ -420,7 +453,10 @@ class FileLane {
                     : this.collectFile();
                 // 开始编译前，记录列表置空
                 this.changeFileList = [];
-                yield this.build(fileList, FileLaneTriggerType_1.default.UPDATE);
+                yield this.triggerBuild({
+                    fileList,
+                    trigger: FileLaneTriggerType_1.default.UPDATE
+                });
             });
             this.listenFileChange(onChange);
         });

package/lib/interface/IFileLaneEvents.d.ts

@@ -4,6 +4,11 @@ import FileLaneTriggerType from '../enum/FileLaneTriggerType';
  * IFileLaneEvents
  */
 export default interface IFileLaneEvents {
+    /**
+     * 开始转换
+     * @returns
+     */
+    onBuildStart?: () => void;
     /**
      * 转换成功
      * @param data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "file-lane",
-  "version": "2.0.3-beta.5",
+  "version": "2.0.3-beta.7",
   "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.5",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.7",
     "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": "d1772d1a3e1e3943deab519f2f1c03540cfd683b"
+  "gitHead": "9621c52866d7bb1dc23110c4c9cc772b6169b682"
 }