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

package/lib/ux/config/IElement.d.ts

@@ -1,4 +1,5 @@
 import { Dictionary, Logger } from '@aiot-toolkit/shared-utils';
+import { IAttributeNode } from '../interface/IIdentifierNode';
 interface IElement {
     /**
      * 别名
@@ -8,6 +9,19 @@ interface IElement {
      * @example <img /> 生成为 image
      */
     aliasName?: string;
+    /**
+     * 别名属性
+     *
+     * aliasName 生效时，会将别名属性合并到属性列表中
+     *
+     * @example
+     * ```
+     *  // <button /> 生成为 <input type="button" />
+     *  aliasName='input'
+     *  aliasAttributes=[{name:'type',value:'button'}]
+     * ```
+     */
+    aliasAttributes?: IAttributeNode[];
     /**
      * 允许文字子节点
      *

package/lib/ux/config/StyleBaseConfig.js

@@ -1321,6 +1321,12 @@ const STYLE_ATTRIBUTE_CONFIG = exports.STYLE_ATTRIBUTE_CONFIG = {
   scrollSnapAlign: {
     // csstree-validator可校验
     // 按照一般转换即可，无需额外转换
+  },
+  selectedFontSize: {
+    validate: validateLengthNode
+  },
+  selectedBackgroundColor: {
+    validate: validColorNode
   }
 };
 /**

package/lib/ux/config/vela/ElementConfig.js

@@ -217,6 +217,17 @@ const elementConfig = {
         name: {}
       }
     },
+    button: {
+      aliasName: 'input',
+      aliasAttributes: [{
+        name: 'type',
+        value: 'button'
+      }],
+      attributes: {
+        name: {},
+        value: {}
+      }
+    },
     input: {
       events: ['change', 'enterkeyclick', 'selectionchange'],
       attributes: {

package/lib/ux/parser/UxParser.js

@@ -11,6 +11,7 @@ var _TemplateUtil = _interopRequireDefault(require("../translate/vela/utils/Temp
 var _UxUtil = _interopRequireDefault(require("../utils/UxUtil"));
 var _ScriptParser = _interopRequireDefault(require("./ScriptParser"));
 var _StyleParser = _interopRequireDefault(require("./StyleParser"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
@@ -72,14 +73,51 @@ class UxParser {
             };
             break;
           case 'style':
-            const cssContent = parse5.serialize(childNode);
+            // 如果 style 标签有 src 属性，则读取对应的文件内容，否则直接使用 style 标签的内容
+            const src = _UxUtil.default.getStyleSrc(childNode, this.options.filePath);
+            let cssContent = '';
+            const filePath = this.options.filePath;
+            if (src) {
+              // 如果有 src 属性，且 style 标签内有内容，则提示用户 style 标签内的内容会被 src 文件覆盖
+              if (childNode.childNodes && childNode.childNodes.length > 0) {
+                this.options.onLog({
+                  level: _sharedUtils.Loglevel.WARN,
+                  filePath: this.options.filePath,
+                  position: {
+                    startLine: childNode.sourceCodeLocation?.startLine || 0,
+                    startColumn: 0
+                  },
+                  message: [`style tag with src should not have inline content, src file will be used directly`]
+                });
+              }
+              // 读取 src 文件内容，如果文件不存在，则提示用户
+              if (!_fsExtra.default.existsSync(src)) {
+                this.options.onLog({
+                  level: _sharedUtils.Loglevel.WARN,
+                  filePath: this.options.filePath,
+                  position: {
+                    startLine: childNode.sourceCodeLocation?.startLine || 0,
+                    startColumn: 0
+                  },
+                  message: [`style src file does not exist: ${src}`]
+                });
+              } else {
+                cssContent = _fsExtra.default.readFileSync(src).toString();
+                // 解析 css 时需要用到文件路径，所以将options.filePath暂时替换为src，解析完成后再还原
+                this.options.filePath = src;
+              }
+            } else cssContent = parse5.serialize(childNode);
+
             // 获取lang值，组合成文件名
             const langType = _UxUtil.default.getLangType(childNode);
-            const cssFileName = _UxUtil.default.spliceFileName(fileName, langType);
+            // 使用 src 时，cssFileName 以 src 的文件名为准，否则以当前解析的文件名为准
+            const cssFileName = src ? _path.default.basename(src) : _UxUtil.default.spliceFileName(fileName, langType);
             // 转换全局变量为符合lang类型的字符串
             const globalStyle = _UxUtil.default.convertGlobalJson(this.globalVar, langType);
             // 解析CSS 转为 js格式的内容
             const cssParserResult = await new _StyleParser.default(this.options, this.compilerOption, this.collectImageResource, childNode.sourceCodeLocation?.startLine || 0).parser(`${cssContent}\n${globalStyle}`, cssFileName);
+            // 还原 this.options.filePath
+            this.options.filePath = filePath;
             // 多Style标签(TODO: 应该不支持多style标签)
             ast.style.styleContent.push(...cssParserResult.ast.styleContent);
             ast.style.content = parse5.serialize(childNode);

package/lib/ux/translate/vela/ScriptToTypescript.js

@@ -103,7 +103,7 @@ class ScriptToTypescript {
       let position = undefined;
       let message = babelError.message;
       if (loc) {
-        const offsetLine = (sourceTree.sourceCodeLocation?.startLine || 0) - 1;
+        const offsetLine = (sourceTree.sourceCodeLocation?.startLine || 1) - 1;
         const startLine = loc.line + offsetLine;
         const startColumn = loc.column;
         // babel 错误信息中包含行列信息，需要替换

package/lib/ux/translate/vela/utils/TemplateUtil.js

@@ -367,6 +367,7 @@ class TemplateUtil {
     }
     const elementConfig = getElementConfig(tag.name);
     const effectTag = elementConfig?.aliasName || tag.name;
+    const aliasAttributes = elementConfig?.aliasAttributes;
     const {
       globalInstance,
       dataInstance,
@@ -374,7 +375,7 @@ class TemplateUtil {
     } = this.context;
     const result = `${globalInstance}.${callerName}("${effectTag}", ${_sharedUtils.StringUtil.objectToString({
       [dataInstance]: dataInstanceValue,
-      __opts__: await this.attributesToObject(attributes, identifiers, {
+      __opts__: await this.attributesToObject(aliasAttributes ? [...aliasAttributes, ...attributes] : attributes, identifiers, {
         nameToCamel: true
       })
     })}, ${children})`;

package/lib/ux/utils/StyleUtil.js

@@ -537,7 +537,7 @@ class StyleUtil {
         if (!(0, _StyleSelectorType.isSupportMediaType)(mediaTypeName, projectType)) {
           // 报错
           onLog({
-            level: _sharedUtils.Loglevel.ERROR,
+            level: _sharedUtils.Loglevel.WARN,
             filePath: filePath,
             position: node.loc ? styleMapUil.transfromLocToPosition(node.loc) : undefined,
             message: [`Unsupported media type `, {

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

@@ -52,5 +52,14 @@ declare class UxUtil {
         projectPath: string;
         e2eConfigPath: string;
     }): IE2eConfig;
+    /**
+     * 获取 style 标签的 src 属性值
+     * 如果 src 是相对路径，则需要拼接路径
+     *
+     * @param node
+     * @param filePath
+     * @returns
+     */
+    static getStyleSrc(node: Element, filePath: string): string;
 }
 export default UxUtil;

package/lib/ux/utils/UxUtil.js

@@ -132,5 +132,22 @@ class UxUtil {
       throw new Error(`e2e Configuration file does not exist: ${configFilePath}`);
     }
   }
+
+  /**
+   * 获取 style 标签的 src 属性值
+   * 如果 src 是相对路径，则需要拼接路径
+   *
+   * @param node
+   * @param filePath
+   * @returns
+   */
+  static getStyleSrc(node, filePath) {
+    for (let attr of node.attrs) {
+      if (attr.name === 'src') {
+        return UxUtil.isAbsoluteResource(attr.value) ? attr.value : _path.default.join(_path.default.dirname(filePath), attr.value);
+      }
+    }
+    return '';
+  }
 }
 var _default = exports.default = UxUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/parser",
-  "version": "2.0.6-beta.17",
+  "version": "2.0.6-beta.19",
   "description": "Parse the source code of aiot and convert it to the AST (Abstract Syntax Tree) of the target code.",
   "keywords": [
     "aiot",
@@ -20,7 +20,7 @@
     "test": "node ./__tests__/parser.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.17",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.19",
     "@babel/core": "^7.23.6",
     "@babel/generator": "^7.24.10",
     "@babel/parser": "^7.24.8",
@@ -31,7 +31,7 @@
     "css-tree": "npm:aiot-css-tree@^2.3.1",
     "csstree-validator": "^3.0.0",
     "eslint": "^8.46.0",
-    "file-lane": "2.0.6-beta.17",
+    "file-lane": "2.0.6-beta.19",
     "fs-extra": "^11.2.0",
     "google-protobuf": "^3.21.2",
     "less": "^4.2.0",
@@ -60,5 +60,5 @@
     "@types/tinycolor2": "^1.4.6",
     "babel-plugin-tester": "^11.0.4"
   },
-  "gitHead": "d9d60157e951ebbc58f6a6f6fac63efd9d9d4fd5"
+  "gitHead": "29d48c29e9b35e01a722868daba622fd74baefc9"
 }