aiot-toolkit 2.0.2 → 2.0.3-beta.2

package/README.md

@@ -32,7 +32,6 @@ aiot-toolkit2.0目前支持的打包格式如下：
 | 命令                     | 说明                     |
 | ------------------------ | ------------------------ |
 | npm create aiot          | 创建并手动选择项目       |
-| npm create aiot xts      | 创建xts项目              |
 | npm create aiot ux       | 创建ux项目               |
 | aiot build               | 构建项目                 |
 | aiot release             | 构建项目-release模式     |
@@ -42,3 +41,5 @@ aiot-toolkit2.0目前支持的打包格式如下：
 | aiot installDbgAndMkp    | 在真机上安装快应用调试器 |
 | aiot createVelaAvd       | 创建 vela 模拟器         |
 | aiot deleteVelaAvd       | 删除 vela 模拟器         |
+
+## 函数调用

package/lib/builder/IBuilder.d.ts

@@ -19,4 +19,10 @@ export default interface IBuilder<O = any> {
      * @param projectPath 项目目录
      */
     match(projectPath: string): boolean;
+    /**
+     * 释放资源
+     *
+     * 进程退出时调用
+     */
+    dispose(): void | Promise<void>;
 }

package/lib/builder/UxBuilderBase.d.ts

@@ -1,23 +1,20 @@
-import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
-import { Dictionary } from '@aiot-toolkit/shared-utils';
+import { CompileMode, IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
+import IFileLaneEvents, { IFileLaneSuccessData } from 'file-lane/lib/interface/IFileLaneEvents';
+export interface IUxBuildOption {
+    watch?: boolean;
+    mode: CompileMode;
+}
 /**
  * UxBuilderBase
  */
-declare class UxBuilderBase<O extends Dictionary = any> {
-    events: {
-        onBuildSuccess?: (data: {
-            costTime: number;
-        }) => void;
-    };
+declare class UxBuilderBase<O extends IUxBuildOption = IUxBuildOption> {
+    events: IFileLaneEvents;
     /**
      * 配置文件
      */
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
-    constructor(events?: {
-        onBuildSuccess?: (data: {
-            costTime: number;
-        }) => void;
-    });
+    private fileLane?;
+    constructor(events?: IFileLaneEvents);
     /**
      * ux项目的build函数
      * @param projectPath 项目路径
@@ -25,6 +22,8 @@ declare class UxBuilderBase<O extends Dictionary = any> {
      * @param watch 是否开启监听
      */
     build(projectPath: string, options: O): Promise<void>;
+    private handleLogs;
+    dispose(): Promise<void>;
     /**
      * 获取build的编译配置
      * @param projectPath 项目路径
@@ -34,3 +33,4 @@ declare class UxBuilderBase<O extends Dictionary = any> {
     private readQuickAppConfig;
 }
 export default UxBuilderBase;
+export { IFileLaneEvents, IFileLaneSuccessData };

package/lib/builder/UxBuilderBase.js

@@ -34,7 +34,9 @@ const file_lane_1 = __importDefault(require("file-lane"));
  */
 class UxBuilderBase {
     constructor(events = {
-        onBuildSuccess: (data) => shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`)
+        onBuildSuccess: (data) => shared_utils_1.ColorConsole.success({
+            word: 'build success:'
+        }, `${data.costTime}ms`)
     }) {
         this.events = events;
         /**
@@ -50,25 +52,54 @@ class UxBuilderBase {
      */
     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)
-            });
+            const log = {
+                level: shared_utils_1.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]);
             // 开始编译项目
-            yield new file_lane_1.default(uxProjectConfig, projectPath, compilerOption, this.events).start({ watch });
+            this.fileLane = new file_lane_1.default(uxProjectConfig, projectPath, compilerOption, this.events);
+            yield this.fileLane.start({ watch });
+        });
+    }
+    handleLogs(logs) {
+        const { onLog } = this.events;
+        if (onLog) {
+            onLog(logs);
+        }
+        else {
+            logs.forEach((log) => {
+                shared_utils_1.ColorConsole.logger(log);
+            });
+        }
+    }
+    dispose() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield ((_a = this.fileLane) === null || _a === void 0 ? void 0 : _a.dispose());
+            this.fileLane = undefined;
         });
     }
     /**
@@ -84,8 +115,8 @@ class UxBuilderBase {
         // 项目配置
         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);
+        const mode = 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 }), otherConfig);
         return compilerOption;
     }
     readQuickAppConfig(projectPath) {
@@ -96,7 +127,16 @@ class UxBuilderBase {
                 return data;
             }
             catch (error) {
-                shared_utils_1.ColorConsole.throw((error === null || error === void 0 ? void 0 : error.toString()) || '');
+                const log = {
+                    level: shared_utils_1.Loglevel.ERROR,
+                    message: [
+                        'read quickapp.config.js error: ',
+                        {
+                            word: (error === null || error === void 0 ? void 0 : error.toString()) || ''
+                        }
+                    ]
+                };
+                this.handleLogs([log]);
             }
         }
         return;

package/lib/builder/VelaUxBuilder.d.ts

@@ -1,22 +1,27 @@
-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';
+interface IVelaUxBuilderOption extends IUxBuildOption {
     watch?: boolean;
-    mode: CompileMode;
     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;
 }
 /**
  * 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/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

@@ -49,12 +49,16 @@ class XtsBuilder {
     build(projectPath, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            if (this.fileLane) {
+                // 已经在运行中，请先停止
+                throw new Error('already running, please stop first: builder.stop()');
+            }
             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();
+            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);
@@ -78,10 +82,20 @@ class XtsBuilder {
                 }
             }
             else {
-                return new file_lane_1.FileLane(config, projectPath, compilerOptions).start({ watch });
+                this.fileLane = new file_lane_1.FileLane(config, projectPath, compilerOptions);
+                this.fileLane.start({
+                    watch
+                });
             }
         });
     }
+    dispose() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield ((_a = this.fileLane) === null || _a === void 0 ? void 0 : _a.dispose());
+            this.fileLane = undefined;
+        });
+    }
 }
 XtsBuilder.PROJECT_TYPE = 'xts quick app';
 exports.default = XtsBuilder;

package/lib/index.d.ts

@@ -0,0 +1,6 @@
+import VelaUxBuilder from './builder/VelaUxBuilder';
+import AndroidUxBuilder from './builder/AndroidUxBuilder';
+import FileLaneTriggerType from 'file-lane/lib/enum/FileLaneTriggerType';
+import { CompileMode } from '@aiot-toolkit/aiotpack';
+import IFileLaneEvents, { IFileLaneSuccessData } from 'file-lane/lib/interface/IFileLaneEvents';
+export { VelaUxBuilder, AndroidUxBuilder, FileLaneTriggerType, CompileMode, IFileLaneEvents, IFileLaneSuccessData };

package/lib/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompileMode = exports.FileLaneTriggerType = exports.AndroidUxBuilder = exports.VelaUxBuilder = void 0;
+const VelaUxBuilder_1 = __importDefault(require("./builder/VelaUxBuilder"));
+exports.VelaUxBuilder = VelaUxBuilder_1.default;
+const AndroidUxBuilder_1 = __importDefault(require("./builder/AndroidUxBuilder"));
+exports.AndroidUxBuilder = AndroidUxBuilder_1.default;
+const FileLaneTriggerType_1 = __importDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
+exports.FileLaneTriggerType = FileLaneTriggerType_1.default;
+const aiotpack_1 = require("@aiot-toolkit/aiotpack");
+Object.defineProperty(exports, "CompileMode", { enumerable: true, get: function () { return aiotpack_1.CompileMode; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2",
+  "version": "2.0.3-beta.2",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -10,6 +10,7 @@
   "bin": {
     "aiot": "lib/bin.js"
   },
+  "main": "lib/index",
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -21,17 +22,17 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2",
-    "@aiot-toolkit/commander": "2.0.2",
-    "@aiot-toolkit/emulator": "2.0.2",
-    "@aiot-toolkit/shared-utils": "2.0.2",
+    "@aiot-toolkit/aiotpack": "2.0.3-beta.2",
+    "@aiot-toolkit/commander": "2.0.3-beta.2",
+    "@aiot-toolkit/emulator": "2.0.3-beta.2",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.2",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "adm-zip": "^0.5.10",
     "axios": "^1.7.4",
     "cli-progress": "^3.12.0",
     "dayjs": "^1.11.10",
-    "file-lane": "2.0.2",
+    "file-lane": "2.0.3-beta.2",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -48,5 +49,5 @@
     "@types/semver": "^7.5.8",
     "@types/ws": "^8.5.10"
   },
-  "gitHead": "8ca4bf2ed7bcf11911e5c514696951bdba4fc12d"
+  "gitHead": "7776973f6a81d7f13eb330be8df5801d9143c83c"
 }