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

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/ux/UxPreWorks.d.ts

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

package/lib/preWorks/ux/UxPreWorks.js

@@ -0,0 +1,31 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
+/**
+ * UxPreWorks
+ */
+class UxPreWorks {
+}
+_a = UxPreWorks;
+UxPreWorks.validateManifest = (context) => __awaiter(void 0, void 0, void 0, function* () {
+    const { projectPath } = context;
+    return UxFileUtils_1.default.validateManifest(projectPath);
+});
+UxPreWorks.validateSitemap = (context) => __awaiter(void 0, void 0, void 0, function* () {
+    const { projectPath } = context;
+    UxFileUtils_1.default.validateSitemap(projectPath);
+});
+exports.default = UxPreWorks;

package/lib/preWorks/xts/preInstall.js

@@ -20,16 +20,14 @@ const path_1 = __importDefault(require("path"));
 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.log({
-            message: `skip install pre-dependencies due to --skip ${compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip.join(',')}`
-        });
+        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.7.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'
         }
     };
@@ -49,18 +47,12 @@ const preInstall = (context, _, __, compilerOption) => __awaiter(void 0, void 0,
             });
         }
     }
-    ColorConsole_1.default.log({
-        message: 'Installing pre-dependencies. The initial build may take some time, please be patient...'
-    });
+    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.log({
-        message: 'Dependencies installation complete.'
-    });
+    ColorConsole_1.default.info('### Dependencies installation complete.');
 });
 exports.preInstall = preInstall;
-
-//# sourceMappingURL=preInstall.js.map

package/lib/utils/PngUtils.js

@@ -41,5 +41,3 @@ class PngUtils {
     }
 }
 exports.default = PngUtils;
-
-//# sourceMappingURL=PngUtils.js.map

package/lib/utils/PreWorkUtils.d.ts

@@ -13,5 +13,10 @@ declare class PreWorkUtils {
      */
     static getEntries(context: IFileLaneContext): Promise<void>;
     static clean: PreWork<IJavascriptCompileOption>;
+    /**
+     * 获取项目的全局样式变量配置
+     * @param context
+     */
+    static getGlobalVar(context: IFileLaneContext): Promise<void>;
 }
 export default PreWorkUtils;

package/lib/utils/PreWorkUtils.js

@@ -13,10 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
+const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const del_1 = __importDefault(require("del"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
+const TranslateCache_1 = __importDefault(require("../../../parser/lib/ux/translate/vela/TranslateCache"));
 const UxFileUtils_1 = __importDefault(require("./ux/UxFileUtils"));
+const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 /**
  * PreWorkUtils
  */
@@ -37,11 +40,13 @@ class PreWorkUtils {
         if (manifestContent) {
             const { router } = manifestContent;
             if (!router) {
-                // 报错，没有router配置
+                // 没有router配置
+                ColorConsole_1.default.throw(`### manifest ### No router configuration`);
             }
             const { pages } = router;
             if (!pages) {
-                // 报错，没有pages配置
+                // 没有pages配置
+                ColorConsole_1.default.throw(`### manifest ### No pages configuration`);
             }
             Object.keys(pages).map((page) => {
                 const pageContent = pages[page];
@@ -51,26 +56,52 @@ class PreWorkUtils {
                     entryList.push(entryPage);
                 }
                 else {
-                    // 报错，路径不存在
+                    // 路径不存在
+                    ColorConsole_1.default.throw(`### manifest ### path '${entryPage}' does not exist`);
                 }
             });
             context['entries'] = entryList;
             return Promise.resolve();
         }
         else {
-            // 报错 manifest.json文件无有效内容
+            // manifest.json文件无有效内容
+            ColorConsole_1.default.error(`### manifest ### File has no valid content`);
             return Promise.reject();
         }
     }
+    /**
+     * 获取项目的全局样式变量配置
+     * @param context
+     */
+    static getGlobalVar(context) {
+        const { projectPath } = context;
+        const filePath = path_1.default.join(projectPath, 'src', 'globalVar.json');
+        let globalVar = {};
+        // 判断文件是否存在
+        if (fs_extra_1.default.existsSync(filePath)) {
+            // 存在则取内容，否则内容为空
+            globalVar = fs_extra_1.default.readJSONSync(filePath);
+        }
+        context.globalVar = globalVar;
+        return Promise.resolve();
+    }
 }
 _a = PreWorkUtils;
 PreWorkUtils.clean = (context, _, config, compileOption) => __awaiter(void 0, void 0, void 0, function* () {
-    (0, del_1.default)(path_1.default.join(context.projectPath, context.output));
+    yield (0, del_1.default)(path_1.default.join(context.projectPath, context.output));
     if (compileOption) {
-        (0, del_1.default)(path_1.default.join(compileOption.projectPath, compileOption.outputPath));
-        (0, del_1.default)(path_1.default.join(compileOption.projectPath, compileOption.releasePath));
+        yield (0, del_1.default)(path_1.default.join(compileOption.projectPath, compileOption.outputPath));
+        yield (0, del_1.default)(path_1.default.join(compileOption.projectPath, compileOption.releasePath));
+        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.outputPath));
+        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.releasePath));
     }
+    TranslateCache_1.default.featureCache.clear();
+    BinaryPlugin.reset();
+    BinaryPlugin.config = {
+        projectPath: context.projectPath,
+        outputProjectPath: path_1.default.join(context.projectPath, context.output),
+        source: compileOption === null || compileOption === void 0 ? void 0 : compileOption.sourceRoot,
+        output: compileOption === null || compileOption === void 0 ? void 0 : compileOption.outputPath
+    };
 });
 exports.default = PreWorkUtils;
-
-//# sourceMappingURL=PreWorkUtils.js.map

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

@@ -0,0 +1,3 @@
+import { JSONSchemaType } from '@aiot-toolkit/shared-utils/lib/utils/CommonUtil';
+declare const ManifestSchema: JSONSchemaType;
+export default ManifestSchema;

package/lib/utils/ux/ManifestSchema.js

@@ -0,0 +1,207 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ManifestSchema = {
+    type: 'object',
+    required: ['package', 'name', 'icon', 'versionCode', 'config', 'router'],
+    properties: {
+        package: {
+            type: 'string'
+        },
+        name: {
+            type: 'string'
+        },
+        icon: {
+            type: 'string'
+        },
+        banner: {
+            type: 'string'
+        },
+        versionName: {
+            type: 'string'
+        },
+        versionCode: {
+            type: ['number']
+        },
+        minPlatformVersion: {
+            type: ['number']
+        },
+        features: {
+            type: 'array',
+            items: {
+                type: 'object',
+                properties: {
+                    name: {
+                        type: 'string'
+                    }
+                }
+            }
+        },
+        config: {
+            type: 'object',
+            properties: {
+                logLevel: {
+                    enum: ['off', 'error', 'warn', 'info', 'log', 'debug']
+                },
+                designWidth: {
+                    type: ['number', 'string']
+                },
+                data: {
+                    // TODO 全局数据对象，属性名不能以$或_开头，
+                    type: 'object'
+                },
+                background: {
+                    // TODO 更详细的后台运行配置信息，
+                    type: 'object'
+                },
+                network: {
+                    // TODO 更详细的网络配置信息，
+                    type: 'object'
+                }
+            }
+        },
+        router: {
+            // TODO 更详细的后台运行配置信息，
+            type: 'object',
+            required: ['entry', 'pages'],
+            properties: {
+                entry: {
+                    type: 'string'
+                },
+                // TODO 看下 key 不确定能否校验值，
+                pages: {
+                    type: 'object'
+                },
+                errorPage: {
+                    type: 'string'
+                },
+                // TODO 看下 key 不确定能否校验值，
+                widgets: {
+                    type: 'object'
+                }
+            }
+        },
+        display: {
+            type: 'object',
+            properties: {
+                backgroundColor: {
+                    // TODO HEXColor
+                    type: 'string'
+                },
+                fullScreen: {
+                    type: 'boolean'
+                },
+                titleBar: {
+                    type: 'boolean'
+                },
+                titleBarBackgroundColor: {
+                    // TODO HEXColor
+                    type: 'string'
+                },
+                titleBarTextColor: {
+                    // TODO HEXColor
+                    type: 'string'
+                },
+                menu: {
+                    type: 'boolean'
+                },
+                windowSoftInputMode: {
+                    enum: ['adjustPan', 'adjustResize']
+                },
+                pages: {
+                    type: 'object'
+                },
+                orientation: {
+                    enum: ['portrait', 'landscape']
+                },
+                statusBarImmersive: {
+                    type: 'boolean'
+                },
+                statusBarTextStyle: {
+                    enum: ['light', 'dark', 'auto']
+                },
+                statusBarBackgroundColor: {
+                    type: 'string'
+                },
+                statusBarBackgroundOpacity: {
+                    type: 'number'
+                },
+                fitCutout: {
+                    enum: ['none', 'portrait', 'landscape']
+                },
+                textSizeAdjust: {
+                    enum: ['none', 'auto']
+                },
+                themeMode: {
+                    enum: [-1, 0, 1]
+                },
+                menuBarData: {
+                    // TODO 详细校验
+                    type: 'object'
+                },
+                forceDark: {
+                    type: 'boolean'
+                },
+                pageCache: {
+                    type: 'boolean'
+                },
+                cacheDuration: {
+                    type: 'number'
+                }
+            }
+        },
+        subpackages: {
+            // TODO 与后面的分包校验融合
+            type: 'array',
+            items: {
+                type: 'object',
+                properties: {
+                    name: {
+                        type: 'string'
+                    },
+                    // TODO 详细的规则校验
+                    resource: {
+                        type: 'string'
+                    }
+                },
+                // 是否必须?
+                required: ['name', 'resource']
+            }
+        },
+        menuBarData: {
+            type: 'object',
+            properties: {
+                menuBar: {
+                    type: 'boolean'
+                },
+                menuBarStyle: {
+                    enum: ['dark', 'light']
+                },
+                shareTitle: {
+                    type: 'string'
+                },
+                shareDescription: {
+                    type: 'string'
+                },
+                shareIcon: {
+                    type: 'string'
+                },
+                shareCurrentPage: {
+                    type: 'string'
+                },
+                shareParams: {
+                    type: 'string'
+                },
+                shareUrl: {
+                    type: 'string'
+                }
+            }
+        },
+        deviceTypeList: {
+            type: 'array',
+            items: {
+                type: 'string'
+            }
+        }
+    }
+};
+exports.default = ManifestSchema;

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

@@ -1,8 +1,5 @@
 import IManifest from '../../compiler/javascript/vela/interface/IManifest';
-/**
- * FileUtils
- */
-declare class UxFileUtils {
+export declare class UxFileUtils {
     static readonly CONFIG_FILE_NAME = "manifest.json";
     /**
      * 获取manifest.json路径
@@ -18,5 +15,25 @@ declare class UxFileUtils {
      * @returns
      */
     static getMainfestInfo(projectPath: string, sourceRoot?: string): IManifest;
+    /**
+     * 检查 manifest文件，并显示错误信息
+     *
+     * 1. TypeError，使用Error 样式
+     * 2. 其它错误，使用 Warn 样式
+     * 3. 如果存在TypeError，则终止程序
+     *
+     * @param projectPath 项目路径
+     * @param sourceRoot 源码路径--相对项目根目录
+     * @returns
+     */
+    static validateManifest(projectPath: string, sourceRoot?: string): Error[] | undefined;
+    /**
+     * 检查 sitemap.json 文件，并显示错误信息
+     *
+     * 1. 当sitemap.json的 rules 中配置的page 不存在于 manifest.json 中时，报错并终止程序
+     * @param projectPath
+     * @param sourceRoot
+     */
+    static validateSitemap(projectPath: string, sourceRoot?: string): void;
 }
 export default UxFileUtils;