@aiot-toolkit/parser 2.0.6-beta.1 → 2.0.6-beta.10

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,
@@ -351,7 +357,6 @@ class StyleUtil {
           endOffset: (error.offset || 0) + propertyLength,
           source: css
         });
-        continue;
       }
     }
     return syntaxErrors;
@@ -568,10 +573,6 @@ class StyleUtil {
    * @returns
    */
   static translateKeyFramesRule(rule, options) {
-    const {
-      onLog,
-      filePath
-    } = options;
     const {
       prelude,
       block,
@@ -594,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;
       }
     }
@@ -633,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) {
@@ -770,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/lib/ux/utils/UxUtil.d.ts

@@ -2,6 +2,7 @@ import { Dictionary } from '@aiot-toolkit/shared-utils';
 import { Element } from 'aiot-parse5/dist/tree-adapters/default';
 import IImportAst from '../interface/IImportAst';
 import ITranslateOption from '../interface/ITranslateOption';
+import IE2eConfig from '../interface/IE2eConfig';
 /**
  * UxParserUtil
  */
@@ -47,5 +48,9 @@ declare class UxUtil {
      */
     static isAbsoluteResource(path?: string): boolean;
     static importToTypescript(importList: IImportAst[], compilerOption: ITranslateOption): string[];
+    static getE2eConfig(option: {
+        projectPath: string;
+        e2eConfigPath?: string;
+    }): IE2eConfig;
 }
 export default UxUtil;

package/lib/ux/utils/UxUtil.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * UxParserUtil
@@ -108,5 +109,28 @@ class UxUtil {
     }
     return appImport;
   }
+  static getE2eConfig(option) {
+    const defaultTestDir = 'test';
+    let result = {
+      dir: _path.default.join(option.projectPath, defaultTestDir)
+    };
+    const {
+      projectPath,
+      e2eConfigPath
+    } = option;
+    if (e2eConfigPath) {
+      const configFilePath = _path.default.resolve(projectPath, e2eConfigPath);
+      const configFileDir = _path.default.dirname(configFilePath);
+      if (_fsExtra.default.existsSync(configFilePath)) {
+        result = _fsExtra.default.readJSONSync(configFilePath, 'utf-8');
+        if (result) {
+          result.dir = _path.default.resolve(configFileDir, result.dir || defaultTestDir);
+        }
+      } else {
+        throw new Error(`e2e Configuration file does not exist: ${configFilePath}`);
+      }
+    }
+    return result;
+  }
 }
 var _default = exports.default = UxUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/parser",
-  "version": "2.0.6-beta.1",
+  "version": "2.0.6-beta.10",
   "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.1",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.10",
     "@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.1",
+    "file-lane": "2.0.6-beta.10",
     "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": "892743ccc51408960e6cee86675538501b3e47f1"
+  "gitHead": "b6a63385af95a6ba445e65225a92014026ce3144"
 }