@aiot-toolkit/aiotpack 2.0.2-beta.12 → 2.0.2-beta.14

package/lib/{followWorks/ux/UxFollowWorks.d.ts → afterCompile/ux/UxAfterCompile.d.ts}

@@ -1,9 +1,9 @@
 import { FollowWork } from 'file-lane';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
- * UxFollowWorks
+ * UxAfterCompile
  */
-declare class UxFollowWorks {
+declare class UxAfterCompile {
     static webpack: FollowWork<IJavascriptCompileOption>;
     static protobuf: FollowWork<IJavascriptCompileOption>;
     static jsc: FollowWork<IJavascriptCompileOption>;
@@ -33,4 +33,4 @@ declare class UxFollowWorks {
      */
     static symlinkNodeModule: FollowWork<IJavascriptCompileOption>;
 }
-export default UxFollowWorks;
+export default UxAfterCompile;

package/lib/{followWorks/ux/UxFollowWorks.js → afterCompile/ux/UxAfterCompile.js}

@@ -25,12 +25,12 @@ const ZipUtil_1 = __importDefault(require("../../compiler/javascript/vela/utils/
 const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 /**
- * UxFollowWorks
+ * UxAfterCompile
  */
-class UxFollowWorks {
+class UxAfterCompile {
 }
-_a = UxFollowWorks;
-UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+_a = UxAfterCompile;
+UxAfterCompile.webpack = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
     return new JavascriptCompiler_1.default()
         .compile(Object.assign(Object.assign({ projectPath: path_1.default.join(context.projectPath, context.output), mode: CompileMode_1.default.DEVELOPMENT, devtool: false, platform: 'vela' }, JavascriptDefaultCompileOption_1.default), compilerOption))
         .then(() => {
@@ -68,17 +68,17 @@ UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, v
         }
     });
 });
-UxFollowWorks.protobuf = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.protobuf = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
     if (compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.enableProtobuf) {
         BinaryPlugin.createBinFiles();
     }
 });
-UxFollowWorks.jsc = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
-    if (compilerOption && compilerOption.disabledJsc === false) {
+UxAfterCompile.jsc = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+    if (compilerOption && compilerOption.enableJsc === true) {
         return new Jsc_1.default(context.projectPath, path_1.default.join(context.projectPath, context.output, compilerOption.outputPath)).jsc();
     }
 });
-UxFollowWorks.toRpk = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.toRpk = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
     if (compilerOption) {
         return ZipUtil_1.default.createRpk(path_1.default.join(compilerOption.projectPath, compilerOption.outputPath), compilerOption);
     }
@@ -89,7 +89,7 @@ UxFollowWorks.toRpk = (context, config, compilerOption) => __awaiter(void 0, voi
  * @param config
  * @param compilerOption
  */
-UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.copyResource = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
     const genDeviceManifests = (compilerOption) => {
         const { projectPath, sourceRoot, outputPath } = compilerOption;
         const manifest = fs_extra_1.default.readJSONSync(path_1.default.join(projectPath, sourceRoot, 'manifest.json'));
@@ -206,7 +206,7 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
  * @param config
  * @param compilerOption
  */
-UxFollowWorks.moveBackResult = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.moveBackResult = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
     if (!compilerOption) {
         return;
     }
@@ -232,7 +232,7 @@ UxFollowWorks.moveBackResult = (context, config, compilerOption) => __awaiter(vo
  * @param config
  * @param compilerOption
  */
-UxFollowWorks.symlinkNodeModule = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.symlinkNodeModule = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
     if (!compilerOption) {
         return;
     }
@@ -250,4 +250,4 @@ UxFollowWorks.symlinkNodeModule = (context, config, compilerOption) => __awaiter
         throw new Error(`${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}. Please check whether the file system of the current disk supports the creation of soft links.`);
     }
 });
-exports.default = UxFollowWorks;
+exports.default = UxAfterCompile;

package/lib/afterWorks/ux/UxAfterWorks.d.ts

@@ -0,0 +1,5 @@
+import { IFileLaneContext } from 'file-lane';
+declare class UxAfterWorks {
+    static cleanOutput(context: IFileLaneContext): Promise<void>;
+}
+export default UxAfterWorks;

package/lib/afterWorks/ux/UxAfterWorks.js

@@ -0,0 +1,26 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const file_lane_1 = require("file-lane");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+class UxAfterWorks {
+    static cleanOutput(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const outputPath = file_lane_1.FileLaneUtil.getOutputPath(context);
+            // 建议在支持es写法后使用del库替换fs
+            fs_extra_1.default.removeSync(outputPath);
+        });
+    }
+}
+exports.default = UxAfterWorks;

package/lib/{preWorks/ux/UxPreWorks.d.ts → beforeCompile/ux/UxBeforeCompile.d.ts}

@@ -1,10 +1,10 @@
 import { PreWork } from 'file-lane';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
- * UxPreWorks
+ * UxBeforeCompile
  */
-declare class UxPreWorks {
+declare class UxBeforeCompile {
     static validateManifest: PreWork<IJavascriptCompileOption>;
     static validateSitemap: PreWork<IJavascriptCompileOption>;
 }
-export default UxPreWorks;
+export default UxBeforeCompile;

package/lib/{preWorks/ux/UxPreWorks.js → beforeCompile/ux/UxBeforeCompile.js}

@@ -15,17 +15,17 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
 /**
- * UxPreWorks
+ * UxBeforeCompile
  */
-class UxPreWorks {
+class UxBeforeCompile {
 }
-_a = UxPreWorks;
-UxPreWorks.validateManifest = (context) => __awaiter(void 0, void 0, void 0, function* () {
+_a = UxBeforeCompile;
+UxBeforeCompile.validateManifest = (context) => __awaiter(void 0, void 0, void 0, function* () {
     const { projectPath } = context;
     return UxFileUtils_1.default.validateManifest(projectPath);
 });
-UxPreWorks.validateSitemap = (context) => __awaiter(void 0, void 0, void 0, function* () {
+UxBeforeCompile.validateSitemap = (context) => __awaiter(void 0, void 0, void 0, function* () {
     const { projectPath } = context;
     UxFileUtils_1.default.validateSitemap(projectPath);
 });
-exports.default = UxPreWorks;
+exports.default = UxBeforeCompile;

package/lib/beforeWorks/ux/UxBeforeWorks.d.ts

@@ -0,0 +1,5 @@
+import { IFileLaneContext } from 'file-lane';
+declare class UxBeforeWorks {
+    static cleanOutput(context: IFileLaneContext): Promise<void>;
+}
+export default UxBeforeWorks;

package/lib/beforeWorks/ux/UxBeforeWorks.js

@@ -0,0 +1,25 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const del_1 = __importDefault(require("del"));
+const file_lane_1 = require("file-lane");
+class UxBeforeWorks {
+    static cleanOutput(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const outputPath = file_lane_1.FileLaneUtil.getOutputPath(context);
+            yield (0, del_1.default)(outputPath, { force: true });
+        });
+    }
+}
+exports.default = UxBeforeWorks;

package/lib/compiler/interface/ISignConfig.d.ts

@@ -3,6 +3,12 @@
  * ISignConfig
  */
 export default interface ISignConfig {
+    /**
+     * 私钥
+     */
     privatekey: Buffer;
+    /**
+     * 证书
+     */
     certificate: Buffer;
 }

package/lib/compiler/javascript/interface/IJavascriptCompileOption.d.ts

@@ -39,7 +39,7 @@ export default interface IJavascriptCompileOption extends ICompileParam {
     /**
      * 禁用 jsc
      */
-    disabledJsc?: boolean;
+    enableJsc?: boolean;
     /**
      * 启用 protobuf
      */

package/lib/compiler/javascript/vela/interface/IChunk.d.ts

@@ -3,7 +3,13 @@
  * IChunk
  */
 export type IFileHash = {
+    /**
+     * 文件名
+     */
     name: string;
+    /**
+     * 文件生成的  SHA256 格式hash
+     */
     hash: Buffer;
 };
 export type IChunkOptions = {

package/lib/compiler/javascript/vela/utils/Jsc.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,9 +25,12 @@ class Jsc {
     jsc() {
         const { projectPath, buildPath } = this;
         return shared_utils_1.CommonUtil.requireNodeModule(projectPath, `@aiot-toolkit/jsc`)
-            .then((module) => {
-            return module.default(buildPath);
-        })
+            .then((module) => __awaiter(this, void 0, void 0, function* () {
+            const msg = yield module.default(buildPath);
+            if (msg) {
+                shared_utils_1.ColorConsole.success({ word: 'jsc command' }, msg);
+            }
+        }))
             .then(() => {
             return (0, del_1.default)(`${buildPath}/**/*.js`, { force: true });
         })

package/lib/compiler/javascript/vela/utils/ZipUtil.d.ts

@@ -35,6 +35,12 @@ declare class ZipUtil {
     private static getFileName;
     private static packageToZipBuffer;
     private static generateDistFile;
+    /**
+     * 根据文件列表创建 zip 的 Buffer
+     * @param fileList 文件列表
+     * @param comment zip 的注释
+     * @returns
+     */
     static createZipBufferFromFileList(fileList: {
         path: string;
         content: string | Buffer;
@@ -70,6 +76,14 @@ declare class ZipUtil {
      * 创建打包的注释属性
      */
     static createComment(param: IJavascriptCompileOption): Dictionary<any>;
+    /**
+     * 生成rpk的最终的Buffer
+     *
+     * @description 使用证书对原始rpk包的 buffer 签名. 签名失败，返回原始包； 签名成功，返回新包
+     * @param fullPackage 原始包 buffer
+     * @param signConfig 证书信息
+     * @returns
+     */
     private static buildProjectAndOutput;
 }
 export default ZipUtil;

package/lib/compiler/javascript/vela/utils/ZipUtil.js

@@ -57,9 +57,7 @@ class ZipUtil {
             const zipBuffer = yield this.packageToZipBuffer(fullPackage);
             // 生产出带签名的rpk文件buffer
             const signConfig = SignUtil_1.default.getProjectSignConfig(param);
-            const { rpkBuffer } = yield ZipUtil.buildProjectAndOutput(zipBuffer, signConfig);
-            // IDE 扫码预览打包 todo
-            // IDE 重置包名
+            const rpkBuffer = yield ZipUtil.buildProjectAndOutput(zipBuffer, signConfig);
             // 3
             this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
         });
@@ -96,6 +94,12 @@ class ZipUtil {
             shared_utils_1.ColorConsole.success(`Project build and generate files：${fileName}`);
         });
     }
+    /**
+     * 根据文件列表创建 zip 的 Buffer
+     * @param fileList 文件列表
+     * @param comment zip 的注释
+     * @returns
+     */
     static createZipBufferFromFileList(fileList, comment) {
         return __awaiter(this, void 0, void 0, function* () {
             const zip = new jszip_1.default();
@@ -229,27 +233,28 @@ class ZipUtil {
         };
         return obj;
     }
-    static buildProjectAndOutput(fullPackage, signConfig) {
+    /**
+     * 生成rpk的最终的Buffer
+     *
+     * @description 使用证书对原始rpk包的 buffer 签名. 签名失败，返回原始包； 签名成功，返回新包
+     * @param fullPackage 原始包 buffer
+     * @param signConfig 证书信息
+     * @returns
+     */
+    static buildProjectAndOutput(zipBuffer, signConfig) {
         return __awaiter(this, void 0, void 0, function* () {
-            // 1. 默认携带META，如果禁用流失打包，需要删除META
-            // 2. 是否需要增加签名内容
+            let result = zipBuffer;
             if (signConfig) {
                 const { privatekey, certificate } = signConfig;
-                // fullPackageBuffer
-                const fullPackageBuffer = yield SignUtil_1.default.signZipBufferForPackage(fullPackage, privatekey, certificate);
+                const fullPackageBuffer = yield SignUtil_1.default.signZipBufferForPackage(zipBuffer, privatekey, certificate);
                 if (fullPackageBuffer === false) {
                     shared_utils_1.ColorConsole.throw('Fullpackage signature failed');
                 }
                 else {
-                    fullPackage = fullPackageBuffer;
+                    result = fullPackageBuffer;
                 }
             }
-            // 3. 校验体积等
-            // 4. 生成rpks：不需要META和签名
-            // 5. 返回
-            return {
-                rpkBuffer: fullPackage
-            };
+            return result;
         });
     }
 }

package/lib/compiler/javascript/vela/utils/signature/SignUtil.d.ts

@@ -13,15 +13,34 @@ declare class SignUtil {
         privatekey: Buffer;
         certificate: Buffer;
     };
+    /**
+     * 对二进制zipBuffer签名
+     *
+     * 1. 解压 zip 流，获取文件列表
+     * 2. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
+     * 3. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
+     * 4. 对“新zipBuffer”，做整体签名
+     * @param zipBuffer
+     * @param privatekey
+     * @param certificate
+     * @returns
+     */
     static signZipBufferForPackage(zipBuffer: Buffer, privatekey: Buffer, certificate: Buffer): Promise<false | Buffer>;
     /**
      * 根据ZIP流获取文件实例
+     *
+     * 1. zipbuffer转换为JSZip对象
+     * 2. 提取文件列表，并生成每个文件的 buffer
+     * 3. 创建获取文件buffer的函数
+     *
      * @param zipBuffer
      * @returns
      */
     private static createFileListFromZipBuffer;
     /**
      * 为 zip buffer 签名，返回签名后的buffer
+     *
+     * @description 根据zipBuffer + zip的文件列表 + 私钥 + 证书，对 zipbuffer 签名
      * @param fileBuffer
      * @param files
      * @param privatekey

package/lib/compiler/javascript/vela/utils/signature/SignUtil.js

@@ -96,14 +96,26 @@ class SignUtil {
         }
         return signConfig;
     }
+    /**
+     * 对二进制zipBuffer签名
+     *
+     * 1. 解压 zip 流，获取文件列表
+     * 2. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
+     * 3. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
+     * 4. 对“新zipBuffer”，做整体签名
+     * @param zipBuffer
+     * @param privatekey
+     * @param certificate
+     * @returns
+     */
     static signZipBufferForPackage(zipBuffer, privatekey, certificate) {
         return __awaiter(this, void 0, void 0, function* () {
-            // 1. 解压得到文件列表
+            // 1
             const zipInstWrap = yield SignUtil.createFileListFromZipBuffer(zipBuffer);
-            // 摘要map
+            // 摘要 和 文件列表
             const fileDigestHash = [];
             const fileList = [];
-            // 2. 如果包含META-INF/CERT，则对其解压，增加签名
+            // 2.1
             const metaBuffer = zipInstWrap.getFileBuffer(ZipUtil_1.default.CERT_PATH);
             if (metaBuffer) {
                 const metaHash = {
@@ -126,7 +138,7 @@ class SignUtil {
                     });
                 }
             }
-            // 3. 对整个zip做签名
+            // 2.2
             const files = zipInstWrap.fileList;
             files.filter(SignUtil.fileFilter).map((item) => {
                 fileList.push(item);
@@ -148,6 +160,11 @@ class SignUtil {
     }
     /**
      * 根据ZIP流获取文件实例
+     *
+     * 1. zipbuffer转换为JSZip对象
+     * 2. 提取文件列表，并生成每个文件的 buffer
+     * 3. 创建获取文件buffer的函数
+     *
      * @param zipBuffer
      * @returns
      */
@@ -169,17 +186,15 @@ class SignUtil {
                 comment: zipInst.comment,
                 getFileBuffer(path) {
                     const buffer = fileList.find((item) => item.path === path);
-                    let content;
-                    if (buffer) {
-                        content = buffer.content;
-                    }
-                    return content;
+                    return buffer === null || buffer === void 0 ? void 0 : buffer.content;
                 }
             };
         });
     }
     /**
      * 为 zip buffer 签名，返回签名后的buffer
+     *
+     * @description 根据zipBuffer + zip的文件列表 + 私钥 + 证书，对 zipbuffer 签名
      * @param fileBuffer
      * @param files
      * @param privatekey

package/lib/config/UxConfig.d.ts

@@ -5,16 +5,30 @@ import PngLoader from '../loader/ux/PngLoader';
 import AppUxLoader from '../loader/ux/vela/AppUxLoader';
 import HmlLoader from '../loader/ux/vela/HmlLoader';
 import UxLoader from '../loader/ux/vela/UxLoader';
+import UxBeforeWorks from '../beforeWorks/ux/UxBeforeWorks';
+import UxAfterWorks from '../afterWorks/ux/UxAfterWorks';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     readonly projectPath: string;
     constructor(projectPath: string);
+    /**
+     * 1. 取项目中所有的真实文件
+     *  1.1 无entryFileList时，
+     *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+     * 2. 返回符合条件的文件列表
+     *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
+     * @param entryFileList
+     * @returns
+     */
+    collectFile: (entryFileList?: string[]) => string[];
     exclude: (RegExp | ((filePath: string) => boolean))[];
     get output(): string;
-    preWorks: import("file-lane").PreWork<IJavascriptCompileOption>[];
-    followWorks: {
+    beforeWorks: (typeof UxBeforeWorks.cleanOutput)[];
+    beforeCompile: import("file-lane").PreWork<IJavascriptCompileOption>[];
+    afterCompile: {
         worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
         workerDescribe: string;
     }[];
+    afterWorks: (typeof UxAfterWorks.cleanOutput)[];
     watchIgnores: (string | RegExp)[];
     /**
      * 通过项目类型，返回模块配置

package/lib/config/UxConfig.js

@@ -7,18 +7,43 @@ const parser_1 = require("@aiot-toolkit/parser");
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const UxFollowWorks_1 = __importDefault(require("../followWorks/ux/UxFollowWorks"));
 const JsLoader_1 = __importDefault(require("../loader/ux/JsLoader"));
 const PngLoader_1 = __importDefault(require("../loader/ux/PngLoader"));
 const AppUxLoader_1 = __importDefault(require("../loader/ux/vela/AppUxLoader"));
 const HmlLoader_1 = __importDefault(require("../loader/ux/vela/HmlLoader"));
 const UxLoader_1 = __importDefault(require("../loader/ux/vela/UxLoader"));
-const UxPreWorks_1 = __importDefault(require("../preWorks/ux/UxPreWorks"));
-const PreWorkUtils_1 = __importDefault(require("../utils/PreWorkUtils"));
 const UxLoader_2 = __importDefault(require("../loader/ux/android/UxLoader"));
+const UxBeforeWorks_1 = __importDefault(require("../beforeWorks/ux/UxBeforeWorks"));
+const UxAfterWorks_1 = __importDefault(require("../afterWorks/ux/UxAfterWorks"));
+const UxAfterCompile_1 = __importDefault(require("../afterCompile/ux/UxAfterCompile"));
+const UxBeforeCompile_1 = __importDefault(require("../beforeCompile/ux/UxBeforeCompile"));
+const BeforeCompileUtils_1 = __importDefault(require("../utils/BeforeCompileUtils"));
 class UxConfig {
     constructor(projectPath) {
         this.projectPath = projectPath;
+        /**
+         * 1. 取项目中所有的真实文件
+         *  1.1 无entryFileList时，
+         *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+         * 2. 返回符合条件的文件列表
+         *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
+         * @param entryFileList
+         * @returns
+         */
+        this.collectFile = (entryFileList) => {
+            // 取项目中所有的真实文件
+            const getProjectFiles = () => {
+                const projectPath = this.projectPath;
+                let files = shared_utils_1.FileUtil.readAlldirSync(projectPath, undefined, this.exclude);
+                return files;
+            };
+            // 2.
+            if ((entryFileList === null || entryFileList === void 0 ? void 0 : entryFileList.findIndex((file) => !/\.(ux|json|js)$/.test(file))) === -1) {
+                return entryFileList.filter((filePath) => shared_utils_1.FileUtil.include(filePath, undefined, this.exclude));
+            }
+            // 1.
+            return getProjectFiles();
+        };
         this.exclude = [
             /node_modules/,
             /dist/,
@@ -36,43 +61,45 @@ class UxConfig {
                 return false;
             }
         ];
-        this.preWorks = [
-            UxPreWorks_1.default.validateManifest,
-            UxPreWorks_1.default.validateSitemap,
-            PreWorkUtils_1.default.clean,
-            PreWorkUtils_1.default.getEntries,
-            PreWorkUtils_1.default.getGlobalVar
+        this.beforeWorks = [UxBeforeWorks_1.default.cleanOutput];
+        this.beforeCompile = [
+            UxBeforeCompile_1.default.validateManifest,
+            UxBeforeCompile_1.default.validateSitemap,
+            BeforeCompileUtils_1.default.clean,
+            BeforeCompileUtils_1.default.getEntries,
+            BeforeCompileUtils_1.default.getGlobalVar
         ];
-        this.followWorks = [
+        this.afterCompile = [
             {
-                worker: UxFollowWorks_1.default.symlinkNodeModule,
+                worker: UxAfterCompile_1.default.symlinkNodeModule,
                 workerDescribe: 'Create a soft link to the node_modules folder'
             },
             {
-                worker: UxFollowWorks_1.default.webpack,
+                worker: UxAfterCompile_1.default.webpack,
                 workerDescribe: 'Compile the project using webpack'
             },
             {
-                worker: UxFollowWorks_1.default.copyResource,
+                worker: UxAfterCompile_1.default.copyResource,
                 workerDescribe: 'Copy resource files'
             },
             {
-                worker: UxFollowWorks_1.default.jsc,
+                worker: UxAfterCompile_1.default.jsc,
                 workerDescribe: 'Generate jsc bytecode'
             },
             {
-                worker: UxFollowWorks_1.default.protobuf,
+                worker: UxAfterCompile_1.default.protobuf,
                 workerDescribe: 'Generate protobuf json'
             },
             {
-                worker: UxFollowWorks_1.default.toRpk,
+                worker: UxAfterCompile_1.default.toRpk,
                 workerDescribe: 'Package the project into an RPK file'
             },
             {
-                worker: UxFollowWorks_1.default.moveBackResult,
+                worker: UxAfterCompile_1.default.moveBackResult,
                 workerDescribe: 'Migrate temporary project'
             }
         ];
+        this.afterWorks = [UxAfterWorks_1.default.cleanOutput];
         this.watchIgnores = [/node_modules/, '/build/', '/dist/'];
     }
     get output() {

package/lib/config/XtsConfig.d.ts

@@ -12,8 +12,8 @@ declare class XtsConfig implements IFileLaneConfig {
             loader: (typeof XtsLoader)[];
         }[];
     };
-    preWorks: PreWork[];
-    followWorks: {
+    beforeCompile: PreWork[];
+    afterCompile: {
         worker: import("file-lane").FollowWork<import("..").IXtsCompileOptions>;
     }[];
 }

package/lib/config/XtsConfig.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const entryTemplate_1 = require("../followWorks/xts/entryTemplate");
-const generateRpk_1 = require("../followWorks/xts/generateRpk");
-const ts2wasm_1 = require("../followWorks/xts/ts2wasm");
+const entryTemplate_1 = require("../afterCompile/xts/entryTemplate");
+const generateRpk_1 = require("../afterCompile/xts/generateRpk");
+const ts2wasm_1 = require("../afterCompile/xts/ts2wasm");
 const XtsLoader_1 = __importDefault(require("../loader/xts/XtsLoader"));
 /**
  * XtsConfig
@@ -22,8 +22,8 @@ class XtsConfig {
                 }
             ]
         };
-        this.preWorks = [];
-        this.followWorks = [
+        this.beforeCompile = [];
+        this.afterCompile = [
             {
                 worker: entryTemplate_1.generateEntryFile
             },

package/lib/utils/{PreWorkUtils.d.ts → BeforeCompileUtils.d.ts}

@@ -1,21 +1,21 @@
-import { IFileLaneContext, PreWork } from 'file-lane';
+import { PreWork } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
 /**
- * PreWorkUtils
+ * BeforeCompileUtils
  */
-declare class PreWorkUtils {
+declare class BeforeCompileUtils {
     /**
      * 获取ux项目的路由入口
      * @param context
      * @param fileList
      * @returns
      */
-    static getEntries(context: IFileLaneContext): Promise<void>;
+    static getEntries: PreWork<IJavascriptCompileOption>;
     static clean: PreWork<IJavascriptCompileOption>;
     /**
      * 获取项目的全局样式变量配置
      * @param context
      */
-    static getGlobalVar(context: IFileLaneContext): Promise<void>;
+    static getGlobalVar: PreWork<IJavascriptCompileOption>;
 }
-export default PreWorkUtils;
+export default BeforeCompileUtils;

package/lib/utils/BeforeCompileUtils.js

@@ -0,0 +1,103 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const del_1 = __importDefault(require("del"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const TranslateCache_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/TranslateCache"));
+const UxFileUtils_1 = __importDefault(require("./ux/UxFileUtils"));
+const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
+/**
+ * BeforeCompileUtils
+ */
+class BeforeCompileUtils {
+}
+_a = BeforeCompileUtils;
+/**
+ * 获取ux项目的路由入口
+ * @param context
+ * @param fileList
+ * @returns
+ */
+BeforeCompileUtils.getEntries = (context, fileList, config, compilerOption) => {
+    const { projectPath } = context;
+    const srcPath = path_1.default.join(projectPath, compilerOption.sourceRoot);
+    // 判断路径是否真实存在
+    const manifestContent = UxFileUtils_1.default.getMainfestInfo(projectPath);
+    // 存储entries
+    let entryList = [];
+    const { router } = manifestContent;
+    if (router) {
+        const { pages } = router;
+        if (pages) {
+            Object.keys(pages).map((page) => {
+                const pageContent = pages[page];
+                const entryDir = path_1.default.join(srcPath, page);
+                const entryPages = parser_1.ExtensionConfig.TEMPLATES.map((item) => `${pageContent.component}${item}`);
+                const entry = entryPages.find((item) => fs_extra_1.default.existsSync(path_1.default.join(entryDir, item)));
+                if (entry) {
+                    entryList.push(path_1.default.join(entryDir, entry));
+                }
+                else {
+                    // 路径不存在
+                    shared_utils_1.ColorConsole.throw(`### manifest ### path '${entryDir}/${entryPages.join(' | ')}' does not exist`);
+                }
+            });
+        }
+        else {
+            // 没有pages配置
+            shared_utils_1.ColorConsole.throw(`### manifest ### No pages configuration`);
+        }
+    }
+    else {
+        // 没有router配置
+        shared_utils_1.ColorConsole.throw(`### manifest ### No router configuration`);
+    }
+    context['entries'] = entryList;
+    return Promise.resolve();
+};
+BeforeCompileUtils.clean = (context, _, config, compileOption) => __awaiter(void 0, void 0, void 0, function* () {
+    if (compileOption) {
+        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.outputPath));
+        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.releasePath));
+    }
+    context.translateCache = new TranslateCache_1.default();
+    BinaryPlugin.reset();
+    BinaryPlugin.config = {
+        projectPath: context.projectPath,
+        outputProjectPath: path_1.default.join(context.projectPath, context.output),
+        source: compileOption === null || compileOption === void 0 ? void 0 : compileOption.sourceRoot,
+        output: compileOption === null || compileOption === void 0 ? void 0 : compileOption.outputPath
+    };
+});
+/**
+ * 获取项目的全局样式变量配置
+ * @param context
+ */
+BeforeCompileUtils.getGlobalVar = (context, fileList, config, compilerOption) => {
+    const { projectPath } = context;
+    const filePath = path_1.default.join(projectPath, compilerOption.sourceRoot, 'globalVar.json');
+    let globalVar = {};
+    // 判断文件是否存在
+    if (fs_extra_1.default.existsSync(filePath)) {
+        // 存在则取内容，否则内容为空
+        globalVar = fs_extra_1.default.readJSONSync(filePath);
+    }
+    context.globalVar = globalVar;
+    return Promise.resolve();
+};
+exports.default = BeforeCompileUtils;

package/lib/utils/ux/UxFileUtils.js

@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UxFileUtils = void 0;
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
+const ILog_1 = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const ManifestSchema_1 = __importDefault(require("./ManifestSchema"));
@@ -41,28 +43,28 @@ class UxFileUtils {
     static validateManifest(projectPath, sourceRoot = 'src') {
         const path = UxFileUtils.getManifestFilePath(projectPath, sourceRoot);
         if (!fs_extra_1.default.existsSync(path)) {
-            shared_utils_1.ColorConsole.throw(`file is missing`, {
+            ColorConsole_1.default.throw(`file is missing`, {
                 word: path,
-                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW)
+                style: ColorConsole_1.default.getStyle(ILog_1.Loglevel.THROW)
             });
         }
         const jsonData = this.getMainfestInfo(projectPath, sourceRoot);
         const schema = ManifestSchema_1.default;
-        const errors = shared_utils_1.CommonUtil.validateJson(jsonData, schema);
+        const errors = CommonUtil_1.default.validateJson(jsonData, schema);
         if (errors) {
-            shared_utils_1.ColorConsole.warn(`Manefest.json error: `, ...errors.map((item, index) => {
+            ColorConsole_1.default.warn(`Manefest.json error: `, ...errors.map((item, index) => {
                 return {
                     word: `\r\n${index + 1}.${item.message}`,
                     style: item instanceof TypeError
-                        ? shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.ERROR)
-                        : shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.WARN)
+                        ? ColorConsole_1.default.getStyle(ILog_1.Loglevel.ERROR)
+                        : ColorConsole_1.default.getStyle(ILog_1.Loglevel.WARN)
                 };
             }));
             const stop = Boolean(errors.find((item) => item instanceof TypeError));
             if (stop) {
-                shared_utils_1.ColorConsole.throw({
+                ColorConsole_1.default.throw({
                     word: `missing required content, program stoped`,
-                    style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW)
+                    style: ColorConsole_1.default.getStyle(ILog_1.Loglevel.THROW)
                 });
             }
         }
@@ -85,13 +87,13 @@ class UxFileUtils {
                 rules.forEach((item, index) => {
                     const page = item.page;
                     if (page !== '*' && !pages.includes(page)) {
-                        shared_utils_1.ColorConsole.throw(`The ${index + 1}th item of sitemap rules is configured incorrectly, the page ${page} does not exist`);
+                        ColorConsole_1.default.throw(`The ${index + 1}th item of sitemap rules is configured incorrectly, the page ${page} does not exist`);
                     }
                     return page;
                 });
             }
             catch (error) {
-                shared_utils_1.ColorConsole.warn(error === null || error === void 0 ? void 0 : error.toString());
+                ColorConsole_1.default.warn(error === null || error === void 0 ? void 0 : error.toString());
             }
         }
     }

package/lib/utils/ux/UxLoaderUtils.js

@@ -42,7 +42,6 @@ const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const parse5 = __importStar(require("aiot-parse5"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const ts_morph_1 = require("ts-morph");
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 const { extractFunctions } = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/protobufControl');
 /**
@@ -58,7 +57,6 @@ class UxLoaderUtils {
      */
     static compileUxToJavascript(file, context, isAppUx, compilerOption) {
         return __awaiter(this, void 0, void 0, function* () {
-            const project = new ts_morph_1.Project();
             const logs = [];
             const { path: filePath, content } = file;
             const { name, ext } = path_1.default.parse(filePath);
@@ -131,7 +129,7 @@ class UxLoaderUtils {
                         `}`
                     ];
             };
-            const { targetTree, mapList, sourceMap } = yield new UxToTypescript_1.default(options, project, integrateFunction, compilerOption, context).translate(parserResult.ast, []);
+            const { targetTree, mapList, sourceMap } = yield new UxToTypescript_1.default(options, integrateFunction, compilerOption, context).translate(parserResult.ast, []);
             const { code } = new generator_1.TypescriptGenerator().generate({
                 sourceFilePath: fullName,
                 targetFilePath: newFileName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.12",
+  "version": "2.0.2-beta.14",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,28 +19,32 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.12",
-    "@aiot-toolkit/parser": "2.0.2-beta.12",
+    "@aiot-toolkit/generator": "2.0.2-beta.14",
+    "@aiot-toolkit/parser": "2.0.2-beta.14",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.14",
     "@hap-toolkit/aaptjs": "^2.0.0",
+    "aiot-parse5": "^1.0.0",
     "archiver": "^6.0.1",
     "babel-loader": "^9.1.3",
-    "del": "^4.1.0",
+    "del": "^4.1.1",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.12",
+    "file-lane": "2.0.2-beta.14",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
     "jszip": "^3.10.1",
-    "source-map": "^0.7.4",
+    "lodash": "^4.17.21",
+    "ts-morph": "^19.0.0",
     "url-loader": "^4.1.1",
     "webpack": "^5.89.0",
-    "webpack-bundle-analyzer": "^4.10.1",
+    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-sources": "^3.2.3"
   },
   "devDependencies": {
+    "@types/archiver": "^6.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "3d2f9f8f48bb88492013d867f6eff27cb33365a0"
+  "gitHead": "c6093733d0267d2d1359fec0af8f7a253955e3e3"
 }

package/lib/utils/PreWorkUtils.js

@@ -1,104 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-const parser_1 = require("@aiot-toolkit/parser");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const del_1 = __importDefault(require("del"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const TranslateCache_1 = __importDefault(require("../../../parser/lib/ux/translate/vela/TranslateCache"));
-const UxFileUtils_1 = __importDefault(require("./ux/UxFileUtils"));
-const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
-/**
- * PreWorkUtils
- */
-class PreWorkUtils {
-    /**
-     * 获取ux项目的路由入口
-     * @param context
-     * @param fileList
-     * @returns
-     */
-    static getEntries(context) {
-        const { projectPath } = context;
-        const srcPath = path_1.default.join(projectPath, 'src');
-        // 判断路径是否真实存在
-        const manifestContent = UxFileUtils_1.default.getMainfestInfo(projectPath);
-        // 存储entries
-        let entryList = [];
-        const { router } = manifestContent;
-        if (router) {
-            const { pages } = router;
-            if (pages) {
-                Object.keys(pages).map((page) => {
-                    const pageContent = pages[page];
-                    const entryDir = path_1.default.join(srcPath, page);
-                    const entryPages = parser_1.ExtensionConfig.TEMPLATES.map((item) => `${pageContent.component}${item}`);
-                    const entry = entryPages.find((item) => fs_extra_1.default.existsSync(path_1.default.join(entryDir, item)));
-                    if (entry) {
-                        entryList.push(path_1.default.join(entryDir, entry));
-                    }
-                    else {
-                        // 路径不存在
-                        shared_utils_1.ColorConsole.throw(`### manifest ### path '${entryDir}/${entryPages.join(' | ')}' does not exist`);
-                    }
-                });
-            }
-            else {
-                // 没有pages配置
-                shared_utils_1.ColorConsole.throw(`### manifest ### No pages configuration`);
-            }
-        }
-        else {
-            // 没有router配置
-            shared_utils_1.ColorConsole.throw(`### manifest ### No router configuration`);
-        }
-        context['entries'] = entryList;
-        return Promise.resolve();
-    }
-    /**
-     * 获取项目的全局样式变量配置
-     * @param context
-     */
-    static getGlobalVar(context) {
-        const { projectPath } = context;
-        const filePath = path_1.default.join(projectPath, 'src', 'globalVar.json');
-        let globalVar = {};
-        // 判断文件是否存在
-        if (fs_extra_1.default.existsSync(filePath)) {
-            // 存在则取内容，否则内容为空
-            globalVar = fs_extra_1.default.readJSONSync(filePath);
-        }
-        context.globalVar = globalVar;
-        return Promise.resolve();
-    }
-}
-_a = PreWorkUtils;
-PreWorkUtils.clean = (context, _, config, compileOption) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, del_1.default)(path_1.default.join(context.projectPath, context.output), { force: true });
-    if (compileOption) {
-        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.outputPath));
-        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.releasePath));
-    }
-    context.translateCache = new TranslateCache_1.default();
-    BinaryPlugin.reset();
-    BinaryPlugin.config = {
-        projectPath: context.projectPath,
-        outputProjectPath: path_1.default.join(context.projectPath, context.output),
-        source: compileOption === null || compileOption === void 0 ? void 0 : compileOption.sourceRoot,
-        output: compileOption === null || compileOption === void 0 ? void 0 : compileOption.outputPath
-    };
-});
-exports.default = PreWorkUtils;