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

package/lib/config/UxConfig.d.ts

@@ -1,14 +1,41 @@
 import { IFileLaneConfig } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
-import AppUxLoader from '../loader/ux/AppUxLoader';
 import JsLoader from '../loader/ux/JsLoader';
-import UxLoader from '../loader/ux/UxLoader';
+import PngLoader from '../loader/ux/PngLoader';
+import AppUxLoader from '../loader/ux/vela/AppUxLoader';
+import HmlLoader from '../loader/ux/vela/HmlLoader';
+import UxLoader from '../loader/ux/vela/UxLoader';
+import UxBeforeWorks from '../beforeWorks/ux/UxBeforeWorks';
+import UxAfterWorks from '../afterWorks/ux/UxAfterWorks';
+import { IChangedFile } from 'file-lane/lib/interface/IChangedFile';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     readonly projectPath: string;
     constructor(projectPath: string);
-    exclude: RegExp[];
+    /**
+     * 1. 取项目中所有的真实文件
+     *  1.1 无entryFileList时
+     *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+     *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
+     * 2. 返回符合条件的文件列表
+     *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
+     * @param entryFileList
+     * @returns
+     */
+    collectFile: (entryFileList?: IChangedFile[]) => string[];
+    exclude: (string | ((filePath: string) => boolean))[];
     get output(): string;
-    module: {
+    beforeWorks: (typeof UxBeforeWorks.cleanOutput)[];
+    beforeCompile: import("file-lane").PreWork<IJavascriptCompileOption>[];
+    afterCompile: {
+        worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
+        workerDescribe: string;
+    }[];
+    afterWorks: (typeof UxAfterWorks.cleanOutput)[];
+    watchIgnores: RegExp[];
+    /**
+     * 通过项目类型，返回模块配置
+     */
+    get module(): {
         rules: ({
             test: string[];
             loader: (typeof AppUxLoader)[];
@@ -17,14 +44,25 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             test: RegExp[];
             exclude: RegExp[];
             loader: (typeof UxLoader)[];
+        } | {
+            test: RegExp[];
+            loader: (typeof HmlLoader | typeof UxLoader)[];
+            exclude?: undefined;
         } | {
             test: RegExp[];
             loader: (typeof JsLoader)[];
             exclude?: undefined;
+        } | {
+            test: RegExp[];
+            loader: (typeof PngLoader)[];
+            exclude?: undefined;
         })[];
     };
-    preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<IJavascriptCompileOption>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<IJavascriptCompileOption>[];
-    watchIgnores: RegExp[];
+    /**
+     * 判断项目类型
+     *
+     * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
+     */
+    private getProjectType;
 }
 export default UxConfig;

package/lib/config/UxConfig.js

@@ -3,61 +3,177 @@ 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 fs_1 = __importDefault(require("fs"));
 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"));
+const AppUxLoader_1 = __importDefault(require("../loader/ux/vela/AppUxLoader"));
+const HmlLoader_1 = __importDefault(require("../loader/ux/vela/HmlLoader"));
+const UxLoader_1 = __importDefault(require("../loader/ux/vela/UxLoader"));
+const UxLoader_2 = __importDefault(require("../loader/ux/android/UxLoader"));
+const UxBeforeWorks_1 = __importDefault(require("../beforeWorks/ux/UxBeforeWorks"));
+const UxAfterWorks_1 = __importDefault(require("../afterWorks/ux/UxAfterWorks"));
+const UxAfterCompile_1 = __importDefault(require("../afterCompile/ux/UxAfterCompile"));
+const UxBeforeCompile_1 = __importDefault(require("../beforeCompile/ux/UxBeforeCompile"));
+const BeforeCompileUtils_1 = __importDefault(require("../utils/BeforeCompileUtils"));
+const IChangedFile_1 = require("file-lane/lib/interface/IChangedFile");
 class UxConfig {
     constructor(projectPath) {
         this.projectPath = projectPath;
-        this.exclude = [/node_modules/, /dist/, /build/];
-        this.module = {
-            rules: [
-                {
-                    test: ['app.ux'],
-                    loader: [AppUxLoader_1.default]
-                },
-                {
-                    test: [/.+\.ux$/],
-                    exclude: [/app\.ux/],
-                    loader: [UxLoader_1.default]
-                },
-                {
-                    test: [/.+\.js$/],
-                    loader: [JsLoader_1.default]
-                },
-                {
-                    test: [/.+\.9.png/],
-                    loader: [PngLoader_1.default]
+        /**
+         * 1. 取项目中所有的真实文件
+         *  1.1 无entryFileList时
+         *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+         *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
+         * 2. 返回符合条件的文件列表
+         *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
+         * @param entryFileList
+         * @returns
+         */
+        this.collectFile = (entryFileList) => {
+            // 取项目中所有的真实文件
+            const getProjectFiles = () => {
+                const projectPath = this.projectPath;
+                let files = shared_utils_1.FileUtil.readAlldirSync(projectPath, undefined, this.exclude);
+                return files;
+            };
+            // 2.
+            if (entryFileList) {
+                let isGetAll = entryFileList.every((item) => item.type === IChangedFile_1.HandlerType.UNLINK || !/\.(ux|json|js)$/.test(item.path));
+                if (!isGetAll) {
+                    return entryFileList
+                        .filter((filePath) => shared_utils_1.FileUtil.include(filePath.path, undefined, this.exclude))
+                        .map((item) => item.path);
                 }
-            ]
+            }
+            // 1.
+            return getProjectFiles();
         };
-        this.preWorks = [
-            UxPreWorks_1.default.validateManifest,
-            UxPreWorks_1.default.validateSitemap,
-            PreWorkUtils_1.default.clean,
-            PreWorkUtils_1.default.getEntries,
-            PreWorkUtils_1.default.getGlobalVar
+        this.exclude = [
+            '**/node_modules{,/**}',
+            '**/dist{,/**}',
+            '**/build{,/**}',
+            '**/.git{,/**}',
+            (filePath) => {
+                // 如果 是 script， style文件，且同路径下存在同名 hml，则忽略
+                const { ext, name } = path_1.default.parse(filePath);
+                if (![...parser_1.ExtensionConfig.SCRIPTS, ...parser_1.ExtensionConfig.STYLES].includes(ext)) {
+                    return false;
+                }
+                const hmlPath = shared_utils_1.FileUtil.updateFileName(filePath, `${name}${parser_1.ExtensionConfig.HML}`);
+                if (fs_1.default.existsSync(hmlPath)) {
+                    return true;
+                }
+                return false;
+            }
+        ];
+        this.beforeWorks = [UxBeforeWorks_1.default.cleanOutput];
+        this.beforeCompile = [
+            UxBeforeCompile_1.default.validateManifest,
+            UxBeforeCompile_1.default.validateSitemap,
+            BeforeCompileUtils_1.default.clean,
+            BeforeCompileUtils_1.default.getEntries,
+            BeforeCompileUtils_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.protobuf
+        this.afterCompile = [
+            {
+                worker: UxAfterCompile_1.default.symlinkNodeModule,
+                workerDescribe: 'Create a soft link to the node_modules folder'
+            },
+            {
+                worker: UxAfterCompile_1.default.webpack,
+                workerDescribe: 'Compile the project using webpack'
+            },
+            {
+                worker: UxAfterCompile_1.default.copyResource,
+                workerDescribe: 'Copy resource files'
+            },
+            {
+                worker: UxAfterCompile_1.default.jsc,
+                workerDescribe: 'Generate jsc bytecode'
+            },
+            {
+                worker: UxAfterCompile_1.default.protobuf,
+                workerDescribe: 'Generate protobuf json'
+            },
+            {
+                worker: UxAfterCompile_1.default.toRpk,
+                workerDescribe: 'Package the project into an RPK file'
+            },
+            {
+                worker: UxAfterCompile_1.default.generateDiff,
+                workerDescribe: 'Generate diff json'
+            },
+            {
+                worker: UxAfterCompile_1.default.moveBackResult,
+                workerDescribe: 'Migrate temporary project'
+            }
         ];
-        this.watchIgnores = [/node_modules/];
+        this.afterWorks = [UxAfterWorks_1.default.cleanOutput];
+        this.watchIgnores = [/node_modules/, /build/, /dist/];
     }
     get output() {
         const name = path_1.default.basename(this.projectPath);
         const result = `../.temp_${name}`;
         return result;
     }
+    /**
+     * 通过项目类型，返回模块配置
+     */
+    get module() {
+        const isVela = this.getProjectType() === shared_utils_1.ProjectType.VELA_UX;
+        return isVela
+            ? {
+                rules: [
+                    {
+                        test: ['app.ux'],
+                        loader: [AppUxLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.ux$/],
+                        exclude: [/app\.ux/],
+                        loader: [UxLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.hml$/],
+                        loader: [HmlLoader_1.default, UxLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.js$/],
+                        loader: [JsLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.9.png/],
+                        loader: [PngLoader_1.default]
+                    }
+                ]
+            }
+            : {
+                rules: [
+                    {
+                        test: [/.+\.ux$/],
+                        loader: [UxLoader_2.default]
+                    },
+                    {
+                        test: [/.+\.js$/],
+                        loader: [JsLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.9.png/],
+                        loader: [PngLoader_1.default]
+                    }
+                ]
+            };
+    }
+    /**
+     * 判断项目类型
+     *
+     * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
+     */
+    getProjectType() {
+        return shared_utils_1.ProjectType.getProjectType(this.projectPath);
+    }
 }
 exports.default = UxConfig;

package/lib/config/XtsConfig.d.ts

@@ -1,10 +1,12 @@
-import { IFileLaneConfig } from 'file-lane';
+import { IFileLaneConfig, PreWork } from 'file-lane';
 import XtsLoader from '../loader/xts/XtsLoader';
 /**
  * XtsConfig
  */
 declare class XtsConfig implements IFileLaneConfig {
-    exclude: RegExp[];
+    projectPath: string;
+    constructor(projectPath: string);
+    exclude: string[];
     output: string;
     module: {
         rules: {
@@ -12,7 +14,9 @@ declare class XtsConfig implements IFileLaneConfig {
             loader: (typeof XtsLoader)[];
         }[];
     };
-    preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
+    beforeCompile: PreWork[];
+    afterCompile: {
+        worker: import("file-lane").FollowWork<import("..").IXtsCompileOptions>;
+    }[];
 }
 export default XtsConfig;

package/lib/config/XtsConfig.js

@@ -3,17 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const entryTemplate_1 = require("../followWorks/xts/entryTemplate");
-const generateRpk_1 = require("../followWorks/xts/generateRpk");
-const ts2wasm_1 = require("../followWorks/xts/ts2wasm");
+const entryTemplate_1 = require("../afterCompile/xts/entryTemplate");
+const generateRpk_1 = require("../afterCompile/xts/generateRpk");
+const ts2wasm_1 = require("../afterCompile/xts/ts2wasm");
 const XtsLoader_1 = __importDefault(require("../loader/xts/XtsLoader"));
-const preInstall_1 = require("../preWorks/xts/preInstall");
 /**
  * XtsConfig
  */
 class XtsConfig {
-    constructor() {
-        this.exclude = [/node_modules/, /dist/, /build/, /wasmUnpacked/];
+    constructor(projectPath) {
+        this.projectPath = projectPath;
+        this.exclude = [
+            '**/node_modules{,/**}',
+            '**/dist{,/**}',
+            '**/build{,/**}',
+            '**/.git{,/**}',
+            '**/.wasmUnpacked{,/**}'
+        ];
         this.output = 'build';
         this.module = {
             rules: [
@@ -23,8 +29,18 @@ class XtsConfig {
                 }
             ]
         };
-        this.preWorks = [preInstall_1.preInstall];
-        this.followWorks = [entryTemplate_1.generateEntryFile, ts2wasm_1.ts2wasm, generateRpk_1.generateRpk];
+        this.beforeCompile = [];
+        this.afterCompile = [
+            {
+                worker: entryTemplate_1.generateEntryFile
+            },
+            {
+                worker: ts2wasm_1.ts2wasm
+            },
+            {
+                worker: generateRpk_1.generateRpk
+            }
+        ];
     }
 }
 exports.default = XtsConfig;

package/lib/index.d.ts

@@ -1,2 +1,10 @@
 import XtsConfig from './config/XtsConfig';
-export { XtsConfig };
+import JavascriptDefaultCompileOption, { setServerPort } from './compiler/javascript/JavascriptDefaultCompileOption';
+import UxConfig from './config/UxConfig';
+import CompileMode from './compiler/enum/CompileMode';
+import IJavascriptCompileOption from './compiler/javascript/interface/IJavascriptCompileOption';
+import IQuickAppConfig from './compiler/javascript/vela/interface/IQuickAppConfig';
+import UxFileUtils from './utils/ux/UxFileUtils';
+import IManifest from './compiler/javascript/vela/interface/IManifest';
+import { ISkipList, IXtsCompileOptions, skipList } from './interface/ICompileOptions';
+export { XtsConfig, UxConfig, JavascriptDefaultCompileOption, CompileMode, IJavascriptCompileOption, IQuickAppConfig, setServerPort, UxFileUtils, IManifest, skipList, IXtsCompileOptions, ISkipList };

package/lib/index.js

@@ -1,8 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XtsConfig = void 0;
+exports.skipList = exports.UxFileUtils = exports.setServerPort = exports.CompileMode = exports.JavascriptDefaultCompileOption = exports.UxConfig = exports.XtsConfig = void 0;
 const XtsConfig_1 = __importDefault(require("./config/XtsConfig"));
 exports.XtsConfig = XtsConfig_1.default;
+const JavascriptDefaultCompileOption_1 = __importStar(require("./compiler/javascript/JavascriptDefaultCompileOption"));
+exports.JavascriptDefaultCompileOption = JavascriptDefaultCompileOption_1.default;
+Object.defineProperty(exports, "setServerPort", { enumerable: true, get: function () { return JavascriptDefaultCompileOption_1.setServerPort; } });
+const UxConfig_1 = __importDefault(require("./config/UxConfig"));
+exports.UxConfig = UxConfig_1.default;
+const CompileMode_1 = __importDefault(require("./compiler/enum/CompileMode"));
+exports.CompileMode = CompileMode_1.default;
+const UxFileUtils_1 = __importDefault(require("./utils/ux/UxFileUtils"));
+exports.UxFileUtils = UxFileUtils_1.default;
+const ICompileOptions_1 = require("./interface/ICompileOptions");
+Object.defineProperty(exports, "skipList", { enumerable: true, get: function () { return ICompileOptions_1.skipList; } });

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

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

package/lib/loader/ux/JsLoader.js

@@ -1,17 +1,12 @@
 "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"));
+const parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 /**
  * JsLoader
  */
 class JsLoader {
     parser(files) {
-        const project = ParserUtil_1.default.createProject();
         const onLog = () => { };
         return files.map((item) => {
             if (!item.content) {
@@ -23,13 +18,15 @@ class JsLoader {
             const options = {
                 filePath: item.path,
                 projectPath: this.context.projectPath,
+                content: item.content.toString(),
+                projectType: shared_utils_1.ProjectType.getProjectType(this.context.projectPath),
                 onLog
             };
             return {
                 path: item.path,
-                content: new ScriptToTypescript_1.default(project, options)
+                content: new parser_1.ScriptToTypescript(options, this.compilerOption, this.context)
                     .translate({
-                    content: new ScriptParser_1.default(options).parser(item.content.toString()).ast.content
+                    content: new parser_1.ScriptParser(options).parser(item.content.toString()).ast.content
                 }, [])
                     .targetTree.getFullText()
             };

package/lib/loader/ux/PngLoader.js

@@ -12,8 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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 PngUtils_1 = __importDefault(require("../../utils/PngUtils"));
 const aaptjs = require('@hap-toolkit/aaptjs');
@@ -30,11 +29,11 @@ class PngLoader {
                 const fullName = `${name}${ext}`;
                 //判断文本，空文本则结束该文件处理
                 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 [];
                 }
                 // 判断传入的.png资源是不是.9.png资源
-                if (FileUtil_1.default.match(filePath, /.+\.9\.png$/)) {
+                if (shared_utils_1.FileUtil.match(filePath, /.+\.9\.png$/)) {
                     yield this.compile9Png(filePath);
                 }
                 else {
@@ -54,7 +53,7 @@ class PngLoader {
                     yield aaptjs.singleCrunch(filePath, outputFile);
                 }
                 catch (error) {
-                    ColorConsole_1.default.throw(`.9.png resource file processing failed`);
+                    shared_utils_1.ColorConsole.throw(`.9.png resource file processing failed`);
                 }
             }
         });

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

@@ -0,0 +1,13 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
+import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
+import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+/**
+ * UxLoader
+ */
+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/android/UxLoader.js

@@ -0,0 +1,38 @@
+"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 path_1 = __importDefault(require("path"));
+const AndroidUx_1 = __importDefault(require("../../../utils/ux/android/AndroidUx"));
+/**
+ * UxLoader
+ */
+class UxLoader {
+    parser(files) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = [];
+            const { projectPath } = this.context;
+            for (let item of files) {
+                const { files, logs } = yield new AndroidUx_1.default().compileUx({
+                    context: this.context,
+                    file: item,
+                    compilerOption: this.compilerOption
+                });
+                this.logs = logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' })));
+                result.push(...files);
+            }
+            return result;
+        });
+    }
+}
+exports.default = UxLoader;

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

@@ -1,5 +1,6 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
-import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
  * 处理app.ux的Loader
  * AppUxLoader
@@ -7,6 +8,7 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
 declare class AppUxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default AppUxLoader;

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

@@ -12,7 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const UxLoaderUtils_1 = __importDefault(require("../../utils/ux/UxLoaderUtils"));
+const path_1 = __importDefault(require("path"));
+const UxLoaderUtils_1 = __importDefault(require("../../../utils/ux/UxLoaderUtils"));
 /**
  * 处理app.ux的Loader
  * AppUxLoader
@@ -20,8 +21,9 @@ const UxLoaderUtils_1 = __importDefault(require("../../utils/ux/UxLoaderUtils"))
 class AppUxLoader {
     parser(files) {
         return __awaiter(this, void 0, void 0, function* () {
-            const resultFiles = [];
-            yield UxLoaderUtils_1.default.compileAppUxToJavascript(files[0], resultFiles, this.context, this.compilerOption);
+            const { projectPath } = this.context;
+            const { files: resultFiles, logs } = yield UxLoaderUtils_1.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption);
+            this.logs = logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' })));
             return resultFiles;
         });
     }

package/lib/loader/ux/vela/HmlLoader.d.ts

@@ -0,0 +1,24 @@
+import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
+/**
+ * HmlLoader
+ */
+declare class HmlLoader implements ILoader {
+    context?: IFileLaneContext | undefined;
+    compilerOption?: any;
+    parser(files: IFileParam<any>[]): IFileParam<any>[] | Promise<IFileParam<any>[]>;
+    /**
+     * 包裹 hml 文件
+     *
+     * # 路径
+     * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
+     *
+     * # 内容
+     * 1. 给hml的内容加上<template></template>
+     * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
+     * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+     *
+     * @param file
+     */
+    private wrapHml;
+}
+export default HmlLoader;