@aiot-toolkit/aiotpack 2.0.2-beta.1 → 2.0.2-beta.11

package/lib/compiler/interface/ICompileParam.d.ts

@@ -1,4 +1,4 @@
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 import CompileMode from '../enum/CompileMode';
 /**
  * 编译参数

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -12,10 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const webpack_1 = require("webpack");
+const AndroidWebpackConfigurator_1 = __importDefault(require("./android/AndroidWebpackConfigurator"));
 const VelaWebpackConfigurator_1 = __importDefault(require("./vela/VelaWebpackConfigurator"));
 const UxCompileUtil_1 = __importDefault(require("./vela/utils/UxCompileUtil"));
 class JavascriptCompiler {
@@ -29,7 +30,7 @@ class JavascriptCompiler {
                 const config = this.createWebpackConfig(param);
                 (0, webpack_1.webpack)(config, (error, stats) => {
                     if (error) {
-                        reject([error]);
+                        reject({ errors: [error] });
                     }
                     else {
                         const statsObj = stats === null || stats === void 0 ? void 0 : stats.toJson();
@@ -51,7 +52,7 @@ class JavascriptCompiler {
         });
     }
     createWebpackConfig(param) {
-        const configurator = this.getConfigurator();
+        const configurator = this.getConfigurator(param);
         if (!configurator) {
             throw new Error(`This project is not supported`);
         }
@@ -63,7 +64,7 @@ class JavascriptCompiler {
         }
         const { projectPath, mode, devtool, outputPath } = param;
         const buildPath = path_1.default.resolve(projectPath, outputPath);
-        const quickAppConfig = CommonUtil_1.default.requireModule(path_1.default.join(param.projectPath, this.QUICKAPP_CONFIG));
+        const quickAppConfig = shared_utils_1.CommonUtil.requireModule(path_1.default.join(param.projectPath, this.QUICKAPP_CONFIG));
         const result = {
             context: projectPath,
             mode,
@@ -77,15 +78,18 @@ class JavascriptCompiler {
             module: {
                 rules: [
                     {
-                        test: /\.js$/,
+                        test: /\.ux$/,
                         use: [
                             {
-                                loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/splitMap.js')
+                                loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
                             }
                         ]
                     }
                 ]
             },
+            resolve: {
+                extensions: ['.js', '.ts', '.ux']
+            },
             stats: {
                 builtAt: false,
                 entrypoints: false,
@@ -108,6 +112,17 @@ class JavascriptCompiler {
                 Array.isArray(readyRules) && readyRules.length > 0
                     ? [...configuratorRules, ...readyRules]
                     : configuratorRules;
+            // 判断devtool类型 inline-source-map时，添加第0列关系映射
+            if (devtool === 'inline-source-map') {
+                result.module.rules.unshift({
+                    test: /\.ux$/,
+                    use: [
+                        {
+                            loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/addColSourceMap.js')
+                        }
+                    ]
+                });
+            }
         }
         if (configurator.createPlugins) {
             result.plugins = configurator.createPlugins();
@@ -117,8 +132,17 @@ class JavascriptCompiler {
         }
         return lodash_1.default.merge({}, result, quickAppConfig === null || quickAppConfig === void 0 ? void 0 : quickAppConfig.webpack);
     }
-    getConfigurator() {
-        return new VelaWebpackConfigurator_1.default();
+    getConfigurator(param) {
+        const { projectPath, sourceRoot } = param;
+        const projectType = shared_utils_1.ProjectType.getProjectType(projectPath, sourceRoot);
+        switch (projectType) {
+            case shared_utils_1.ProjectType.VELA_UX:
+                return new VelaWebpackConfigurator_1.default();
+            case shared_utils_1.ProjectType.ANDDROID_UX:
+                return new AndroidWebpackConfigurator_1.default();
+            default:
+                break;
+        }
     }
     clean(param) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/compiler/javascript/android/AndroidWebpackConfigurator.d.ts

@@ -0,0 +1,9 @@
+import VelaWebpackConfigurator from '../vela/VelaWebpackConfigurator';
+import WrapPlugin from './plugin/WrapPlugin';
+/**
+ * AndroidWebpackConfigurator
+ */
+declare class AndroidWebpackConfigurator extends VelaWebpackConfigurator {
+    protected createWrapPlugin(): WrapPlugin;
+}
+export default AndroidWebpackConfigurator;

package/lib/compiler/javascript/android/AndroidWebpackConfigurator.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const VelaWebpackConfigurator_1 = __importDefault(require("../vela/VelaWebpackConfigurator"));
+const WrapPlugin_1 = __importDefault(require("./plugin/WrapPlugin"));
+/**
+ * AndroidWebpackConfigurator
+ */
+class AndroidWebpackConfigurator extends VelaWebpackConfigurator_1.default {
+    createWrapPlugin() {
+        return new WrapPlugin_1.default(this.param);
+    }
+}
+exports.default = AndroidWebpackConfigurator;

package/lib/compiler/javascript/android/plugin/WrapPlugin.d.ts

@@ -0,0 +1,20 @@
+import { Compiler } from 'webpack';
+import IJavascriptCompileOption from '../../interface/IJavascriptCompileOption';
+/**
+ * WrapPlugin
+ */
+declare class WrapPlugin {
+    private readonly param;
+    constructor(param: IJavascriptCompileOption);
+    apply(compiler: Compiler): void;
+    /**
+     * 添加包含代码
+     *
+     * 1. 仅 page 文件添加
+     * @param compilation
+     */
+    private wrap;
+    private wrapPage;
+    private wrapApp;
+}
+export default WrapPlugin;

package/lib/compiler/javascript/android/plugin/WrapPlugin.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const webpack_1 = require("webpack");
+const webpack_sources_1 = require("webpack-sources");
+const UxFileUtils_1 = __importDefault(require("../../../../utils/ux/UxFileUtils"));
+/**
+ * WrapPlugin
+ */
+class WrapPlugin {
+    constructor(param) {
+        this.param = param;
+    }
+    apply(compiler) {
+        compiler.hooks.compilation.tap('WrapPlugin', (compilation) => {
+            compilation.hooks.processAssets.tap({
+                name: 'WrapPlugin',
+                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
+            }, () => {
+                this.wrap(compilation);
+            });
+        });
+    }
+    /**
+     * 添加包含代码
+     *
+     * 1. 仅 page 文件添加
+     * @param compilation
+     */
+    wrap(compilation) {
+        // 获取入口文件
+        const entrys = Object.keys(compilation.options.entry).map((item) => `${item}.js`);
+        entrys.forEach((entry) => {
+            if (compilation.assets[entry]) {
+                const source = compilation.assets[entry];
+                const isApp = entry === 'app.js';
+                compilation.assets[entry] = isApp
+                    ? this.wrapApp(source)
+                    : this.wrapPage(source);
+            }
+        });
+    }
+    wrapPage(source) {
+        return new webpack_sources_1.ConcatSource(`
+(function () {
+  var createPageHandler = function () {
+    return`, source, `;
+  };
+  if (typeof window === "undefined") {
+    return createPageHandler();
+  } else {
+    window.createPageHandler = createPageHandler;
+  }
+})();`);
+    }
+    wrapApp(source) {
+        const { projectPath, sourceRoot } = this.param;
+        return new webpack_sources_1.ConcatSource(`
+(function () {
+  var $app_define_wrap$ = $app_define_wrap$ || function () {};
+  var manifestJson =${JSON.stringify(UxFileUtils_1.default.getMainfestInfo(projectPath, sourceRoot))}
+  var createAppHandler = function () {
+      `, source, `
+  }
+    if (typeof window === "undefined") {
+    return createAppHandler();
+  } else {
+    window.createAppHandler = createAppHandler;
+    // H5注入manifest以获取features
+    global.manifest = manifestJson;
+  }
+})();
+`);
+    }
+}
+exports.default = WrapPlugin;

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

@@ -22,6 +22,9 @@ export default interface IJavascriptCompileOption extends ICompileParam {
      * 项目运行的代码覆盖率数据
      */
     dataCoverage: string;
+    /**
+     * 记录“连接过的设备信息”的文件地址
+     */
     clientRecordPath: string;
     /**
      * 运行端口
@@ -36,9 +39,21 @@ export default interface IJavascriptCompileOption extends ICompileParam {
     /**
      * 禁用 jsc
      */
-    disabledJSC?: boolean;
+    disabledJsc?: boolean;
     /**
      * 启用 protobuf
      */
     enableProtobuf?: boolean;
+    /**
+     * 启用应用自动化测试
+     */
+    enableE2e?: boolean;
+    /**
+     * 启用代码体积分析，会生成 report.html 文件，可查看打包后各模块占用体积
+     */
+    enableStats?: boolean;
+    /**
+     * 是否自动补全 manifest.json 中的 features 配置
+     */
+    completeFeature?: boolean;
 }

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.d.ts

@@ -5,6 +5,8 @@ import IWebpackConfigurator from '../interface/IWebpackConfigurator';
 declare class VelaWebpackConfigurator implements IWebpackConfigurator {
     param: ICompileParam & IJavascriptCompileOption;
     createPlugins(): WebpackPluginInstance[];
+    protected createWrapPlugin(): WebpackPluginInstance;
+    protected createBundleAnalyzerPlugin(): any;
     /**
      * 通过读取 manifest.json 生成 entry
      * @returns

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.js

@@ -10,10 +10,24 @@ const WrapPlugin_1 = __importDefault(require("./plugin/WrapPlugin"));
 const UxCompileUtil_1 = __importDefault(require("./utils/UxCompileUtil"));
 class VelaWebpackConfigurator {
     createPlugins() {
-        return [
-            // 给 入口js 添加包裹
-            new WrapPlugin_1.default()
-        ];
+        // 包裹代码的插件
+        const result = [this.createWrapPlugin()];
+        // 如果开启 stats 参数，则添加 webpack-bundle-analyzer 插件
+        if (this.param.enableStats) {
+            result.push(this.createBundleAnalyzerPlugin());
+        }
+        return result;
+    }
+    createWrapPlugin() {
+        return new WrapPlugin_1.default();
+    }
+    createBundleAnalyzerPlugin() {
+        const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+        return new BundleAnalyzerPlugin({
+            analyzerMode: 'static',
+            openAnalyzer: false,
+            excludeAssets: /^@(system|service)\./
+        });
     }
     /**
      * 通过读取 manifest.json 生成 entry
@@ -40,7 +54,6 @@ class VelaWebpackConfigurator {
                     {
                         loader: require.resolve('babel-loader'),
                         options: {
-                            // configFile: getBabelConfigJsPath(cwd),
                             cwd: this.param.projectPath,
                             cacheDirectory: true
                         }

package/lib/compiler/javascript/vela/interface/IManifest.d.ts

@@ -1,4 +1,4 @@
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 /**
  * vela manifest文件对应的数据结构
  */

package/lib/compiler/javascript/vela/model/Package.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 /**
  * 文件资源
  */

package/lib/compiler/javascript/vela/model/Package.js

@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 /**
  * 定义文件包
  *
@@ -38,7 +35,7 @@ class Package {
     addResource(data) {
         const { fileBuildPath } = data;
         if (this.include(fileBuildPath)) {
-            ColorConsole_1.default.throw(`File ${fileBuildPath} is added repeatedly`);
+            shared_utils_1.ColorConsole.throw(`File ${fileBuildPath} is added repeatedly`);
             return;
         }
         this._resourceDic[fileBuildPath] = true;

package/lib/compiler/javascript/vela/utils/Jsc.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const del_1 = __importDefault(require("del"));
 /**
  * Jsc
@@ -16,7 +15,7 @@ class Jsc {
     }
     jsc() {
         const { projectPath, buildPath } = this;
-        return CommonUtil_1.default.requireNodeModule(projectPath, `@aiot-toolkit/jsc`)
+        return shared_utils_1.CommonUtil.requireNodeModule(projectPath, `@aiot-toolkit/jsc`)
             .then((module) => {
             return module.default(buildPath);
         })
@@ -24,7 +23,7 @@ class Jsc {
             return (0, del_1.default)(`${buildPath}/**/*.js`, { force: true });
         })
             .catch((error) => {
-            ColorConsole_1.default.throw(error.message);
+            shared_utils_1.ColorConsole.throw(error.message);
         });
     }
 }

package/lib/compiler/javascript/vela/utils/UxCompileUtil.d.ts

@@ -1,4 +1,4 @@
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 declare class UxCompileUtil {
     static readonly DIGEST_ZIP_DIR = "META-INF";
     static clean(dirList: string[]): void;

package/lib/compiler/javascript/vela/utils/UxCompileUtil.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const EntryType_1 = __importDefault(require("../enum/EntryType"));
@@ -37,7 +37,7 @@ class UxCompileUtil {
         }
         const appFile = this.resolveFile(path_1.default.join(codeDir, 'app'));
         if (!fs_extra_1.default.existsSync(appFile)) {
-            ColorConsole_1.default.throw(`App file does not exist`);
+            shared_utils_1.ColorConsole.throw(`App file does not exist`);
         }
         const { pages = {}, widgets = {}, floatingWindows = {} } = router;
         const confsList = [
@@ -130,7 +130,7 @@ class UxCompileUtil {
      * @returns
      */
     static getExtensionList(withDot = true) {
-        const result = ['js'];
+        const result = ['ux', 'hml'];
         if (withDot) {
             return result.map((item) => `.${item}`);
         }

package/lib/compiler/javascript/vela/utils/ZipUtil.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 import JSZip from 'jszip';
 import IJavascriptCompileOption from '../../interface/IJavascriptCompileOption';
 import IManifest from '../interface/IManifest';

package/lib/compiler/javascript/vela/utils/ZipUtil.js

@@ -13,9 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
-const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const jszip_1 = __importDefault(require("jszip"));
 const path_1 = __importDefault(require("path"));
@@ -51,7 +49,7 @@ class ZipUtil {
             // 1
             const files = this.getSortedFiles(dist, param, config);
             if (!files.length) {
-                ColorConsole_1.default.error(`The build file is missing, stop generating the application package, please check carefully`);
+                shared_utils_1.ColorConsole.error(`The build file is missing, stop generating the application package, please check carefully`);
                 return;
             }
             // 2
@@ -95,7 +93,7 @@ class ZipUtil {
             const { releasePath, projectPath } = param;
             const filePath = path_1.default.join(projectPath, releasePath, fileName);
             fs_extra_1.default.outputFileSync(filePath, buffer);
-            ColorConsole_1.default.success(`Project build and generate files：${fileName}`);
+            shared_utils_1.ColorConsole.success(`Project build and generate files：${fileName}`);
         });
     }
     static createZipBufferFromFileList(fileList, comment) {
@@ -133,7 +131,7 @@ class ZipUtil {
                     let metaZip = yield jszip_1.default.loadAsync(fileContentBuffer);
                     fileContentBuffer = (yield metaZip.generateAsync(Object.assign(Object.assign({}, ZipUtil.ZIP_OPTION), { comment: null })));
                 }
-                const fileContentDigest = CommonUtil_1.default.calcDataDigest(fileContentBuffer);
+                const fileContentDigest = shared_utils_1.CommonUtil.calcDataDigest(fileContentBuffer);
                 const resourceInfo = {
                     fileBuildPath,
                     fileContentBuffer,
@@ -174,13 +172,13 @@ class ZipUtil {
         // 1. 排除META-INF 目录下的文件
         // 2. 生产环境排除 .map 文件
         const mapReg = /\.map$/;
-        let result = FileUtil_1.default.readAlldirSync(dist);
+        let result = shared_utils_1.FileUtil.readAlldirSync(dist);
         result = result
             .filter((item) => {
             return !(item.startsWith(UxCompileUtil_1.default.DIGEST_ZIP_DIR) ||
                 (param.mode === CompileMode_1.default.PRODUCTION && mapReg.test(item)));
         })
-            .map((item) => path_1.default.relative(dist, item));
+            .map((item) => path_1.default.relative(dist, item).split(path_1.default.sep).join(path_1.default.posix.sep));
         result.sort((a, b) => {
             const indexA = getFileIndex(a);
             const indexB = getFileIndex(b);
@@ -240,7 +238,7 @@ class ZipUtil {
                 // fullPackageBuffer
                 const fullPackageBuffer = yield SignUtil_1.default.signZipBufferForPackage(fullPackage, privatekey, certificate);
                 if (fullPackageBuffer === false) {
-                    ColorConsole_1.default.throw('Fullpackage signature failed');
+                    shared_utils_1.ColorConsole.throw('Fullpackage signature failed');
                 }
                 else {
                     fullPackage = fullPackageBuffer;

package/lib/compiler/javascript/vela/utils/signature/SignUtil.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import ICompileParam from '../../../../interface/ICompileParam';
 import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
 /**
  * SignUtil
@@ -7,11 +6,10 @@ import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOptio
 declare class SignUtil {
     /**
      * 获取签名相关的配置内容
-     * 1. ICompileParam参数中获取编译模式是否为release
-     * 2. IJavascriptCompileOption参数中获取签名目录等内容
-     * @param param
+     * @param param IJavascriptCompileOption参数中获取签名目录等内容
+     * @returns
      */
-    static getProjectSignConfig(param: ICompileParam & IJavascriptCompileOption): {
+    static getProjectSignConfig(param: IJavascriptCompileOption): {
         privatekey: Buffer;
         certificate: Buffer;
     };