@aiot-toolkit/parser 2.0.6-beta.3 → 2.0.6-beta.5

package/lib/ux/config/{vela/StyleAttributeConfig.d.ts → StyleBaseConfig.d.ts}

@@ -1,6 +1,6 @@
 import { Dictionary, Loglevel } from '@aiot-toolkit/shared-utils';
 import { StyleMessage } from '@aiot-toolkit/shared-utils';
-import { BlockItem, StyleItem } from '../../interface/IStyleAst';
+import { BlockItem, StyleItem } from '../interface/IStyleAst';
 type ValidateInfo = {
     level: Loglevel;
     message: StyleMessage[];

package/lib/ux/config/{vela/StyleAttributeConfig.js → StyleBaseConfig.js}

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.STYLE_ATTRIBUTE_LIST = exports.STYLE_ATTRIBUTE_CONFIG = void 0;
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
-var _ExtendedBoxStyle = _interopRequireDefault(require("../../translate/vela/utils/ExtendedBoxStyle"));
-var _UxUtil = _interopRequireDefault(require("../../utils/UxUtil"));
+var _ExtendedBoxStyle = _interopRequireDefault(require("../translate/vela/utils/ExtendedBoxStyle"));
+var _UxUtil = _interopRequireDefault(require("../utils/UxUtil"));
 var _cssTree = _interopRequireDefault(require("css-tree"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const REGEXP_NAME = /^([a-zA-Z_]+[a-zA-Z0-9]*\s*,\s*)*[a-zA-Z_]+[a-zA-Z0-9]*$/;
@@ -1345,9 +1345,9 @@ function validateLengthNode(sourceNode) {
     value[0] = value[0];
     const validResult = validLength(value[0]);
     if (validResult.message.length > 0) {
-      validateInfo.message = [`The value verification of attribute`, {
-        word: attributeName
-      }, `failed.`, ...validResult.message];
+      validateInfo.message = [`The value of attribute`, {
+        word: `${attributeName}:`
+      }, ...validResult.message];
     }
   }
   return validateInfo;
@@ -1363,11 +1363,9 @@ function validLength(value) {
     message: []
   };
   if (_cssTree.default.lexer.matchType('length', value.value + value.unit).error !== null) {
-    validateInfo.message = [`The length value is`, {
-      word: value.value || 'null'
-    }, `, unit is`, {
-      word: value.unit || 'null'
-    }, `, which does not meet the length standard.`];
+    validateInfo.message = [{
+      word: `${value.value}${value.unit}`
+    }, `is invalid.`];
   }
   return validateInfo;
 }
@@ -1549,30 +1547,24 @@ function validPosition(sourceNode) {
     name: attributeName
   } = sourceNode;
   if (value.length <= 0) {
-    validateInfo.message = [`Error parsing the value of attribute`, {
+    validateInfo.message = [`The value of attribute`, {
       word: `${attributeName}`
-    }];
+    }, 'is invalid.'];
   } else if (value.length > 3) {
-    validateInfo.message = [`Error parsing the value length`, `of`, {
-      word: `'${attributeName}'`
-    }, `is`, {
-      word: value.length
-    }, `, which does not meet the requirement.`];
+    validateInfo.message = [`The value length`, `of attribute`, {
+      word: `${attributeName}: ${value.length}`
+    }, `is invalid.`];
   } else {
     value.forEach(v => {
       v = v;
       const validResult = validLength(v);
       // 有报错
       if (validResult.message.length > 0) {
-        validateInfo.message.push(...validResult.message);
+        validateInfo.message = [`The value of attribute`, {
+          word: `${attributeName}:`
+        }, ...validResult.message];
       }
     });
-    // 如果有报错，添加一下属性名
-    if (validateInfo.message.length > 0) {
-      validateInfo.message.unshift(`The value verification of attribute `, {
-        word: attributeName
-      }, `failed.`);
-    }
   }
   return validateInfo;
 }

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

@@ -93,6 +93,12 @@ const elementConfig = {
         }
       }
     },
+    markdown: {
+      allowTextChildren: true,
+      attributes: {
+        value: {}
+      }
+    },
     'arc-text': {
       allowTextChildren: true,
       attributes: {

package/lib/ux/interface/IStyleError.d.ts

@@ -1,8 +1,9 @@
 /**
  * IStyleError
  */
+import { StyleMessage } from '@aiot-toolkit/shared-utils';
 export interface IStyleError {
-    message: string;
+    messages: StyleMessage[];
     details: string;
     startLine: number;
     startCol: number;

package/lib/ux/parser/ScriptParser.js

@@ -14,7 +14,8 @@ class ScriptParser {
   parser(content) {
     // const { onLog } = this.options
     const ast = {
-      content
+      // 判断content是否包含有效js内容，若只包含\n\r\t空白符，则content为''
+      content: content.trim() ? content : ''
     };
     return {
       ast

package/lib/ux/parser/StyleParser.js

@@ -598,17 +598,10 @@ class StyleParser {
     let errors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     let isParserError = errorType === 'parserError';
     let sourceCodeStyle = _sharedUtils.Loglevel.WARN;
-    const {
-      onLog,
-      filePath
-    } = this.options;
     if (isParserError) {
       sourceCodeStyle = _sharedUtils.Loglevel.ERROR;
     }
     errors.forEach(error => {
-      const sourceCode = error.source ? [`, source code:`, {
-        word: `${error.source}`
-      }] : [];
       const position = this.styleMapUtil.transfromLocToPosition({
         start: {
           line: error.startLine,
@@ -624,14 +617,7 @@ class StyleParser {
       });
       position.startColumn++;
       position.endColumn++;
-      onLog({
-        level: sourceCodeStyle,
-        filePath,
-        position,
-        message: [{
-          word: error.message
-        }, ...sourceCode]
-      });
+      _StyleUtil.default.handleStyleError(sourceCodeStyle, error.messages, this.options, position);
     });
     return [];
   }

package/lib/ux/parser/UxParser.d.ts

@@ -20,6 +20,7 @@ declare class UxParser implements IParser<IUxAst> {
      * 1. template：
      *    a. 最多1个
      *    b. 子元素有且仅有1个，不能是 block
+     * 2. 必须有闭合标签， 示例：  `<script>....</script>`正确，  `<script>aaaa`错误
      */
     private validateContent;
     /**

package/lib/ux/parser/UxParser.js

@@ -201,6 +201,7 @@ class UxParser {
    * 1. template：
    *    a. 最多1个
    *    b. 子元素有且仅有1个，不能是 block
+   * 2. 必须有闭合标签， 示例：  `<script>....</script>`正确，  `<script>aaaa`错误
    */
   validateContent(childNodes) {
     let result = true;
@@ -249,21 +250,22 @@ class UxParser {
     }
 
     // 2
-    // if (scriptCount !== 1) {
-    //   onLog({
-    //     level: Loglevel.THROW,
-    //     filePath,
-    //     message: [
-    //       { word: '<script>' },
-    //       `There are`,
-    //       { word: scriptCount },
-    //       `, but expect to have`,
-    //       { word: 1 }
-    //     ]
-    //   })
-    //   result = false
-    // }
-
+    childNodes.forEach(node => {
+      if (_TemplateUtil.default.isElement(node)) {
+        const {
+          sourceCodeLocation
+        } = node;
+        if (sourceCodeLocation && !sourceCodeLocation.endTag) {
+          onLog({
+            level: _sharedUtils.Loglevel.ERROR,
+            filePath,
+            position: _TemplateUtil.default.parse5LocationToPosition(sourceCodeLocation.startTag),
+            message: [`<${node.nodeName}>`, 'must have an end tag']
+          });
+          result = false;
+        }
+      }
+    });
     return result;
   }
   /**

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

@@ -51,7 +51,10 @@ class ScriptToTypescript {
    * @returns
    */
   babelScript(sourceTree) {
-    const sourceCode = sourceTree.content ? sourceTree.content : `""`;
+    if (sourceTree.content === '') {
+      return '';
+    }
+    const sourceCode = sourceTree.content;
     const relativePath = _path.default.relative(this.options.projectPath, this.options.filePath);
     const plugins = [
     // 替换所有的require节点

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

@@ -137,10 +137,6 @@ class StyleToTypescript {
    * @param name
    */
   addThorwLog(type, name, position, info) {
-    const {
-      onLog,
-      filePath
-    } = this.options;
     const logLevel = name === ' ' || name === '>' ? _sharedUtils.Loglevel.WARN : _sharedUtils.Loglevel.THROW;
     const message = info ? [`### StyleToTypescript ### Selector type unsupport`, {
       word: info
@@ -149,12 +145,7 @@ class StyleToTypescript {
     }, ',name:', {
       word: name
     }];
-    onLog({
-      filePath,
-      position,
-      level: logLevel,
-      message
-    });
+    _StyleUtil.default.handleStyleError(logLevel, message, this.options, position);
   }
   translateAtrule(sourceNode) {
     let targetNodes = [];

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

@@ -1,3 +1,4 @@
+import { IPosition, Loglevel, StyleMessage } from '@aiot-toolkit/shared-utils';
 import { AtrulePrelude, CssNode, Declaration, Identifier, MediaFeature, MediaQuery, MediaQueryList, SelectorList, SyntaxParseError } from 'css-tree';
 import IOptions from '../config/IOptions';
 import { IImageFunction } from '../interface/IImageResource';
@@ -226,5 +227,6 @@ declare class StyleUtil {
      * @returns
      */
     static translateToNormalValue(value: any): any;
+    static handleStyleError(errorLevel: Loglevel, messages: StyleMessage[], options: IOptions, position: IPosition | undefined): void;
 }
 export default StyleUtil;

package/lib/ux/utils/StyleUtil.js

@@ -11,8 +11,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _CompressConfig = require("../config/CompressConfig");
 var _StyleSelectorType = require("../enum/StyleSelectorType");
-var _StyleAttributeConfig = require("../config/vela/StyleAttributeConfig");
 var _tinycolor = _interopRequireDefault(require("tinycolor2"));
+var _StyleBaseConfig = require("../config/StyleBaseConfig");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * StyleUtil
@@ -181,8 +181,7 @@ class StyleUtil {
     }
     const {
       projectPath,
-      filePath,
-      onLog
+      filePath
     } = options;
     const rootDir = compilerOption.sourceRoot;
     const targetPath = _path.default.resolve(projectPath, rootDir);
@@ -196,12 +195,7 @@ class StyleUtil {
     };
     if (!assetsPath) {
       // 警告，路径值不存在
-      onLog({
-        filePath,
-        level: _sharedUtils.Loglevel.WARN,
-        position,
-        message: 'url value is null'
-      });
+      StyleUtil.handleStyleError(_sharedUtils.Loglevel.WARN, ['url value is null'], options, position);
       return '';
     }
     // 1.
@@ -210,16 +204,11 @@ class StyleUtil {
       if (_fsExtra.default.existsSync(_path.default.join(targetPath, assetsPath))) {
         return assetsPath;
       } else {
-        onLog({
-          filePath,
-          level: _sharedUtils.Loglevel.ERROR,
-          position,
-          message: ['The absolute path ', {
-            word: `(${assetsAbsolutePath})`
-          }, 'to the current value ', {
-            word: `(${assetsPath})`
-          }, 'does not exist']
-        });
+        StyleUtil.handleStyleError(_sharedUtils.Loglevel.ERROR, ['The absolute path ', {
+          word: `(${assetsAbsolutePath})`
+        }, 'to the current value ', {
+          word: `(${assetsPath})`
+        }, 'does not exist'], options, position);
         return '';
       }
     }
@@ -291,7 +280,9 @@ class StyleUtil {
         loc
       } = fallbackNode;
       parserError = {
-        message: name,
+        messages: [{
+          word: name
+        }],
         details: message,
         startLine: loc?.start?.line || loc?.start?.startLine || 0,
         startCol: loc?.start?.column || loc?.start?.startCol || 0,
@@ -321,14 +312,29 @@ class StyleUtil {
         message,
         details,
         loc,
-        css
+        css,
+        property
       } = error;
-      if (message.includes('Unknown property') && _StyleAttributeConfig.STYLE_ATTRIBUTE_LIST.includes(_sharedUtils.StringUtil.hyphenedToCamel(error.property)) || message.includes('Invalid value for `@media` prelude')) {
+      let messages = [];
+      if (message.includes('Unknown property') && _StyleBaseConfig.STYLE_ATTRIBUTE_LIST.includes(_sharedUtils.StringUtil.hyphenedToCamel(error.property)) || message.includes('Invalid value for `@media` prelude')) {
         continue;
       }
+      // 优化值报错的信息，csstree-validator值报错时为Invalida value for
+      if (message.includes('Invalid value for')) {
+        // 请检查属性的值是否符合要求
+        messages = [`The value of attribute`, {
+          word: `${property}: ${css}`
+        }, 'is invalid.'];
+        css = '';
+      } else {
+        // 高亮原始报错信息
+        messages = [{
+          word: message
+        }];
+      }
       if (loc) {
         syntaxErrors.push({
-          message,
+          messages,
           details,
           startLine: loc?.start?.line || 0,
           startCol: loc?.start?.column || 1,
@@ -341,7 +347,7 @@ class StyleUtil {
       } else {
         const propertyLength = error?.property?.length || 0;
         syntaxErrors.push({
-          message,
+          messages,
           details,
           startLine: error.line || 0,
           startCol: error.column || 0,
@@ -567,10 +573,6 @@ class StyleUtil {
    * @returns
    */
   static translateKeyFramesRule(rule, options) {
-    const {
-      onLog,
-      filePath
-    } = options;
     const {
       prelude,
       block,
@@ -593,12 +595,8 @@ class StyleUtil {
           result.time = 100;
           break;
         default:
-          onLog({
-            level: _sharedUtils.Loglevel.THROW,
-            message: `${firstName} is not a valid time value`,
-            filePath,
-            position
-          });
+          const errorMessage = [`${firstName} is not a valid time value`];
+          StyleUtil.handleStyleError(_sharedUtils.Loglevel.THROW, errorMessage, options, position);
           break;
       }
     }
@@ -632,20 +630,14 @@ class StyleUtil {
         value: valueNode
       } = sourceNode;
       // 属性校验
-      const config = _StyleAttributeConfig.STYLE_ATTRIBUTE_CONFIG[name];
+      const config = _StyleBaseConfig.STYLE_ATTRIBUTE_CONFIG[name];
       if (config?.validate) {
-        const validateResult = config.validate(sourceNode);
-        if (validateResult.message.length > 0) {
-          const {
-            onLog,
-            filePath
-          } = options;
-          onLog({
-            filePath: filePath,
-            level: validateResult.level,
-            position: sourceNode.position,
-            message: [`Attribute verification failed,`, ...validateResult.message]
-          });
+        const {
+          message: validMessages,
+          level: validInfoLevel
+        } = config.validate(sourceNode);
+        if (validMessages.length > 0) {
+          StyleUtil.handleStyleError(validInfoLevel, validMessages, options, sourceNode.position);
         }
       }
       if (config?.translate) {
@@ -769,5 +761,26 @@ class StyleUtil {
     }
     return value;
   }
+  static handleStyleError(errorLevel, messages, options, position) {
+    const {
+      onLog,
+      filePath,
+      projectPath
+    } = options;
+    // position.source存储的是相对路径，报错时要用绝对路径
+    let updatedPosition;
+    if (position) {
+      updatedPosition = {
+        ...position,
+        source: position.source && _path.default.resolve(projectPath, position.source)
+      };
+    }
+    onLog({
+      level: errorLevel,
+      message: messages,
+      filePath,
+      position: updatedPosition
+    });
+  }
 }
 var _default = exports.default = StyleUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/parser",
-  "version": "2.0.6-beta.3",
+  "version": "2.0.6-beta.5",
   "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.3",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.5",
     "@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.3",
+    "file-lane": "2.0.6-beta.5",
     "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": "2e2ba4b1d293218736343237d963fe93c5fb27a8"
+  "gitHead": "d40eba7eacc8334bce1e952c39365513a171719e"
 }