@aiot-toolkit/aiotpack 2.0.2-beta.3 → 2.0.2-beta.4

package/lib/compiler/javascript/interface/IJavascriptCompileOption.d.ts

@@ -36,9 +36,13 @@ export default interface IJavascriptCompileOption extends ICompileParam {
     /**
      * 禁用 jsc
      */
-    disabledJSC?: boolean;
+    disabledJsc?: boolean;
     /**
      * 启用 protobuf
      */
     enableProtobuf?: boolean;
+    /**
+     * 启用应用自动化测试
+     */
+    enableE2e?: boolean;
 }

package/lib/config/UxConfig.d.ts

@@ -2,6 +2,7 @@ import { IFileLaneConfig } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
 import AppUxLoader from '../loader/ux/AppUxLoader';
 import JsLoader from '../loader/ux/JsLoader';
+import PngLoader from '../loader/ux/PngLoader';
 import UxLoader from '../loader/ux/UxLoader';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     readonly projectPath: string;
@@ -21,6 +22,10 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             test: RegExp[];
             loader: (typeof JsLoader)[];
             exclude?: undefined;
+        } | {
+            test: RegExp[];
+            loader: (typeof PngLoader)[];
+            exclude?: undefined;
         })[];
     };
     preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<IJavascriptCompileOption>[];

package/lib/followWorks/ux/UxFollowWorks.js

@@ -78,7 +78,7 @@ UxFollowWorks.protobuf = (context, config, compilerOption) => __awaiter(void 0,
     }
 });
 UxFollowWorks.jsc = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
-    if (compilerOption && compilerOption.disabledJSC === false) {
+    if (compilerOption && compilerOption.disabledJsc === false) {
         return new Jsc_1.default(context.projectPath, path_1.default.join(context.projectPath, context.output, compilerOption.outputPath)).jsc();
     }
 });

package/lib/loader/ux/JsLoader.d.ts

@@ -1,9 +1,11 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
+import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
  * JsLoader
  */
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
+    compilerOption: IJavascriptCompileOption;
     parser(files: IFileParam<any>[]): IFileParam<any>[] | Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -27,7 +27,7 @@ class JsLoader {
             };
             return {
                 path: item.path,
-                content: new ScriptToTypescript_1.default(project, options)
+                content: new ScriptToTypescript_1.default(project, options, this.compilerOption)
                     .translate({
                     content: new ScriptParser_1.default(options).parser(item.content.toString()).ast.content
                 }, [])

package/lib/utils/ux/UxLoaderUtils.js

@@ -74,10 +74,13 @@ class UxLoaderUtils {
                     logs
                 };
             }
+            // 区分页面组件和子组件
+            const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
             // 配置转换参数
             const options = {
                 projectPath: context.projectPath,
                 filePath,
+                fileType: isAppUx ? 'app' : isPageUx ? 'page' : '',
                 onLog: (log) => {
                     logs.push(log);
                 }
@@ -88,8 +91,6 @@ class UxLoaderUtils {
             // 区分app.ux和一般ux
             // app.ux解析结果中加上manifest.json的内容
             const manifestJson = `require('./manifest.json')`;
-            // 区分页面组件和子组件
-            const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
             const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
                 // script代码放在第三个位置不能变化，影响更新source map
                 return isAppUx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.3",
+  "version": "2.0.2-beta.4",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,13 +19,13 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.3",
-    "@aiot-toolkit/parser": "2.0.2-beta.3",
+    "@aiot-toolkit/generator": "2.0.2-beta.4",
+    "@aiot-toolkit/parser": "2.0.2-beta.4",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "babel-loader": "^9.1.3",
     "del": "^4.1.0",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.3",
+    "file-lane": "2.0.2-beta.4",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
@@ -39,5 +39,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "8bfdd8895ffd8fc4aa1465779def5ab4392a7a4b"
+  "gitHead": "656add8e64d8101b9f3886957c5b9ae23e2e854f"
 }