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

package/lib/loader/ux/vela/HmlLoader.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const parser_1 = require("@aiot-toolkit/parser");
+/**
+ * HmlLoader
+ */
+class HmlLoader {
+    parser(files) {
+        return files.map((file) => {
+            return this.wrapHml(file);
+        });
+    }
+    /**
+     * 包裹 hml 文件
+     *
+     * # 路径
+     * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
+     *
+     * # 内容
+     * 1. 给hml的内容加上<template></template>
+     * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
+     * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+     *
+     * @param file
+     */
+    wrapHml(file) {
+        const { path, content } = file;
+        const uxExt = parser_1.ExtensionConfig.UX;
+        const getFilePath = (ext) => {
+            const pathParsed = path_1.default.parse(path);
+            pathParsed.ext = ext;
+            pathParsed.base = pathParsed.name + ext;
+            return path_1.default.format(pathParsed);
+        };
+        const uxPath = getFilePath(uxExt);
+        if (fs_1.default.existsSync(uxPath)) {
+            throw new Error(`${uxPath} already exists`);
+        }
+        const scriptExts = parser_1.ExtensionConfig.SCRIPTS;
+        const styleExts = parser_1.ExtensionConfig.STYLES;
+        const scriptPath = scriptExts
+            .map((item) => getFilePath(item))
+            .find((item) => fs_1.default.existsSync(item));
+        const stylePath = styleExts.map((item) => getFilePath(item)).find((item) => fs_1.default.existsSync(item));
+        let uxContent = ['<template>', content, '</template>'].join('\n');
+        if (scriptPath) {
+            uxContent += ['<script>', fs_1.default.readFileSync(scriptPath, 'utf-8'), '</script>'].join('\n');
+        }
+        if (stylePath) {
+            uxContent += ['<style>', fs_1.default.readFileSync(stylePath, 'utf-8'), '</style>'].join('\n');
+        }
+        return {
+            path,
+            content: uxContent
+        };
+    }
+}
+exports.default = HmlLoader;

package/lib/loader/ux/{UxLoader.d.ts → vela/UxLoader.d.ts}

@@ -1,8 +1,10 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
-import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+import { ILog } from '@aiot-toolkit/shared-utils/lib/interface/ILog';
 declare class UxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default UxLoader;

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

@@ -12,10 +12,8 @@ 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"));
+const UxLoaderUtils_1 = __importDefault(require("../../../utils/ux/UxLoaderUtils"));
 class UxLoader {
     parser(files) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -23,17 +21,16 @@ 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);
+                this.logs = logs.map((item) => {
+                    var _a;
+                    return Object.assign(Object.assign({}, item), { filePath: ((_a = item.position) === null || _a === void 0 ? void 0 : _a.source)
+                            ? item.position.source
+                            : 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/BeforeCompileUtils.d.ts

@@ -0,0 +1,21 @@
+import { PreWork } from 'file-lane';
+import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
+/**
+ * BeforeCompileUtils
+ */
+declare class BeforeCompileUtils {
+    /**
+     * 获取ux项目的路由入口
+     * @param context
+     * @param fileList
+     * @returns
+     */
+    static getEntries: PreWork;
+    static clean: PreWork;
+    /**
+     * 获取项目的全局样式变量配置
+     * @param context
+     */
+    static getGlobalVar: PreWork<IJavascriptCompileOption>;
+}
+export default BeforeCompileUtils;

package/lib/utils/BeforeCompileUtils.js

@@ -0,0 +1,118 @@
+"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 parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const TranslateCache_1 = __importDefault(require("@aiot-toolkit/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');
+/**
+ * BeforeCompileUtils
+ */
+class BeforeCompileUtils {
+}
+_a = BeforeCompileUtils;
+/**
+ * 获取ux项目的路由入口
+ * @param context
+ * @param fileList
+ * @returns
+ */
+BeforeCompileUtils.getEntries = (params) => {
+    const { context, compilerOption } = params;
+    const { projectPath } = context;
+    const srcPath = path_1.default.join(projectPath, compilerOption.sourceRoot);
+    // 判断路径是否真实存在
+    const manifestContent = UxFileUtils_1.default.getMainfestInfo(projectPath);
+    // 存储entries
+    let entryList = [];
+    const { router } = manifestContent;
+    if (router) {
+        const { pages } = router;
+        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 '${path_1.default.join(entryDir, entryPages.join(' | '))}' does not exist`);
+                }
+            });
+        }
+        else {
+            // 没有pages配置
+            shared_utils_1.ColorConsole.throw(`### manifest ### No pages configuration`);
+        }
+    }
+    else {
+        // 没有router配置
+        shared_utils_1.ColorConsole.throw(`### manifest ### No router configuration`);
+    }
+    context['entries'] = entryList;
+    return Promise.resolve();
+};
+BeforeCompileUtils.clean = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption, compalition } = params;
+    if (compilerOption) {
+        // 存储build中的文件列表
+        const buildPath = path_1.default.join(context.projectPath, compilerOption.outputPath);
+        const buildFileList = fs_extra_1.default.existsSync(buildPath)
+            ? shared_utils_1.FileUtil.readAlldirSync(buildPath).map((filePath) => {
+                const relativePath = path_1.default.relative(buildPath, filePath);
+                const fileContent = fs_extra_1.default.readFileSync(filePath);
+                return { path: relativePath, content: fileContent };
+            })
+            : [];
+        if (compalition) {
+            compalition.buildFileList = buildFileList;
+        }
+        // 清空build文件夹、dist文件夹
+        yield shared_utils_1.FileUtil.del(path_1.default.join(context.projectPath, compilerOption.outputPath));
+        yield shared_utils_1.FileUtil.del(path_1.default.join(context.projectPath, compilerOption.releasePath));
+    }
+    context.translateCache = new TranslateCache_1.default();
+    BinaryPlugin.reset();
+    BinaryPlugin.config = {
+        projectPath: context.projectPath,
+        outputProjectPath: path_1.default.join(context.projectPath, context.output),
+        source: compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.sourceRoot,
+        output: compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.outputPath
+    };
+});
+/**
+ * 获取项目的全局样式变量配置
+ * @param context
+ */
+BeforeCompileUtils.getGlobalVar = (params) => {
+    const { context, compilerOption } = params;
+    const { projectPath } = context;
+    const filePath = path_1.default.join(projectPath, (compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.sourceRoot) || '', 'globalVar.json');
+    let globalVar = {};
+    // 判断文件是否存在
+    if (fs_extra_1.default.existsSync(filePath)) {
+        // 存在则取内容，否则内容为空
+        globalVar = fs_extra_1.default.readJSONSync(filePath);
+    }
+    context.globalVar = globalVar;
+    return Promise.resolve();
+};
+exports.default = BeforeCompileUtils;

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.d.ts

@@ -1,3 +1,4 @@
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 import IManifest from '../../compiler/javascript/vela/interface/IManifest';
 export declare class UxFileUtils {
     static readonly CONFIG_FILE_NAME = "manifest.json";
@@ -18,9 +19,10 @@ export declare class UxFileUtils {
     /**
      * 检查 manifest文件，并显示错误信息
      *
-     * 1. TypeError，使用Error 样式
-     * 2. 其它错误，使用 Warn 样式
-     * 3. 如果存在TypeError，则终止程序
+     * 1. 使用ManifestSchema 校验
+     *    1. TypeError: Error
+     *    2. 其它: Warn
+     * 2. 检查 router.entry 是否存在于 router.pages
      *
      * @param projectPath 项目路径
      * @param sourceRoot 源码路径--相对项目根目录
@@ -35,5 +37,16 @@ export declare class UxFileUtils {
      * @param sourceRoot
      */
     static validateSitemap(projectPath: string, sourceRoot?: string): void;
+    /**
+     * 1. 遍历旧文件列表
+     *  1.1 若文件路径在新文件列表newFileList中，且内容一致时，从newFileList中移除该项
+     *  1.2 若文件路径在新文件列表newFileList中，且内容不一致时，添加到diffList中表示待更新，从newFileList中移除该项
+     *  1.3 若文件路径不在新文件列表中，表示该文件待删除(热更新时，可以不做删除，删除耗费性能)
+     * 2. 若遍历完旧文件列表后，newFileList长度不为0，表示有文件待新增
+     * @param oldFileList 旧文件列表
+     * @param newFileList 新文件列表
+     * @returns
+     */
+    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): string[];
 }
 export default UxFileUtils;

package/lib/utils/ux/UxFileUtils.js

@@ -4,8 +4,8 @@ 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 ILog_1 = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
 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"));
@@ -32,9 +32,10 @@ class UxFileUtils {
     /**
      * 检查 manifest文件，并显示错误信息
      *
-     * 1. TypeError，使用Error 样式
-     * 2. 其它错误，使用 Warn 样式
-     * 3. 如果存在TypeError，则终止程序
+     * 1. 使用ManifestSchema 校验
+     *    1. TypeError: Error
+     *    2. 其它: Warn
+     * 2. 检查 router.entry 是否存在于 router.pages
      *
      * @param projectPath 项目路径
      * @param sourceRoot 源码路径--相对项目根目录
@@ -45,30 +46,29 @@ class UxFileUtils {
         if (!fs_extra_1.default.existsSync(path)) {
             ColorConsole_1.default.throw(`file is missing`, {
                 word: path,
-                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
+                style: ColorConsole_1.default.getStyle(ILog_1.Loglevel.THROW)
             });
         }
+        // 1
         const jsonData = this.getMainfestInfo(projectPath, sourceRoot);
         const schema = ManifestSchema_1.default;
-        const errors = CommonUtil_1.default.validateJson(jsonData, schema);
-        if (errors) {
+        const errors = CommonUtil_1.default.validateJson(jsonData, schema) || [];
+        // 2
+        const { entry, pages } = jsonData.router;
+        if (!pages[entry]) {
+            errors.push(new TypeError(`router.entry content:  ${entry}, is missing in router.pages`));
+        }
+        if (errors === null || errors === void 0 ? void 0 : errors.length) {
             ColorConsole_1.default.warn(`Manefest.json error: `, ...errors.map((item, index) => {
                 return {
                     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)
+                        ? ColorConsole_1.default.getStyle(ILog_1.Loglevel.ERROR)
+                        : ColorConsole_1.default.getStyle(ILog_1.Loglevel.WARN)
                 };
             }));
-            const stop = Boolean(errors.find((item) => item instanceof TypeError));
-            if (stop) {
-                ColorConsole_1.default.throw({
-                    word: `missing required content, program stoped`,
-                    style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
-                });
-            }
         }
-        return errors;
+        return errors.length ? errors : undefined;
     }
     /**
      * 检查 sitemap.json 文件，并显示错误信息
@@ -97,6 +97,42 @@ class UxFileUtils {
             }
         }
     }
+    /**
+     * 1. 遍历旧文件列表
+     *  1.1 若文件路径在新文件列表newFileList中，且内容一致时，从newFileList中移除该项
+     *  1.2 若文件路径在新文件列表newFileList中，且内容不一致时，添加到diffList中表示待更新，从newFileList中移除该项
+     *  1.3 若文件路径不在新文件列表中，表示该文件待删除(热更新时，可以不做删除，删除耗费性能)
+     * 2. 若遍历完旧文件列表后，newFileList长度不为0，表示有文件待新增
+     * @param oldFileList 旧文件列表
+     * @param newFileList 新文件列表
+     * @returns
+     */
+    static getDiffJSON(compilation, newFileList, buildPath) {
+        var _a;
+        const oldFileList = compilation.buildFileList;
+        if (!oldFileList.length) {
+            return [];
+        }
+        let diffList = [];
+        // 1.
+        for (let i = 0; i < oldFileList.length; i++) {
+            const index = newFileList.findIndex((file) => file === oldFileList[i].path);
+            // 1.3
+            if (index !== -1) {
+                // 1.2
+                const oldContent = (_a = oldFileList[i].content) === null || _a === void 0 ? void 0 : _a.toString('utf-8');
+                const newContent = fs_extra_1.default.readFileSync(path_1.default.join(buildPath, newFileList[index]), 'utf-8');
+                if (oldContent !== newContent) {
+                    diffList.push(newFileList[index]);
+                }
+                // 从newFileList中移除该项
+                newFileList.splice(index, 1);
+            }
+        }
+        // 2.
+        newFileList.length > 0 && newFileList.forEach((file) => diffList.push(file));
+        return diffList;
+    }
 }
 exports.UxFileUtils = UxFileUtils;
 UxFileUtils.CONFIG_FILE_NAME = 'manifest.json';

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[];
+        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,14 +36,12 @@ 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');
 const { extractFunctions } = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/protobufControl');
 /**
@@ -59,7 +57,6 @@ class UxLoaderUtils {
      */
     static compileUxToJavascript(file, context, isAppUx, compilerOption) {
         return __awaiter(this, void 0, void 0, function* () {
-            const project = new ts_morph_1.Project();
             const logs = [];
             const { path: filePath, content } = file;
             const { name, ext } = path_1.default.parse(filePath);
@@ -68,44 +65,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 +129,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, integrateFunction, compilerOption, context).translate(parserResult.ast, []);
             const { code } = new generator_1.TypescriptGenerator().generate({
                 sourceFilePath: fullName,
                 targetFilePath: newFileName,
@@ -124,13 +140,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 +159,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 +170,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 +190,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 +307,7 @@ class UxLoaderUtils {
      * @param appScriptTree
      * @returns
      */
-    static handleScriptContent(isPageUx, appScriptTree) {
+    static wrapScript(isPageUx, appScriptTree) {
         if (isPageUx) {
             // 页面组件添加ViewModel处理代码
             appScriptTree.addStatements(UxLoaderUtils.contenAccess);