@aiot-toolkit/aiotpack 2.0.6-beta.2 → 2.0.6-beta.20

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -18,6 +18,7 @@ var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/Fi
 var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/utils/ZipFileUtil"));
 var _ImageIcu = _interopRequireDefault(require("../../compiler/tools/icu/ImageIcu"));
 var _LiteCard = _interopRequireDefault(require("../../compiler/javascript/vela/utils/LiteCard"));
+var _UxUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/UxUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 
@@ -39,7 +40,10 @@ class UxAfterCompile {
       ..._JavascriptDefaultCompileOption.default,
       ...compilerOption
     }).then(() => {
-      _sharedUtils.ColorConsole.info(`webpack complete`);
+      onLog?.([{
+        level: _sharedUtils.Loglevel.SUCCESS,
+        message: ['javascript compile success']
+      }]);
     }).catch(_ref => {
       let {
         errors,
@@ -64,10 +68,16 @@ class UxAfterCompile {
         });
       }
       if (errors?.length) {
-        _sharedUtils.ColorConsole.throw(...messages);
+        onLog?.([{
+          level: _sharedUtils.Loglevel.THROW,
+          message: messages
+        }]);
         throw new Error();
       } else {
-        _sharedUtils.ColorConsole.warn(...messages);
+        onLog?.([{
+          level: _sharedUtils.Loglevel.WARN,
+          message: messages
+        }]);
       }
     });
   };
@@ -91,13 +101,13 @@ class UxAfterCompile {
   static toRpk = async params => {
     const {
       compilerOption,
-      compalition,
+      compilation,
       context
     } = params;
     if (compilerOption) {
       const fileName = await _ZipUtil.default.createRpk(_path.default.join(compilerOption.projectPath, compilerOption.outputPath), compilerOption);
-      if (compalition && fileName) {
-        compalition.info.rpk = _path.default.join(context.projectPath, compilerOption.releasePath, fileName);
+      if (compilation && fileName) {
+        compilation.info.rpk = _path.default.join(context.projectPath, compilerOption.releasePath, fileName);
       }
       return fileName;
     }
@@ -187,13 +197,15 @@ class UxAfterCompile {
       }
 
       // feature
+      // 无需检查的feature
+      const ignoreFeatureList = ['system.router', 'system.configuration', 'system.app'];
       if (translateCache?.featureCache.size) {
         // 消息提示
         // 1. 获取未手动配置的 feature
         // 2. 如果开启自动填充，则 info；否则 warn
         const featureSet = new Set([...Array.from(translateCache.featureCache), ...(content.features || []).map(item => item.name)]);
         const usedList = Array.from(featureSet).filter(Boolean);
-        const unSetList = usedList.filter(featureItem => !content.features?.find(item => item.name === featureItem));
+        const unSetList = usedList.filter(featureItem => !ignoreFeatureList.includes(featureItem) && !content.features?.find(item => item.name === featureItem));
         if (unSetList?.length) {
           const featureMessage = {
             word: `\n${JSON.stringify(unSetList.map(item => ({
@@ -228,6 +240,28 @@ class UxAfterCompile {
           });
         }
       }
+
+      // e2e
+      if (compilerOption.e2eConfigPath && compilerOption.enableE2e) {
+        const testConfig = _UxUtil.default.getE2eConfig({
+          projectPath: compilerOption.projectPath,
+          e2eConfigPath: compilerOption.e2eConfigPath
+        });
+        const testPagePath = _path.default.parse(_path.default.relative(_path.default.join(compilerOption.projectPath, sourceRoot), _path.default.join(testConfig.dir, testConfig.entry.path)).replaceAll(_path.default.sep, _path.default.posix.sep));
+        // 1. 修改entry
+        const entryName = testPagePath.dir;
+        const launchMode = testConfig.entry?.launchMode;
+        if (entryName) {
+          content.router.entry = entryName;
+        }
+        // 2. 添加测试页到router.pages
+        if (content.router.pages) {
+          content.router.pages[entryName] = {
+            component: testPagePath.name,
+            launchMode
+          };
+        }
+      }
       _fsExtra.default.writeJSONSync(_path.default.join(projectPath, outputPath, _UxFileUtils.default.CONFIG_FILE_NAME), content, {
         spaces: 2
       });
@@ -304,13 +338,13 @@ class UxAfterCompile {
   static generateDiff = async params => {
     const {
       compilerOption,
-      compalition,
+      compilation,
       context
     } = params;
-    if (!compilerOption || !compalition) {
+    if (!compilerOption || !compilation) {
       return;
     }
-    if (compalition.trigger === _FileLaneTriggerType.default.START) {
+    if (compilation.trigger === _FileLaneTriggerType.default.START) {
       return;
     }
     // 读取临时项目build文件夹中所有文件路径
@@ -318,7 +352,7 @@ class UxAfterCompile {
     // 待优化，map文件跟随源文件变化，与时间戳有关文件无需对比
     const tempFileList = _sharedUtils.FileUtil.readAlldirSync(tempBuildDir);
     const buildDir = _path.default.join(context.projectPath, compilerOption.outputPath);
-    const diffList = _UxFileUtils.default.getDiffJSON(compalition.buildFileList, tempFileList, buildDir, tempBuildDir);
+    const diffList = _UxFileUtils.default.getDiffJSON(compilation.buildFileList, tempFileList, buildDir, tempBuildDir);
 
     // 所有差异文件，压缩到 .diff.rpk 中
     if (diffList?.length) {
@@ -330,8 +364,8 @@ class UxAfterCompile {
         filePath: _path.default.join(buildFold, item),
         zipFilePath: item
       })));
-      compalition.info.diffList = diffList;
-      compalition.info.diffFile = _path.default.join(context.projectPath, compilerOption.releasePath, diffFileName);
+      compilation.info.diffList = diffList;
+      compilation.info.diffFile = _path.default.join(context.projectPath, compilerOption.releasePath, diffFileName);
     }
   };
 
@@ -411,10 +445,11 @@ class UxAfterCompile {
   static compileLiteCard = async params => {
     const {
       compilerOption,
-      context
+      context,
+      compilation
     } = params;
     try {
-      if (context?.liteCards?.length > 0 && compilerOption) {
+      if (compilation && compilation?.liteCards?.length > 0 && compilerOption) {
         const {
           projectPath: tempProjectPath,
           outputPath: LITE_OUTPUT_PATH
@@ -425,7 +460,7 @@ class UxAfterCompile {
         // 1.
         await new _LiteCard.default(projectPath).compileLiteCard();
         // 2.
-        context.liteCards.forEach(card => {
+        compilation.liteCards.forEach(card => {
           // hap-toolkit的产物在项目的build文件夹下
           const fromPath = _path.default.join(projectPath, LITE_OUTPUT_PATH, card);
           // aiot-toolkit的产物在临时项目的build文件夹下

package/lib/compiler/javascript/interface/IJavascriptCompileOption.d.ts

@@ -48,6 +48,11 @@ interface IJavascriptCompileOption extends ICompileParam {
      * 启用应用自动化测试
      */
     enableE2e?: boolean;
+    /**
+     * 自动化测试配置文件路径
+     *
+     */
+    e2eConfigPath?: string;
     /**
      * 启用 png8 压缩
      */

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.d.ts

@@ -8,7 +8,9 @@ declare class VelaWebpackConfigurator implements IWebpackConfigurator {
     protected createWrapPlugin(): RspackPluginInstance;
     protected createBundleAnalyzerPlugin(): any;
     /**
-     * 通过读取 manifest.json 生成 entry
+     * 生成entry
+     * 1. 通过读取 manifest.json 生成 entry
+     * 2. 通过自动化测试的entry配置生成entry
      * @returns
      */
     createEntry(): string | EntryObject | string[];

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.js

@@ -9,6 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 var _UxFileUtils = _interopRequireDefault(require("../../../utils/ux/UxFileUtils"));
 var _WrapPlugin = _interopRequireDefault(require("./plugin/WrapPlugin"));
 var _UxCompileUtil = _interopRequireDefault(require("./utils/UxCompileUtil"));
+var _UxUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/UxUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class VelaWebpackConfigurator {
   createPlugins() {
@@ -34,7 +35,9 @@ class VelaWebpackConfigurator {
   }
 
   /**
-   * 通过读取 manifest.json 生成 entry
+   * 生成entry
+   * 1. 通过读取 manifest.json 生成 entry
+   * 2. 通过自动化测试的entry配置生成entry
    * @returns
    */
   createEntry() {
@@ -44,7 +47,19 @@ class VelaWebpackConfigurator {
     } = this.param;
     const configFilePath = _UxFileUtils.default.getManifestFilePath(this.param.projectPath, this.param.sourceRoot);
     if (_fsExtra.default.existsSync(configFilePath)) {
+      // 1
       const config = _fsExtra.default.readJSONSync(configFilePath);
+      // 2
+      if (this.param.e2eConfigPath && this.param.enableE2e) {
+        const e2eConfig = _UxUtil.default.getE2eConfig({
+          projectPath: this.param.projectPath,
+          e2eConfigPath: this.param.e2eConfigPath
+        });
+        const testPagePath = _path.default.parse(_path.default.relative(_path.default.join(this.param.projectPath, sourceRoot), _path.default.join(e2eConfig.dir, e2eConfig.entry.path)).replaceAll(_path.default.sep, _path.default.posix.sep));
+        config.router.pages[testPagePath.dir] = {
+          component: testPagePath.name
+        };
+      }
       return _UxCompileUtil.default.resolveEntries(config, _path.default.resolve(projectPath, sourceRoot), projectPath);
     } else {
       throw new Error(`Configuration file does not exist: ${configFilePath}`);

package/lib/compiler/javascript/vela/interface/IManifest.d.ts

@@ -29,13 +29,26 @@ export default interface IManifest {
         entry: string;
         pages: Dictionary<{
             component?: string;
+            launchMode?: string;
         }>;
+        floatingWindows?: any;
     };
+    services: IService[] | Record<string, IService>;
     minAPILevel?: number;
     packageInfo?: Dictionary<string | number>;
     icon: string;
+    workers?: {
+        entries: {
+            file: string;
+        }[];
+    };
 }
 export interface IFeatures {
     name: string;
 }
+export interface IService {
+    name: string;
+    autoStart?: boolean;
+    path: string;
+}
 export {};

package/lib/compiler/javascript/vela/utils/UxCompileUtil.d.ts

@@ -1,4 +1,5 @@
 import { Dictionary } from '@aiot-toolkit/shared-utils';
+import IManifest from '../interface/IManifest';
 declare class UxCompileUtil {
     static readonly DIGEST_ZIP_DIR = "META-INF";
     static clean(dirList: string[]): void;
@@ -7,9 +8,9 @@ declare class UxCompileUtil {
      * @param config 项目配置文件的内容，应为json对象
      * @param codeDir 源码目录
      * @param projectPath 项目目录
-     * @returns {[入口名]:源文件路径}
+     * @returns `{[entryName]:entryPath}`
      */
-    static resolveEntries(config: any, codeDir: string, projectPath: string): Dictionary<string>;
+    static resolveEntries(config: IManifest, codeDir: string, projectPath: string): Dictionary<string>;
     /**
      * 通过无后缀的文件名路径获取存在的文件路径
      *

package/lib/compiler/javascript/vela/utils/UxCompileUtil.js

@@ -36,7 +36,7 @@ class UxCompileUtil {
    * @param config 项目配置文件的内容，应为json对象
    * @param codeDir 源码目录
    * @param projectPath 项目目录
-   * @returns {[入口名]:源文件路径}
+   * @returns `{[entryName]:entryPath}`
    */
   static resolveEntries(config, codeDir, projectPath) {
     const {
@@ -114,11 +114,10 @@ class UxCompileUtil {
     if (Array.isArray(services)) {
       services.forEach(item => {
         const {
-          name,
           path
         } = item;
-        if (name && path) {
-          result['services/' + name] = './src/' + path + `?uxType=${_EntryType.default.APP}`;
+        if (path) {
+          result[path] = './src/' + path + `?uxType=${_EntryType.default.APP}`;
         }
       });
     }

package/lib/compiler/javascript/vela/utils/webpackLoader/IWebpackLoaderOption.d.ts

@@ -1,11 +1,13 @@
 import { IFileLaneContext } from 'file-lane';
 import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
 import { ILog } from '@aiot-toolkit/shared-utils';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * IWebpackLoaderOption
  */
 export default interface IWebpackLoaderOption {
     compileParam: IJavascriptCompileOption;
     context: IFileLaneContext;
+    compilation: FileLaneCompilation;
     onLog: (log: ILog[]) => void;
 }

package/lib/compiler/javascript/vela/utils/webpackLoader/WebpackJsLoader.js

@@ -20,7 +20,7 @@ async function _default(source) {
     projectPath: this.rootContext,
     onLog: log => onLog?.([log]),
     projectType: _sharedUtils.ProjectType.VELA_UX
-  }, compileParam, context).translate({
+  }, compileParam, context, true).translate({
     content: source
   }, []);
   callback(null, result.targetTree.getFullText());

package/lib/compiler/javascript/vela/utils/webpackLoader/WebpackUxLoader.js

@@ -11,7 +11,8 @@ async function _default(source) {
   const {
     onLog,
     compileParam,
-    context
+    context,
+    compilation
   } = options;
   const callback = this.async();
   const {
@@ -20,7 +21,7 @@ async function _default(source) {
   } = await _UxLoaderUtils.default.compileUxToJavascript({
     path: this.resourcePath,
     content: source
-  }, context, false, compileParam);
+  }, context, false, compileParam, compilation);
   onLog?.(logs);
   callback(null, compiledFiles[0].content, compiledFiles[1].content);
 }

package/lib/config/UxConfig.d.ts

@@ -5,6 +5,7 @@ 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 AndroidUxLoader from '../loader/ux/android/UxLoader';
 import UxBeforeWorks from '../beforeWorks/ux/UxBeforeWorks';
 import UxAfterWorks from '../afterWorks/ux/UxAfterWorks';
 import { IChangedFile } from 'file-lane/lib/interface/IChangedFile';
@@ -34,7 +35,7 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
         workerDescribe: string;
     })[];
     afterWorks: (typeof UxAfterWorks.cleanOutput)[];
-    watchIgnores: RegExp[];
+    watchIgnores: string[];
     /**
      * 通过项目类型，返回模块配置
      */
@@ -46,11 +47,7 @@ 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)[];
@@ -60,6 +57,14 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             loader: (typeof PngLoader)[];
             exclude?: undefined;
         })[];
+    } | {
+        rules: ({
+            test: RegExp[];
+            loader: (typeof AndroidUxLoader)[];
+        } | {
+            test: RegExp[];
+            loader: (typeof PngLoader)[];
+        })[];
     };
     /**
      * 判断项目类型

package/lib/config/UxConfig.js

@@ -111,7 +111,7 @@ class UxConfig {
     workerDescribe: 'Check resource'
   }])();
   afterWorks = (() => [_UxAfterWorks.default.cleanOutput])();
-  watchIgnores = [/node_modules/, /build/, /dist/];
+  watchIgnores = ['**/node_modules/**', '**/build/**', '**/dist/**'];
 
   /**
    * 通过项目类型，返回模块配置
@@ -123,11 +123,8 @@ class UxConfig {
         test: ['app.ux'],
         loader: [_AppUxLoader.default]
       }, {
-        test: [/.+\.ux$/],
+        test: [/.+\.(ux|hml)$/],
         exclude: [/app\.ux/],
-        loader: [_UxLoader.default]
-      }, {
-        test: [/.+\.hml$/],
         loader: [_HmlLoader.default, _UxLoader.default]
       }, {
         test: [/.+\.js$/],

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

@@ -1,11 +1,15 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import { ILog } from '@aiot-toolkit/shared-utils';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * JsLoader
  */
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    compilation: FileLaneCompilation;
+    logs: ILog[];
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _parser = require("@aiot-toolkit/parser");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _UxLoaderUtils = _interopRequireDefault(require("../../utils/ux/UxLoaderUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * JsLoader
  */
 class JsLoader {
+  logs = [];
   async parser(files) {
-    const onLog = () => {};
     const result = [];
     for (const item of files) {
       if (!item.content) {
@@ -25,13 +27,22 @@ class JsLoader {
           projectPath: this.context.projectPath,
           content: item.content.toString(),
           projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
-          onLog
+          onLog: log => {
+            this.logs.push(log);
+          }
         };
+        const scriptTree = await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
+          content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
+        }, []);
+        const isService = _UxLoaderUtils.default.isServiceFile(item.path, {
+          compilation: this.compilation,
+          compilerOption: this.compilerOption,
+          context: this.context
+        });
+        const content = isService ? _UxLoaderUtils.default.createServiceWrapper(scriptTree.targetTree).filter(Boolean).join('\n') : scriptTree.targetTree.getFullText();
         result.push({
           path: item.path,
-          content: (await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
-            content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
-          }, [])).targetTree.getFullText()
+          content
         });
       }
     }

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

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

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

@@ -19,7 +19,8 @@ class UxLoader {
       } = await new _AndroidUx.default().compileUx({
         context: this.context,
         file: item,
-        compilerOption: this.compilerOption
+        compilerOption: this.compilerOption,
+        compilation: this.compilation
       });
       this.logs = logs;
       result.push(...files);

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

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

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

@@ -15,7 +15,7 @@ class AppUxLoader {
     const {
       files: resultFiles,
       logs
-    } = await _UxLoaderUtils.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption);
+    } = await _UxLoaderUtils.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption, this.compilation);
     this.logs = logs;
     return resultFiles;
   }

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

@@ -9,16 +9,16 @@ declare class HmlLoader implements ILoader {
     /**
      * 包裹 hml 文件
      *
-     * # 路径
-     * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
-     *
      * # 内容
-     * 1. 给hml的内容加上<template></template>
-     * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
-     * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+     * 1. 全文模式(存在template、script、style任一节点)，保留原内容不变
+     * 2. 否则，则进行如下包装
+     *    1. hml的内容: import放到最前，其它内容使用<template></template>包裹
+     *    2. 如果存在同路径同名的 script文件，则加到<script></script>中
+     *    3. 如果存在同路径同名的 style文件，则加到<style></style>中
      *
      * @param file
      */
     private wrapHml;
+    private nodesToString;
 }
 export default HmlLoader;

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

@@ -7,6 +7,9 @@ exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
 var _parser = require("@aiot-toolkit/parser");
+var parse5 = _interopRequireWildcard(require("aiot-parse5"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * HmlLoader
@@ -21,13 +24,12 @@ class HmlLoader {
   /**
    * 包裹 hml 文件
    *
-   * # 路径
-   * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
-   *
    * # 内容
-   * 1. 给hml的内容加上<template></template>
-   * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
-   * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+   * 1. 全文模式(存在template、script、style任一节点)，保留原内容不变
+   * 2. 否则，则进行如下包装
+   *    1. hml的内容: import放到最前，其它内容使用<template></template>包裹
+   *    2. 如果存在同路径同名的 script文件，则加到<script></script>中
+   *    3. 如果存在同路径同名的 style文件，则加到<style></style>中
    *
    * @param file
    */
@@ -36,32 +38,47 @@ class HmlLoader {
       path,
       content
     } = file;
-    const uxExt = _parser.ExtensionConfig.UX;
+    const uxAst = parse5.parseFragment(content?.toString() || '', {
+      scriptingEnabled: false,
+      sourceCodeLocationInfo: true
+    });
+    const fullMode = uxAst.childNodes.some(node => {
+      return ['template', 'script', 'style'].includes(node.nodeName);
+    });
+    if (fullMode) {
+      return file;
+    }
     const getFilePath = ext => {
       const pathParsed = _path.default.parse(path);
       pathParsed.ext = ext;
       pathParsed.base = pathParsed.name + ext;
       return _path.default.format(pathParsed);
     };
-    const uxPath = getFilePath(uxExt);
-    if (_fs.default.existsSync(uxPath)) {
-      throw new Error(`${uxPath} already exists`);
-    }
     const scriptExts = _parser.ExtensionConfig.SCRIPTS;
     const styleExts = _parser.ExtensionConfig.STYLES;
     const scriptPath = scriptExts.map(item => getFilePath(item)).find(item => _fs.default.existsSync(item));
     const stylePath = styleExts.map(item => getFilePath(item)).find(item => _fs.default.existsSync(item));
-    let uxContent = ['<template>', content, '</template>'].join('\n');
+    const importNodes = uxAst.childNodes.filter(node => node.nodeName === 'import');
+    const otherNodes = uxAst.childNodes.filter(node => node.nodeName !== 'import');
+    let uxContent = this.nodesToString(importNodes);
+    uxContent += ['<template>', this.nodesToString(otherNodes), '</template>'].join('\n');
     if (scriptPath) {
       uxContent += ['<script>', _fs.default.readFileSync(scriptPath, 'utf-8'), '</script>'].join('\n');
     }
     if (stylePath) {
-      uxContent += ['<style>', _fs.default.readFileSync(stylePath, 'utf-8'), '</style>'].join('\n');
+      const styleExt = _path.default.extname(stylePath).toLowerCase();
+      uxContent += [`<style lang="${styleExt.slice(1)}">`, _fs.default.readFileSync(stylePath, 'utf-8'), '</style>'].join('\n');
     }
     return {
       path,
       content: uxContent
     };
   }
+  nodesToString(nodes) {
+    return parse5.serialize({
+      nodeName: '#document-fragment',
+      childNodes: nodes
+    });
+  }
 }
 var _default = exports.default = HmlLoader;

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

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

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

@@ -11,7 +11,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 class UxLoader {
   async parser(files) {
     const resultFiles = [];
-    const liteCardList = this.context.liteCards?.map(item => _path.default.join(this.context.projectPath, this.compilerOption.sourceRoot, `${item}${_parser.ExtensionConfig.UX}`)) || [];
+    const liteCardList = this.compilation.liteCards?.map(item => _path.default.join(this.context.projectPath, this.compilerOption.sourceRoot, `${item}${_parser.ExtensionConfig.UX}`)) || [];
     for (const file of files) {
       // 轻卡ux不转换
       if (liteCardList.includes(file.path)) {
@@ -21,7 +21,7 @@ class UxLoader {
       const {
         files: compiledFiles,
         logs
-      } = await _UxLoaderUtils.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
+      } = await _UxLoaderUtils.default.compileUxToJavascript(file, this.context, false, this.compilerOption, this.compilation);
       this.logs = logs.map(item => {
         return {
           ...item,

package/lib/utils/BeforeCompileUtils.d.ts

@@ -6,13 +6,11 @@ import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascri
 declare class BeforeCompileUtils {
     /**
      * 获取ux项目的路由入口
-     * context.entries中存放ux页面路由
-     * context.liteCards中存放轻卡路由
      * @param context
      * @param fileList
      * @returns
      */
-    static getEntries: PreWork;
+    static getEntries: PreWork<IJavascriptCompileOption>;
     static clean: PreWork;
     /**
      * 获取项目的全局样式变量配置

package/lib/utils/BeforeCompileUtils.js

@@ -11,6 +11,7 @@ var _path = _interopRequireDefault(require("path"));
 var _TranslateCache = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/TranslateCache"));
 var _UxFileUtils = _interopRequireDefault(require("./ux/UxFileUtils"));
 var _IManifest = require("../compiler/javascript/vela/interface/IManifest");
+var _UxUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/UxUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 
@@ -20,8 +21,6 @@ const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobu
 class BeforeCompileUtils {
   /**
    * 获取ux项目的路由入口
-   * context.entries中存放ux页面路由
-   * context.liteCards中存放轻卡路由
    * @param context
    * @param fileList
    * @returns
@@ -29,7 +28,8 @@ class BeforeCompileUtils {
   static getEntries = params => {
     const {
       context,
-      compilerOption
+      compilerOption,
+      compilation
     } = params;
     const {
       projectPath
@@ -41,8 +41,12 @@ class BeforeCompileUtils {
     let entryList = [];
     // 存储轻卡路由
     let liteCardList = [];
+
+    // services 路由
+    let serviceList = [];
     const {
-      router
+      router,
+      services
     } = manifestContent;
     if (router) {
       const {
@@ -85,22 +89,37 @@ class BeforeCompileUtils {
       // 没有router配置
       _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
-    context['entries'] = entryList;
-    context['liteCards'] = liteCardList;
+
+    // e2e测试入口
+    if (compilerOption?.enableE2e && compilerOption?.e2eConfigPath) {
+      const e2eConfig = _UxUtil.default.getE2eConfig({
+        projectPath: context.projectPath,
+        e2eConfigPath: compilerOption.e2eConfigPath
+      });
+      entryList.push(_path.default.join(e2eConfig.dir, e2eConfig.entry.path));
+    }
+    if (services) {
+      serviceList = Array.isArray(services) ? services : Object.values(services);
+    }
+    if (compilation) {
+      compilation['entries'] = entryList;
+      compilation['liteCards'] = liteCardList;
+      compilation['services'] = serviceList;
+    }
     return Promise.resolve();
   };
   static clean = async params => {
     const {
       context,
       compilerOption,
-      compalition
+      compilation
     } = params;
     if (compilerOption) {
       // 存储build中的文件列表
       const buildPath = _path.default.join(context.projectPath, compilerOption.outputPath);
       const buildFileList = _fsExtra.default.existsSync(buildPath) ? _sharedUtils.FileUtil.readAlldirSync(buildPath).map(filePath => _path.default.relative(buildPath, filePath)) : [];
-      if (compalition) {
-        compalition.buildFileList = buildFileList;
+      if (compilation) {
+        compilation.buildFileList = buildFileList;
       }
     }
     context.translateCache = new _TranslateCache.default();

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

@@ -3,6 +3,7 @@ import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam } from 'file-lane';
 import { SourceFile } from 'ts-morph';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * UxLoaderUtils
  */
@@ -15,7 +16,7 @@ declare class UxLoaderUtils {
      * @param project
      * @returns
      */
-    static compileUxToJavascript(file: IFileParam, context: IFileLaneContext, isAppUx: boolean, compilerOption: IJavascriptCompileOption): Promise<{
+    static compileUxToJavascript(file: IFileParam, context: IFileLaneContext, isAppUx: boolean, compilerOption: IJavascriptCompileOption, compilation: FileLaneCompilation): Promise<{
         files: IFileParam[];
         logs: ILog[];
     }>;
@@ -25,7 +26,7 @@ declare class UxLoaderUtils {
      * @param resultFiles
      * @param context
      */
-    static compileAppUxToJavascript(file: IFileParam, context: IFileLaneContext, compileOption: IJavascriptCompileOption): Promise<{
+    static compileAppUxToJavascript(file: IFileParam, context: IFileLaneContext, compileOption: IJavascriptCompileOption, compilation: FileLaneCompilation): Promise<{
         files: IFileParam[];
         logs: ILog[];
     }>;
@@ -41,7 +42,7 @@ declare class UxLoaderUtils {
      * @param filePath
      * @returns
      */
-    static isPageUx(context: IFileLaneContext, filePath: string): boolean;
+    static isPageUx(compilation: FileLaneCompilation, filePath: string): boolean;
     /**
      * 获取app.ux的内容，且只返回script和style内容
      * @param fileContent
@@ -64,5 +65,11 @@ declare class UxLoaderUtils {
      */
     static wrapScript(isPageUx: boolean, appScriptTree: SourceFile): string;
     static getReturnType(isPageUx: boolean): "$app_exports$['entry'] =" | "module.exports = ";
+    static createServiceWrapper(appScriptTree: SourceFile): string[];
+    static isServiceFile(filePath: string, option: {
+        compilation: FileLaneCompilation;
+        context: IFileLaneContext;
+        compilerOption: IJavascriptCompileOption;
+    }): boolean;
 }
 export default UxLoaderUtils;

package/lib/utils/ux/UxLoaderUtils.js

@@ -12,6 +12,7 @@ var parse5 = _interopRequireWildcard(require("aiot-parse5"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
 var _QuickAppDocHelp = require("@aiot-toolkit/shared-utils/lib/utils/QuickAppDocHelp");
+var _StyleUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/StyleUtil"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -54,7 +55,7 @@ class UxLoaderUtils {
    * @param project
    * @returns
    */
-  static async compileUxToJavascript(file, context, isAppUx, compilerOption) {
+  static async compileUxToJavascript(file, context, isAppUx, compilerOption, compilation) {
     const logs = [];
     const {
       path: filePath,
@@ -77,7 +78,7 @@ class UxLoaderUtils {
     }
 
     // 区分页面组件和子组件
-    const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
+    const isPageUx = UxLoaderUtils.isPageUx(compilation, filePath);
     // 配置转换参数
     const options = {
       projectPath: context.projectPath,
@@ -145,8 +146,26 @@ class UxLoaderUtils {
     const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
       const scriptCode = appScriptTree.getText();
       const hasScript = Boolean(scriptCode) && scriptCode !== '""';
+      const isService = UxLoaderUtils.isServiceFile(filePath, {
+        compilation,
+        context,
+        compilerOption
+      });
+
       // script代码放在第三个位置不能变化，影响更新source map
-      return isAppUx ? [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}` : '', hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`, translateStyleFunc()] : [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}` : '', `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.template = $app_template$;`, `$app_exports$.default.style = $app_style$;`, `}`];
+      const createAppWrapper = () => {
+        return [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}` : '', hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`, translateStyleFunc()];
+      };
+      const createComponentWrapper = () => {
+        return [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}` : '', `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.template = $app_template$;`, `$app_exports$.default.style = $app_style$;`, `}`];
+      };
+      if (isAppUx) {
+        return createAppWrapper();
+      } else if (isService) {
+        return UxLoaderUtils.createServiceWrapper(appScriptTree);
+      } else {
+        return createComponentWrapper();
+      }
     };
     const {
       targetTree,
@@ -179,7 +198,7 @@ class UxLoaderUtils {
    * @param resultFiles
    * @param context
    */
-  static async compileAppUxToJavascript(file, context, compileOption) {
+  static async compileAppUxToJavascript(file, context, compileOption, compilation) {
     const {
       path: filePath,
       content
@@ -194,7 +213,7 @@ class UxLoaderUtils {
     const compileResult = await UxLoaderUtils.compileUxToJavascript({
       path: filePath,
       content: appContent
-    }, context, isAppUx, compileOption);
+    }, context, isAppUx, compileOption, compilation);
     return compileResult;
   }
   /**
@@ -213,8 +232,8 @@ class UxLoaderUtils {
    * @param filePath
    * @returns
    */
-  static isPageUx(context, filePath) {
-    return Boolean(context.entries?.includes(filePath));
+  static isPageUx(compilation, filePath) {
+    return Boolean(compilation.entries?.includes(filePath));
   }
   /**
    * 获取app.ux的内容，且只返回script和style内容
@@ -334,7 +353,19 @@ class UxLoaderUtils {
     return result;
   }
   static wrapStyle(styleNodes, file, compilerOption) {
-    const code = JSON.stringify(styleNodes);
+    // 排序，媒体查询放到最后
+    const sortedNodes = [...styleNodes];
+    sortedNodes.sort((a, b) => {
+      const conditionA = _StyleUtil.default.isConditionStyleItem(a[0]);
+      const conditionB = _StyleUtil.default.isConditionStyleItem(b[0]);
+      if (conditionA && !conditionB) {
+        return 1;
+      } else if (!conditionA && conditionB) {
+        return -1;
+      }
+      return 0;
+    });
+    const code = JSON.stringify(sortedNodes);
     if (compilerOption.enableProtobuf) {
       if (styleNodes?.length) {
         const result = BinaryPlugin.addStyle(file.path, file.path, code);
@@ -360,5 +391,13 @@ class UxLoaderUtils {
   static getReturnType(isPageUx) {
     return isPageUx ? `$app_exports$['entry'] =` : 'module.exports = ';
   }
+  static createServiceWrapper(appScriptTree) {
+    return ['', '', `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}`, `$app_script$({}, $app_exports$, $app_require$);`, `module.exports = $app_exports$.default;`];
+  }
+  static isServiceFile(filePath, option) {
+    const services = option.compilation['services'];
+    const relativeFilePath = _path.default.relative(_path.default.join(option.context.projectPath, option.compilerOption.sourceRoot), filePath).replace(/\\/g, _path.default.posix.sep);
+    return services?.some(service => relativeFilePath.startsWith(service.path));
+  }
 }
 var _default = exports.default = UxLoaderUtils;

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

@@ -1,6 +1,7 @@
 import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * AndroidUx
  */
@@ -18,6 +19,7 @@ declare class AndroidUx {
         context: IFileLaneContext;
         file: IFileParam;
         compilerOption: IJavascriptCompileOption;
+        compilation: FileLaneCompilation;
     }): Promise<{
         files: IFileParam[];
         logs: ILog[];

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

@@ -28,7 +28,8 @@ class AndroidUx {
     const {
       context,
       file,
-      compilerOption
+      compilerOption,
+      compilation
     } = params;
     const {
       path: filePath,
@@ -37,7 +38,7 @@ class AndroidUx {
     const {
       projectPath
     } = context;
-    const fileType = this.getFileType(filePath, context);
+    const fileType = this.getFileType(filePath, compilation);
 
     // 无内容的文件，添加空内容警告
     if (!content) {
@@ -84,10 +85,10 @@ class AndroidUx {
       logs
     };
   }
-  getFileType(filePath, context) {
+  getFileType(filePath, compilation) {
     const {
       entries
-    } = context;
+    } = compilation;
     if (_path.default.basename(filePath) === 'app.ux') {
       return 'app';
     } else if (entries.includes(filePath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.2",
+  "version": "2.0.6-beta.20",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.6-beta.2",
-    "@aiot-toolkit/parser": "2.0.6-beta.2",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.2",
+    "@aiot-toolkit/generator": "2.0.6-beta.20",
+    "@aiot-toolkit/parser": "2.0.6-beta.20",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.20",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.6-beta.2",
+    "file-lane": "2.0.6-beta.20",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -42,5 +42,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "d0057f9e62ac191d21445787667217cfa4aff1e9"
+  "gitHead": "b2a85a11db9ff9e51e63bfca5643f3e6e0eeb15c"
 }