@aiot-toolkit/aiotpack 2.0.2 → 2.0.3-beta.1

package/lib/afterCompile/ux/UxAfterCompile.d.ts

@@ -16,7 +16,7 @@ declare class UxAfterCompile {
      */
     static copyResource: FollowWork<IJavascriptCompileOption>;
     /**
-     * 对比 临时项目build文件夹 和 项目build文件夹，生成diff.json
+     * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
      * @param context
      * @param config
      * @param compilerOption

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -23,6 +23,8 @@ const JavascriptDefaultCompileOption_1 = __importDefault(require("../../compiler
 const Jsc_1 = __importDefault(require("../../compiler/javascript/vela/utils/Jsc"));
 const ZipUtil_1 = __importDefault(require("../../compiler/javascript/vela/utils/ZipUtil"));
 const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
+const archiver_1 = __importDefault(require("archiver"));
+const FileLaneTriggerType_1 = __importDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 /**
  * UxAfterCompile
@@ -82,9 +84,13 @@ UxAfterCompile.jsc = (params) => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 UxAfterCompile.toRpk = (params) => __awaiter(void 0, void 0, void 0, function* () {
-    const { compilerOption } = params;
+    const { compilerOption, compalition, config } = params;
     if (compilerOption) {
-        return ZipUtil_1.default.createRpk(path_1.default.join(compilerOption.projectPath, compilerOption.outputPath), compilerOption);
+        const fileName = yield ZipUtil_1.default.createRpk(path_1.default.join(compilerOption.projectPath, compilerOption.outputPath), compilerOption);
+        if (compalition && fileName) {
+            compalition.info.rpk = path_1.default.join(config.projectPath, compilerOption.releasePath, fileName);
+        }
+        return fileName;
     }
 });
 /**
@@ -203,22 +209,42 @@ UxAfterCompile.copyResource = (params) => __awaiter(void 0, void 0, void 0, func
     }
 });
 /**
- * 对比 临时项目build文件夹 和 项目build文件夹，生成diff.json
+ * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
  * @param context
  * @param config
  * @param compilerOption
  */
 UxAfterCompile.generateDiff = (params) => __awaiter(void 0, void 0, void 0, function* () {
-    const { compilerOption, compalition } = params;
+    const { compilerOption, compalition, config } = params;
     if (!compilerOption || !compalition) {
         return;
     }
+    if (compalition.trigger === FileLaneTriggerType_1.default.START) {
+        return;
+    }
     const { outputPath, projectPath } = compilerOption;
     // 读取临时项目build文件夹中所有文件路径
     const tempBuildPath = path_1.default.join(projectPath, outputPath);
     // 待优化，map文件跟随源文件变化，与时间戳有关文件无需对比
     const tempFileList = shared_utils_1.FileUtil.readAlldirSync(tempBuildPath).map((filePath) => path_1.default.relative(tempBuildPath, filePath));
-    UxFileUtils_1.default.getDiffJSON(compalition, tempFileList, tempBuildPath);
+    const diffList = UxFileUtils_1.default.getDiffJSON(compalition, tempFileList, tempBuildPath);
+    // 所有差异文件，压缩到 .diff.rpk 中
+    if (diffList === null || diffList === void 0 ? void 0 : diffList.length) {
+        const buildFold = path_1.default.join(compilerOption.projectPath, compilerOption.outputPath);
+        const distFold = path_1.default.join(compilerOption.projectPath, compilerOption.releasePath);
+        const diffFileName = `.diff.rpk`;
+        const diffPath = path_1.default.join(distFold, diffFileName);
+        const diffStream = fs_extra_1.default.createWriteStream(diffPath);
+        const archiver = (0, archiver_1.default)('zip', { zlib: { level: 9 } });
+        archiver.pipe(diffStream);
+        diffList.forEach((item) => {
+            const filePath = path_1.default.join(buildFold, item);
+            archiver.append(fs_extra_1.default.createReadStream(filePath), { name: item });
+        });
+        yield archiver.finalize();
+        compalition.info.diffList = diffList;
+        compalition.info.diffFile = path_1.default.join(config.projectPath, compilerOption.releasePath, diffFileName);
+    }
 });
 /**
  * 打包结果移回源码项目，并删除中间项目

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

@@ -29,11 +29,19 @@ declare class ZipUtil {
      * 3. 写入到硬盘
      * @param dist
      * @param param
-     * @returns
+     * @returns 生成的 rpk 文件名
      */
-    static createRpk(dist: string, param: IJavascriptCompileOption): Promise<void>;
+    static createRpk(dist: string, param: IJavascriptCompileOption): Promise<string | undefined>;
     private static getFileName;
     private static packageToZipBuffer;
+    /**
+     *
+     * @param buffer
+     * @param param
+     * @param fileName
+     *
+     * @returns 生成的文件名
+     */
     private static generateDistFile;
     /**
      * 根据文件列表创建 zip 的 Buffer

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

@@ -41,7 +41,7 @@ class ZipUtil {
      * 3. 写入到硬盘
      * @param dist
      * @param param
-     * @returns
+     * @returns 生成的 rpk 文件名
      */
     static createRpk(dist, param) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -58,7 +58,7 @@ class ZipUtil {
             const signConfig = SignUtil_1.default.getProjectSignConfig(param);
             const rpkBuffer = yield _a.buildProjectAndOutput(fullPackage, signConfig);
             // 3
-            this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
+            return this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
         });
     }
     static getFileName(param, config, ext) {
@@ -85,12 +85,21 @@ class ZipUtil {
             return yield this.createZipBufferFromFileList(packageFileList, comment);
         });
     }
+    /**
+     *
+     * @param buffer
+     * @param param
+     * @param fileName
+     *
+     * @returns 生成的文件名
+     */
     static generateDistFile(buffer, param, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
             const { releasePath, projectPath } = param;
             const filePath = path_1.default.join(projectPath, releasePath, fileName);
             fs_extra_1.default.outputFileSync(filePath, buffer);
             shared_utils_1.ColorConsole.success(`Project build and generate files：${fileName}`);
+            return fileName;
         });
     }
     /**

package/lib/config/XtsConfig.d.ts

@@ -4,6 +4,8 @@ import XtsLoader from '../loader/xts/XtsLoader';
  * XtsConfig
  */
 declare class XtsConfig implements IFileLaneConfig {
+    projectPath: string;
+    constructor(projectPath: string);
     exclude: string[];
     output: string;
     module: {

package/lib/config/XtsConfig.js

@@ -11,7 +11,8 @@ const XtsLoader_1 = __importDefault(require("../loader/xts/XtsLoader"));
  * XtsConfig
  */
 class XtsConfig {
-    constructor() {
+    constructor(projectPath) {
+        this.projectPath = projectPath;
         this.exclude = [
             '**/node_modules{,/**}',
             '**/dist{,/**}',

package/lib/loader/ux/android/UxLoader.d.ts

@@ -1,3 +1,4 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
@@ -6,6 +7,7 @@ import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJa
 declare class UxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default UxLoader;

package/lib/loader/ux/android/UxLoader.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const path_1 = __importDefault(require("path"));
 const AndroidUx_1 = __importDefault(require("../../../utils/ux/android/AndroidUx"));
 /**
@@ -29,7 +28,7 @@ class UxLoader {
                     file: item,
                     compilerOption: this.compilerOption
                 });
-                shared_utils_1.CommonUtil.processingLogsInTerminal(logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' }))));
+                this.logs = logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' })));
                 result.push(...files);
             }
             return result;

package/lib/loader/ux/vela/AppUxLoader.d.ts

@@ -1,3 +1,4 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
@@ -7,6 +8,7 @@ import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJa
 declare class AppUxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default AppUxLoader;

package/lib/loader/ux/vela/AppUxLoader.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const path_1 = __importDefault(require("path"));
 const UxLoaderUtils_1 = __importDefault(require("../../../utils/ux/UxLoaderUtils"));
 /**
@@ -24,7 +23,7 @@ class AppUxLoader {
         return __awaiter(this, void 0, void 0, function* () {
             const { projectPath } = this.context;
             const { files: resultFiles, logs } = yield UxLoaderUtils_1.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption);
-            shared_utils_1.CommonUtil.processingLogsInTerminal(logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' }))));
+            this.logs = logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' })));
             return resultFiles;
         });
     }

package/lib/loader/ux/vela/UxLoader.d.ts

@@ -1,8 +1,10 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+import { ILog } from '@aiot-toolkit/shared-utils/lib/interface/ILog';
 declare class UxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default UxLoader;

package/lib/loader/ux/vela/UxLoader.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const path_1 = __importDefault(require("path"));
 const UxLoaderUtils_1 = __importDefault(require("../../../utils/ux/UxLoaderUtils"));
 class UxLoader {
@@ -23,15 +22,14 @@ class UxLoader {
             for (const file of files) {
                 // 转换每个文件
                 const { files: compiledFiles, logs } = yield UxLoaderUtils_1.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
-                // style报错中，@import导入的文件报错路径存储在item.position.source中
-                shared_utils_1.CommonUtil.processingLogsInTerminal(logs.map((item) => {
+                this.logs = logs.map((item) => {
                     var _a;
-                    return (Object.assign(Object.assign({}, item), { filePath: ((_a = item.position) === null || _a === void 0 ? void 0 : _a.source)
+                    return Object.assign(Object.assign({}, item), { filePath: ((_a = item.position) === null || _a === void 0 ? void 0 : _a.source)
                             ? item.position.source
                             : item.filePath
                                 ? path_1.default.relative(projectPath, item.filePath)
-                                : '' }));
-                }));
+                                : '' });
+                });
                 resultFiles.push(...compiledFiles);
             }
             return resultFiles;

package/lib/utils/ux/UxFileUtils.d.ts

@@ -47,6 +47,6 @@ export declare class UxFileUtils {
      * @param newFileList 新文件列表
      * @returns
      */
-    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): void;
+    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): string[];
 }
 export default UxFileUtils;

package/lib/utils/ux/UxFileUtils.js

@@ -110,6 +110,9 @@ class UxFileUtils {
     static getDiffJSON(compilation, newFileList, buildPath) {
         var _a;
         const oldFileList = compilation.buildFileList;
+        if (!oldFileList.length) {
+            return [];
+        }
         let diffList = [];
         // 1.
         for (let i = 0; i < oldFileList.length; i++) {
@@ -128,7 +131,7 @@ class UxFileUtils {
         }
         // 2.
         newFileList.length > 0 && newFileList.forEach((file) => diffList.push(file));
-        compilation.diffJson = diffList;
+        return diffList;
     }
 }
 exports.UxFileUtils = UxFileUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2",
+  "version": "2.0.3-beta.1",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,16 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2",
-    "@aiot-toolkit/parser": "2.0.2",
-    "@aiot-toolkit/shared-utils": "2.0.2",
+    "@aiot-toolkit/generator": "2.0.3-beta.1",
+    "@aiot-toolkit/parser": "2.0.3-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.1",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.0.0",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2",
+    "file-lane": "2.0.3-beta.1",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -45,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "8ca4bf2ed7bcf11911e5c514696951bdba4fc12d"
+  "gitHead": "77b1b0aab9b5c227b5cc355b585a7c93761cc9a3"
 }