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

package/lib/ux/translate/android/UxToTypescript.js

@@ -67,7 +67,7 @@ class UxToTypescript {
     } = sourceTree;
     const importTarget = await this.importToTypescript(importList);
     const templateTarget = await new _TemplateToTypescript.default(this.options, this.compilerOption, importList).translate(template, offsetList);
-    const scriptTarget = new _ScriptToTypescript.default(this.options, this.compilerOption, this.contxt).translate(script, []);
+    const scriptTarget = await new _ScriptToTypescript.default(this.options, this.compilerOption, this.contxt).translate(script, []);
     // 切割script中的转换结果和source map
     const spliteResult = _SourceMapUtil.default.splitSourceMap(scriptTarget.targetTree);
     const styleTarget = new _StyleToTypescript.default(this.options, this.compilerOption).translate(style, []);

package/lib/ux/translate/vela/ScriptToTypescript.d.ts

@@ -1,4 +1,3 @@
-import { MapData } from '@aiot-toolkit/shared-utils';
 import { SourceFile } from 'ts-morph';
 import IOffset from '../../../interface/IOffset';
 import ITranslate from '../../../interface/ITranslate';
@@ -15,10 +14,10 @@ declare class ScriptToTypescript implements ITranslate<IScriptAst, SourceFile> {
     readonly context: IFileLaneContext;
     private _systemFeatures;
     constructor(options: IOptions, compilerOption: ITranslateOption, context: IFileLaneContext);
-    translate(sourceTree: IScriptAst, offsetList: IOffset[]): {
+    translate(sourceTree: IScriptAst, offsetList: IOffset[]): Promise<{
         targetTree: SourceFile;
-        mapList: MapData[];
-    };
+        mapList: never[];
+    }>;
     /**
      * babel自定义插件实现替换
      * @param sourceCode
@@ -29,5 +28,9 @@ declare class ScriptToTypescript implements ITranslate<IScriptAst, SourceFile> {
      * 缓存并检查 feature
      */
     private cacheAndCheckFeature;
+    /**
+     * 检查代码
+     */
+    private checkCode;
 }
 export default ScriptToTypescript;

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

@@ -9,6 +9,7 @@ var babel = _interopRequireWildcard(require("@babel/core"));
 var _path = _interopRequireDefault(require("path"));
 var _ParserUtil = _interopRequireDefault(require("../../../utils/ParserUtil"));
 var _FeatureConfig = _interopRequireDefault(require("../../config/FeatureConfig"));
+var _eslint = require("eslint");
 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; }
@@ -24,9 +25,16 @@ class ScriptToTypescript {
     this.compilerOption = compilerOption;
     this.context = context;
   }
-  translate(sourceTree,
+  async translate(sourceTree,
   // eslint-disable-next-line
   offsetList) {
+    // 检查代码错误
+    const logs = await this.checkCode(sourceTree);
+    if (logs) {
+      logs.forEach(log => {
+        this.options.onLog(log);
+      });
+    }
     // 使用babel实现替换，由此实现自动更新source map
     const content = this.babelScript(sourceTree);
     const fileName = this.options.filePath + '.js';
@@ -151,5 +159,52 @@ class ScriptToTypescript {
       });
     }
   }
+
+  /**
+   * 检查代码
+   */
+  async checkCode(sourceTree) {
+    const code = sourceTree.content;
+    if (!code) {
+      return;
+    }
+    const lintResult = await new _eslint.ESLint({
+      useEslintrc: false,
+      baseConfig: {
+        env: {
+          browser: true,
+          node: true,
+          es2022: true
+        },
+        parserOptions: {
+          sourceType: 'module',
+          ecmaVersion: 'latest'
+        },
+        rules: {
+          '*': 'off',
+          // 检查未定义的变量
+          'no-undef': 'error'
+        }
+      }
+    }).lintText(code);
+    if (lintResult?.length) {
+      const result = [];
+      const offsetLine = (sourceTree.sourceCodeLocation?.startLine || 0) - 1;
+      lintResult.forEach(item => {
+        item.messages.forEach(message => {
+          result.push({
+            filePath: this.options.filePath,
+            level: _sharedUtils.Loglevel.WARN,
+            message: message.message,
+            position: {
+              startLine: message.line + offsetLine,
+              startColumn: message.column
+            }
+          });
+        });
+      });
+      return result;
+    }
+  }
 }
 var _default = exports.default = ScriptToTypescript;

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

@@ -27,7 +27,7 @@ class UxToTypescript {
     const appImport = this.importToTypescript(sourceTree.import);
     const appStyle = new _StyleToTypescript.default(this.options, this.compilerOption).translate(sourceTree.style, []);
     const appTemplate = await new _TemplateToTypescript.default(this.options, this.compilerOption, sourceTree.import.map(item => item.name.toLowerCase())).translate(sourceTree.template, []);
-    const appScript = new _ScriptToTypescript.default(this.options, this.compilerOption, this.context).translate(sourceTree.script, []);
+    const appScript = await new _ScriptToTypescript.default(this.options, this.compilerOption, this.context).translate(sourceTree.script, []);
     // 切割出源码和map信息
     const spliteResult = _SourceMapUtil.default.splitSourceMap(appScript.targetTree);
     const integratedList = this.integratedFunction.bind(this, appImport, appStyle.targetTree, appTemplate.targetTree, spliteResult.newScriptTree, this.options)();

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

@@ -63,18 +63,13 @@ const ATTRIBUTE_CONFIG = {
         if (nameLocation) {
           const {
             startLine,
-            startColumn,
-            pos
+            startColumn
           } = nameLocation;
           logs.forEach(log => {
             const position = log.position;
             if (position) {
               position.startLine += startLine - 1;
               position.startColumn += startColumn;
-              position.pos += pos;
-              position.endLine += startLine - 1;
-              position.endColumn += startColumn;
-              position.end += pos;
             }
             option.onLog(log);
           });

package/lib/ux/utils/StyleUtil.js

@@ -755,7 +755,7 @@ class StyleUtil {
           return value[0];
         } else {
           // 例如animation-name属性值
-          return value.join(' ');
+          return value.map(item => item === ',' ? `${item} ` : item).join('').trim();
         }
       } else {
         // 例如transform属性值,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/parser",
-  "version": "2.0.5-beta.2",
+  "version": "2.0.5-beta.4",
   "description": "Parse the source code of aiot and convert it to the AST (Abstract Syntax Tree) of the target code.",
   "keywords": [
     "aiot",
@@ -20,19 +20,20 @@
     "test": "node ./__tests__/parser.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.5-beta.2",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.2",
+    "@aiot-toolkit/generator": "2.0.5-beta.4",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.4",
     "@babel/core": "^7.23.6",
     "@babel/generator": "^7.24.10",
     "@babel/parser": "^7.24.8",
     "@babel/preset-env": "^7.25.4",
     "@babel/traverse": "^7.23.7",
     "@babel/types": "^7.23.6",
-    "aiot-parse5": "^1.0.0",
+    "aiot-parse5": "^1.0.2",
     "colord": "^2.9.3",
     "css-tree": "npm:aiot-css-tree@^2.3.1",
     "csstree-validator": "^3.0.0",
-    "file-lane": "2.0.5-beta.2",
+    "eslint": "^8.46.0",
+    "file-lane": "2.0.5-beta.4",
     "fs-extra": "^11.2.0",
     "google-protobuf": "^3.21.2",
     "less": "^4.2.0",
@@ -51,6 +52,7 @@
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.3",
+    "@types/eslint": "^8.56.12",
     "@types/fs-extra": "^11.0.4",
     "@types/less": "^3.0.5",
     "@types/postcss-import": "^14.0.3",
@@ -58,5 +60,5 @@
     "@types/reserved-words": "^0.1.4",
     "babel-plugin-tester": "^11.0.4"
   },
-  "gitHead": "90f28324bb8bded7f04e1074dbf5ddc9a31f86f6"
+  "gitHead": "cfa77c8f2d3916b703ac23a93a9dcc0df1bc261a"
 }