@aiot-toolkit/parser 2.0.5-beta.4 → 2.0.5-beta.6

package/lib/ux/parser/StyleParser.js

@@ -91,9 +91,10 @@ class StyleParser {
         validError && errors.push(validError);
       }
     });
+
     // 解析错误全部抛出
     errors = this.printError('parserError', errors);
-    errors.push(..._StyleUtil.default.collectSyntaxError(CsstreeValidator(originAst, fileName)));
+    errors.push(..._StyleUtil.default.collectSyntaxError(CsstreeValidator(originAst, fileName), this.styleMapUtil, fileExt !== '.css', this.styleLineOffset));
     // 校验错误打印warn
     this.printError('validateError', errors);
     const cssAst = {

package/lib/ux/translate/vela/runtime/velaTestLibrary.js

@@ -48,7 +48,7 @@ global.normalize = function (map) {
     if (/^\d*\.?\d*$/.test(val) && !isNaN(parseFloat(val))) {
       map[key] = +val
       // 标准尺寸
-      map[key + 'Std'] = Math.round((map[key] * 750) / global.Env.deviceWidth)
+      map[key + 'Std'] = Math.round((map[key] * global.Env.designWidth) / global.Env.deviceWidth)
     }
   })
   return map

package/lib/ux/utils/StyleMapUtil.js

@@ -32,21 +32,28 @@ class StyleMapUtil {
     const {
       projectPath
     } = this.options;
-    const nodePosition = this.sourceMapConsumer.originalPositionFor({
+    const nodeStartPosition = this.sourceMapConsumer.originalPositionFor({
       line: location.start.line,
       column: location.start.column
     });
-    if (nodePosition.source?.endsWith('.ux') && nodePosition.line) {
-      nodePosition.line = nodePosition.line - 1 + this.lineOffset;
+    const nodeEndPosition = this.sourceMapConsumer.originalPositionFor({
+      line: location.end.line,
+      column: location.end.column
+    });
+    if (nodeStartPosition.source?.endsWith('.ux') && nodeStartPosition.line) {
+      nodeStartPosition.line = nodeStartPosition.line - 1 + this.lineOffset;
+    }
+    if (nodeEndPosition.source?.endsWith('.ux') && nodeEndPosition.line) {
+      nodeEndPosition.line = nodeEndPosition.line - 1 + this.lineOffset;
     }
     return {
       pos: 0,
       end: 0,
-      startLine: nodePosition.line || 0,
-      startColumn: nodePosition.column || 0,
-      endLine: nodePosition.line ? nodePosition.line + (location.end.line - location.start.line) : 0,
-      endColumn: location.end.column - 1,
-      source: nodePosition.source ? _path.default.resolve(projectPath, decodeURI(nodePosition.source)) : ''
+      startLine: nodeStartPosition.line || 0,
+      startColumn: nodeStartPosition.column || 0,
+      endLine: nodeEndPosition.line || 0,
+      endColumn: nodeEndPosition.column || 0,
+      source: nodeStartPosition.source ? _path.default.relative(projectPath, decodeURI(nodeStartPosition.source)) : ''
     };
   }
 }

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

@@ -104,9 +104,10 @@ declare class StyleUtil {
     /**
      * 收集CSS语法错误
      * @param errors
+     * @param trace 是否需要追溯到上一次sourcemap, default: false
      * @returns
      */
-    static collectSyntaxError(errors: Array<any>): IStyleError[];
+    static collectSyntaxError(errors: Array<any>, instance: StyleMapUtil, trace?: boolean, startLineOffset?: number): IStyleError[];
     /**
      * 相同选择器时融合样式
      * 1. 遍历待融合列表，如果元素长度为3，判断选择器列表是否在存储列表中存在

package/lib/ux/utils/StyleUtil.js

@@ -312,9 +312,12 @@ class StyleUtil {
   /**
    * 收集CSS语法错误
    * @param errors
+   * @param trace 是否需要追溯到上一次sourcemap, default: false
    * @returns
    */
-  static collectSyntaxError(errors) {
+  static collectSyntaxError(errors, instance) {
+    let trace = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    let startLineOffset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
     let syntaxErrors = [];
     for (let i = 0; i < errors.length; i++) {
       const error = errors[i];
@@ -328,30 +331,85 @@ class StyleUtil {
         continue;
       }
       if (loc) {
-        syntaxErrors.push({
-          message,
-          details,
-          startLine: loc?.start?.line || 0,
-          startCol: loc?.start?.column || 0,
-          startOffset: loc?.start?.offset || 0,
-          endLine: loc?.start?.line || 0,
-          endCol: loc?.start?.column || 0,
-          endOffset: loc?.end?.offset || 0,
-          source: css
-        });
+        if (!trace) {
+          syntaxErrors.push({
+            message,
+            details,
+            startLine: loc?.start?.line || 0,
+            startCol: (loc?.start?.column || 1) - 1,
+            startOffset: loc?.start?.offset || 0,
+            endLine: loc?.start?.line || 0,
+            endCol: (loc?.start?.column || 1) - 1,
+            endOffset: loc?.end?.offset || 0,
+            source: css
+          });
+        } else {
+          const transformedLoc = instance.transfromLocToPosition({
+            start: {
+              line: loc.start.line,
+              column: loc.start.column,
+              offset: 0
+            },
+            end: {
+              line: loc.start.line,
+              column: loc.start.column,
+              offset: 0
+            },
+            source: css
+          });
+          syntaxErrors.push({
+            message,
+            details,
+            startLine: transformedLoc?.startLine - startLineOffset + 1,
+            startCol: transformedLoc?.startColumn,
+            startOffset: transformedLoc?.pos,
+            endLine: transformedLoc?.endLine - startLineOffset + 1,
+            endCol: transformedLoc?.endColumn,
+            endOffset: transformedLoc?.end,
+            source: css
+          });
+        }
       } else {
         const propertyLength = error?.property?.length || 0;
-        syntaxErrors.push({
-          message,
-          details,
-          startLine: error.line || 0,
-          startCol: error.column || 0,
-          startOffset: error.offset || 0,
-          endLine: error.line || 0,
-          endCol: (error.column || 0) + propertyLength,
-          endOffset: (error.offset || 0) + propertyLength,
-          source: css
-        });
+        if (!trace) {
+          syntaxErrors.push({
+            message,
+            details,
+            startLine: error.line || 0,
+            startCol: error.column || 0,
+            startOffset: error.offset || 0,
+            endLine: error.line || 0,
+            endCol: (error.column || 0) + propertyLength - 1,
+            endOffset: (error.offset || 0) + propertyLength - 1,
+            source: css
+          });
+        } else {
+          const transformedLoc = instance.transfromLocToPosition({
+            start: {
+              line: error.line,
+              column: error.column,
+              offset: 0
+            },
+            end: {
+              line: error.line,
+              column: error.column,
+              offset: 0
+            },
+            source: css
+          });
+          syntaxErrors.push({
+            message,
+            details,
+            startLine: transformedLoc?.startLine,
+            startCol: transformedLoc?.startColumn,
+            startOffset: transformedLoc?.pos,
+            endLine: transformedLoc?.endLine,
+            endCol: transformedLoc?.endColumn,
+            endOffset: transformedLoc?.end,
+            source: css
+          });
+        }
+        continue;
       }
     }
     return syntaxErrors;

package/package.json

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