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

package/lib/loader/ux/{UxLoader.js → vela/UxLoader.js}

@@ -13,9 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (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"));
+const UxLoaderUtils_1 = __importDefault(require("../../../utils/ux/UxLoaderUtils"));
 class UxLoader {
     parser(files) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -23,17 +22,9 @@ class UxLoader {
             const { projectPath } = this.context;
             for (const file of files) {
                 // 转换每个文件
-                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);
+                const { files: compiledFiles, logs } = yield UxLoaderUtils_1.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
+                shared_utils_1.CommonUtil.processingLogsInTerminal(logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' }))));
+                resultFiles.push(...compiledFiles);
             }
             return resultFiles;
         });

package/lib/loader/xts/XtsLoader.js

@@ -5,8 +5,7 @@ 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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const path_1 = __importDefault(require("path"));
 const ts_morph_1 = require("ts-morph");
 /**
@@ -23,11 +22,11 @@ class XtsLoader {
             const newFileName = `${name}.ts`;
             //判断文本，空文本则结束该文件处理
             if (!content) {
-                ColorConsole_1.default.warn(`The file '${fullName}' under the path '${path}' has no content `);
+                shared_utils_1.ColorConsole.warn(`The file '${fullName}' under the path '${path}' has no content `);
                 return [];
             }
-            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 parserResult = new parser_1.XtsParser(project, shared_utils_1.ColorConsole.logger).parser(content.toString(), fullName);
+            const { ast, mapList } = new parser_1.XtsToTypescript(project, shared_utils_1.ColorConsole.logger, this.context, path).translate(parserResult.ast, parserResult.offsetList);
             const { code, sourcemap } = new generator_1.TypescriptGenerator().generate({
                 sourceFilePath: fullName,
                 targetFilePath: newFileName,
@@ -35,10 +34,10 @@ class XtsLoader {
                 mapList
             });
             resultFiles.push({
-                path: FileUtil_1.default.updatePath(path, newFileName),
+                path: shared_utils_1.FileUtil.updateFileName(path, newFileName),
                 content: code
             }, {
-                path: FileUtil_1.default.updatePath(path, `${name}.map.ts`),
+                path: shared_utils_1.FileUtil.updateFileName(path, `${name}.map.ts`),
                 content: sourcemap
             });
         }

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

@@ -1,4 +1,4 @@
-import { PreWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { PreWork } from 'file-lane';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
  * UxPreWorks

package/lib/{utils → preWorks}/ux/UxPreWorks.js

@@ -13,7 +13,7 @@ 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
  */

package/lib/preWorks/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/xts/preInstall.js

@@ -13,14 +13,14 @@ 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* () {
     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(',')}`);
+        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 +47,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/utils/PreWorkUtils.d.ts

@@ -1,5 +1,4 @@
-import { IFileLaneContext } from 'file-lane';
-import { PreWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { IFileLaneContext, PreWork } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
 /**
  * PreWorkUtils

package/lib/utils/PreWorkUtils.js

@@ -13,7 +13,8 @@ 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 parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const del_1 = __importDefault(require("del"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -37,37 +38,35 @@ class PreWorkUtils {
         const manifestContent = UxFileUtils_1.default.getMainfestInfo(projectPath);
         // 存储entries
         let entryList = [];
-        if (manifestContent) {
-            const { router } = manifestContent;
-            if (!router) {
-                // 没有router配置
-                ColorConsole_1.default.throw(`### manifest ### No router configuration`);
-            }
+        const { router } = manifestContent;
+        if (router) {
             const { pages } = router;
-            if (!pages) {
+            if (pages) {
+                Object.keys(pages).map((page) => {
+                    const pageContent = pages[page];
+                    const entryDir = path_1.default.join(srcPath, page);
+                    const entryPages = parser_1.ExtensionConfig.TEMPLATES.map((item) => `${pageContent.component}${item}`);
+                    const entry = entryPages.find((item) => fs_extra_1.default.existsSync(path_1.default.join(entryDir, item)));
+                    if (entry) {
+                        entryList.push(path_1.default.join(entryDir, entry));
+                    }
+                    else {
+                        // 路径不存在
+                        shared_utils_1.ColorConsole.throw(`### manifest ### path '${entryDir}/${entryPages.join(' | ')}' does not exist`);
+                    }
+                });
+            }
+            else {
                 // 没有pages配置
-                ColorConsole_1.default.throw(`### manifest ### No pages configuration`);
+                shared_utils_1.ColorConsole.throw(`### manifest ### No pages configuration`);
             }
-            Object.keys(pages).map((page) => {
-                const pageContent = pages[page];
-                const entryDir = path_1.default.join(srcPath, page);
-                const entryPage = path_1.default.join(entryDir, `${pageContent.component}.ux`);
-                if (fs_extra_1.default.existsSync(entryPage)) {
-                    entryList.push(entryPage);
-                }
-                else {
-                    // 路径不存在
-                    ColorConsole_1.default.throw(`### manifest ### path '${entryPage}' does not exist`);
-                }
-            });
-            context['entries'] = entryList;
-            return Promise.resolve();
         }
         else {
-            // manifest.json文件无有效内容
-            ColorConsole_1.default.error(`### manifest ### File has no valid content`);
-            return Promise.reject();
+            // 没有router配置
+            shared_utils_1.ColorConsole.throw(`### manifest ### No router configuration`);
         }
+        context['entries'] = entryList;
+        return Promise.resolve();
     }
     /**
      * 获取项目的全局样式变量配置
@@ -88,17 +87,16 @@ class PreWorkUtils {
 }
 _a = PreWorkUtils;
 PreWorkUtils.clean = (context, _, config, compileOption) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (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), { force: true });
     if (compileOption) {
-        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();
+    context.translateCache = new TranslateCache_1.default();
     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
     };

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

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

package/lib/utils/ux/UxFileUtils.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UxFileUtils = void 0;
 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 fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const ManifestSchema_1 = __importDefault(require("./ManifestSchema"));
@@ -43,28 +41,28 @@ class UxFileUtils {
     static validateManifest(projectPath, sourceRoot = 'src') {
         const path = UxFileUtils.getManifestFilePath(projectPath, sourceRoot);
         if (!fs_extra_1.default.existsSync(path)) {
-            ColorConsole_1.default.throw(`file is missing`, {
+            shared_utils_1.ColorConsole.throw(`file is missing`, {
                 word: path,
-                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
+                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW)
             });
         }
         const jsonData = this.getMainfestInfo(projectPath, sourceRoot);
         const schema = ManifestSchema_1.default;
-        const errors = CommonUtil_1.default.validateJson(jsonData, schema);
+        const errors = shared_utils_1.CommonUtil.validateJson(jsonData, schema);
         if (errors) {
-            ColorConsole_1.default.warn(`Manefest.json error: `, ...errors.map((item, index) => {
+            shared_utils_1.ColorConsole.warn(`Manefest.json error: `, ...errors.map((item, index) => {
                 return {
-                    word: `\r\n${index + 1}. ${item.message}`,
+                    word: `\r\n${index + 1}.${item.message}`,
                     style: item instanceof TypeError
-                        ? ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Error)
-                        : ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Warn)
+                        ? shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.ERROR)
+                        : shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.WARN)
                 };
             }));
             const stop = Boolean(errors.find((item) => item instanceof TypeError));
             if (stop) {
-                ColorConsole_1.default.throw({
+                shared_utils_1.ColorConsole.throw({
                     word: `missing required content, program stoped`,
-                    style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
+                    style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW)
                 });
             }
         }
@@ -87,13 +85,13 @@ class UxFileUtils {
                 rules.forEach((item, index) => {
                     const page = item.page;
                     if (page !== '*' && !pages.includes(page)) {
-                        ColorConsole_1.default.throw(`The ${index + 1}th item of sitemap rules is configured incorrectly, the page ${page} does not exist`);
+                        shared_utils_1.ColorConsole.throw(`The ${index + 1}th item of sitemap rules is configured incorrectly, the page ${page} does not exist`);
                     }
                     return page;
                 });
             }
             catch (error) {
-                ColorConsole_1.default.warn(error === null || error === void 0 ? void 0 : error.toString());
+                shared_utils_1.ColorConsole.warn(error === null || error === void 0 ? void 0 : error.toString());
             }
         }
     }

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

@@ -24,7 +24,10 @@ declare class UxLoaderUtils {
      * @param resultFiles
      * @param context
      */
-    static compileAppUxToJavascript(file: IFileParam, resultFiles: IFileParam[], context: IFileLaneContext, compileOption: IJavascriptCompileOption): Promise<void>;
+    static compileAppUxToJavascript(file: IFileParam, context: IFileLaneContext, compileOption: IJavascriptCompileOption): Promise<{
+        files: IFileParam<any>[];
+        logs: ILog[];
+    }>;
     /**
      * 判断是否为src/app.ux
      * @param filePath
@@ -37,7 +40,7 @@ declare class UxLoaderUtils {
      * @param filePath
      * @returns
      */
-    static isPageUx(context: IFileLaneContext, filePath: string): any;
+    static isPageUx(context: IFileLaneContext, filePath: string): boolean;
     /**
      * 获取app.ux的内容，且只返回script和style内容
      * @param fileContent
@@ -51,14 +54,14 @@ declare class UxLoaderUtils {
      * @returns
      */
     static wrapTempalte(templateTree: SourceFile, file: IFileParam, compilerOption: IJavascriptCompileOption): string;
-    private static wrapStyle;
+    static wrapStyle(code: string, file: IFileParam, compilerOption: IJavascriptCompileOption): string;
     /**
      * 给script增加外层包裹内容
      * @param isPageUx
      * @param appScriptTree
      * @returns
      */
-    static handleScriptContent(isPageUx: boolean, appScriptTree: SourceFile): string;
+    static wrapScript(isPageUx: boolean, appScriptTree: SourceFile): string;
     static getReturnType(isPageUx: boolean): "$app_exports$['entry'] =" | "module.exports = ";
 }
 export default UxLoaderUtils;

package/lib/utils/ux/UxLoaderUtils.js

@@ -36,12 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const generator_1 = require("@aiot-toolkit/generator");
-const UxParser_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/parser/UxParser"));
+const parser_1 = require("@aiot-toolkit/parser");
 const UxToTypescript_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/UxToTypescript"));
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
-const StringUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/StringUtil"));
-const parse5 = __importStar(require("parse5"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const parse5 = __importStar(require("aiot-parse5"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const ts_morph_1 = require("ts-morph");
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
@@ -68,44 +67,63 @@ class UxLoaderUtils {
             const newFileName = `${name}.js`;
             //判断文本，空文本则结束该文件处理
             if (!content) {
-                ColorConsole_1.default.warn(`The file '${fullName}' under the path '${filePath}' has no content `);
+                shared_utils_1.ColorConsole.warn(`The file '${fullName}' under the path '${filePath}' has no content `);
                 return {
                     files: [],
                     logs
                 };
             }
+            // 区分页面组件和子组件
+            const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
             // 配置转换参数
             const options = {
                 projectPath: context.projectPath,
+                projectType: shared_utils_1.ProjectType.VELA_UX,
                 filePath,
+                fileType: isAppUx ? 'app' : isPageUx ? 'page' : '',
+                content: content.toString(),
                 onLog: (log) => {
                     logs.push(log);
                 }
             };
+            // 收集图片资源
+            const ImageResources = [];
+            const collectImageResource = (originFilePath) => {
+                const assetDir = 'dynamicAssets';
+                const sourcePath = path_1.default.resolve(options.projectPath, compilerOption.sourceRoot);
+                const assetPath = path_1.default.resolve(sourcePath, assetDir);
+                const { name, ext } = path_1.default.parse(originFilePath);
+                const hashName = shared_utils_1.CommonUtil.calcImageDigest(originFilePath);
+                const newFilePath = path_1.default.join(assetPath, `${name}-${hashName}${ext}`);
+                const relativePath = path_1.default.posix.sep + path_1.default.relative(sourcePath, newFilePath).split(path_1.default.sep).join(path_1.default.posix.sep);
+                ImageResources.push({
+                    path: newFilePath,
+                    content: fs_extra_1.default.readFileSync(originFilePath)
+                });
+                return relativePath;
+            };
             // 开始转换
             const globalVar = ('globalVar' in context && context.globalVar) || {};
-            const parserResult = yield new UxParser_1.default(options, globalVar).parser(content.toString(), fullName);
+            const parserResult = yield new parser_1.UxParser(options, compilerOption, globalVar, collectImageResource).parser();
             // 区分app.ux和一般ux
             // app.ux解析结果中加上manifest.json的内容
             const manifestJson = `require('./manifest.json')`;
-            // 区分页面组件和子组件
-            const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
             const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
                 // script代码放在第三个位置不能变化，影响更新source map
                 return isAppUx
                     ? [
                         `${appImport.join('\n')}`,
-                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(StringUtil_1.default.arrayTostring(appStyleTree, true), file, compilerOption)}`,
-                        `var $app_script$ = ${UxLoaderUtils.handleScriptContent(false, appScriptTree)}\n`,
-                        `$app_script$({}, $app_exports$, $app_require$);\n\n`,
+                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`,
+                        `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}`,
+                        `$app_script$({}, $app_exports$, $app_require$);`,
                         `$app_exports$.default.style = $app_style$;`,
                         `$app_exports$.default.manifest = ${manifestJson}`
                     ]
                     : [
                         `${appImport.join('\n')}`,
-                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(StringUtil_1.default.arrayTostring(appStyleTree, true), file, compilerOption)}\n`,
-                        `var $app_script$ = ${UxLoaderUtils.handleScriptContent(isPageUx, appScriptTree)}`,
-                        `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}\n`,
+                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`,
+                        `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}`,
+                        `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`,
                         `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`,
                         `$app_script$({}, $app_exports$, $app_require$);`,
                         `$app_exports$.default.template = $app_template$;`,
@@ -113,7 +131,7 @@ class UxLoaderUtils {
                         `}`
                     ];
             };
-            const { targetTree, mapList, sourceMap } = yield new UxToTypescript_1.default(options, project, integrateFunction, compilerOption).translate(parserResult.ast, []);
+            const { targetTree, mapList, sourceMap } = yield new UxToTypescript_1.default(options, project, integrateFunction, compilerOption, context).translate(parserResult.ast, []);
             const { code } = new generator_1.TypescriptGenerator().generate({
                 sourceFilePath: fullName,
                 targetFilePath: newFileName,
@@ -124,13 +142,14 @@ class UxLoaderUtils {
             return {
                 files: [
                     {
-                        path: FileUtil_1.default.updatePath(filePath, newFileName),
+                        path: filePath,
                         content: code
                     },
                     {
-                        path: FileUtil_1.default.updatePath(filePath, `${name}.js.map`),
+                        path: shared_utils_1.FileUtil.updateFileName(filePath, `${name}${ext}.map`),
                         content: sourceMap.toString()
-                    }
+                    },
+                    ...ImageResources
                 ],
                 logs
             };
@@ -142,7 +161,7 @@ class UxLoaderUtils {
      * @param resultFiles
      * @param context
      */
-    static compileAppUxToJavascript(file, resultFiles, context, compileOption) {
+    static compileAppUxToJavascript(file, context, compileOption) {
         return __awaiter(this, void 0, void 0, function* () {
             const { path: filePath, content } = file;
             let appContent = content;
@@ -153,7 +172,7 @@ class UxLoaderUtils {
             }
             // 解析script和style两部分
             const compileResult = yield UxLoaderUtils.compileUxToJavascript({ path: filePath, content: appContent }, context, isAppUx, compileOption);
-            resultFiles.push(...compileResult.files);
+            return compileResult;
         });
     }
     /**
@@ -173,7 +192,8 @@ class UxLoaderUtils {
      * @returns
      */
     static isPageUx(context, filePath) {
-        return ('entries' in context && context.entries.find((entryItem) => entryItem === filePath));
+        var _a;
+        return Boolean((_a = context.entries) === null || _a === void 0 ? void 0 : _a.includes(filePath));
     }
     /**
      * 获取app.ux的内容，且只返回script和style内容
@@ -289,7 +309,7 @@ class UxLoaderUtils {
      * @param appScriptTree
      * @returns
      */
-    static handleScriptContent(isPageUx, appScriptTree) {
+    static wrapScript(isPageUx, appScriptTree) {
         if (isPageUx) {
             // 页面组件添加ViewModel处理代码
             appScriptTree.addStatements(UxLoaderUtils.contenAccess);

package/lib/utils/ux/android/AndroidUx.d.ts

@@ -0,0 +1,27 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
+import { IFileLaneContext, IFileParam } from 'file-lane';
+import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+/**
+ * AndroidUx
+ */
+declare class AndroidUx {
+    /**
+     *
+     * 编译 ux 文件
+     * 1. 获取文件类型：app  page  普通ux
+     * 2. 使用`UxParse`解析
+     * 3. 使用`UxToTypeScript`转换
+     * 4. 使用`TypeScriptGenerator`生成
+     * @param params
+     */
+    compileUx(params: {
+        context: IFileLaneContext;
+        file: IFileParam;
+        compilerOption: IJavascriptCompileOption;
+    }): Promise<{
+        files: IFileParam[];
+        logs: ILog[];
+    }>;
+    private getFileType;
+}
+export default AndroidUx;

package/lib/utils/ux/android/AndroidUx.js

@@ -0,0 +1,98 @@
+"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 parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const UxToTypescript_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/android/UxToTypescript"));
+const generator_1 = require("@aiot-toolkit/generator");
+const path_1 = __importDefault(require("path"));
+/**
+ * AndroidUx
+ */
+class AndroidUx {
+    /**
+     *
+     * 编译 ux 文件
+     * 1. 获取文件类型：app  page  普通ux
+     * 2. 使用`UxParse`解析
+     * 3. 使用`UxToTypeScript`转换
+     * 4. 使用`TypeScriptGenerator`生成
+     * @param params
+     */
+    compileUx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { context, file, compilerOption } = params;
+            const { path: filePath, content } = file;
+            const { projectPath } = context;
+            const fileType = this.getFileType(filePath, context);
+            // 无内容的文件，添加空内容警告
+            if (!content) {
+                return {
+                    files: [],
+                    logs: [
+                        {
+                            level: shared_utils_1.Loglevel.WARN,
+                            message: `${filePath} is empty`,
+                            filePath
+                        }
+                    ]
+                };
+            }
+            const logs = [];
+            const option = {
+                filePath,
+                projectPath,
+                projectType: shared_utils_1.ProjectType.ANDDROID_UX,
+                fileType,
+                onLog: function (log) {
+                    logs.push(log);
+                },
+                content: content.toString()
+            };
+            const uxAst = yield new parser_1.UxParser(option, compilerOption, {}, (path) => path).parser();
+            const tsAst = yield new UxToTypescript_1.default(option, compilerOption, context).translate(uxAst.ast, uxAst.offsetList || []);
+            const filePathParse = path_1.default.parse(filePath);
+            const code = new generator_1.TypescriptGenerator().generate({
+                sourceFilePath: filePathParse.base,
+                targetFilePath: `${filePathParse.name}.js`,
+                ast: tsAst.targetTree,
+                mapList: tsAst.mapList
+            });
+            return {
+                files: [
+                    {
+                        path: filePath,
+                        content: code.code
+                    },
+                    {
+                        path: `${filePathParse.dir}/${filePathParse.base}.map`,
+                        content: code.sourcemap
+                    }
+                    // resource todo
+                ],
+                logs
+            };
+        });
+    }
+    getFileType(filePath, context) {
+        const { entries } = context;
+        if (path_1.default.basename(filePath) === 'app.ux') {
+            return 'app';
+        }
+        else if (entries.includes(filePath)) {
+            return 'page';
+        }
+    }
+}
+exports.default = AndroidUx;

package/lib/utils/xts/XtsFileLaneUtils.d.ts

@@ -0,0 +1,10 @@
+declare class XtsFileLaneUtils {
+    /**
+     * 将buildPath文件夹的内容压缩成zip包，放置于targetPath路径下
+     * @param buildPath
+     * @param targetPath
+     * @param zipRootDirNames 可自定义压缩包内最外层目录的名称
+     */
+    static zipProject(buildPath: string[], targetFile: string, zipRootDirNames?: string[]): Promise<void>;
+}
+export default XtsFileLaneUtils;