file-lane 2.0.2-beta.16 → 2.0.2-beta.18

package/lib/FileLane.d.ts

@@ -13,6 +13,7 @@ declare class FileLane<O = any> {
     private context;
     private watcher?;
     private compilation?;
+    private changeFileList;
     /**
      * 实例化FileLane
      * @param config fileLane 配置
@@ -20,9 +21,9 @@ declare class FileLane<O = any> {
      * @param compilerOption 编译参数，不同语言的项目具有的参数不同，即使同一项目开发者也会设置不同的参数
      */
     constructor(config: IFileLaneConfig<O>, projectPath?: string, compilerOption?: O | undefined, events?: {
-        onBuildSuccess?: ((data: {
+        onBuildSuccess?: (data: {
             costTime: number;
-        }) => void) | undefined;
+        }) => void;
     } | undefined);
     /**
      * 运行

package/lib/FileLane.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const chokidar_1 = __importDefault(require("chokidar"));
-const del_1 = __importDefault(require("del"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
@@ -22,6 +21,7 @@ const FileLaneCompilation_1 = __importDefault(require("./FileLaneCompilation"));
 const CompilationEvent_1 = __importDefault(require("./event/CompilationEvent"));
 const FileEvent_1 = __importDefault(require("./event/FileEvent"));
 const FileLaneUtil_1 = __importDefault(require("./utils/FileLaneUtil"));
+const IChangedFile_1 = require("./interface/IChangedFile");
 /**
  * FileLane
  *
@@ -40,6 +40,7 @@ class FileLane {
         this.config = config;
         this.compilerOption = compilerOption;
         this.events = events;
+        this.changeFileList = [];
         this.processExitHandler = () => {
             this.dispose();
         };
@@ -136,7 +137,7 @@ class FileLane {
             const t1 = Date.now();
             this.initCompilation();
             try {
-                yield this.complyBeforeCompile(fileList);
+                yield this.complyBeforeCompile();
                 this.triggerPlugins(new CompilationEvent_1.default(CompilationEvent_1.default.PROJECT_START));
                 for (let item of fileList) {
                     this.triggerPlugins(new FileEvent_1.default(FileEvent_1.default.FILE_START_COMPILATION, FileLaneUtil_1.default.pathToFileParam(item)));
@@ -212,6 +213,9 @@ class FileLane {
                 return;
             }
             const buildPath = FileLaneUtil_1.default.getOutputPath(this.context);
+            if (!fs_extra_1.default.existsSync(buildPath)) {
+                shared_utils_1.FileUtil.mkdirSync(buildPath, { hidden: true });
+            }
             return Promise.all(fileList.map((item) => {
                 const resolvePath = path_1.default.relative(this.context.projectPath, item.path);
                 // 将相对路径与输出路径拼接，形成最新的文件路径
@@ -283,12 +287,17 @@ class FileLane {
     /**
      * 执行项目转换的前置工作
      */
-    complyBeforeCompile(fileList) {
+    complyBeforeCompile() {
         return __awaiter(this, void 0, void 0, function* () {
             const { beforeCompile } = this.config;
             if (beforeCompile) {
                 for (let item of beforeCompile) {
-                    yield item(this.context, fileList, this.config, this.compilerOption);
+                    yield item({
+                        context: this.context,
+                        config: this.config,
+                        compilerOption: this.compilerOption,
+                        compalition: this.compilation
+                    });
                 }
             }
         });
@@ -303,7 +312,12 @@ class FileLane {
                 for (let item of afterCompile) {
                     try {
                         shared_utils_1.ColorConsole.info(`FollowWork: ${item.workerDescribe} start`);
-                        yield item.worker(this.context, this.config, this.compilerOption);
+                        yield item.worker({
+                            context: this.context,
+                            config: this.config,
+                            compilerOption: this.compilerOption,
+                            compalition: this.compilation
+                        });
                         shared_utils_1.ColorConsole.info(`FollowWork: ${item.workerDescribe} end`);
                     }
                     catch (error) {
@@ -317,8 +331,12 @@ class FileLane {
     watch() {
         return __awaiter(this, void 0, void 0, function* () {
             // 监听文件变化，并触发 build
-            const onChange = (changedFileList) => __awaiter(this, void 0, void 0, function* () {
-                const fileList = this.config.collectFile ? this.config.collectFile() : this.collectFile();
+            const onChange = () => __awaiter(this, void 0, void 0, function* () {
+                const fileList = this.config.collectFile
+                    ? this.config.collectFile(this.changeFileList)
+                    : this.collectFile();
+                // 开始编译前，记录列表置空
+                this.changeFileList = [];
                 yield this.build(fileList);
             });
             this.listenFileChange(onChange);
@@ -357,14 +375,16 @@ class FileLane {
             ignored: this.getIgnoreConfig()
         });
         const throttledOnChange = lodash_1.default.throttle(onChange, 1000, {
-            leading: true,
-            trailing: false
+            leading: false,
+            trailing: true
         });
-        const handler = (filePath) => {
+        const handler = (path, type) => {
             const { exclude, include } = this.config;
             // 执行onChange回调
-            if (shared_utils_1.FileUtil.include(filePath, include, exclude)) {
-                throttledOnChange([filePath]);
+            const validFile = shared_utils_1.FileUtil.include(path, include, exclude);
+            if (validFile) {
+                this.changeFileList.push({ path, type });
+                throttledOnChange();
             }
         };
         watcher
@@ -373,15 +393,15 @@ class FileLane {
             watcher
                 .on('add', (path) => {
                 // 监听文件添加事件
-                handler(path);
+                handler(path, IChangedFile_1.HandlerType.ADD);
             })
                 .on('change', (path) => {
                 // 监听文件修改事件
-                handler(path);
+                handler(path, IChangedFile_1.HandlerType.CHANGE);
             })
                 .on('unlink', (filePath) => {
                 // 监听文件删除事件
-                handler(filePath);
+                handler(filePath, IChangedFile_1.HandlerType.UNLINK);
             });
         })
             .on('error', (error) => {
@@ -399,7 +419,7 @@ class FileLane {
      */
     cleanOutput() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield (0, del_1.default)(FileLaneUtil_1.default.getOutputPath(this.context), { force: true });
+            shared_utils_1.FileUtil.del(FileLaneUtil_1.default.getOutputPath(this.context));
         });
     }
     /**

package/lib/FileLaneCompilation.d.ts

@@ -1,7 +1,10 @@
 import AsyncEventDispatcher from './event/asyncEvent/AsyncEventDispatcher';
+import IFileParam from './interface/IFileParam';
 /**
  * FileLaneCompilation
  */
 declare class FileLaneCompilation extends AsyncEventDispatcher {
+    buildFileList: IFileParam<any>[];
+    diffJson: string[];
 }
 export default FileLaneCompilation;

package/lib/FileLaneCompilation.js

@@ -8,5 +8,10 @@ const AsyncEventDispatcher_1 = __importDefault(require("./event/asyncEvent/Async
  * FileLaneCompilation
  */
 class FileLaneCompilation extends AsyncEventDispatcher_1.default {
+    constructor() {
+        super(...arguments);
+        this.buildFileList = [];
+        this.diffJson = [];
+    }
 }
 exports.default = FileLaneCompilation;

package/lib/interface/IChangedFile.d.ts

@@ -0,0 +1,9 @@
+export interface IChangedFile {
+    path: string;
+    type: HandlerType;
+}
+export declare enum HandlerType {
+    ADD = 0,
+    CHANGE = 1,
+    UNLINK = 2
+}

package/lib/interface/IChangedFile.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandlerType = void 0;
+var HandlerType;
+(function (HandlerType) {
+    HandlerType[HandlerType["ADD"] = 0] = "ADD";
+    HandlerType[HandlerType["CHANGE"] = 1] = "CHANGE";
+    HandlerType[HandlerType["UNLINK"] = 2] = "UNLINK";
+})(HandlerType || (exports.HandlerType = HandlerType = {}));

package/lib/interface/IFileLaneConfig.d.ts

@@ -2,6 +2,8 @@ import { MatchType } from '@aiot-toolkit/shared-utils';
 import IFileLaneContext from './IFileLaneContext';
 import ILoader from './ILoader';
 import IPlugin from './IPlugin';
+import FileLaneCompilation from '../FileLaneCompilation';
+import { IChangedFile } from './IChangedFile';
 export type ILoaderClass = (new (...args: any[]) => ILoader) & {
     raw?: boolean;
 };
@@ -30,7 +32,7 @@ export default interface IFileLaneConfig<O = any> {
      *
      * @description 用于采集所有要处理的真实文件路径列表，或者输入文件列表中要处理的真实文件路径列表
      */
-    collectFile?: (entryFileList?: string[]) => string[];
+    collectFile?: (entryFileList?: IChangedFile[]) => string[];
     /**
      * 文件收集器
      *
@@ -106,12 +108,14 @@ type FollowWoker<O> = {
     worker: FollowWork<O>;
     workerDescribe?: string;
 };
-export type FollowWork<O = any> = (context: IFileLaneContext, config?: IFileLaneConfig, compilerOption?: O) => Promise<any>;
-/**
- * context 上下文
- * fileList 待转换的文件列表
- */
-export type PreWork<O = any> = (context: IFileLaneContext, fileList: string[], config: IFileLaneConfig, compilerOption: O) => Promise<any>;
+type CompileParam<O = any> = {
+    context: IFileLaneContext;
+    config: IFileLaneConfig;
+    compilerOption?: O;
+    compalition?: FileLaneCompilation;
+};
 export type BeforeWork = (context: IFileLaneContext) => Promise<any>;
+export type PreWork<O = any> = (preWorkParams: CompileParam<O>) => Promise<any>;
+export type FollowWork<O = any> = (followParams: CompileParam<O>) => Promise<any>;
 export type AfterWork = (context: IFileLaneContext) => Promise<any>;
 export {};

package/lib/interface/IFileParam.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * IFileParam
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "file-lane",
-  "version": "2.0.2-beta.16",
+  "version": "2.0.2-beta.18",
   "description": "File conversion tool, can be one-to-one, one to N, N to one",
   "keywords": [
     "file",
@@ -20,14 +20,13 @@
     "test": "node ./__tests__/file-lane.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.16",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.18",
     "chokidar": "^3.6.0",
-    "del": "^4.1.0",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4"
   },
-  "gitHead": "785701c64914f50acd18ab71ea41b2f5a2cd161c"
+  "gitHead": "e39f0ad4fe3bfe8e733499742c5a39ab80fa2cd0"
 }