@aiot-toolkit/aiotpack 2.0.6-beta.17 → 2.0.6-beta.19

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

@@ -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/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';
@@ -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

@@ -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,5 +1,6 @@
 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
@@ -8,6 +9,7 @@ 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

@@ -12,8 +12,8 @@ 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) {
@@ -27,7 +27,9 @@ 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

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

@@ -9,13 +9,12 @@ declare class HmlLoader implements ILoader {
     /**
      * 包裹 hml 文件
      *
-     * # 路径
-     * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
-     *
      * # 内容
-     * 1. 给hml的内容加上<template></template>
-     * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
-     * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+     * 1. 如果存在template节点，则保留原内容不变
+     * 2. 如果不存在template节点，则进行如下包装
+     *    1. hml的内容加上<template></template>
+     *    2. 如果存在同路径同名的 script文件，则加到<script></script>中
+     *    3. 如果存在同路径同名的 style文件，则加到<style></style>中
      *
      * @param file
      */

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节点，则保留原内容不变
+   * 2. 如果不存在template节点，则进行如下包装
+   *    1. hml的内容加上<template></template>
+   *    2. 如果存在同路径同名的 script文件，则加到<script></script>中
+   *    3. 如果存在同路径同名的 style文件，则加到<style></style>中
    *
    * @param file
    */
@@ -36,17 +38,22 @@ class HmlLoader {
       path,
       content
     } = file;
-    const uxExt = _parser.ExtensionConfig.UX;
+    const uxAst = parse5.parseFragment(content?.toString() || '', {
+      scriptingEnabled: false,
+      sourceCodeLocationInfo: true
+    });
+    const hasTemplate = uxAst.childNodes.some(node => {
+      return node.nodeName === 'template';
+    });
+    if (hasTemplate) {
+      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));
@@ -56,7 +63,8 @@ class HmlLoader {
       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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.17",
+  "version": "2.0.6-beta.19",
   "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.17",
-    "@aiot-toolkit/parser": "2.0.6-beta.17",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.17",
+    "@aiot-toolkit/generator": "2.0.6-beta.19",
+    "@aiot-toolkit/parser": "2.0.6-beta.19",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.19",
     "@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.17",
+    "file-lane": "2.0.6-beta.19",
     "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": "d9d60157e951ebbc58f6a6f6fac63efd9d9d4fd5"
+  "gitHead": "29d48c29e9b35e01a722868daba622fd74baefc9"
 }