@aiot-toolkit/parser 2.0.5-beta.1 → 2.0.5-beta.3

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

@@ -93,6 +93,16 @@ const elementConfig = {
         }
       }
     },
+    'arc-text': {
+      allowTextChildren: true,
+      attributes: {
+        value: {},
+        'start-angle': {},
+        direction: {
+          enums: ['clockwise', 'counterclockwise']
+        }
+      }
+    },
     span: {
       allowTextChildren: true,
       attributes: {

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

@@ -8,6 +8,10 @@ export default interface ITranslateOption {
      */
     sourceRoot: string;
     enableE2e?: boolean;
+    /**
+     * e2e 配置文件的路径
+     */
+    e2eConfigPath?: string;
     enableStats?: boolean;
     optimizeCssAttr?: boolean;
     /**

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,51 @@ class ScriptToTypescript {
       });
     }
   }
+
+  /**
+   * 检查代码
+   */
+  async checkCode(sourceTree) {
+    const code = sourceTree.content;
+    if (!code) {
+      return;
+    }
+    const lintResult = await new _eslint.ESLint({
+      useEslintrc: false,
+      baseConfig: {
+        env: {
+          browser: true,
+          es6: true,
+          node: true
+        },
+        parserOptions: {
+          sourceType: 'module'
+        },
+        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: message.severity === 2 ? _sharedUtils.Loglevel.ERROR : _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/TemplateToTypescript.js

@@ -321,7 +321,10 @@ class TemplateToTypescript {
       const {
         itemNode,
         indexNode
-      } = _CfTranslate.default.extractForNodes(forAttribute, this.options);
+      } = _CfTranslate.default.extractForNodes(forAttribute, {
+        ...this.options,
+        onLog: () => {}
+      });
       [itemNode, indexNode].forEach(item => {
         if (item) {
           result.push(item.escapedText.toString());

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/plugins/e2e.js

@@ -8,6 +8,7 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var parser = _interopRequireWildcard(require("@babel/parser"));
 var _path = _interopRequireDefault(require("path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
 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,10 +25,11 @@ function e2e() {
         let {
           opts
         } = _ref;
-        const options = opts.options;
+        const opts2 = opts;
+        const options = opts2.options;
         switch (options.fileType) {
           case 'page':
-            addPageTestCode(path, opts);
+            addPageTestCode(path, opts2);
             break;
           case 'app':
             addAppTestCode(path);
@@ -55,11 +57,17 @@ function addAppTestCode(path) {
 
 /**
  * 添加页面的测试代码
- * 1. 检查测试文件是否存在
- * 2. 如果存在，则
+ * 1. 如果测试文件存在，则
  *    a. import 测试文件
  *    b. 设置测试函数: 如果 onTestStart 方法已存在，则在其内部添加测试代码；否则，添加 onTestStart方法
  *
+ *
+ * 2. 如果启用自动路由，且当前页面是首页
+ *    a. 从routerList 中过滤出有测试文件的路由
+ *    b. 在末尾添加 $generateAutoRunTest
+ *    c. 在onShow 方法中调用 $generateAutoRunTest
+ *
+ *
  * @description 示例
  *
  * 源码 `src/home/myHome.ux`
@@ -83,43 +91,155 @@ function addAppTestCode(path) {
  * @param opts
  */
 function addPageTestCode(path, opts) {
-  const testFilePath = getTestFilePath(opts);
-  // 1.
+  const e2eConfig = getE2eConfig(opts);
+  const testFilePath = getTestFilePath(opts.options.filePath, opts, e2eConfig);
+  // 1
   if (_fsExtra.default.existsSync(testFilePath)) {
-    const funcName = 'onTestStart';
-    const funcBody = generateTestFn();
-    // 2.a
+    // 1.a
     const vmImport = t.importDeclaration([t.importDefaultSpecifier(t.identifier('fnTestCase'))], t.stringLiteral(testFilePath));
     if (path.parent.type === 'Program') {
       path.parent.body.unshift(vmImport);
     }
 
-    // 2.b
+    // 1.b
     if (path.node.declaration.type === 'ObjectExpression') {
       const properties = path.node.declaration.properties;
-      const testFunc = properties.find(p => p.type === 'ObjectMethod' && p.key.name === funcName);
-      if (testFunc) {
-        testFunc.body.body.push(...funcBody.body);
-      } else {
-        properties.push(t.objectMethod('method', {
-          name: funcName,
-          type: 'Identifier'
-        }, [], funcBody));
+      insertFun('onTestStart', generateTestFn(), properties);
+    }
+  }
+
+  // 2
+  if (isIndexPage(opts) && e2eConfig.autoRoute) {
+    let {
+      routerList,
+      pageSleep
+    } = e2eConfig.autoRoute;
+    routerList = routerList?.filter(item => hasTestFile(item, opts, e2eConfig));
+    if (!routerList?.length) {
+      console.log('missing autoRoute.routerList');
+      return;
+    }
+    // 2.a
+
+    if (path.node.declaration.type === 'ObjectExpression') {
+      const properties = path.node.declaration.properties;
+
+      // 2.b
+      insertFun('$generateAutoRunTest', generateAutoRouterFn(pageSleep, routerList), properties);
+      // 2.c
+      insertFun('onShow', generateAutoRouterInOnShow(), properties);
+    }
+  }
+}
+
+/**
+ * 插入函数
+ *
+ * 如果已存在，把函数体插入到指定函数末尾；不存在，则添加
+ *
+ * @param name 函数名
+ * @param body 函数体
+ */
+function insertFun(name, body, properties) {
+  const fun = properties.find(p => p.type === 'ObjectMethod' && p.key.name === name);
+  if (fun) {
+    fun.body.body.push(...body.body);
+  } else {
+    properties.push(t.objectMethod('method', {
+      name: name,
+      type: 'Identifier'
+    }, [], body));
+  }
+}
+function hasTestFile(router, opts, e2eConfig) {
+  const manifest = getManifest(opts);
+  if (manifest) {
+    const {
+      pages
+    } = manifest.router;
+    const pageRouter = pages[router];
+    if (!pageRouter) {
+      opts.options.onLog({
+        level: _sharedUtils.Loglevel.WARN,
+        message: [{
+          word: router
+        }, `missing router in manifest.json`]
+      });
+      return false;
+    }
+    const pagePath = `${opts.compilerOption.sourceRoot}/${router}/${pageRouter.component}`;
+    const testFilePath = getTestFilePath(pagePath, opts, e2eConfig);
+    return _fsExtra.default.existsSync(testFilePath);
+  }
+  return false;
+}
+function isIndexPage(opts) {
+  const manifest = getManifest(opts);
+  if (manifest) {
+    const {
+      entry,
+      pages
+    } = manifest.router;
+    const entryItem = pages[entry];
+    const entryPath = `${entry}/${entryItem.component}`;
+    const sourcePath = _path.default.join(opts.options.projectPath, opts.compilerOption.sourceRoot);
+    const filePath = _path.default.relative(sourcePath, opts.options.filePath);
+    const filePathParsed = _path.default.parse(filePath);
+    return entryPath === `${filePathParsed.dir}/${filePathParsed.name}`;
+  }
+  return false;
+}
+function getManifest(opts) {
+  const manifestPath = _path.default.resolve(opts.options.projectPath, opts.compilerOption.sourceRoot, 'manifest.json');
+  if (manifestPath) {
+    return _fsExtra.default.readJSONSync(manifestPath);
+  }
+}
+function getE2eConfig(opts) {
+  const defaultTestDir = 'test';
+  let result = {
+    testDir: _path.default.join(opts.options.projectPath, defaultTestDir)
+  };
+  const {
+    projectPath
+  } = opts.options;
+  const {
+    e2eConfigPath
+  } = opts.compilerOption;
+  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.testDir = _path.default.resolve(configFileDir, result.testDir || defaultTestDir);
       }
+    } else {
+      throw new Error(`e2e Configuration file does not exist: ${configFilePath}`);
     }
   }
+  return result;
 }
-function getTestFilePath(opts) {
+
+/**
+ * 获取源文件对应的测试文件地址
+ * @param sourceFile 源文件
+ * @param opts
+ * @param e2eConfig
+ * @returns
+ */
+function getTestFilePath(sourceFile, opts, e2eConfig) {
   const {
-    filePath,
     projectPath
   } = opts.options;
   const {
     sourceRoot
   } = opts.compilerOption;
-  const relativeSrc = _path.default.relative(_path.default.join(projectPath, sourceRoot || ''), filePath);
+  const relativeSrc = _path.default.relative(_path.default.join(projectPath, sourceRoot || ''), sourceFile);
   const parsed = _path.default.parse(relativeSrc);
-  return _path.default.join(projectPath, 'test', parsed.dir, `${parsed.name}.js`);
+  return _path.default.join(e2eConfig.testDir, parsed.dir, `${parsed.name}.js`);
 }
 
 /**
@@ -149,4 +269,35 @@ function generateTestFn() {
   }, global.CASE_TEST_START);
   }`;
   return parser.parseExpression(fn).body;
+}
+function generateAutoRouterFn() {
+  let sleep = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 3000;
+  let routerList = arguments.length > 1 ? arguments[1] : undefined;
+  const fn = `function(){
+  const routerList = ${JSON.stringify(routerList)}
+  if (!routerList) {
+      console.log('missing routerList');
+      return;
+    }
+    if (this.autoTestPageIndex === undefined) {
+      this.autoTestPageIndex = -1;
+    }
+
+    setTimeout(() => {
+      if (++this.autoTestPageIndex < routerList.length) {
+        const uri = routerList[this.autoTestPageIndex];
+        console.log(\`auto test page=\${uri}, index=\${this.autoTestPageIndex}\`);
+        router.push({ uri });
+      } else {
+        console.log('auto test finish');
+      }
+    }, ${sleep});
+  }`;
+  return parser.parseExpression(fn).body;
+}
+function generateAutoRouterInOnShow() {
+  const fn = `function(){
+  this.$generateAutoRunTest();
+  }`;
+  return parser.parseExpression(fn).body;
 }

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.1",
+  "version": "2.0.5-beta.3",
   "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.1",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.1",
+    "@aiot-toolkit/generator": "2.0.5-beta.3",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.3",
     "@babel/core": "^7.23.6",
     "@babel/generator": "^7.24.10",
     "@babel/parser": "^7.24.8",
@@ -32,7 +32,8 @@
     "colord": "^2.9.3",
     "css-tree": "npm:aiot-css-tree@^2.3.1",
     "csstree-validator": "^3.0.0",
-    "file-lane": "2.0.5-beta.1",
+    "eslint": "^8.46.0",
+    "file-lane": "2.0.5-beta.3",
     "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": "44f8c6ee763bc01bd53c655b93e09c698057fc3e"
+  "gitHead": "273b9c3c85c4e199d642fd7aced0f140b7eac496"
 }