@aiot-toolkit/aiotpack 2.0.1-alpha.9 → 2.0.2-beta.2

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.js

@@ -0,0 +1,58 @@
+"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 SourceMapUtil_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/utils/SourceMapUtil"));
+function addColSourceMap(source, map) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const callback = this.async();
+        if (!map) {
+            callback(null, source, map);
+        }
+        let { consumer, tempGenerator } = yield SourceMapUtil_1.default.createConsumerAndGenerator(JSON.stringify(map));
+        let recordLine = -1;
+        consumer.eachMapping(mapping => {
+            if (mapping.source === consumer.sources[consumer.sources.length - 1]) {
+                if (recordLine < mapping.generatedLine && (mapping.generatedColumn !== 0 || mapping.originalColumn !== 0)) {
+                    tempGenerator.addMapping({
+                        generated: {
+                            line: mapping.generatedLine,
+                            column: 0
+                        },
+                        original: {
+                            line: mapping.originalLine,
+                            column: 0
+                        },
+                        source: mapping.source,
+                        name: ''
+                    });
+                }
+                recordLine = mapping.generatedLine;
+            }
+            tempGenerator.addMapping({
+                generated: {
+                    line: mapping.generatedLine,
+                    column: mapping.generatedColumn
+                },
+                original: {
+                    line: mapping.originalLine,
+                    column: mapping.originalColumn
+                },
+                source: mapping.source,
+                name: mapping.name
+            });
+        });
+        callback(null, source, JSON.parse(tempGenerator.toString()));
+    });
+}
+exports.default = addColSourceMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/splitMap.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from 'webpack';
+declare function splitMap(this: LoaderContext<any>, source: string, map: any): void;
+export default splitMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/splitMap.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function splitMap(source, map) {
+    const enterFilePath = this.resourcePath;
+    // 获取当前文件夹和文件名
+    const dirName = path_1.default.dirname(enterFilePath);
+    const fileName = path_1.default.basename(enterFilePath);
+    // 取到对应的map文件内容
+    const mapFilePath = path_1.default.join(dirName, fileName + '.map');
+    if (fs_1.default.existsSync(mapFilePath)) {
+        map = fs_1.default.readFileSync(mapFilePath, { encoding: 'utf-8' });
+    }
+    this.callback(null, source, map && JSON.parse(map));
+}
+exports.default = splitMap;

package/lib/config/UxConfig.d.ts

@@ -1,13 +1,12 @@
 import { IFileLaneConfig } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
 import AppUxLoader from '../loader/ux/AppUxLoader';
-import PngLoader from '../loader/ux/PngLoader';
+import JsLoader from '../loader/ux/JsLoader';
 import UxLoader from '../loader/ux/UxLoader';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     readonly projectPath: string;
     constructor(projectPath: string);
     exclude: RegExp[];
-    include: RegExp[];
     get output(): string;
     module: {
         rules: ({
@@ -20,11 +19,15 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             loader: (typeof UxLoader)[];
         } | {
             test: RegExp[];
-            loader: (typeof PngLoader)[];
+            loader: (typeof JsLoader)[];
             exclude?: undefined;
         })[];
     };
     preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<IJavascriptCompileOption>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<IJavascriptCompileOption>[];
+    followWorks: {
+        worker: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<IJavascriptCompileOption>;
+        workerDescribe: string;
+    }[];
+    watchIgnores: RegExp[];
 }
 export default UxConfig;

package/lib/config/UxConfig.js

@@ -5,15 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const AppUxLoader_1 = __importDefault(require("../loader/ux/AppUxLoader"));
+const JsLoader_1 = __importDefault(require("../loader/ux/JsLoader"));
 const PngLoader_1 = __importDefault(require("../loader/ux/PngLoader"));
 const UxLoader_1 = __importDefault(require("../loader/ux/UxLoader"));
 const PreWorkUtils_1 = __importDefault(require("../utils/PreWorkUtils"));
-const UxFollowWorks_1 = __importDefault(require("../utils/ux/UxFollowWorks"));
+const UxFollowWorks_1 = __importDefault(require("../followWorks/ux/UxFollowWorks"));
+const UxPreWorks_1 = __importDefault(require("../preWorks/ux/UxPreWorks"));
 class UxConfig {
     constructor(projectPath) {
         this.projectPath = projectPath;
         this.exclude = [/node_modules/, /dist/, /build/];
-        this.include = [/src/];
         this.module = {
             rules: [
                 {
@@ -26,20 +27,53 @@ class UxConfig {
                     loader: [UxLoader_1.default]
                 },
                 {
-                    test: [/.+\.png/],
+                    test: [/.+\.js$/],
+                    loader: [JsLoader_1.default]
+                },
+                {
+                    test: [/.+\.9.png/],
                     loader: [PngLoader_1.default]
                 }
             ]
         };
-        this.preWorks = [PreWorkUtils_1.default.clean, PreWorkUtils_1.default.getEntries];
+        this.preWorks = [
+            UxPreWorks_1.default.validateManifest,
+            UxPreWorks_1.default.validateSitemap,
+            PreWorkUtils_1.default.clean,
+            PreWorkUtils_1.default.getEntries,
+            PreWorkUtils_1.default.getGlobalVar
+        ];
         this.followWorks = [
-            UxFollowWorks_1.default.symlinkNodeModule,
-            UxFollowWorks_1.default.webpack,
-            UxFollowWorks_1.default.copyResource,
-            UxFollowWorks_1.default.jsc,
-            UxFollowWorks_1.default.toRpk,
-            UxFollowWorks_1.default.moveBackResult
+            {
+                worker: UxFollowWorks_1.default.symlinkNodeModule,
+                workerDescribe: 'Create a soft link to the node_modules folder'
+            },
+            {
+                worker: UxFollowWorks_1.default.webpack,
+                workerDescribe: 'Compile the project using webpack'
+            },
+            {
+                worker: UxFollowWorks_1.default.copyResource,
+                workerDescribe: 'Copy resource files'
+            },
+            {
+                worker: UxFollowWorks_1.default.jsc,
+                workerDescribe: 'Generate jsc bytecode'
+            },
+            {
+                worker: UxFollowWorks_1.default.protobuf,
+                workerDescribe: 'Generate protobuf json'
+            },
+            {
+                worker: UxFollowWorks_1.default.toRpk,
+                workerDescribe: 'Package the project into an RPK file'
+            },
+            {
+                worker: UxFollowWorks_1.default.moveBackResult,
+                workerDescribe: 'Migrate temporary project'
+            }
         ];
+        this.watchIgnores = [/node_modules/];
     }
     get output() {
         const name = path_1.default.basename(this.projectPath);
@@ -48,5 +82,3 @@ class UxConfig {
     }
 }
 exports.default = UxConfig;
-
-//# sourceMappingURL=UxConfig.js.map

package/lib/config/XtsConfig.d.ts

@@ -13,6 +13,8 @@ declare class XtsConfig implements IFileLaneConfig {
         }[];
     };
     preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
+    followWorks: {
+        worker: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<import("../interface/ICompileOptions").IXtsCompileOptions>;
+    }[];
 }
 export default XtsConfig;

package/lib/config/XtsConfig.js

@@ -24,9 +24,17 @@ class XtsConfig {
             ]
         };
         this.preWorks = [preInstall_1.preInstall];
-        this.followWorks = [entryTemplate_1.generateEntryFile, ts2wasm_1.ts2wasm, generateRpk_1.generateRpk];
+        this.followWorks = [
+            {
+                worker: entryTemplate_1.generateEntryFile
+            },
+            {
+                worker: ts2wasm_1.ts2wasm
+            },
+            {
+                worker: generateRpk_1.generateRpk
+            }
+        ];
     }
 }
 exports.default = XtsConfig;
-
-//# sourceMappingURL=XtsConfig.js.map

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

@@ -5,6 +5,7 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
  */
 declare class UxFollowWorks {
     static webpack: FollowWork<IJavascriptCompileOption>;
+    static protobuf: FollowWork<IJavascriptCompileOption>;
     static jsc: FollowWork<IJavascriptCompileOption>;
     static toRpk: FollowWork<IJavascriptCompileOption>;
     /**

package/lib/{utils → followWorks}/ux/UxFollowWorks.js

@@ -13,6 +13,9 @@ 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"));
@@ -23,7 +26,8 @@ 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 BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 /**
  * UxFollowWorks
  */
@@ -31,10 +35,50 @@ class UxFollowWorks {
 }
 _a = UxFollowWorks;
 UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
-    yield 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));
+    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`);
+    })
+        .catch(({ errors, warnings }) => {
+        const errorLength = (errors === null || errors === void 0 ? void 0 : errors.length) || 0;
+        const messages = [`webpack error:\r\n`];
+        if (errors === null || errors === void 0 ? void 0 : errors.length) {
+            messages.push({
+                word: errors
+                    .map((item, index) => {
+                    return `${index + 1}. ${item.message}`;
+                })
+                    .join('\r\n'),
+                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
+            });
+        }
+        if (warnings === null || warnings === void 0 ? void 0 : warnings.length) {
+            messages.push({
+                word: warnings
+                    .map((item, index) => {
+                    return `${errorLength + index + 1}. ${item.message}`;
+                })
+                    .join('\r\n'),
+                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Warn)
+            });
+        }
+        if (errors === null || errors === void 0 ? void 0 : errors.length) {
+            ColorConsole_1.default.throw(...messages);
+            throw new Error();
+        }
+        else {
+            ColorConsole_1.default.warn(...messages);
+        }
+    });
+});
+UxFollowWorks.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) {
+    if (compilerOption && compilerOption.disabledJSC === false) {
         return new Jsc_1.default(context.projectPath, path_1.default.join(context.projectPath, context.output, compilerOption.outputPath)).jsc();
     }
 });
@@ -54,6 +98,7 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
         const { projectPath, sourceRoot, outputPath } = compilerOption;
         const manifest = fs_extra_1.default.readJSONSync(path_1.default.join(projectPath, sourceRoot, 'manifest.json'));
         const { deviceTypeList } = manifest;
+        // 生成设备的 manifest 文件，规则为：manifest.json + config-设备类型.json
         if (deviceTypeList) {
             deviceTypeList.forEach((deviceType) => {
                 let data = Object.assign({}, manifest);
@@ -87,7 +132,8 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
             'md',
             'ux',
             'mix',
-            'DS_Store'
+            '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));
@@ -108,6 +154,15 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
         if (!content.packageInfo) {
             content.packageInfo = ZipUtil_1.default.createComment(compilerOption);
         }
+        if (TranslateCache_1.default.featureCache.size) {
+            const featureSet = new Set([
+                ...Array.from(TranslateCache_1.default.featureCache),
+                ...(content.features || []).map((item) => item.name)
+            ]);
+            content.features = Array.from(featureSet).map((item) => {
+                return { name: item };
+            });
+        }
         fs_extra_1.default.writeJSONSync(path_1.default.join(projectPath, outputPath, UxFileUtils_1.default.CONFIG_FILE_NAME), content, {
             spaces: 2
         });
@@ -141,8 +196,8 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
     });
     if (compilerOption) {
         copyResourceFiles(compilerOption);
-        genDeviceManifests(compilerOption);
         updateManifest(compilerOption);
+        genDeviceManifests(compilerOption);
         yield genMetaFiles(compilerOption);
     }
 });
@@ -187,14 +242,17 @@ UxFollowWorks.symlinkNodeModule = (context, config, compilerOption) => __awaiter
     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));
-        }
-    });
+    try {
+        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');
+            }
+        });
+    }
+    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;
-
-//# sourceMappingURL=UxFollowWorks.js.map

package/lib/followWorks/xts/entryTemplate.d.ts

@@ -1,4 +1,4 @@
-import { IFileLaneContext } from 'file-lane';
+import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
 export interface Aspects {
     path: string;
     name: string;
@@ -18,4 +18,4 @@ export declare const XtsEntryFileName = "__entry__.ts";
  * 生成 __entry__.ts 文件
  * @param context
  */
-export declare function generateEntryFile(context: IFileLaneContext): Promise<void>;
+export declare const generateEntryFile: FollowWork;

package/lib/followWorks/xts/entryTemplate.js

@@ -14,9 +14,7 @@ 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 shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const entryTemplate = (options) => {
@@ -41,20 +39,24 @@ const entryTemplate = (options) => {
         for (let i = 0; i < aspects.length; i++) {
             const aspect = aspects[i];
             const { routes = [] } = aspect;
+            res += `
+  const aspectName_${i + 1} = '${aspect.name}'
+  const pathPages_${i + 1} = new Map()`;
             for (let r = 0; r < routes.length; r++) {
                 const route = routes[r];
                 res += `
-  const pathPages${i + 1}_${r + 1} = new Map()
-  pathPages${i + 1}_${r + 1}.set('${route.route}', function (params?: ${Framework_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
+  pathPages_${i + 1}.set('${route.route}', function (params?: ${Framework_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
     return new Page${i + 1}_${r + 1}(params)
   })
-  const aspectName_${i + 1} = '${aspect.name}'
+        `;
+            }
+            res += `
   const aspectDef_${i + 1}: AspectDefinition = {
     newFn: (): ViewAspect => new AspectClass${i + 1}(),
-    pathPages: pathPages${i + 1}_${r + 1}
+    pathPages: pathPages_${i + 1}
   } 
-  aspectDefs.set(aspectName_${i + 1}, aspectDef_${i + 1})`;
-            }
+  aspectDefs.set(aspectName_${i + 1}, aspectDef_${i + 1})
+      `;
         }
         return res;
     }
@@ -110,57 +112,72 @@ export { entry, on }
 `;
 };
 exports.entryTemplate = entryTemplate;
+function getManifest(manifestPath) {
+    const content = fs_extra_1.default.readFileSync(manifestPath, 'utf-8');
+    const data = JSON.parse(content);
+    return data;
+}
 exports.XtsEntryFileName = '__entry__.ts';
 /**
  * 生成 __entry__.ts 文件
  * @param context
  */
-function generateEntryFile(context) {
-    var _a, _b, _c;
+const generateEntryFile = function generateEntryFile(context, _, compilerOptions) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const { projectPath, output } = context;
-        ColorConsole_1.default.log({
-            level: shared_utils_1.LOG_LEVEL.Info,
-            message: `Generating entry file`
-        });
-        const dist = path_1.default.resolve(projectPath, output);
-        const manifests = yield (0, fast_glob_1.default)(`${fast_glob_1.default.convertPathToPattern(dist)}/**/manifest.json`);
-        function relativeDist(tar) {
-            return path_1.default.join('.', path_1.default.relative(dist, tar)).replace(path_1.default.sep, '/');
+        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}`);
+            return;
+        }
+        ColorConsole_1.default.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 !');
         }
-        const appTs = yield (0, fast_glob_1.default)(`${fast_glob_1.default.convertPathToPattern(dist)}/**/app.ts`);
-        if (appTs.length !== 1) {
-            ColorConsole_1.default.log({ level: shared_utils_1.LOG_LEVEL.Error, message: 'app.ts can only have one！' });
+        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 !');
+        }
+        function relativeDist(tar) {
+            return path_1.default.join('.', path_1.default.relative(buildDir, tar)).replace(path_1.default.sep, '/');
         }
         let opt = {
-            appPath: relativeDist(appTs[0].replace('.ts', '')),
+            appPath: relativeDist(appTs.replace('.ts', '')),
             aspects: []
         };
-        for (const manifest of manifests) {
-            const content = fs_extra_1.default.readFileSync(manifest, 'utf-8');
-            const data = JSON.parse(content);
-            if ((_a = data === null || data === void 0 ? void 0 : data.router) === null || _a === void 0 ? void 0 : _a.pages) {
-                (_b = opt.aspects) === null || _b === void 0 ? void 0 : _b.push({
-                    name: data.name,
-                    path: relativeDist(path_1.default.resolve(path_1.default.dirname(manifest), 'aspect')),
-                    routes: Object.entries((_c = data === null || data === void 0 ? void 0 : data.router) === null || _c === void 0 ? void 0 : _c.pages).map(([k, v]) => {
-                        return {
-                            importPath: relativeDist(path_1.default.resolve(path_1.default.dirname(manifest), v.path)),
-                            name: k,
-                            route: v.path
-                        };
-                    })
+        function getAspectRoutes(aspectPath) {
+            var _a;
+            const aspectManifestPath = path_1.default.join(aspectPath, 'src', 'manifest.json');
+            const aspectManifest = getManifest(aspectManifestPath);
+            if (!((_a = aspectManifest === null || aspectManifest === void 0 ? void 0 : aspectManifest.router) === null || _a === void 0 ? void 0 : _a.pages))
+                return [];
+            return Object.entries(aspectManifest.router.pages).map(([k, v]) => {
+                return {
+                    importPath: relativeDist(path_1.default.resolve(path_1.default.dirname(aspectManifestPath), v.path)),
+                    name: k,
+                    route: v.path
+                };
+            });
+        }
+        if ((_b = appManifest === null || appManifest === void 0 ? void 0 : appManifest.router) === null || _b === void 0 ? void 0 : _b.aspects) {
+            Object.entries(appManifest.router.aspects).forEach(([name, aspects]) => {
+                aspects.forEach((aspect) => {
+                    var _a;
+                    const aspectPath = path_1.default.join(buildDir, aspect.path);
+                    (_a = opt.aspects) === null || _a === void 0 ? void 0 : _a.push({
+                        name: name,
+                        path: relativeDist(path_1.default.resolve(buildDir, aspect.path, 'src', 'aspect')),
+                        routes: getAspectRoutes(aspectPath)
+                    });
                 });
-            }
+            });
         }
         const template = (0, exports.entryTemplate)(opt);
         fs_extra_1.default.writeFileSync(path_1.default.join(projectPath, output, exports.XtsEntryFileName), template);
-        ColorConsole_1.default.log({
-            level: shared_utils_1.LOG_LEVEL.Info,
-            message: `Entry file built`
-        });
+        ColorConsole_1.default.info(`entry file built`);
     });
-}
+};
 exports.generateEntryFile = generateEntryFile;
-
-//# sourceMappingURL=entryTemplate.js.map

package/lib/followWorks/xts/generateRpk.js

@@ -43,7 +43,7 @@ const ts2wasm_1 = require("./ts2wasm");
 const generateRpk = (context, _, compilerOptions) => __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.log({ message: `skip package due to --skip ${compilerOptions.skip.join(',')}` });
+        ColorConsole_1.default.info(`### skip package due to --skip ${compilerOptions.skip.join(',')}`);
         return;
     }
     const manifestPath = path_1.default.resolve(context.projectPath, 'app', 'manifest.json');
@@ -54,5 +54,3 @@ const generateRpk = (context, _, compilerOptions) => __awaiter(void 0, void 0, v
     });
 });
 exports.generateRpk = generateRpk;
-
-//# sourceMappingURL=generateRpk.js.map

package/lib/followWorks/xts/ts2wasm.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ts2wasm = exports.wasmPackageName = void 0;
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const child_process_1 = require("child_process");
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -38,22 +37,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.log({
-            level: shared_utils_1.LOG_LEVEL.Info,
-            message: 'Waiting for generating app.wasm file.'
-        });
+        ColorConsole_1.default.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.log({
-            level: shared_utils_1.LOG_LEVEL.Info,
-            message: res
-        });
+        ColorConsole_1.default.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.log({
-            message: `skip compile ts to wasm due to --skip ${compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip.join(',')}`
-        });
+        ColorConsole_1.default.info(`### skip compile ts to wasm due to --skip ${compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip.join(',')}`);
     }
     else {
         compile();
@@ -76,5 +67,3 @@ const ts2wasm = (context, _, compilerOptions) => __awaiter(void 0, void 0, void
     fs_1.default.copyFileSync(path_1.default.resolve(fast_glob_1.default.convertPathToPattern(projectPath), output, 'app', 'manifest.json'), path_1.default.resolve(fast_glob_1.default.convertPathToPattern(projectPath), exports.wasmPackageName, 'manifest.json'));
 });
 exports.ts2wasm = ts2wasm;
-
-//# sourceMappingURL=ts2wasm.js.map

package/lib/index.js

@@ -6,5 +6,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XtsConfig = void 0;
 const XtsConfig_1 = __importDefault(require("./config/XtsConfig"));
 exports.XtsConfig = XtsConfig_1.default;
-
-//# sourceMappingURL=index.js.map

package/lib/interface/ICompileOptions.d.ts

@@ -1,4 +1,4 @@
-export declare const skipList: readonly ["install", "ts2wasm", "package"];
+export declare const skipList: readonly ["xts2ts", "install", "ts2wasm", "package"];
 export type ISkipList = typeof skipList;
 export interface IXtsCompileOptions {
     watch?: boolean;

package/lib/interface/ICompileOptions.js

@@ -1,6 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.skipList = void 0;
-exports.skipList = ['install', 'ts2wasm', 'package'];
-
-//# sourceMappingURL=ICompileOptions.js.map
+exports.skipList = ['xts2ts', 'install', 'ts2wasm', 'package'];

package/lib/interface/IDeviceList.js

@@ -1,4 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-
-//# sourceMappingURL=IDeviceList.js.map