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

package/lib/{utils → followWorks}/ux/UxFollowWorks.js

@@ -13,11 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const TranslateCache_1 = __importDefault(require("@aiot-toolkit/parser/lib//ux/translate/vela/TranslateCache"));
 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 FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
@@ -26,7 +22,7 @@ const JavascriptCompiler_1 = __importDefault(require("../../compiler/javascript/
 const JavascriptDefaultCompileOption_1 = __importDefault(require("../../compiler/javascript/JavascriptDefaultCompileOption"));
 const Jsc_1 = __importDefault(require("../../compiler/javascript/vela/utils/Jsc"));
 const ZipUtil_1 = __importDefault(require("../../compiler/javascript/vela/utils/ZipUtil"));
-const UxFileUtils_1 = __importDefault(require("./UxFileUtils"));
+const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 /**
  * UxFollowWorks
@@ -38,7 +34,7 @@ UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, v
     return new JavascriptCompiler_1.default()
         .compile(Object.assign(Object.assign({ projectPath: path_1.default.join(context.projectPath, context.output), mode: CompileMode_1.default.DEVELOPMENT, devtool: false, platform: 'vela' }, JavascriptDefaultCompileOption_1.default), compilerOption))
         .then(() => {
-        ColorConsole_1.default.info(`webpack complete`);
+        shared_utils_1.ColorConsole.info(`webpack complete`);
     })
         .catch(({ errors, warnings }) => {
         const errorLength = (errors === null || errors === void 0 ? void 0 : errors.length) || 0;
@@ -50,7 +46,7 @@ UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, v
                     return `${index + 1}. ${item.message}`;
                 })
                     .join('\r\n'),
-                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
+                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW)
             });
         }
         if (warnings === null || warnings === void 0 ? void 0 : warnings.length) {
@@ -60,15 +56,15 @@ UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, v
                     return `${errorLength + index + 1}. ${item.message}`;
                 })
                     .join('\r\n'),
-                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Warn)
+                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.WARN)
             });
         }
         if (errors === null || errors === void 0 ? void 0 : errors.length) {
-            ColorConsole_1.default.throw(...messages);
+            shared_utils_1.ColorConsole.throw(...messages);
             throw new Error();
         }
         else {
-            ColorConsole_1.default.warn(...messages);
+            shared_utils_1.ColorConsole.warn(...messages);
         }
     });
 });
@@ -78,7 +74,7 @@ UxFollowWorks.protobuf = (context, config, compilerOption) => __awaiter(void 0,
     }
 });
 UxFollowWorks.jsc = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
-    if (compilerOption && compilerOption.disabledJSC === false) {
+    if (compilerOption && compilerOption.disabledJsc === false) {
         return new Jsc_1.default(context.projectPath, path_1.default.join(context.projectPath, context.output, compilerOption.outputPath)).jsc();
     }
 });
@@ -115,7 +111,7 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
     const copyResourceFiles = (compilerOption) => {
         // 复制除 js/jsx/ts/tsx/json 外，但是包含manifest.json、sitemap.json的文件
         const { projectPath, sourceRoot, outputPath } = compilerOption;
-        const includeList = ['sitemap.json', /i18n(.+)\.json/];
+        const includeList = [/sitemap\.json$/, /i18n(.+)\.json/];
         const excludeExtList = [
             'js',
             'jsx',
@@ -128,7 +124,6 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
             'sass',
             'styl',
             'html',
-            'json',
             'md',
             'ux',
             'mix',
@@ -136,8 +131,8 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
             'map'
         ];
         const excludeReg = `\.(${excludeExtList.join('|')})$`;
-        FileUtil_1.default.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), new RegExp(excludeReg));
-        FileUtil_1.default.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), undefined, includeList);
+        shared_utils_1.FileUtil.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), new RegExp(excludeReg));
+        shared_utils_1.FileUtil.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), undefined, includeList);
     };
     /**
      * 写入 manifest.json 文件
@@ -146,17 +141,18 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
      * @param compilerOption
      */
     const updateManifest = (compilerOption) => {
-        const { projectPath, sourceRoot, outputPath } = compilerOption;
+        const { projectPath, sourceRoot, outputPath, completeFeature } = compilerOption;
         const content = UxFileUtils_1.default.getMainfestInfo(projectPath, sourceRoot);
+        const translateCache = context.translateCache;
         if (!content.minAPILevel) {
             content.minAPILevel = 1;
         }
         if (!content.packageInfo) {
             content.packageInfo = ZipUtil_1.default.createComment(compilerOption);
         }
-        if (TranslateCache_1.default.featureCache.size) {
+        if (completeFeature && (translateCache === null || translateCache === void 0 ? void 0 : translateCache.featureCache.size)) {
             const featureSet = new Set([
-                ...Array.from(TranslateCache_1.default.featureCache),
+                ...Array.from(translateCache.featureCache),
                 ...(content.features || []).map((item) => item.name)
             ]);
             content.features = Array.from(featureSet).map((item) => {
@@ -180,7 +176,7 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
         const files = ZipUtil_1.default.getSortedFiles(outputAbsPath, compilerOption, UxFileUtils_1.default.getMainfestInfo(projectPath, sourceRoot));
         const digestDic = Object.fromEntries(files.map((item) => [
             item,
-            CommonUtil_1.default.calcDataDigest(fs_extra_1.default.readFileSync(path_1.default.join(outputAbsPath, item))).toString('hex')
+            shared_utils_1.CommonUtil.calcDataDigest(fs_extra_1.default.readFileSync(path_1.default.join(outputAbsPath, item))).toString('hex')
         ]));
         const hashJson = [
             {
@@ -195,9 +191,9 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
         fs_extra_1.default.outputFileSync(path_1.default.join(outputAbsPath, ZipUtil_1.default.CERT_PATH), buffer);
     });
     if (compilerOption) {
-        copyResourceFiles(compilerOption);
-        updateManifest(compilerOption);
-        genDeviceManifests(compilerOption);
+        yield copyResourceFiles(compilerOption);
+        yield updateManifest(compilerOption);
+        yield genDeviceManifests(compilerOption);
         yield genMetaFiles(compilerOption);
     }
 });
@@ -228,9 +224,7 @@ UxFollowWorks.moveBackResult = (context, config, compilerOption) => __awaiter(vo
     ];
     targetList.forEach((item) => {
         fs_extra_1.default.moveSync(item.from, item.to, { overwrite: true });
-        fs_extra_1.default.removeSync(item.from);
     });
-    fs_extra_1.default.removeSync(projectPath);
 });
 /**
  * 创建 node_module 软链
@@ -242,12 +236,18 @@ UxFollowWorks.symlinkNodeModule = (context, config, compilerOption) => __awaiter
     if (!compilerOption) {
         return;
     }
-    const foldList = ['node_modules'];
-    foldList.forEach((item) => {
-        const sourcePath = path_1.default.join(context.projectPath, item);
-        if (fs_extra_1.default.existsSync(sourcePath)) {
-            fs_extra_1.default.symlinkSync(sourcePath, path_1.default.join(compilerOption.projectPath, item), 'junction');
-        }
-    });
+    try {
+        const foldList = ['node_modules'];
+        foldList.forEach((item) => {
+            const sourcePath = path_1.default.join(context.projectPath, item);
+            const targetPath = path_1.default.join(compilerOption.projectPath, item);
+            if (fs_extra_1.default.existsSync(sourcePath) && !fs_extra_1.default.existsSync(targetPath)) {
+                fs_extra_1.default.symlinkSync(sourcePath, targetPath, 'junction');
+            }
+        });
+    }
+    catch (error) {
+        throw new Error(`${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}. Please check whether the file system of the current disk supports the creation of soft links.`);
+    }
 });
 exports.default = UxFollowWorks;

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

@@ -1,4 +1,4 @@
-import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { FollowWork } from 'file-lane';
 export interface Aspects {
     path: string;
     name: string;

package/lib/followWorks/xts/entryTemplate.js

@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateEntryFile = exports.XtsEntryFileName = exports.entryTemplate = void 0;
-const Framework_1 = require("@aiot-toolkit/parser/lib/xts/enum/Framework");
-const 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 fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const entryTemplate = (options) => {
@@ -29,7 +29,7 @@ const entryTemplate = (options) => {
             const { routes = [] } = aspect;
             for (let r = 0; r < (routes === null || routes === void 0 ? void 0 : routes.length); r++) {
                 const route = routes[r];
-                imports += `import Page${i + 1}_${r + 1}, { ${Framework_1.HomeState.interface} as ${Framework_1.HomeState.interface}${i + 1}_${r + 1}_ } from './${route.importPath}'\n`;
+                imports += `import Page${i + 1}_${r + 1}, { ${parser_1.HomeState.interface} as ${parser_1.HomeState.interface}${i + 1}_${r + 1}_ } from './${route.importPath}'\n`;
             }
         }
         return imports;
@@ -45,7 +45,7 @@ const entryTemplate = (options) => {
             for (let r = 0; r < routes.length; r++) {
                 const route = routes[r];
                 res += `
-  pathPages_${i + 1}.set('${route.route}', function (params?: ${Framework_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
+  pathPages_${i + 1}.set('${route.route}', function (params?: ${parser_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
     return new Page${i + 1}_${r + 1}(params)
   })
         `;
@@ -76,7 +76,7 @@ const entryTemplate = (options) => {
 
   // export function
   on
-} from '../node_modules/${Framework_1.tsFrameWork.name}/index'
+} from '../node_modules/${parser_1.tsFrameWork.name}/index'
 
 // import app
 import AppClass from './${options.appPath}'
@@ -127,19 +127,19 @@ const generateEntryFile = function generateEntryFile(context, _, compilerOptions
     return __awaiter(this, void 0, void 0, function* () {
         const { projectPath, output } = context;
         if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
-            ColorConsole_1.default.info(`### skip generate entry file due to --skip xts2ts}`);
+            shared_utils_1.ColorConsole.info(`### skip generate entry file due to --skip xts2ts}`);
             return;
         }
-        ColorConsole_1.default.info(`Generating entry file`);
+        shared_utils_1.ColorConsole.info(`Generating entry file`);
         const buildDir = path_1.default.resolve(projectPath, output);
         const appManifestPath = path_1.default.join(buildDir, 'app', 'manifest.json');
         const appManifest = getManifest(appManifestPath);
         if (!appManifest) {
-            ColorConsole_1.default.throw('not find app/manifest.json file !');
+            shared_utils_1.ColorConsole.throw('not find app/manifest.json file !');
         }
         const appTs = path_1.default.join(buildDir, 'app', 'app.ts');
         if (!fs_extra_1.default.existsSync(appTs)) {
-            ColorConsole_1.default.throw('not find app/app.ts file !');
+            shared_utils_1.ColorConsole.throw('not find app/app.ts file !');
         }
         function relativeDist(tar) {
             return path_1.default.join('.', path_1.default.relative(buildDir, tar)).replace(path_1.default.sep, '/');
@@ -177,7 +177,7 @@ const generateEntryFile = function generateEntryFile(context, _, compilerOptions
         }
         const template = (0, exports.entryTemplate)(opt);
         fs_extra_1.default.writeFileSync(path_1.default.join(projectPath, output, exports.XtsEntryFileName), template);
-        ColorConsole_1.default.info(`entry file built`);
+        shared_utils_1.ColorConsole.info(`entry file built`);
     });
 };
 exports.generateEntryFile = generateEntryFile;

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

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

package/lib/followWorks/xts/generateRpk.js

@@ -38,12 +38,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRpk = void 0;
 const path_1 = __importDefault(require("path"));
 const XtsFollowWorks_1 = __importDefault(require("../../utils/xts/XtsFollowWorks"));
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const ts2wasm_1 = require("./ts2wasm");
 const generateRpk = (context, _, compilerOptions) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('package')) {
-        ColorConsole_1.default.info(`### skip package due to --skip ${compilerOptions.skip.join(',')}`);
+        shared_utils_1.ColorConsole.info(`### skip package due to --skip ${compilerOptions.skip.join(',')}`);
         return;
     }
     const manifestPath = path_1.default.resolve(context.projectPath, 'app', 'manifest.json');

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

@@ -1,4 +1,4 @@
-import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { FollowWork } from 'file-lane';
 import { IXtsCompileOptions } from '../../interface/ICompileOptions';
 export declare const wasmPackageName = "wasmUnpacked";
 /**

package/lib/followWorks/xts/ts2wasm.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ts2wasm = exports.wasmPackageName = 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 fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_1 = __importDefault(require("fs"));
@@ -37,14 +37,14 @@ const ts2wasm = (context, _, compilerOptions) => __awaiter(void 0, void 0, void
     function compile() {
         // TODO: 后续修改为 @mi
         const ts2wasmpath = path_1.default.resolve(projectPath, 'node_modules', 'mi/wasmnizer-ts');
-        ColorConsole_1.default.info('### Waiting for generating app.wasm file.');
+        shared_utils_1.ColorConsole.info('### Waiting for generating app.wasm file.');
         const res = (0, child_process_1.execSync)(`node ${ts2wasmpath}/build/cli/ts2wasm.js  ${entryFile} -o ${wasmDir}/app.wasm`, {
             encoding: 'utf-8'
         });
-        ColorConsole_1.default.info(`### ts2wasm ### ${res.toString()}`);
+        shared_utils_1.ColorConsole.info(`### ts2wasm ### ${res.toString()}`);
     }
     if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('ts2wasm')) {
-        ColorConsole_1.default.info(`### skip compile ts to wasm due to --skip ${compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip.join(',')}`);
+        shared_utils_1.ColorConsole.info(`### skip compile ts to wasm due to --skip ${compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip.join(',')}`);
     }
     else {
         compile();

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

package/lib/loader/ux/android/UxLoader.js

@@ -0,0 +1,39 @@
+"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 shared_utils_1 = require("@aiot-toolkit/shared-utils");
+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
+                });
+                shared_utils_1.CommonUtil.processingLogsInTerminal(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,5 @@
 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

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

@@ -12,7 +12,9 @@ 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 shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const path_1 = __importDefault(require("path"));
+const UxLoaderUtils_1 = __importDefault(require("../../../utils/ux/UxLoaderUtils"));
 /**
  * 处理app.ux的Loader
  * AppUxLoader
@@ -20,8 +22,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);
+            shared_utils_1.CommonUtil.processingLogsInTerminal(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;

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,5 +1,5 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
-import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
 declare class UxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;