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

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

@@ -5,7 +5,7 @@ export default interface IE2eConfig {
     /**
      * 测试文件的目录
      *
-     * 绝对路径或相对config文件的路径
+     * 绝对路径 或 相对config文件的路径
      *
      * @default "test"
      */
@@ -13,8 +13,13 @@ export default interface IE2eConfig {
     /**
      * 测试模式打包，入口文件的在manifest中的名称
      */
-    entry?: {
-        name: string;
+    entry: {
+        /**
+         * 自动化测试文件路径：相对config文件的路径 或 绝对路径
+         *
+         * @example "pages/index"
+         */
+        path: string;
         launchMode?: string;
     };
     /**

package/lib/ux/translate/vela/plugins/e2e.js

@@ -87,6 +87,9 @@ function addAppTestCode(path) {
  * @param opts
  */
 function addPageTestCode(path, opts) {
+  if (!opts.compilerOption.e2eConfigPath) {
+    return;
+  }
   const e2eConfig = _UxUtil.default.getE2eConfig({
     projectPath: opts.options.projectPath,
     e2eConfigPath: opts.compilerOption.e2eConfigPath

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

@@ -50,7 +50,7 @@ declare class UxUtil {
     static importToTypescript(importList: IImportAst[], compilerOption: ITranslateOption): string[];
     static getE2eConfig(option: {
         projectPath: string;
-        e2eConfigPath?: string;
+        e2eConfigPath: string;
     }): IE2eConfig;
 }
 export default UxUtil;

package/lib/ux/utils/UxUtil.js

@@ -111,26 +111,26 @@ class UxUtil {
   }
   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}`);
+    const configFilePath = _path.default.resolve(projectPath, e2eConfigPath);
+    const configFileDir = _path.default.dirname(configFilePath);
+    if (_fsExtra.default.existsSync(configFilePath)) {
+      const obj = _fsExtra.default.readJSONSync(configFilePath, 'utf-8');
+      const dir = _path.default.resolve(configFileDir, obj.dir || defaultTestDir);
+      if (!obj.entry) {
+        throw new Error(`e2e Configuration file error: missing entry field`);
       }
+      const result = {
+        ...obj,
+        dir
+      };
+      return result;
+    } 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.10",
+  "version": "2.0.6-beta.11",
   "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.10",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.11",
     "@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.10",
+    "file-lane": "2.0.6-beta.11",
     "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": "b6a63385af95a6ba445e65225a92014026ce3144"
+  "gitHead": "acecf0ae5d6991619051dbbeda770a602f215dd6"
 }