@aiot-toolkit/aiotpack 2.0.1-alpha.8 → 2.0.2-beta.1

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,12 @@ 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>[];
+    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 UxPreWorks_1 = __importDefault(require("../utils/ux/UxPreWorks"));
 class UxConfig {
     constructor(projectPath) {
         this.projectPath = projectPath;
         this.exclude = [/node_modules/, /dist/, /build/];
-        this.include = [/src/];
         this.module = {
             rules: [
                 {
@@ -26,20 +27,32 @@ 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
+            UxFollowWorks_1.default.moveBackResult,
+            UxFollowWorks_1.default.protobuf
         ];
+        this.watchIgnores = [/node_modules/];
     }
     get output() {
         const name = path_1.default.basename(this.projectPath);
@@ -48,5 +61,3 @@ class UxConfig {
     }
 }
 exports.default = UxConfig;
-
-//# sourceMappingURL=UxConfig.js.map

package/lib/config/XtsConfig.d.ts

@@ -12,7 +12,7 @@ declare class XtsConfig implements IFileLaneConfig {
             loader: (typeof XtsLoader)[];
         }[];
     };
-    preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork[];
+    preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
+    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
 }
 export default XtsConfig;

package/lib/config/XtsConfig.js

@@ -28,5 +28,3 @@ class XtsConfig {
     }
 }
 exports.default = XtsConfig;
-
-//# sourceMappingURL=XtsConfig.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.d.ts

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

package/lib/followWorks/xts/generateRpk.js

@@ -38,8 +38,14 @@ 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 ts2wasm_1 = require("./ts2wasm");
-const generateRpk = (context) => __awaiter(void 0, void 0, void 0, function* () {
+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.info(`### skip package due to --skip ${compilerOptions.skip.join(',')}`);
+        return;
+    }
     const manifestPath = path_1.default.resolve(context.projectPath, 'app', 'manifest.json');
     const manifest = yield Promise.resolve(`${manifestPath}`).then(s => __importStar(require(s)));
     return XtsFollowWorks_1.default.defaultZipProject(context, {
@@ -48,5 +54,3 @@ const generateRpk = (context) => __awaiter(void 0, void 0, void 0, function* ()
     });
 });
 exports.generateRpk = generateRpk;
-
-//# sourceMappingURL=generateRpk.js.map

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

@@ -1,7 +1,8 @@
 import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { IXtsCompileOptions } from '../../interface/ICompileOptions';
 export declare const wasmPackageName = "wasmUnpacked";
 /**
  * 将 __entry__.ts 文件打包成 warm 文件
  * @param context
  */
-export declare const ts2wasm: FollowWork;
+export declare const ts2wasm: FollowWork<IXtsCompileOptions>;

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"));
@@ -25,11 +24,8 @@ exports.wasmPackageName = 'wasmUnpacked';
  * 将 __entry__.ts 文件打包成 warm 文件
  * @param context
  */
-const ts2wasm = (context) => __awaiter(void 0, void 0, void 0, function* () {
-    ColorConsole_1.default.log({
-        level: shared_utils_1.LOG_LEVEL.Info,
-        message: 'Waiting for generating app.wasm file.'
-    });
+const ts2wasm = (context, _, compilerOptions) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     /** 1. 生成 app.wasm 文件 */
     const { projectPath, output } = context;
     const buildDir = path_1.default.resolve(projectPath, output);
@@ -38,15 +34,21 @@ const ts2wasm = (context) => __awaiter(void 0, void 0, void 0, function* () {
     fs_1.default.mkdirSync(wasmDir, {
         recursive: true
     });
-    // TODO: 后续修改为 @mi
-    const ts2wasmpath = path_1.default.resolve(projectPath, 'node_modules', 'mi/wasmnizer-ts');
-    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
-    });
+    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.');
+        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()}`);
+    }
+    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(',')}`);
+    }
+    else {
+        compile();
+    }
     /** 2. 拷贝静态资源 */
     // TODO: ignore 数组待优化
     const files = fast_glob_1.default.sync(`${fast_glob_1.default.convertPathToPattern(projectPath)}/${output}/**/*`, {
@@ -65,5 +67,3 @@ const ts2wasm = (context) => __awaiter(void 0, void 0, void 0, function* () {
     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

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

package/lib/interface/ICompileOptions.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.skipList = void 0;
+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

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

@@ -1,10 +1,12 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
+import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
  * 处理app.ux的Loader
  * AppUxLoader
  */
 declare class AppUxLoader implements ILoader {
     context: IFileLaneContext;
+    compilerOption: IJavascriptCompileOption;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default AppUxLoader;

package/lib/loader/ux/AppUxLoader.js

@@ -21,11 +21,9 @@ class AppUxLoader {
     parser(files) {
         return __awaiter(this, void 0, void 0, function* () {
             const resultFiles = [];
-            yield UxLoaderUtils_1.default.compileAppUxToJavascript(files[0], resultFiles, this.context);
+            yield UxLoaderUtils_1.default.compileAppUxToJavascript(files[0], resultFiles, this.context, this.compilerOption);
             return resultFiles;
         });
     }
 }
 exports.default = AppUxLoader;
-
-//# sourceMappingURL=AppUxLoader.js.map

package/lib/loader/ux/JsLoader.d.ts

@@ -0,0 +1,9 @@
+import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
+/**
+ * JsLoader
+ */
+declare class JsLoader implements ILoader {
+    context: IFileLaneContext;
+    parser(files: IFileParam<any>[]): IFileParam<any>[] | Promise<IFileParam<any>[]>;
+}
+export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ParserUtil_1 = __importDefault(require("@aiot-toolkit/parser/lib/utils/ParserUtil"));
+const ScriptParser_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/parser/ScriptParser"));
+const ScriptToTypescript_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/ScriptToTypescript"));
+/**
+ * JsLoader
+ */
+class JsLoader {
+    parser(files) {
+        const project = ParserUtil_1.default.createProject();
+        const onLog = () => { };
+        return files.map((item) => {
+            if (!item.content) {
+                return {
+                    path: item.path,
+                    content: item.content
+                };
+            }
+            const options = {
+                filePath: item.path,
+                projectPath: this.context.projectPath,
+                onLog
+            };
+            return {
+                path: item.path,
+                content: new ScriptToTypescript_1.default(project, options)
+                    .translate({
+                    content: new ScriptParser_1.default(options).parser(item.content.toString()).ast.content
+                }, [])
+                    .targetTree.getFullText()
+            };
+        });
+    }
+}
+exports.default = JsLoader;

package/lib/loader/ux/PngLoader.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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
 const path_1 = __importDefault(require("path"));
@@ -31,10 +30,7 @@ class PngLoader {
                 const fullName = `${name}${ext}`;
                 //判断文本，空文本则结束该文件处理
                 if (!content) {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Warn,
-                        message: `【XtsLoader】the file '${fullName}' under the path '${filePath}' has no content `
-                    });
+                    ColorConsole_1.default.warn(`The file '${fullName}' under the path '${filePath}' has no content `);
                     return [];
                 }
                 // 判断传入的.png资源是不是.9.png资源
@@ -58,13 +54,12 @@ class PngLoader {
                     yield aaptjs.singleCrunch(filePath, outputFile);
                 }
                 catch (error) {
-                    // 报错
-                    console.error('.9.png资源文件优化失败', error);
+                    ColorConsole_1.default.throw(`.9.png resource file processing failed`);
                 }
             }
         });
     }
 }
+;
+PngLoader.raw = true;
 exports.default = PngLoader;
-
-//# sourceMappingURL=PngLoader.js.map

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

@@ -1,6 +1,8 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
+import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 declare class UxLoader implements ILoader {
     context: IFileLaneContext;
+    compilerOption: IJavascriptCompileOption;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default UxLoader;

package/lib/loader/ux/UxLoader.js

@@ -12,20 +12,31 @@ 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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const path_1 = __importDefault(require("path"));
 const UxLoaderUtils_1 = __importDefault(require("../../utils/ux/UxLoaderUtils"));
 class UxLoader {
     parser(files) {
         return __awaiter(this, void 0, void 0, function* () {
             const resultFiles = [];
+            const { projectPath } = this.context;
             for (const file of files) {
                 // 转换每个文件
-                const compileFiles = yield UxLoaderUtils_1.default.compileUxToJavascript(file, this.context, false);
-                resultFiles.push(...compileFiles);
+                const { files, logs } = yield UxLoaderUtils_1.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
+                if (logs) {
+                    logs.forEach((item) => {
+                        ColorConsole_1.default.logger(Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' }));
+                    });
+                    // 如果有 error throw，则停止
+                    if (logs.some((item) => item.level && [shared_utils_1.LOG_LEVEL.Throw].includes(item.level))) {
+                        throw new Error('stop!');
+                    }
+                }
+                resultFiles.push(...files);
             }
             return resultFiles;
         });
     }
 }
 exports.default = UxLoader;
-
-//# sourceMappingURL=UxLoader.js.map

package/lib/loader/xts/XtsLoader.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const generator_1 = require("@aiot-toolkit/generator");
 const parser_1 = require("@aiot-toolkit/parser");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
 const path_1 = __importDefault(require("path"));
@@ -24,14 +23,11 @@ class XtsLoader {
             const newFileName = `${name}.ts`;
             //判断文本，空文本则结束该文件处理
             if (!content) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Warn,
-                    message: `【XtsLoader】the file '${fullName}' under the path '${path}' has no content `
-                });
+                ColorConsole_1.default.warn(`The file '${fullName}' under the path '${path}' has no content `);
                 return [];
             }
-            const parserResult = new parser_1.XtsParser(project, ColorConsole_1.default.log).parser(content, fullName);
-            const { ast, mapList } = new parser_1.XtsToTypescript(project, ColorConsole_1.default.log, this.context, path).translate(parserResult.ast, parserResult.offsetList);
+            const parserResult = new parser_1.XtsParser(project, ColorConsole_1.default.logger).parser(content.toString(), fullName);
+            const { ast, mapList } = new parser_1.XtsToTypescript(project, ColorConsole_1.default.logger, this.context, path).translate(parserResult.ast, parserResult.offsetList);
             const { code, sourcemap } = new generator_1.TypescriptGenerator().generate({
                 sourceFilePath: fullName,
                 targetFilePath: newFileName,
@@ -51,5 +47,3 @@ class XtsLoader {
     }
 }
 exports.default = XtsLoader;
-
-//# sourceMappingURL=XtsLoader.js.map

package/lib/preWorks/xts/preInstall.d.ts

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

package/lib/preWorks/xts/preInstall.js

@@ -13,16 +13,22 @@ 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 child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const preInstall = (context) => __awaiter(void 0, void 0, void 0, function* () {
+const preInstall = (context, _, __, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    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(',')}`);
+        return;
+    }
     const { projectPath } = context;
     const packagePath = path_1.default.resolve(projectPath, 'package.json');
     const preContent = {
         dependencies: {
-            '@mi/ts-framework': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/ts-framework/-/@mi/ts-framework-1.0.6.tgz',
-            '@mi/wasmnizer-ts': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/wasmnizer-ts/-/@mi/wasmnizer-ts-0.0.9.tgz'
+            '@mi/ts-framework': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/ts-framework/-/@mi/ts-framework-1.0.9.tgz',
+            '@mi/wasmnizer-ts': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/wasmnizer-ts/-/@mi/wasmnizer-ts-0.0.12.tgz'
         }
     };
     if (!fs_1.default.existsSync(packagePath)) {
@@ -41,12 +47,12 @@ const preInstall = (context) => __awaiter(void 0, void 0, void 0, function* () {
             });
         }
     }
+    ColorConsole_1.default.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.');
 });
 exports.preInstall = preInstall;
-
-//# sourceMappingURL=preInstall.js.map