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

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/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,12 +617,7 @@ class StyleParser {
       });
       position.startColumn++;
       position.endColumn++;
-      onLog({
-        level: sourceCodeStyle,
-        filePath,
-        position,
-        message: [...error.messages, ...sourceCode]
-      });
+      _StyleUtil.default.handleStyleError(sourceCodeStyle, error.messages, this.options, position);
     });
     return [];
   }

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,6 +227,6 @@ declare class StyleUtil {
      * @returns
      */
     static translateToNormalValue(value: any): any;
-    private static translateError;
+    static handleStyleError(errorLevel: Loglevel, messages: StyleMessage[], options: IOptions, position: IPosition | undefined): void;
 }
 export default StyleUtil;

package/lib/ux/utils/StyleUtil.js

@@ -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 '';
       }
     }
@@ -607,7 +596,7 @@ class StyleUtil {
           break;
         default:
           const errorMessage = [`${firstName} is not a valid time value`];
-          StyleUtil.translateError(_sharedUtils.Loglevel.THROW, errorMessage, options, position);
+          StyleUtil.handleStyleError(_sharedUtils.Loglevel.THROW, errorMessage, options, position);
           break;
       }
     }
@@ -648,7 +637,7 @@ class StyleUtil {
           level: validInfoLevel
         } = config.validate(sourceNode);
         if (validMessages.length > 0) {
-          StyleUtil.translateError(validInfoLevel, validMessages, options, sourceNode.position);
+          StyleUtil.handleStyleError(validInfoLevel, validMessages, options, sourceNode.position);
         }
       }
       if (config?.translate) {
@@ -772,7 +761,7 @@ class StyleUtil {
     }
     return value;
   }
-  static translateError(errorLevel, messages, options, position) {
+  static handleStyleError(errorLevel, messages, options, position) {
     const {
       onLog,
       filePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/parser",
-  "version": "2.0.6-beta.4",
+  "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.4",
+    "@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.4",
+    "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": "1acc8279ba3c5995aebe3a97a6b33154086f09d6"
+  "gitHead": "d40eba7eacc8334bce1e952c39365513a171719e"
 }