@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/commands/lowcode/app.js

@@ -34,26 +34,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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 };
 };
@@ -99,18 +79,16 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(ctx, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
-            const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
-            Promise.resolve().then(() => __importStar(require('@cloudbase/lowcode-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
-                yield res.watchApp({
-                    watchPort: 8288,
-                    wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath,
-                    forceInstall: options === null || options === void 0 ? void 0 : options.forceInstall,
-                    projectPath: options === null || options === void 0 ? void 0 : options.path
-                });
-            }));
+    async execute(ctx, options) {
+        const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
+        const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
+        Promise.resolve().then(() => __importStar(require('@cloudbase/lowcode-cli'))).then(async (res) => {
+            await res.watchApp({
+                watchPort: 8288,
+                wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath,
+                forceInstall: options === null || options === void 0 ? void 0 : options.forceInstall,
+                projectPath: options === null || options === void 0 ? void 0 : options.path
+            });
         });
     }
 };
@@ -147,17 +125,15 @@ let LowCodeBuildApp = class LowCodeBuildApp extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(ctx, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
-            const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
-            yield lowcodeCli.buildApp({
-                envId: ctx.envId || ctx.config.envId,
-                projectPath: process.cwd(),
-                logger: log,
-                privateSettings: (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd)
-            }, mergesOptions);
-        });
+    async execute(ctx, log, options) {
+        const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
+        const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
+        await lowcodeCli.buildApp({
+            envId: ctx.envId || ctx.config.envId,
+            projectPath: process.cwd(),
+            logger: log,
+            privateSettings: (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd)
+        }, mergesOptions);
     }
 };
 __decorate([
@@ -192,17 +168,15 @@ let LowCodePreviewApp = class LowCodePreviewApp extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(ctx, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
-            const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
-            yield lowcodeCli.previewApp({
-                envId: ctx.envId || ctx.config.envId,
-                projectPath: process.cwd(),
-                logger: log,
-                privateSettings: (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd)
-            }, mergesOptions);
-        });
+    async execute(ctx, log, options) {
+        const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
+        const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
+        await lowcodeCli.previewApp({
+            envId: ctx.envId || ctx.config.envId,
+            projectPath: process.cwd(),
+            logger: log,
+            privateSettings: (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd)
+        }, mergesOptions);
     }
 };
 __decorate([
@@ -241,17 +215,15 @@ let LowCodeBuildAppConfig = class LowCodeBuildAppConfig extends common_1.Command
             requiredEnvId: false
         };
     }
-    execute(ctx, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
-            const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
-            yield lowcodeCli.buildAppConfig({
-                envId: ctx.envId || ctx.config.envId,
-                projectPath: process.cwd(),
-                logger: log,
-                privateSettings: (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd)
-            }, mergesOptions);
-        });
+    async execute(ctx, log, options) {
+        const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
+        const mergesOptions = (0, utils_1.getMergedOptions)(config, options);
+        await lowcodeCli.buildAppConfig({
+            envId: ctx.envId || ctx.config.envId,
+            projectPath: process.cwd(),
+            logger: log,
+            privateSettings: (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd)
+        }, mergesOptions);
     }
 };
 __decorate([
@@ -286,25 +258,27 @@ let LowCodeDeployApp = class LowCodeDeployApp extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(ctx, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let credential;
-            const privateSettings = (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd);
-            const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
-            const _a = (0, utils_1.getMergedOptions)(config, options), { src } = _a, restMergedOptions = __rest(_a, ["src"]);
-            if (ctx.hasPrivateSettings) {
-                process.env.IS_PRIVATE = 'true';
-                credential = privateSettings.credential;
-            }
-            else {
-                credential = yield utils_2.authSupevisor.getLoginState();
-            }
-            yield lowcodeCli.deployApp({
-                envId: ctx.envId || ctx.config.envId,
-                projectPath: process.cwd(),
-                logger: log,
-                privateSettings
-            }, Object.assign(Object.assign({ credential }, restMergedOptions), { projectPath: src || restMergedOptions.projectPath }));
+    async execute(ctx, log, options) {
+        let credential;
+        const privateSettings = (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd);
+        const config = (0, utils_1.getCmdConfig)(ctx.config, this.options);
+        const { src, ...restMergedOptions } = (0, utils_1.getMergedOptions)(config, options);
+        if (ctx.hasPrivateSettings) {
+            process.env.IS_PRIVATE = 'true';
+            credential = privateSettings.credential;
+        }
+        else {
+            credential = await utils_2.authSupevisor.getLoginState();
+        }
+        await lowcodeCli.deployApp({
+            envId: ctx.envId || ctx.config.envId,
+            projectPath: process.cwd(),
+            logger: log,
+            privateSettings
+        }, {
+            credential,
+            ...restMergedOptions,
+            projectPath: src || restMergedOptions.projectPath
         });
     }
 };
@@ -336,46 +310,44 @@ let ModelTypeSync = class ModelTypeSync extends common_1.Command {
             autoRunLogin: true
         };
     }
-    execute(ctx, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            log.info('同步中...');
-            if (!(yield fs_extra_1.default.pathExists('cloudbaserc.json'))) {
-                yield fs_extra_1.default.writeFile('cloudbaserc.json', JSON.stringify({
-                    version: '2.0',
-                    envId: ctx.envId
-                }, null, 2), 'utf8');
-            }
-            if (!(yield fs_extra_1.default.pathExists('tsconfig.json'))) {
-                yield fs_extra_1.default.writeFile('tsconfig.json', JSON.stringify({
-                    compilerOptions: {
-                        allowJs: true
-                    }
-                }, null, 2), 'utf8');
-            }
-            else {
-                const config = yield fs_extra_1.default.readJson('tsconfig.json', 'utf8');
-                (0, lodash_1.set)(config, 'compilerOptions.allowJs', true);
-                yield fs_extra_1.default.writeFile('tsconfig.json', JSON.stringify(config, null, 2), 'utf8');
-            }
-            const cloudService = yield getCloudServiceInstance(ctx);
-            const datasourceList = yield cloudService.lowcode.request('DescribeDataSourceList', {
-                EnvId: ctx.envId,
-                PageIndex: 1,
-                PageSize: 1000,
-                QuerySystemModel: true,
-                QueryConnector: 0
-            });
-            const rows = datasourceList.Data.Rows;
-            const dataModelList = rows.map((item) => ({
-                name: item.Name,
-                schema: JSON.parse(item.Schema),
-                title: item.Title
-            }));
-            const dts = yield (0, dts_1.generateDataModelDTS)(dataModelList);
-            const dtsFileName = 'cloud-models.d.ts';
-            yield fs_extra_1.default.writeFile(dtsFileName, dts);
-            log.success('同步数据模型类型定义文件成功。文件名称：' + dtsFileName);
+    async execute(ctx, log, options) {
+        log.info('同步中...');
+        if (!(await fs_extra_1.default.pathExists('cloudbaserc.json'))) {
+            await fs_extra_1.default.writeFile('cloudbaserc.json', JSON.stringify({
+                version: '2.0',
+                envId: ctx.envId
+            }, null, 2), 'utf8');
+        }
+        if (!(await fs_extra_1.default.pathExists('tsconfig.json'))) {
+            await fs_extra_1.default.writeFile('tsconfig.json', JSON.stringify({
+                compilerOptions: {
+                    allowJs: true
+                }
+            }, null, 2), 'utf8');
+        }
+        else {
+            const config = await fs_extra_1.default.readJson('tsconfig.json', 'utf8');
+            (0, lodash_1.set)(config, 'compilerOptions.allowJs', true);
+            await fs_extra_1.default.writeFile('tsconfig.json', JSON.stringify(config, null, 2), 'utf8');
+        }
+        const cloudService = await getCloudServiceInstance(ctx);
+        const datasourceList = await cloudService.lowcode.request('DescribeDataSourceList', {
+            EnvId: ctx.envId,
+            PageIndex: 1,
+            PageSize: 1000,
+            QuerySystemModel: true,
+            QueryConnector: 0
         });
+        const rows = datasourceList.Data.Rows;
+        const dataModelList = rows.map((item) => ({
+            name: item.Name,
+            schema: JSON.parse(item.Schema),
+            title: item.Title
+        }));
+        const dts = await (0, dts_1.generateDataModelDTS)(dataModelList);
+        const dtsFileName = 'cloud-models.d.ts';
+        await fs_extra_1.default.writeFile(dtsFileName, dts);
+        log.success('同步数据模型类型定义文件成功。文件名称：' + dtsFileName);
     }
 };
 __decorate([
@@ -391,25 +363,23 @@ ModelTypeSync = __decorate([
     (0, common_1.ICommand)({ supportPrivate: true })
 ], ModelTypeSync);
 exports.ModelTypeSync = ModelTypeSync;
-function getCloudServiceInstance(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let credential;
-        if (ctx.hasPrivateSettings) {
-            process.env.IS_PRIVATE = 'true';
-            const privateSettings = (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd);
-            credential = privateSettings.credential;
-        }
-        else {
-            credential = yield utils_2.authSupevisor.getLoginState();
-        }
-        return {
-            lowcode: cloud_api_1.CloudApiService.getInstance({
-                service: 'lowcode',
-                proxy: (0, toolbox_1.getProxy)(),
-                credential,
-                version: '2021-01-08'
-            }),
-            tcb: cloud_api_1.CloudApiService.getInstance({ service: 'tcb', proxy: (0, toolbox_1.getProxy)(), credential })
-        };
-    });
+async function getCloudServiceInstance(ctx) {
+    let credential;
+    if (ctx.hasPrivateSettings) {
+        process.env.IS_PRIVATE = 'true';
+        const privateSettings = (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd);
+        credential = privateSettings.credential;
+    }
+    else {
+        credential = await utils_2.authSupevisor.getLoginState();
+    }
+    return {
+        lowcode: cloud_api_1.CloudApiService.getInstance({
+            service: 'lowcode',
+            proxy: (0, toolbox_1.getProxy)(),
+            credential,
+            version: '2021-01-08'
+        }),
+        tcb: cloud_api_1.CloudApiService.getInstance({ service: 'tcb', proxy: (0, toolbox_1.getProxy)(), credential })
+    };
 }

package/lib/commands/lowcode/comps.js

@@ -34,15 +34,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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 });
 exports.LowCodePublishVersionComps = exports.LowCodePublishComps = exports.LowCodeDebugComps = exports.LowCodeBuildComps = exports.LowCodeCreateComps = void 0;
 const common_1 = require("../common");
@@ -76,58 +67,56 @@ let LowCodeCreateComps = class LowCodeCreateComps extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(opts, params, isPrivateEnv, config, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const mergesOptions = (0, utils_2.getMergedOptions)((0, utils_2.getCmdConfig)(config, this.options), opts);
-            if (mergesOptions.skipValidate) {
-                if (!(params === null || params === void 0 ? void 0 : params[0])) {
-                    throw new error_1.CloudBaseError('skip validate 需要指定组件库名 eg: `tcb lowcode create mydemo`');
-                }
-                yield lowcodeCli.bootstrap(params === null || params === void 0 ? void 0 : params[0], log);
-                return;
-            }
-            const privateSettings = (0, utils_1.getPrivateSettings)(config, this.options.cmd);
-            if (process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL === undefined) {
-                process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL =
-                    'https://lcap.cloud.tencent.com/api/v1/cliapi';
+    async execute(opts, params, isPrivateEnv, config, log) {
+        const mergesOptions = (0, utils_2.getMergedOptions)((0, utils_2.getCmdConfig)(config, this.options), opts);
+        if (mergesOptions.skipValidate) {
+            if (!(params === null || params === void 0 ? void 0 : params[0])) {
+                throw new error_1.CloudBaseError('skip validate 需要指定组件库名 eg: `tcb lowcode create mydemo`');
             }
-            let cloudService;
-            if (isPrivateEnv) {
-                cloudService = cloud_api_1.CloudApiService.getInstance({
-                    service: 'lowcode',
-                    credential: privateSettings.credential
-                });
+            await lowcodeCli.bootstrap(params === null || params === void 0 ? void 0 : params[0], log);
+            return;
+        }
+        const privateSettings = (0, utils_1.getPrivateSettings)(config, this.options.cmd);
+        if (process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL === undefined) {
+            process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL =
+                'https://lcap.cloud.tencent.com/api/v1/cliapi';
+        }
+        let cloudService;
+        if (isPrivateEnv) {
+            cloudService = cloud_api_1.CloudApiService.getInstance({
+                service: 'lowcode',
+                credential: privateSettings.credential
+            });
+        }
+        else {
+            cloudService = utils_1.CloudApiService.getInstance('lowcode');
+        }
+        const res = await cloudService.request('ListUserCompositeGroups', isPrivateEnv
+            ? {
+                privateUin: privateSettings.privateUin
             }
-            else {
-                cloudService = utils_1.CloudApiService.getInstance('lowcode');
-            }
-            const res = yield cloudService.request('ListUserCompositeGroups', isPrivateEnv
-                ? {
-                    privateUin: privateSettings.privateUin
-                }
-                : undefined);
-            const comps = res === null || res === void 0 ? void 0 : res.data;
-            if (!(comps === null || comps === void 0 ? void 0 : comps.count)) {
-                throw new error_1.CloudBaseError('没有可关联的云端组件库，请到低码控制台新建组件库！');
+            : undefined);
+        const comps = res === null || res === void 0 ? void 0 : res.data;
+        if (!(comps === null || comps === void 0 ? void 0 : comps.count)) {
+            throw new error_1.CloudBaseError('没有可关联的云端组件库，请到低码控制台新建组件库！');
+        }
+        let compsName = params === null || params === void 0 ? void 0 : params[0];
+        if (!compsName) {
+            const { selectCompsName } = await (0, enquirer_1.prompt)({
+                type: 'select',
+                name: 'selectCompsName',
+                message: '关联云端组件库:',
+                choices: comps.rows.map((row) => row.groupName)
+            });
+            compsName = selectCompsName;
+        }
+        else {
+            const comp = comps.rows.find((row) => row.groupName === compsName);
+            if (!comp) {
+                throw new error_1.CloudBaseError(`云端不存在组件库 ${compsName}，请在微搭控制台-应用菜单中，打开任意一个应用的编辑器，点击素材-组件库管理模块，并创建组件库`);
             }
-            let compsName = params === null || params === void 0 ? void 0 : params[0];
-            if (!compsName) {
-                const { selectCompsName } = yield (0, enquirer_1.prompt)({
-                    type: 'select',
-                    name: 'selectCompsName',
-                    message: '关联云端组件库:',
-                    choices: comps.rows.map((row) => row.groupName)
-                });
-                compsName = selectCompsName;
-            }
-            else {
-                const comp = comps.rows.find((row) => row.groupName === compsName);
-                if (!comp) {
-                    throw new error_1.CloudBaseError(`云端不存在组件库 ${compsName}，请在微搭控制台-应用菜单中，打开任意一个应用的编辑器，点击素材-组件库管理模块，并创建组件库`);
-                }
-            }
-            yield lowcodeCli.bootstrap(compsName, log);
-        });
+        }
+        await lowcodeCli.bootstrap(compsName, log);
     }
 };
 __decorate([
@@ -162,15 +151,19 @@ let LowCodeBuildComps = class LowCodeBuildComps extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(ctx, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = ctx.config.lowcodeCustomComponents;
-            if (config) {
-                yield lowcodeCli.graceBuildComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd), envId: ctx.envId || ctx.config.envId }));
-                return;
-            }
-            throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
-        });
+    async execute(ctx, log) {
+        const config = ctx.config.lowcodeCustomComponents;
+        if (config) {
+            await lowcodeCli.graceBuildComps({
+                ...config,
+                context: config.context || process.cwd(),
+                logger: log,
+                privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd),
+                envId: ctx.envId || ctx.config.envId,
+            });
+            return;
+        }
+        throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
     }
 };
 __decorate([
@@ -210,19 +203,25 @@ let LowCodeDebugComps = class LowCodeDebugComps extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(ctx, options, log) {
+    async execute(ctx, options, log) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = ctx.config.lowcodeCustomComponents;
-            const privateSettings = (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd);
-            if (config) {
-                const cmdConfig = (0, utils_2.getCmdConfig)(ctx.config, this.options);
-                const mergesOptions = (0, utils_2.getMergedOptions)(cmdConfig, options);
-                yield lowcodeCli.graceDebugComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), debugPort: (mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.debugPort) || 8388, logger: log, wxDevtoolPath: mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.wxDevtoolPath, debugBaseUrl: (_a = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.endpoints) === null || _a === void 0 ? void 0 : _a.editor, envId: ctx.envId || ctx.config.envId }));
-                return;
-            }
-            throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
-        });
+        const config = ctx.config.lowcodeCustomComponents;
+        const privateSettings = (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd);
+        if (config) {
+            const cmdConfig = (0, utils_2.getCmdConfig)(ctx.config, this.options);
+            const mergesOptions = (0, utils_2.getMergedOptions)(cmdConfig, options);
+            await lowcodeCli.graceDebugComps({
+                ...config,
+                context: config.context || process.cwd(),
+                debugPort: (mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.debugPort) || 8388,
+                logger: log,
+                wxDevtoolPath: mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.wxDevtoolPath,
+                debugBaseUrl: (_a = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.endpoints) === null || _a === void 0 ? void 0 : _a.editor,
+                envId: ctx.envId || ctx.config.envId,
+            });
+            return;
+        }
+        throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
     }
 };
 __decorate([
@@ -260,17 +259,22 @@ let LowCodePublishComps = class LowCodePublishComps extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(ctx, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = ctx.config.lowcodeCustomComponents;
-            if (config) {
-                const mergesOptions = (0, utils_2.getMergedOptions)((0, utils_2.getCmdConfig)(ctx.config, this.options), options);
-                yield lowcodeCli.gracePublishComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd), isAdmin: Boolean(mergesOptions.admin), envId: ctx.envId || ctx.config.envId }));
-                log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！');
-                return;
-            }
-            throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
-        });
+    async execute(ctx, log, options) {
+        const config = ctx.config.lowcodeCustomComponents;
+        if (config) {
+            const mergesOptions = (0, utils_2.getMergedOptions)((0, utils_2.getCmdConfig)(ctx.config, this.options), options);
+            await lowcodeCli.gracePublishComps({
+                ...config,
+                context: config.context || process.cwd(),
+                logger: log,
+                privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd),
+                isAdmin: Boolean(mergesOptions.admin),
+                envId: ctx.envId || ctx.config.envId,
+            });
+            log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！');
+            return;
+        }
+        throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
     }
 };
 __decorate([
@@ -314,46 +318,51 @@ let LowCodePublishVersionComps = class LowCodePublishVersionComps extends common
             requiredEnvId: false
         };
     }
-    execute(ctx, options, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { tag, comment, admin } = (0, utils_2.getMergedOptions)((0, utils_2.getCmdConfig)(ctx.config, this.options), options) || {};
-            if (!comment) {
-                throw new error_1.CloudBaseError('请使用 --comment 填写版本注释');
-            }
-            if (!tag) {
-                throw new error_1.CloudBaseError('请使用 --tag 填写符合semver的版本号');
-            }
-            if (!semver.valid(tag)) {
-                log.error('组件库版本不符合semver标准');
-                return;
-            }
-            const config = ctx.config.lowcodeCustomComponents;
-            if (!config) {
-                throw new error_1.CloudBaseError('组件库 - 请添加组件库配置到cloudbaserc.json 以使用该命令');
-            }
-            const res = yield lowcodeCli.publishVersion(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: options.admin, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd), envId: ctx.envId || ctx.config.envId }), comment, tag);
-            if (res.data.code === 200) {
-                log.success('组件库 - 已发布新版本！');
-                return;
-            }
-            if (res.data.code === 100) {
-                log.error('组件库 - 无待发布版本');
-                return;
-            }
-            if (res.data.code === 201) {
-                log.error('组件库 - comment 重复， 请使用有意义的comment');
-                return;
+    async execute(ctx, options, log) {
+        const { tag, comment, admin } = (0, utils_2.getMergedOptions)((0, utils_2.getCmdConfig)(ctx.config, this.options), options) || {};
+        if (!comment) {
+            throw new error_1.CloudBaseError('请使用 --comment 填写版本注释');
+        }
+        if (!tag) {
+            throw new error_1.CloudBaseError('请使用 --tag 填写符合semver的版本号');
+        }
+        if (!semver.valid(tag)) {
+            log.error('组件库版本不符合semver标准');
+            return;
+        }
+        const config = ctx.config.lowcodeCustomComponents;
+        if (!config) {
+            throw new error_1.CloudBaseError('组件库 - 请添加组件库配置到cloudbaserc.json 以使用该命令');
+        }
+        const res = await lowcodeCli.publishVersion({
+            ...config,
+            context: config.context || process.cwd(),
+            logger: log,
+            isAdmin: options.admin,
+            privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd),
+            envId: ctx.envId || ctx.config.envId,
+        }, comment, tag);
+        if (res.data.code === 200) {
+            log.success('组件库 - 已发布新版本！');
+            return;
+        }
+        if (res.data.code === 100) {
+            log.error('组件库 - 无待发布版本');
+            return;
+        }
+        if (res.data.code === 201) {
+            log.error('组件库 - comment 重复， 请使用有意义的comment');
+            return;
+        }
+        else {
+            if (res.data.msg) {
+                log.error(`组件库 - ${res.data.msg} RequestId: ${res.requestId}`);
             }
             else {
-                if (res.data.msg) {
-                    log.error(`组件库 - ${res.data.msg} RequestId: ${res.requestId}`);
-                }
-                else {
-                    log.error('组件库 - 未知错误');
-                }
-                return;
+                log.error('组件库 - 未知错误');
             }
-        });
+            return;
+        }
     }
 };
 __decorate([