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

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

@@ -1,9 +1,9 @@
-import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+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>;
@@ -15,6 +15,13 @@ declare class UxFollowWorks {
      * @param compilerOption
      */
     static copyResource: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
+     * @param context
+     * @param config
+     * @param compilerOption
+     */
+    static generateDiff: FollowWork<IJavascriptCompileOption>;
     /**
      * 打包结果移回源码项目，并删除中间项目
      *
@@ -33,4 +40,4 @@ declare class UxFollowWorks {
      */
     static symlinkNodeModule: FollowWork<IJavascriptCompileOption>;
 }
-export default UxFollowWorks;
+export default UxAfterCompile;

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

@@ -13,11 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const TranslateCache_1 = __importDefault(require("@aiot-toolkit/parser/lib//ux/translate/vela/TranslateCache"));
 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 FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
@@ -26,19 +22,22 @@ const JavascriptCompiler_1 = __importDefault(require("../../compiler/javascript/
 const JavascriptDefaultCompileOption_1 = __importDefault(require("../../compiler/javascript/JavascriptDefaultCompileOption"));
 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("./UxFileUtils"));
+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');
 /**
- * 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 = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     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(() => {
-        ColorConsole_1.default.info(`webpack complete`);
+        shared_utils_1.ColorConsole.info(`webpack complete`);
     })
         .catch(({ errors, warnings }) => {
         const errorLength = (errors === null || errors === void 0 ? void 0 : errors.length) || 0;
@@ -50,7 +49,7 @@ UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, v
                     return `${index + 1}. ${item.message}`;
                 })
                     .join('\r\n'),
-                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
+                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW)
             });
         }
         if (warnings === null || warnings === void 0 ? void 0 : warnings.length) {
@@ -60,31 +59,38 @@ UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, v
                     return `${errorLength + index + 1}. ${item.message}`;
                 })
                     .join('\r\n'),
-                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Warn)
+                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.WARN)
             });
         }
         if (errors === null || errors === void 0 ? void 0 : errors.length) {
-            ColorConsole_1.default.throw(...messages);
+            shared_utils_1.ColorConsole.throw(...messages);
             throw new Error();
         }
         else {
-            ColorConsole_1.default.warn(...messages);
+            shared_utils_1.ColorConsole.warn(...messages);
         }
     });
 });
-UxFollowWorks.protobuf = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.protobuf = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { compilerOption } = params;
     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 = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
+    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 = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    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;
     }
 });
 /**
@@ -93,7 +99,8 @@ 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 = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     const genDeviceManifests = (compilerOption) => {
         const { projectPath, sourceRoot, outputPath } = compilerOption;
         const manifest = fs_extra_1.default.readJSONSync(path_1.default.join(projectPath, sourceRoot, 'manifest.json'));
@@ -115,7 +122,7 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
     const copyResourceFiles = (compilerOption) => {
         // 复制除 js/jsx/ts/tsx/json 外，但是包含manifest.json、sitemap.json的文件
         const { projectPath, sourceRoot, outputPath } = compilerOption;
-        const includeList = ['sitemap.json', /i18n(.+)\.json/];
+        const includeList = [/sitemap\.json$/, /i18n(.+)\.json/];
         const excludeExtList = [
             'js',
             'jsx',
@@ -128,16 +135,15 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
             'sass',
             'styl',
             'html',
-            'json',
             'md',
             'ux',
             'mix',
             'DS_Store',
             'map'
         ];
-        const excludeReg = `\.(${excludeExtList.join('|')})$`;
-        FileUtil_1.default.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), new RegExp(excludeReg));
-        FileUtil_1.default.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), undefined, includeList);
+        const excludeReg = `\\.(${excludeExtList.join('|')})$`;
+        shared_utils_1.FileUtil.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), new RegExp(excludeReg));
+        shared_utils_1.FileUtil.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), undefined, includeList);
     };
     /**
      * 写入 manifest.json 文件
@@ -146,17 +152,18 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
      * @param compilerOption
      */
     const updateManifest = (compilerOption) => {
-        const { projectPath, sourceRoot, outputPath } = compilerOption;
+        const { projectPath, sourceRoot, outputPath, completeFeature } = compilerOption;
         const content = UxFileUtils_1.default.getMainfestInfo(projectPath, sourceRoot);
+        const translateCache = context.translateCache;
         if (!content.minAPILevel) {
             content.minAPILevel = 1;
         }
         if (!content.packageInfo) {
             content.packageInfo = ZipUtil_1.default.createComment(compilerOption);
         }
-        if (TranslateCache_1.default.featureCache.size) {
+        if (completeFeature && (translateCache === null || translateCache === void 0 ? void 0 : translateCache.featureCache.size)) {
             const featureSet = new Set([
-                ...Array.from(TranslateCache_1.default.featureCache),
+                ...Array.from(translateCache.featureCache),
                 ...(content.features || []).map((item) => item.name)
             ]);
             content.features = Array.from(featureSet).map((item) => {
@@ -180,7 +187,7 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
         const files = ZipUtil_1.default.getSortedFiles(outputAbsPath, compilerOption, UxFileUtils_1.default.getMainfestInfo(projectPath, sourceRoot));
         const digestDic = Object.fromEntries(files.map((item) => [
             item,
-            CommonUtil_1.default.calcDataDigest(fs_extra_1.default.readFileSync(path_1.default.join(outputAbsPath, item))).toString('hex')
+            shared_utils_1.CommonUtil.calcDataDigest(fs_extra_1.default.readFileSync(path_1.default.join(outputAbsPath, item))).toString('hex')
         ]));
         const hashJson = [
             {
@@ -195,12 +202,50 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
         fs_extra_1.default.outputFileSync(path_1.default.join(outputAbsPath, ZipUtil_1.default.CERT_PATH), buffer);
     });
     if (compilerOption) {
-        copyResourceFiles(compilerOption);
-        updateManifest(compilerOption);
-        genDeviceManifests(compilerOption);
+        yield copyResourceFiles(compilerOption);
+        yield updateManifest(compilerOption);
+        yield genDeviceManifests(compilerOption);
         yield genMetaFiles(compilerOption);
     }
 });
+/**
+ * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
+ * @param context
+ * @param config
+ * @param compilerOption
+ */
+UxAfterCompile.generateDiff = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    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));
+    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);
+    }
+});
 /**
  * 打包结果移回源码项目，并删除中间项目
  *
@@ -210,7 +255,8 @@ 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 = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     if (!compilerOption) {
         return;
     }
@@ -228,9 +274,7 @@ UxFollowWorks.moveBackResult = (context, config, compilerOption) => __awaiter(vo
     ];
     targetList.forEach((item) => {
         fs_extra_1.default.moveSync(item.from, item.to, { overwrite: true });
-        fs_extra_1.default.removeSync(item.from);
     });
-    fs_extra_1.default.removeSync(projectPath);
 });
 /**
  * 创建 node_module 软链
@@ -238,16 +282,23 @@ 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 = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     if (!compilerOption) {
         return;
     }
-    const foldList = ['node_modules'];
-    foldList.forEach((item) => {
-        const sourcePath = path_1.default.join(context.projectPath, item);
-        if (fs_extra_1.default.existsSync(sourcePath)) {
-            fs_extra_1.default.symlinkSync(sourcePath, path_1.default.join(compilerOption.projectPath, item), 'junction');
-        }
-    });
+    try {
+        const foldList = ['node_modules'];
+        foldList.forEach((item) => {
+            const sourcePath = path_1.default.join(context.projectPath, item);
+            const targetPath = path_1.default.join(compilerOption.projectPath, item);
+            if (fs_extra_1.default.existsSync(sourcePath) && !fs_extra_1.default.existsSync(targetPath)) {
+                fs_extra_1.default.symlinkSync(sourcePath, targetPath, 'junction');
+            }
+        });
+    }
+    catch (error) {
+        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/{followWorks → afterCompile}/xts/entryTemplate.d.ts

@@ -1,4 +1,4 @@
-import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { FollowWork } from 'file-lane';
 export interface Aspects {
     path: string;
     name: string;

package/lib/{followWorks → afterCompile}/xts/entryTemplate.js

@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateEntryFile = exports.XtsEntryFileName = exports.entryTemplate = void 0;
-const Framework_1 = require("@aiot-toolkit/parser/lib/xts/enum/Framework");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const entryTemplate = (options) => {
@@ -29,7 +29,7 @@ const entryTemplate = (options) => {
             const { routes = [] } = aspect;
             for (let r = 0; r < (routes === null || routes === void 0 ? void 0 : routes.length); r++) {
                 const route = routes[r];
-                imports += `import Page${i + 1}_${r + 1}, { ${Framework_1.HomeState.interface} as ${Framework_1.HomeState.interface}${i + 1}_${r + 1}_ } from './${route.importPath}'\n`;
+                imports += `import Page${i + 1}_${r + 1}, { ${parser_1.HomeState.interface} as ${parser_1.HomeState.interface}${i + 1}_${r + 1}_ } from './${route.importPath}'\n`;
             }
         }
         return imports;
@@ -45,7 +45,7 @@ const entryTemplate = (options) => {
             for (let r = 0; r < routes.length; r++) {
                 const route = routes[r];
                 res += `
-  pathPages_${i + 1}.set('${route.route}', function (params?: ${Framework_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
+  pathPages_${i + 1}.set('${route.route}', function (params?: ${parser_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
     return new Page${i + 1}_${r + 1}(params)
   })
         `;
@@ -76,7 +76,7 @@ const entryTemplate = (options) => {
 
   // export function
   on
-} from '../node_modules/${Framework_1.tsFrameWork.name}/index'
+} from '../node_modules/${parser_1.tsFrameWork.name}/index'
 
 // import app
 import AppClass from './${options.appPath}'
@@ -122,24 +122,25 @@ exports.XtsEntryFileName = '__entry__.ts';
  * 生成 __entry__.ts 文件
  * @param context
  */
-const generateEntryFile = function generateEntryFile(context, _, compilerOptions) {
-    var _a, _b;
+const generateEntryFile = function generateEntryFile(params) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { context, compilerOption } = params;
         const { projectPath, output } = context;
-        if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
-            ColorConsole_1.default.info(`### skip generate entry file due to --skip xts2ts}`);
+        if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
+            shared_utils_1.ColorConsole.info(`### skip generate entry file due to --skip xts2ts}`);
             return;
         }
-        ColorConsole_1.default.info(`Generating entry file`);
+        shared_utils_1.ColorConsole.info(`Generating entry file`);
         const buildDir = path_1.default.resolve(projectPath, output);
         const appManifestPath = path_1.default.join(buildDir, 'app', 'manifest.json');
         const appManifest = getManifest(appManifestPath);
         if (!appManifest) {
-            ColorConsole_1.default.throw('not find app/manifest.json file !');
+            shared_utils_1.ColorConsole.throw('not find app/manifest.json file !');
         }
         const appTs = path_1.default.join(buildDir, 'app', 'app.ts');
         if (!fs_extra_1.default.existsSync(appTs)) {
-            ColorConsole_1.default.throw('not find app/app.ts file !');
+            shared_utils_1.ColorConsole.throw('not find app/app.ts file !');
         }
         function relativeDist(tar) {
             return path_1.default.join('.', path_1.default.relative(buildDir, tar)).replace(path_1.default.sep, '/');
@@ -177,7 +178,7 @@ const generateEntryFile = function generateEntryFile(context, _, compilerOptions
         }
         const template = (0, exports.entryTemplate)(opt);
         fs_extra_1.default.writeFileSync(path_1.default.join(projectPath, output, exports.XtsEntryFileName), template);
-        ColorConsole_1.default.info(`entry file built`);
+        shared_utils_1.ColorConsole.info(`entry file built`);
     });
 };
 exports.generateEntryFile = generateEntryFile;

package/lib/{followWorks → afterCompile}/xts/generateRpk.d.ts

@@ -1,3 +1,3 @@
-import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { FollowWork } from 'file-lane';
 import { IXtsCompileOptions } from '../../interface/ICompileOptions';
 export declare const generateRpk: FollowWork<IXtsCompileOptions>;

package/lib/{followWorks → afterCompile}/xts/generateRpk.js

@@ -38,12 +38,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRpk = void 0;
 const path_1 = __importDefault(require("path"));
 const XtsFollowWorks_1 = __importDefault(require("../../utils/xts/XtsFollowWorks"));
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const ts2wasm_1 = require("./ts2wasm");
-const generateRpk = (context, _, compilerOptions) => __awaiter(void 0, void 0, void 0, function* () {
+const generateRpk = (params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('package')) {
-        ColorConsole_1.default.info(`### skip package due to --skip ${compilerOptions.skip.join(',')}`);
+    const { context, compilerOption } = params;
+    if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('package')) {
+        shared_utils_1.ColorConsole.info(`### skip package due to --skip ${compilerOption.skip.join(',')}`);
         return;
     }
     const manifestPath = path_1.default.resolve(context.projectPath, 'app', 'manifest.json');

package/lib/{followWorks → afterCompile}/xts/ts2wasm.d.ts

@@ -1,4 +1,4 @@
-import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { FollowWork } from 'file-lane';
 import { IXtsCompileOptions } from '../../interface/ICompileOptions';
 export declare const wasmPackageName = "wasmUnpacked";
 /**

package/lib/{followWorks → afterCompile}/xts/ts2wasm.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ts2wasm = exports.wasmPackageName = void 0;
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const child_process_1 = require("child_process");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_1 = __importDefault(require("fs"));
@@ -24,8 +24,9 @@ exports.wasmPackageName = 'wasmUnpacked';
  * 将 __entry__.ts 文件打包成 warm 文件
  * @param context
  */
-const ts2wasm = (context, _, compilerOptions) => __awaiter(void 0, void 0, void 0, function* () {
+const ts2wasm = (params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const { context, compilerOption } = params;
     /** 1. 生成 app.wasm 文件 */
     const { projectPath, output } = context;
     const buildDir = path_1.default.resolve(projectPath, output);
@@ -37,14 +38,14 @@ const ts2wasm = (context, _, compilerOptions) => __awaiter(void 0, void 0, void
     function compile() {
         // TODO: 后续修改为 @mi
         const ts2wasmpath = path_1.default.resolve(projectPath, 'node_modules', 'mi/wasmnizer-ts');
-        ColorConsole_1.default.info('### Waiting for generating app.wasm file.');
+        shared_utils_1.ColorConsole.info('### Waiting for generating app.wasm file.');
         const res = (0, child_process_1.execSync)(`node ${ts2wasmpath}/build/cli/ts2wasm.js  ${entryFile} -o ${wasmDir}/app.wasm`, {
             encoding: 'utf-8'
         });
-        ColorConsole_1.default.info(`### ts2wasm ### ${res.toString()}`);
+        shared_utils_1.ColorConsole.info(`### ts2wasm ### ${res.toString()}`);
     }
-    if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('ts2wasm')) {
-        ColorConsole_1.default.info(`### skip compile ts to wasm due to --skip ${compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip.join(',')}`);
+    if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('ts2wasm')) {
+        shared_utils_1.ColorConsole.info(`### skip compile ts to wasm due to --skip ${compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip.join(',')}`);
     }
     else {
         compile();

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,22 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const file_lane_1 = require("file-lane");
+class UxAfterWorks {
+    static cleanOutput(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const outputPath = file_lane_1.FileLaneUtil.getOutputPath(context);
+            shared_utils_1.FileUtil.del(outputPath);
+        });
+    }
+}
+exports.default = UxAfterWorks;

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

@@ -1,10 +1,10 @@
-import { PreWork } from 'file-lane/lib/interface/IFileLaneConfig';
+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/{utils/ux/UxPreWorks.js → beforeCompile/ux/UxBeforeCompile.js}

@@ -13,19 +13,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const UxFileUtils_1 = __importDefault(require("./UxFileUtils"));
+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 = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;
-    return UxFileUtils_1.default.validateManifest(projectPath);
+    const errors = yield UxFileUtils_1.default.validateManifest(projectPath);
+    if (errors === null || errors === void 0 ? void 0 : errors.length) {
+        return Promise.reject(errors);
+    }
 });
-UxPreWorks.validateSitemap = (context) => __awaiter(void 0, void 0, void 0, function* () {
+UxBeforeCompile.validateSitemap = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;
     UxFileUtils_1.default.validateSitemap(projectPath);
 });
-exports.default = UxPreWorks;
+exports.default = UxBeforeCompile;

package/lib/{preWorks → beforeCompile}/xts/preInstall.d.ts

@@ -1,3 +1,3 @@
-import { PreWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { PreWork } from 'file-lane';
 import { IXtsCompileOptions } from '../../interface/ICompileOptions';
 export declare const preInstall: PreWork<IXtsCompileOptions>;

package/lib/{preWorks → beforeCompile}/xts/preInstall.js

@@ -13,14 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preInstall = void 0;
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const preInstall = (context, _, __, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+const preInstall = (params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const { context, compilerOption } = params;
     if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('install')) {
-        ColorConsole_1.default.info(`### skip install pre-dependencies due to --skip ${compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip.join(',')}`);
+        shared_utils_1.ColorConsole.info(`### skip install pre-dependencies due to --skip ${compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip.join(',')}`);
         return;
     }
     const { projectPath } = context;
@@ -47,12 +48,12 @@ const preInstall = (context, _, __, compilerOption) => __awaiter(void 0, void 0,
             });
         }
     }
-    ColorConsole_1.default.info('### Installing pre-dependencies. The initial build may take some time, please be patient...');
+    shared_utils_1.ColorConsole.info('### Installing pre-dependencies. The initial build may take some time, please be patient...');
     (0, child_process_1.execSync)('npm install', {
         cwd: projectPath
     });
     // 目前ts2wasm不支持@符号
     fs_1.default.renameSync(path_1.default.resolve(projectPath, 'node_modules/@mi'), path_1.default.resolve(projectPath, 'node_modules/mi'));
-    ColorConsole_1.default.info('### Dependencies installation complete.');
+    shared_utils_1.ColorConsole.info('### Dependencies installation complete.');
 });
 exports.preInstall = preInstall;

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,22 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+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);
+            shared_utils_1.FileUtil.del(outputPath);
+        });
+    }
+}
+exports.default = UxBeforeWorks;

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

@@ -1,4 +1,4 @@
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 import CompileMode from '../enum/CompileMode';
 /**
  * 编译参数

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

@@ -1,8 +1,13 @@
-/// <reference types="node" />
 /**
  * ISignConfig
  */
 export default interface ISignConfig {
+    /**
+     * 私钥
+     */
     privatekey: Buffer;
+    /**
+     * 证书
+     */
     certificate: Buffer;
 }