aiot-toolkit 2.0.3-beta.1 → 2.0.3-beta.11

package/lib/builder/UxBuilderBase.js

@@ -1,120 +1,139 @@
 "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 __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const aiotpack_1 = require("@aiot-toolkit/aiotpack");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const lodash_1 = __importDefault(require("lodash"));
-const file_lane_1 = __importDefault(require("file-lane"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "IFileLaneEvents", {
+  enumerable: true,
+  get: function () {
+    return _IFileLaneEvents.default;
+  }
+});
+Object.defineProperty(exports, "IFileLaneSuccessData", {
+  enumerable: true,
+  get: function () {
+    return _IFileLaneEvents.IFileLaneSuccessData;
+  }
+});
+exports.default = void 0;
+var _aiotpack = require("@aiot-toolkit/aiotpack");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _path = _interopRequireDefault(require("path"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _lodash = _interopRequireDefault(require("lodash"));
+var _fileLane = _interopRequireDefault(require("file-lane"));
+var _IFileLaneEvents = _interopRequireWildcard(require("file-lane/lib/interface/IFileLaneEvents"));
+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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * UxBuilderBase
  */
 class UxBuilderBase {
-    constructor(events = {
-        onBuildSuccess: (data) => shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`)
-    }) {
-        this.events = events;
-        /**
-         * 配置文件
-         */
-        this.QUICKAPP_CONFIG = 'quickapp.config.js';
-    }
-    /**
-     * ux项目的build函数
-     * @param projectPath 项目路径
-     * @param options 命令参数
-     * @param watch 是否开启监听
-     */
-    build(projectPath, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.fileLane) {
-                // 已经在运行中，请先停止
-                throw new Error('already running, please stop first: builder.stop()');
-            }
-            const watch = options.watch || false;
-            // 项目配置
-            const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
-            // 编译配置
-            const compilerOption = this.getCompilerOption(projectPath, options);
-            shared_utils_1.ColorConsole.info('start build: ', {
-                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.INFO),
-                word: JSON.stringify({
-                    projectPath,
-                    options,
-                    watch,
-                    node: process.version,
-                    platform: process.platform,
-                    arch: process.arch,
-                    toolkit: require('../../package.json').version
-                }, null, 2)
-            });
-            // 开始编译项目
-            this.fileLane = new file_lane_1.default(uxProjectConfig, projectPath, compilerOption, this.events);
-            yield this.fileLane.start({ watch });
-        });
+  /**
+   * 配置文件
+   */
+  QUICKAPP_CONFIG = 'quickapp.config.js';
+  constructor() {
+    let events = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    this.events = events;
+  }
+
+  /**
+   * ux项目的build函数
+   * @param projectPath 项目路径
+   * @param options 命令参数
+   * @param watch 是否开启监听
+   */
+  async build(projectPath, options) {
+    if (this.fileLane) {
+      // 已经在运行中，请先停止
+      throw new Error('already running, please stop first: builder.stop()');
     }
-    /**
-     *
-     */
-    stop() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            yield ((_a = this.fileLane) === null || _a === void 0 ? void 0 : _a.stop());
-            this.fileLane = undefined;
-        });
-    }
-    /**
-     * 获取build的编译配置
-     * @param projectPath 项目路径
-     * @param options 命令参数
-     */
-    getCompilerOption(projectPath, options) {
-        // 读取项目中文件的配置
-        const quickappConfig = this.readQuickAppConfig(projectPath);
-        const _a = quickappConfig || {}, { cli } = _a, otherConfig = __rest(_a, ["cli"]);
-        options = lodash_1.default.merge({}, options, cli);
-        // 项目配置
-        const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
-        // 编译配置
-        const compileMode = options.mode || aiotpack_1.CompileMode.DEVELOPMENT;
-        const compilerOption = lodash_1.default.merge(aiotpack_1.JavascriptDefaultCompileOption, Object.assign(Object.assign({}, options), { projectPath: path_1.default.join(projectPath, uxProjectConfig.output), mode: compileMode }), otherConfig);
-        return compilerOption;
+    const watch = options.watch || false;
+    // 项目配置
+    const uxProjectConfig = new _aiotpack.UxConfig(projectPath);
+    // 编译配置
+    const compilerOption = this.getCompilerOption(projectPath, options);
+    const log = {
+      level: _sharedUtils.Loglevel.INFO,
+      message: ['start build: ', {
+        word: JSON.stringify({
+          projectPath,
+          options,
+          watch,
+          node: process.version,
+          platform: process.platform,
+          arch: process.arch,
+          toolkit: require('../../package.json').version
+        }, null, 2)
+      }]
+    };
+    this.handleLogs([log]);
+    // 开始编译项目
+    this.fileLane = new _fileLane.default(uxProjectConfig, projectPath, compilerOption, this.events);
+    await this.fileLane.start({
+      watch
+    });
+  }
+  handleLogs(logs) {
+    const {
+      onLog
+    } = this.events;
+    if (onLog) {
+      onLog(logs);
+    } else {
+      logs.forEach(log => {
+        _sharedUtils.ColorConsole.logger(log);
+      });
     }
-    readQuickAppConfig(projectPath) {
-        const path = path_1.default.join(projectPath, this.QUICKAPP_CONFIG);
-        if (fs_extra_1.default.existsSync(path)) {
-            try {
-                const data = require(path);
-                return data;
-            }
-            catch (error) {
-                shared_utils_1.ColorConsole.throw((error === null || error === void 0 ? void 0 : error.toString()) || '');
-            }
-        }
-        return;
+  }
+  async dispose() {
+    await this.fileLane?.dispose();
+    this.fileLane = undefined;
+  }
+
+  /**
+   * 获取build的编译配置
+   * @param projectPath 项目路径
+   * @param options 命令参数
+   */
+  getCompilerOption(projectPath, options) {
+    // 读取项目中文件的配置
+    const quickappConfig = this.readQuickAppConfig(projectPath);
+    const {
+      cli,
+      ...otherConfig
+    } = quickappConfig || {};
+    options = _lodash.default.merge({}, options, cli);
+    // 项目配置
+    const uxProjectConfig = new _aiotpack.UxConfig(projectPath);
+    // 编译配置
+    const mode = options.mode || _aiotpack.CompileMode.DEVELOPMENT;
+    const compilerOption = _lodash.default.merge({}, _aiotpack.JavascriptDefaultCompileOption, {
+      ...options,
+      projectPath: _path.default.join(projectPath, uxProjectConfig.output),
+      mode
+    }, otherConfig);
+    return compilerOption;
+  }
+  readQuickAppConfig(projectPath) {
+    const path = _path.default.join(projectPath, this.QUICKAPP_CONFIG);
+    if (_fsExtra.default.existsSync(path)) {
+      try {
+        const data = require(path);
+        return data;
+      } catch (error) {
+        const log = {
+          level: _sharedUtils.Loglevel.ERROR,
+          message: ['read quickapp.config.js error: ', {
+            word: error?.toString() || ''
+          }]
+        };
+        this.handleLogs([log]);
+      }
     }
+    return;
+  }
 }
-exports.default = UxBuilderBase;
+var _default = exports.default = UxBuilderBase;

package/lib/builder/VelaUxBuilder.d.ts

@@ -1,28 +1,29 @@
-import { CompileMode } from '@aiot-toolkit/aiotpack';
 import { IParam } from '@aiot-toolkit/commander';
-import { Dictionary } from '@aiot-toolkit/shared-utils';
 import IBuilder from './IBuilder';
-import UxBuilderBase from './UxBuilderBase';
-interface IUxBuilderOption extends Dictionary {
+import UxBuilderBase, { IUxBuildOption } from './UxBuilderBase';
+export interface IVelaUxBuilderOption extends IUxBuildOption {
     watch?: boolean;
-    mode: CompileMode;
-    enableJsc: boolean;
+    enableJsc?: boolean;
     enableE2e?: boolean;
+    enableStats?: boolean;
+    optimizeCssAttr?: boolean;
+    /**
+     * 是否自动补全 manifest.json 中的 features 配置
+     */
+    completeFeature?: boolean;
     /**
      * 此选项控制是否生成，以及如何生成 source map
      *
      * @see https://www.webpackjs.com/configuration/devtool/#devtool
      */
     devtool?: string;
-    /**
-     * 是否自动补全 manifest.json 中的 features 配置
-     */
-    completeFeature?: boolean;
+    enableProtobuf?: boolean;
 }
+export declare const velaUxBuilderParams: IParam[];
 /**
  * VelaUxBuilder
  */
-declare class VelaUxBuilder extends UxBuilderBase<IUxBuilderOption> implements IBuilder<IUxBuilderOption> {
+declare class VelaUxBuilder extends UxBuilderBase<IVelaUxBuilderOption> implements IBuilder<IVelaUxBuilderOption> {
     params: IParam[];
     match(projectPath: string): boolean;
 }

package/lib/builder/VelaUxBuilder.js

@@ -1,66 +1,70 @@
 "use strict";
-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 UxBuilderBase_1 = __importDefault(require("./UxBuilderBase"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.velaUxBuilderParams = exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _UxBuilderBase = _interopRequireDefault(require("./UxBuilderBase"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const velaUxBuilderParams = exports.velaUxBuilderParams = [{
+  type: 'string',
+  name: 'devtool',
+  description: 'source map config'
+}, {
+  name: 'disable-subpackages',
+  description: 'disable subpackages'
+}, {
+  type: 'confirm',
+  name: 'enable-jsc',
+  description: 'enable jsc bundle',
+  defaultValue: false
+}, {
+  type: 'confirm',
+  name: 'enable-protobuf',
+  description: 'enable protobuf',
+  defaultValue: false
+}, {
+  type: 'confirm',
+  name: 'enable-e2e',
+  description: 'inject test-suite for current project',
+  defaultValue: false
+}, {
+  type: 'confirm',
+  name: 'enable-stats',
+  description: 'analyse time and size of webpack output files',
+  defaultValue: false
+}, {
+  type: 'confirm',
+  name: 'optimize-css-attr',
+  description: 'optimize css attr',
+  defaultValue: false
+}, {
+  type: 'confirm',
+  name: 'complete-feature',
+  description: 'auto complete the features are used in the code into the features field of the manifest.json file',
+  defaultValue: false
+}, {
+  type: 'confirm',
+  name: 'enable-custom-component',
+  description: 'deprecated',
+  deprecated: 'please remove it now',
+  deprecatedVersion: '2.1.0'
+}, {
+  type: 'confirm',
+  name: 'stats',
+  description: 'deprecated',
+  deprecated: 'please use `enable-stats` instead',
+  deprecatedVersion: '2.1.0'
+}];
+
 /**
  * VelaUxBuilder
  */
-class VelaUxBuilder extends UxBuilderBase_1.default {
-    constructor() {
-        super(...arguments);
-        this.params = [
-            {
-                type: 'string',
-                name: 'devtool',
-                description: 'source map config'
-            },
-            {
-                name: 'disable-subpackages',
-                description: 'disable subpackages'
-            },
-            {
-                type: 'confirm',
-                name: 'enable-jsc',
-                description: 'enable jsc bundle',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'enable-protobuf',
-                description: 'enable protobuf',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'enable-e2e',
-                description: 'inject test-suite for current project',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'enable-stats',
-                description: 'analyse time and size of webpack output files',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'optimize-css-attr',
-                description: 'optimize css attr',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'complete-feature',
-                description: 'auto complete the features are used in the code into the features field of the manifest.json file',
-                defaultValue: false
-            }
-        ];
-    }
-    match(projectPath) {
-        return shared_utils_1.ProjectType.getProjectType(projectPath) === shared_utils_1.ProjectType.VELA_UX;
-    }
+class VelaUxBuilder extends _UxBuilderBase.default {
+  params = (() => velaUxBuilderParams)();
+  match(projectPath) {
+    return _sharedUtils.ProjectType.getProjectType(projectPath) === _sharedUtils.ProjectType.VELA_UX;
+  }
 }
-exports.default = VelaUxBuilder;
+var _default = exports.default = VelaUxBuilder;

package/lib/builder/XtsBuilder.d.ts

@@ -9,8 +9,10 @@ export interface IBuilderOption {
  */
 declare class XtsBuilder implements IBuilder<IBuilderOption> {
     static readonly PROJECT_TYPE = "xts quick app";
+    private fileLane?;
     match(projectPath: string): boolean;
     build(projectPath: string, options: IBuilderOption): Promise<void>;
+    dispose(): Promise<void>;
     readonly params: IParam[];
 }
 export default XtsBuilder;

package/lib/builder/XtsBuilder.js

@@ -1,87 +1,94 @@
 "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 aiotpack_1 = require("@aiot-toolkit/aiotpack");
-const aiotpack_2 = require("@aiot-toolkit/aiotpack");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const file_lane_1 = require("file-lane");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _aiotpack = require("@aiot-toolkit/aiotpack");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _fileLane = require("file-lane");
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * XtsBuilder
  */
 class XtsBuilder {
-    constructor() {
-        this.params = [
-            {
-                name: 'skip',
-                type: 'string',
-                description: `Can configure skip steps, comma separated, optional values: ${aiotpack_2.skipList.join(',')}`,
-                validate(value) {
-                    // TODO: validate 不起作用
-                    const res = shared_utils_1.StringUtil.string2arrayByComma(value);
-                    const unValid = res.find((r) => {
-                        return !aiotpack_2.skipList.includes(r);
-                    });
-                    if (unValid) {
-                        return `${unValid} is unvalidate,  validate value are ${aiotpack_2.skipList.join(',')}, Multiple values separated by commas`;
-                    }
-                    return true;
-                }
-            }
-        ];
+  static PROJECT_TYPE = 'xts quick app';
+  match(projectPath) {
+    // app/app.xts 存在视为xts项目
+    return _fs.default.existsSync(_path.default.resolve(projectPath, 'app/app.xts'));
+  }
+  async build(projectPath, options) {
+    if (this.fileLane) {
+      // 已经在运行中，请先停止
+      throw new Error('already running, please stop first: builder.stop()');
     }
-    match(projectPath) {
-        // app/app.xts 存在视为xts项目
-        return fs_1.default.existsSync(path_1.default.resolve(projectPath, 'app/app.xts'));
+    const watch = options.watch || false;
+    _sharedUtils.ColorConsole.success('Start build...\n', {
+      word: 'ProjectPath: ',
+      style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.SUCCESS)
+    }, projectPath, '\n', {
+      word: 'buildOptions: ',
+      style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.SUCCESS)
+    }, JSON.stringify(options));
+    const compilerOptions = {
+      skip: _sharedUtils.StringUtil.string2arrayByComma(options.skip)
+    };
+    const config = new _aiotpack.XtsConfig(projectPath);
+    if (compilerOptions.skip?.includes('xts2ts')) {
+      _sharedUtils.ColorConsole.info("### skip compile xts to ts due to --skip ${compilerOptions?.skip.join(',')}");
+      const context = _fileLane.FileLaneUtil.createContext(config.output, projectPath);
+      const preWorks = config.beforeCompile || [];
+      for (let item of preWorks) {
+        try {
+          await item({
+            context,
+            config,
+            compilerOption: compilerOptions
+          });
+        } catch (error) {
+          // 报错 prework的item error
+        }
+      }
+      const follWorks = config.afterCompile || [];
+      for (let item of follWorks) {
+        try {
+          await item.worker({
+            context,
+            config,
+            compilerOption: compilerOptions
+          });
+        } catch (error) {
+          // 报错 prework的item error
+        }
+      }
+    } else {
+      this.fileLane = new _fileLane.FileLane(config, projectPath, compilerOptions);
+      this.fileLane.start({
+        watch
+      });
     }
-    build(projectPath, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const watch = options.watch || false;
-            shared_utils_1.ColorConsole.success('Start build...\n', { word: 'ProjectPath: ', style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.SUCCESS) }, projectPath, '\n', { word: 'buildOptions: ', style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.SUCCESS) }, JSON.stringify(options));
-            const compilerOptions = {
-                skip: shared_utils_1.StringUtil.string2arrayByComma(options.skip)
-            };
-            const config = new aiotpack_1.XtsConfig(projectPath);
-            if ((_a = compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
-                shared_utils_1.ColorConsole.info("### skip compile xts to ts due to --skip ${compilerOptions?.skip.join(',')}");
-                const context = file_lane_1.FileLaneUtil.createContext(config.output, projectPath);
-                const preWorks = config.beforeCompile || [];
-                for (let item of preWorks) {
-                    try {
-                        yield item({ context, config, compilerOption: compilerOptions });
-                    }
-                    catch (error) {
-                        // 报错 prework的item error
-                    }
-                }
-                const follWorks = config.afterCompile || [];
-                for (let item of follWorks) {
-                    try {
-                        yield item.worker({ context, config, compilerOption: compilerOptions });
-                    }
-                    catch (error) {
-                        // 报错 prework的item error
-                    }
-                }
-            }
-            else {
-                return new file_lane_1.FileLane(config, projectPath, compilerOptions).start({ watch });
-            }
-        });
+  }
+  async dispose() {
+    await this.fileLane?.dispose();
+    this.fileLane = undefined;
+  }
+  params = (() => [{
+    name: 'skip',
+    type: 'string',
+    description: `Can configure skip steps, comma separated, optional values: ${_aiotpack.skipList.join(',')}`,
+    validate(value) {
+      // TODO: validate 不起作用
+      const res = _sharedUtils.StringUtil.string2arrayByComma(value);
+      const unValid = res.find(r => {
+        return !_aiotpack.skipList.includes(r);
+      });
+      if (unValid) {
+        return `${unValid} is unvalidate,  validate value are ${_aiotpack.skipList.join(',')}, Multiple values separated by commas`;
+      }
+      return true;
     }
+  }])();
 }
-XtsBuilder.PROJECT_TYPE = 'xts quick app';
-exports.default = XtsBuilder;
+var _default = exports.default = XtsBuilder;