@aiot-toolkit/aiotpack 2.0.3-beta.7 → 2.0.3-beta.8

package/lib/beforeCompile/xts/preInstall.js

@@ -1,59 +1,54 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.preInstall = void 0;
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const child_process_1 = require("child_process");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const preInstall = (params) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const { context, compilerOption } = params;
-    if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('install')) {
-        shared_utils_1.ColorConsole.info(`### skip install pre-dependencies due to --skip ${compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip.join(',')}`);
-        return;
-    }
-    const { projectPath } = context;
-    const packagePath = path_1.default.resolve(projectPath, 'package.json');
-    const preContent = {
-        dependencies: {
-            '@mi/ts-framework': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/ts-framework/-/@mi/ts-framework-1.0.9.tgz',
-            '@mi/wasmnizer-ts': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/wasmnizer-ts/-/@mi/wasmnizer-ts-0.0.12.tgz'
-        }
-    };
-    if (!fs_1.default.existsSync(packagePath)) {
-        /** 如果没有 package.json 则创建 */
-        fs_1.default.writeFileSync(packagePath, JSON.stringify(preContent, undefined, 2), {
-            encoding: 'utf-8'
-        });
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _child_process = require("child_process");
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const preInstall = async params => {
+  const {
+    context,
+    compilerOption
+  } = params;
+  if (compilerOption?.skip?.includes('install')) {
+    _sharedUtils.ColorConsole.info(`### skip install pre-dependencies due to --skip ${compilerOption?.skip.join(',')}`);
+    return;
+  }
+  const {
+    projectPath
+  } = context;
+  const packagePath = _path.default.resolve(projectPath, 'package.json');
+  const preContent = {
+    dependencies: {
+      '@mi/ts-framework': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/ts-framework/-/@mi/ts-framework-1.0.9.tgz',
+      '@mi/wasmnizer-ts': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/wasmnizer-ts/-/@mi/wasmnizer-ts-0.0.12.tgz'
     }
-    else {
-        const pckageContent = require(packagePath);
-        if (!pckageContent.dependencies['@mi/ts-framework'] ||
-            !pckageContent.dependencies['@mi/wasmnizer-ts']) {
-            Object.assign(pckageContent, preContent);
-            fs_1.default.writeFileSync(packagePath, JSON.stringify(pckageContent), {
-                encoding: 'utf-8'
-            });
-        }
-    }
-    shared_utils_1.ColorConsole.info('### Installing pre-dependencies. The initial build may take some time, please be patient...');
-    (0, child_process_1.execSync)('npm install', {
-        cwd: projectPath
+  };
+  if (!_fs.default.existsSync(packagePath)) {
+    /** 如果没有 package.json 则创建 */
+    _fs.default.writeFileSync(packagePath, JSON.stringify(preContent, undefined, 2), {
+      encoding: 'utf-8'
     });
-    // 目前ts2wasm不支持@符号
-    fs_1.default.renameSync(path_1.default.resolve(projectPath, 'node_modules/@mi'), path_1.default.resolve(projectPath, 'node_modules/mi'));
-    shared_utils_1.ColorConsole.info('### Dependencies installation complete.');
-});
-exports.preInstall = preInstall;
+  } else {
+    const pckageContent = require(packagePath);
+    if (!pckageContent.dependencies['@mi/ts-framework'] || !pckageContent.dependencies['@mi/wasmnizer-ts']) {
+      Object.assign(pckageContent, preContent);
+      _fs.default.writeFileSync(packagePath, JSON.stringify(pckageContent), {
+        encoding: 'utf-8'
+      });
+    }
+  }
+  _sharedUtils.ColorConsole.info('### Installing pre-dependencies. The initial build may take some time, please be patient...');
+  (0, _child_process.execSync)('npm install', {
+    cwd: projectPath
+  });
+
+  // 目前ts2wasm不支持@符号
+  _fs.default.renameSync(_path.default.resolve(projectPath, 'node_modules/@mi'), _path.default.resolve(projectPath, 'node_modules/mi'));
+  _sharedUtils.ColorConsole.info('### Dependencies installation complete.');
+};
+exports.preInstall = preInstall;

package/lib/beforeWorks/ux/UxBeforeWorks.js

@@ -1,22 +1,15 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const file_lane_1 = require("file-lane");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _fileLane = require("file-lane");
 class UxBeforeWorks {
-    static cleanOutput(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const outputPath = file_lane_1.FileLaneUtil.getOutputPath(context);
-            shared_utils_1.FileUtil.del(outputPath);
-        });
-    }
+  static async cleanOutput(context) {
+    const outputPath = _fileLane.FileLaneUtil.getOutputPath(context);
+    _sharedUtils.FileUtil.del(outputPath);
+  }
 }
-exports.default = UxBeforeWorks;
+var _default = exports.default = UxBeforeWorks;

package/lib/compiler/enum/CompileMode.js

@@ -1,28 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
 /**
  * 编译模式枚举
  */
-var CompileMode;
-(function (CompileMode) {
-    /**
-     * 开发模式
-     */
-    CompileMode["DEVELOPMENT"] = "development";
-    /**
-     * 生产模式
-     */
-    CompileMode["PRODUCTION"] = "production";
+var CompileMode = /*#__PURE__*/function (CompileMode) {
+  CompileMode["DEVELOPMENT"] = "development";
+  CompileMode["PRODUCTION"] = "production";
+  return CompileMode;
+}(CompileMode || {});
+(function (_CompileMode) {
+  function isProductionMode(value) {
+    return value === CompileMode.PRODUCTION;
+  }
+  _CompileMode.isProductionMode = isProductionMode;
 })(CompileMode || (CompileMode = {}));
-(function (CompileMode) {
-    /**
-     * 判断是否为生产模式
-     * @param value
-     * @returns
-     */
-    function isProductionMode(value) {
-        return value === CompileMode.PRODUCTION;
-    }
-    CompileMode.isProductionMode = isProductionMode;
-})(CompileMode || (CompileMode = {}));
-exports.default = CompileMode;
+var _default = exports.default = CompileMode;

package/lib/compiler/interface/ICompileParam.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";

package/lib/compiler/interface/ICompiler.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";

package/lib/compiler/interface/ISignConfig.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -1,163 +1,156 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const core_1 = require("@rspack/core");
-const lodash_1 = __importDefault(require("lodash"));
-const path_1 = __importDefault(require("path"));
-const AndroidWebpackConfigurator_1 = __importDefault(require("./android/AndroidWebpackConfigurator"));
-const VelaWebpackConfigurator_1 = __importDefault(require("./vela/VelaWebpackConfigurator"));
-const UxCompileUtil_1 = __importDefault(require("./vela/utils/UxCompileUtil"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _core = require("@rspack/core");
+var _lodash = _interopRequireDefault(require("lodash"));
+var _path = _interopRequireDefault(require("path"));
+var _AndroidWebpackConfigurator = _interopRequireDefault(require("./android/AndroidWebpackConfigurator"));
+var _VelaWebpackConfigurator = _interopRequireDefault(require("./vela/VelaWebpackConfigurator"));
+var _UxCompileUtil = _interopRequireDefault(require("./vela/utils/UxCompileUtil"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class JavascriptCompiler {
-    constructor() {
-        this.QUICKAPP_CONFIG = 'quickapp.config.js';
-    }
-    compile(param) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                yield this.clean(param);
-                const config = this.createWebpackConfig(param);
-                (0, core_1.rspack)(config, (error, stats) => {
-                    if (error) {
-                        reject({ errors: [error] });
-                    }
-                    else {
-                        const statsObj = stats === null || stats === void 0 ? void 0 : stats.toJson({});
-                        if (statsObj) {
-                            const { errors, warnings } = statsObj;
-                            if ((errors === null || errors === void 0 ? void 0 : errors.length) || (warnings === null || warnings === void 0 ? void 0 : warnings.length)) {
-                                reject({
-                                    errors,
-                                    warnings
-                                });
-                            }
-                            else {
-                                resolve();
-                            }
-                        }
-                    }
-                });
-            }));
-        });
-    }
-    createWebpackConfig(param) {
-        const configurator = this.getConfigurator(param);
-        if (!configurator) {
-            throw new Error(`This project is not supported`);
-        }
-        configurator.param = param;
-        // 如果configurator有 create 函数，直接返回
-        // 否则，结合configurator生成默认配置，并使用
-        if (configurator.create) {
-            return configurator.create();
-        }
-        const { projectPath, mode, devtool, outputPath } = param;
-        const buildPath = path_1.default.resolve(projectPath, outputPath);
-        const quickAppConfig = shared_utils_1.CommonUtil.requireModule(path_1.default.join(param.projectPath, this.QUICKAPP_CONFIG));
-        const result = {
-            context: projectPath,
-            mode,
-            devtool: devtool,
-            output: {
-                globalObject: 'window',
-                filename: '[name].js',
-                publicPath: './',
-                path: buildPath
-            },
-            module: {
-                rules: [
-                    {
-                        test: /\.ux$/, // 匹配以 .ux 结尾的文件
-                        use: [
-                            {
-                                loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
-                            }
-                        ]
-                    }
-                ]
-            },
-            optimization: {
-                minimizer: [
-                    new core_1.rspack.SwcJsMinimizerRspackPlugin({
-                        minimizerOptions: {
-                            module: true
-                        }
-                    })
-                ]
-            },
-            resolve: {
-                extensions: ['.js', '.ts', '.ux']
-            },
-            stats: {
-                builtAt: false,
-                entrypoints: false,
-                children: false,
-                chunks: false,
-                chunkModules: false,
-                chunkOrigins: false,
-                modules: false,
-                version: false,
-                assets: false
-            }
-        };
-        if (configurator.createEntry) {
-            result.entry = configurator.createEntry();
-        }
-        if (configurator.createRules && result.module) {
-            const readyRules = result.module.rules;
-            const configuratorRules = configurator.createRules();
-            result.module.rules =
-                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$/, // 匹配以 .ux 结尾的文件
-                    use: [
-                        {
-                            loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/addColSourceMap.js')
-                        }
-                    ]
-                });
+  QUICKAPP_CONFIG = 'quickapp.config.js';
+  async compile(param) {
+    return new Promise(async (resolve, reject) => {
+      await this.clean(param);
+      const config = this.createWebpackConfig(param);
+      (0, _core.rspack)(config, (error, stats) => {
+        if (error) {
+          reject({
+            errors: [error]
+          });
+        } else {
+          const statsObj = stats?.toJson({});
+          if (statsObj) {
+            const {
+              errors,
+              warnings
+            } = statsObj;
+            if (errors?.length || warnings?.length) {
+              reject({
+                errors,
+                warnings
+              });
+            } else {
+              resolve();
             }
+          }
         }
-        if (configurator.createPlugins) {
-            result.plugins = configurator.createPlugins();
-        }
-        if (configurator.hook) {
-            configurator.hook(result);
-        }
-        return lodash_1.default.merge({}, result, quickAppConfig === null || quickAppConfig === void 0 ? void 0 : quickAppConfig.webpack);
+      });
+    });
+  }
+  createWebpackConfig(param) {
+    const configurator = this.getConfigurator(param);
+    if (!configurator) {
+      throw new Error(`This project is not supported`);
     }
-    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;
-        }
+    configurator.param = param;
+    // 如果configurator有 create 函数，直接返回
+    // 否则，结合configurator生成默认配置，并使用
+    if (configurator.create) {
+      return configurator.create();
     }
-    clean(param) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { outputPath, releasePath, projectPath } = param;
-            UxCompileUtil_1.default.clean([outputPath, releasePath].map((item) => path_1.default.resolve(projectPath, item)));
+    const {
+      projectPath,
+      mode,
+      devtool,
+      outputPath
+    } = param;
+    const buildPath = _path.default.resolve(projectPath, outputPath);
+    const quickAppConfig = _sharedUtils.CommonUtil.requireModule(_path.default.join(param.projectPath, this.QUICKAPP_CONFIG));
+    const result = {
+      context: projectPath,
+      mode,
+      devtool: devtool,
+      output: {
+        globalObject: 'window',
+        filename: '[name].js',
+        publicPath: './',
+        path: buildPath
+      },
+      module: {
+        rules: [{
+          test: /\.ux$/,
+          // 匹配以 .ux 结尾的文件
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
+          }]
+        }]
+      },
+      optimization: {
+        minimizer: [new _core.rspack.SwcJsMinimizerRspackPlugin({
+          minimizerOptions: {
+            module: true
+          }
+        })]
+      },
+      resolve: {
+        extensions: ['.js', '.ts', '.ux']
+      },
+      stats: {
+        builtAt: false,
+        entrypoints: false,
+        children: false,
+        chunks: false,
+        chunkModules: false,
+        chunkOrigins: false,
+        modules: false,
+        version: false,
+        assets: false
+      }
+    };
+    if (configurator.createEntry) {
+      result.entry = configurator.createEntry();
+    }
+    if (configurator.createRules && result.module) {
+      const readyRules = result.module.rules;
+      const configuratorRules = configurator.createRules();
+      result.module.rules = 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$/,
+          // 匹配以 .ux 结尾的文件
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/addColSourceMap.js')
+          }]
         });
+      }
+    }
+    if (configurator.createPlugins) {
+      result.plugins = configurator.createPlugins();
+    }
+    if (configurator.hook) {
+      configurator.hook(result);
+    }
+    return _lodash.default.merge({}, result, quickAppConfig?.webpack);
+  }
+  getConfigurator(param) {
+    const {
+      projectPath,
+      sourceRoot
+    } = param;
+    const projectType = _sharedUtils.ProjectType.getProjectType(projectPath, sourceRoot);
+    switch (projectType) {
+      case _sharedUtils.ProjectType.VELA_UX:
+        return new _VelaWebpackConfigurator.default();
+      case _sharedUtils.ProjectType.ANDDROID_UX:
+        return new _AndroidWebpackConfigurator.default();
+      default:
+        break;
     }
+  }
+  async clean(param) {
+    const {
+      outputPath,
+      releasePath,
+      projectPath
+    } = param;
+    _UxCompileUtil.default.clean([outputPath, releasePath].map(item => _path.default.resolve(projectPath, item)));
+  }
 }
-exports.default = JavascriptCompiler;
+var _default = exports.default = JavascriptCompiler;

package/lib/compiler/javascript/JavascriptDefaultCompileOption.js

@@ -1,22 +1,26 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
 exports.setServerPort = setServerPort;
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const clientRecordPath = path_1.default.join(os_1.default.homedir(), 'hap-toolkit-client-records.json');
+var _os = _interopRequireDefault(require("os"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const clientRecordPath = _path.default.join(_os.default.homedir(), 'hap-toolkit-client-records.json');
 const JavascriptDefaultCompileOption = {
-    sourceRoot: './src',
-    signRoot: './sign',
-    releasePath: './dist',
-    outputPath: './build',
-    dataCoverage: './.nyc_output',
-    clientRecordPath,
-    server: { port: 8000 }
+  sourceRoot: './src',
+  signRoot: './sign',
+  releasePath: './dist',
+  outputPath: './build',
+  dataCoverage: './.nyc_output',
+  clientRecordPath,
+  server: {
+    port: 8000
+  }
 };
 function setServerPort(port) {
-    JavascriptDefaultCompileOption.server.port = port;
+  JavascriptDefaultCompileOption.server.port = port;
 }
-exports.default = JavascriptDefaultCompileOption;
+var _default = exports.default = JavascriptDefaultCompileOption;

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

@@ -1,16 +1,18 @@
 "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"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _VelaWebpackConfigurator = _interopRequireDefault(require("../vela/VelaWebpackConfigurator"));
+var _WrapPlugin = _interopRequireDefault(require("./plugin/WrapPlugin"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * AndroidWebpackConfigurator
  */
-class AndroidWebpackConfigurator extends VelaWebpackConfigurator_1.default {
-    createWrapPlugin() {
-        return new WrapPlugin_1.default(this.param);
-    }
+class AndroidWebpackConfigurator extends _VelaWebpackConfigurator.default {
+  createWrapPlugin() {
+    return new _WrapPlugin.default(this.param);
+  }
 }
-exports.default = AndroidWebpackConfigurator;
+var _default = exports.default = AndroidWebpackConfigurator;