@cloudbase/cli 2.2.0-alpha.7 → 2.2.0-alpha.9

package/bin/tcb.js

@@ -14,7 +14,7 @@ const pkg = require('../package.json')
 const store = require('../lib/utils/store')
 const { ALL_COMMANDS } = require('../lib/constant')
 const { getProxy } = require('../lib/utils/net')
-const { getCloudBaseConfig, checkPrivateSettingsExisted } = require('../lib/utils/config')
+const { getCloudBaseConfig, getPrivateSettings } = require('../lib/utils/config')
 const {registerCommands} = require('../lib')
 
 async function main() {
@@ -53,14 +53,14 @@ console.log(chalk.gray(`CloudBase Framework ${frameworkPkg.version}`))
 
 const yargsParsedResult = yargsParser(process.argv.slice(2));
 const config = await getCloudBaseConfig(yargsParsedResult.configFile);
-const isPrivateEnv = checkPrivateSettingsExisted(config)
-if (isPrivateEnv) {
+const privateSettings = getPrivateSettings(config, yargsParsedResult._?.[0])
+
+if (privateSettings) {
     console.log(chalk.gray(`检测到私有化配置`))
     // 初始化 lowcode 服务cliapi入口
-    process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL = config.privateSettings.cliApiEntrypoint;
+    process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL = privateSettings.endpoints.cliApi;
 
 }
-
 // 注册命令
 await registerCommands()
 
@@ -84,7 +84,7 @@ program.option('--mode <mode>', '指定加载 env 文件的环境')
 program.option('--config-file <path>', '设置配置文件，默认为 cloudbaserc.json')
 program.option('-r, --region <region>', '指定环境地域')
 
-if(!isPrivateEnv) {
+if(!privateSettings) {
     // HACK: 隐藏自动生成的 help 信息
     program.helpOption(false)
 }
@@ -118,7 +118,7 @@ program.action(() => {
 
 // 没有使用命令
 if (isCommandEmpty) {
-    if(isPrivateEnv) {
+    if(privateSettings) {
         program.outputHelp()
     } else {
         if (['-h', '--help'].includes(processArgv[2])) {
@@ -207,5 +207,12 @@ notifier.notify({
 }
 
 if(require.main === module) {
-    main()
-}
+    try {
+        main()
+    } catch (error) {
+        console.log(error)
+    }
+}
+process.on('unhandledRejection', (err) => {
+    console.log('unhandledRejection', err)
+})

package/lib/commands/common.js

@@ -55,10 +55,11 @@ function ICommand(options = defaultCmdDecoratorOpts) {
 }
 exports.ICommand = ICommand;
 function registerCommands() {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const args = (0, yargs_parser_1.default)(process.argv.slice(2));
         const config = yield (0, utils_1.getCloudBaseConfig)(args.configFile);
-        const isPrivate = (0, utils_1.checkPrivateSettingsExisted)(config);
+        const isPrivate = (0, utils_1.getPrivateSettings)(config, ((_a = args === null || args === void 0 ? void 0 : args._) === null || _a === void 0 ? void 0 : _a[0]) || undefined);
         registrableCommands.forEach(({ Command, decoratorOptions }) => {
             if (isPrivate) {
                 if (decoratorOptions.supportPrivate) {
@@ -151,13 +152,10 @@ class Command extends events_1.EventEmitter {
             const parentOptions = commander_1.program.opts();
             const config = yield (0, utils_1.getCloudBaseConfig)(parentOptions === null || parentOptions === void 0 ? void 0 : parentOptions.configFile);
             const envId = (cmdOptions === null || cmdOptions === void 0 ? void 0 : cmdOptions.envId) || (config === null || config === void 0 ? void 0 : config.envId);
-            const hasPrivateSettings = (0, utils_1.checkPrivateSettingsExisted)(config);
+            const privateSettings = (0, utils_1.getPrivateSettings)(config, cmd);
             let loginState;
-            if (hasPrivateSettings) {
-                loginState = {
-                    secretId: config.privateSettings.secretID,
-                    secretKey: config.privateSettings.secretKey
-                };
+            if (privateSettings) {
+                loginState = privateSettings.credential;
             }
             else {
                 loginState = (yield utils_1.authSupevisor.getLoginState());
@@ -174,7 +172,7 @@ class Command extends events_1.EventEmitter {
                 config,
                 params,
                 options: cmdOptions,
-                hasPrivateSettings
+                hasPrivateSettings: Boolean(privateSettings)
             };
             this.emit('preHandle', ctx, args.slice(0, -1));
             yield this.preHandle();

package/lib/commands/lowcode/app.js

@@ -54,12 +54,8 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LowCodeDeployApp = exports.LowCodeBuildApp = exports.LowCodeWatch = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const common_1 = require("../common");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("./utils");
@@ -89,10 +85,12 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
     }
     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
+                    wxDevtoolPath: mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.wxDevtoolPath
                 });
             }));
         });
@@ -117,19 +115,30 @@ let LowCodeBuildApp = class LowCodeBuildApp extends common_1.Command {
         return {
             cmd: 'lowcode',
             childCmd: 'build:app',
-            options: [],
+            options: [
+                {
+                    flags: '--clean',
+                    desc: '清理构建目录'
+                },
+                {
+                    flags: '--out <out>',
+                    desc: '输出目录'
+                }
+            ],
             desc: '构建应用',
             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,
+                envId: ctx.envId || ctx.config.envId,
                 projectPath: process.cwd(),
                 logger: log,
-                privateSettings: lodash_1.default.get(ctx, 'config.privateSettings')
-            }, options);
+                privateSettings: (0, utils_2.getPrivateSettings)(ctx.config, this.options.cmd)
+            }, mergesOptions);
         });
     }
 };
@@ -163,15 +172,13 @@ let LowCodeDeployApp = class LowCodeDeployApp extends common_1.Command {
     }
     execute(ctx, log, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { src } = options, restOptions = __rest(options, ["src"]);
             let credential;
-            const privateSettings = lodash_1.default.get(ctx, 'config.privateSettings');
+            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 = {
-                    secretId: privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.secretID,
-                    secretKey: privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.secretKey
-                };
+                credential = privateSettings.credential;
             }
             else {
                 credential = yield utils_2.authSupevisor.getLoginState();
@@ -180,8 +187,8 @@ let LowCodeDeployApp = class LowCodeDeployApp extends common_1.Command {
                 envId: ctx.envId || ctx.config.envId,
                 projectPath: process.cwd(),
                 logger: log,
-                privateSettings: lodash_1.default.get(ctx, 'config.privateSettings')
-            }, Object.assign(Object.assign({ credential }, restOptions), { projectPath: src }));
+                privateSettings
+            }, Object.assign(Object.assign({ credential }, restMergedOptions), { projectPath: src }));
         });
     }
 };

package/lib/commands/lowcode/comps.js

@@ -43,12 +43,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 });
 exports.LowCodePublishVersionComps = exports.LowCodePublishComps = exports.LowCodeDebugComps = exports.LowCodeBuildComps = exports.LowCodeCreateComps = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const common_1 = require("../common");
 const decorators_1 = require("../../decorators");
 const enquirer_1 = require("enquirer");
@@ -59,7 +55,7 @@ const error_1 = require("../../error");
 const utils_2 = require("./utils");
 let lowcodeCli;
 if (process.argv.includes('lowcode')) {
-    (0, utils_2.getLowcodeCli)().then(_ => lowcodeCli = _);
+    (0, utils_2.getLowcodeCli)().then((_) => (lowcodeCli = _));
 }
 let LowCodeCreateComps = class LowCodeCreateComps extends common_1.Command {
     get options() {
@@ -82,32 +78,34 @@ let LowCodeCreateComps = class LowCodeCreateComps extends common_1.Command {
     }
     execute(opts, params, isPrivateEnv, config, log) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (opts.skipValidate) {
+            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';
+                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: {
-                        secretId: config.privateSettings.secretID,
-                        secretKey: config.privateSettings.secretKey
-                    }
+                    credential: privateSettings.credential
                 });
             }
             else {
                 cloudService = utils_1.CloudApiService.getInstance('lowcode');
             }
-            const res = yield cloudService.request('ListUserCompositeGroups', isPrivateEnv ? {
-                privateUin: config.privateSettings.privateUin
-            } : undefined);
+            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('没有可关联的云端组件库，请到低码控制台新建组件库！');
@@ -168,7 +166,7 @@ class LowCodeBuildComps extends common_1.Command {
         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: lodash_1.default.get(ctx, 'config.privateSettings') }));
+                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) }));
                 return;
             }
             throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
@@ -208,10 +206,14 @@ let LowCodeDebugComps = class LowCodeDebugComps extends common_1.Command {
         };
     }
     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) {
-                yield lowcodeCli.graceDebugComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), debugPort: (options === null || options === void 0 ? void 0 : options.debugPort) || 8388, logger: log, wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath, debugBaseUrl: lodash_1.default.get(ctx, 'config.privateSettings.editorEntrypoint') }));
+                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 }));
                 return;
             }
             throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
@@ -255,7 +257,8 @@ let LowCodePublishComps = class LowCodePublishComps extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const config = ctx.config.lowcodeCustomComponents;
             if (config) {
-                yield lowcodeCli.gracePublishComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, privateSettings: lodash_1.default.get(ctx, 'config.privateSettings'), isAdmin: Boolean(options.admin) }));
+                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) }));
                 log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！');
                 return;
             }
@@ -288,7 +291,7 @@ let LowCodePublishVersionComps = class LowCodePublishVersionComps extends common
                 },
                 {
                     flags: '--comment <comment>',
-                    desc: '版本备注',
+                    desc: '版本备注'
                 },
                 {
                     flags: '--tag <version>',
@@ -306,7 +309,7 @@ let LowCodePublishVersionComps = class LowCodePublishVersionComps extends common
     }
     execute(ctx, options, log) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { tag, comment, admin } = options;
+            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 填写版本注释');
             }
@@ -321,7 +324,7 @@ let LowCodePublishVersionComps = class LowCodePublishVersionComps extends common
             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: lodash_1.default.get(ctx, 'config.privateSettings') }), comment, tag);
+            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) }), comment, tag);
             if (res.data.code === 200) {
                 log.success('组件库 - 已发布新版本！');
                 return;

package/lib/commands/lowcode/utils.js

@@ -32,21 +32,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLowcodeCli = exports.promisifyProcess = void 0;
+exports.getMergedOptions = exports.getCmdConfig = exports.getLowcodeCli = exports.promisifyProcess = void 0;
+const lodash_1 = require("lodash");
 const toolbox_1 = require("@cloudbase/toolbox");
 function promisifyProcess(p, pipe = false) {
     return new Promise((resolve, reject) => {
         let stdout = '';
         let stderr = '';
-        p.stdout.on('data', (data => {
+        p.stdout.on('data', (data) => {
             stdout += String(data);
-        }));
-        p.stderr.on('data', (data => {
+        });
+        p.stderr.on('data', (data) => {
             stderr += String(data);
-        }));
+        });
         p.on('error', reject);
-        p.on('exit', exitCode => {
-            exitCode === 0 ? resolve(stdout) : reject(new toolbox_1.CloudBaseError(stderr || String(exitCode)));
+        p.on('exit', (exitCode) => {
+            exitCode === 0
+                ? resolve(stdout)
+                : reject(new toolbox_1.CloudBaseError(stderr || String(exitCode)));
         });
         if (pipe) {
             p.stdout.pipe(process.stdout);
@@ -69,3 +72,11 @@ function getLowcodeCli() {
     });
 }
 exports.getLowcodeCli = getLowcodeCli;
+function getCmdConfig(config, options) {
+    return (0, lodash_1.get)(config, `${options.cmd}["${options.childCmd}"]`);
+}
+exports.getCmdConfig = getCmdConfig;
+function getMergedOptions(config = {}, argOptions = {}) {
+    return (0, lodash_1.merge)({}, config.inputs || {}, argOptions);
+}
+exports.getMergedOptions = getMergedOptions;

package/lib/utils/config.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCloudBaseConfig = exports.checkPrivateSettingsExisted = exports.getArgs = void 0;
+exports.getCloudBaseConfig = exports.getPrivateSettings = exports.getArgs = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const yargs_1 = __importDefault(require("yargs"));
@@ -22,12 +22,18 @@ const getArgs = () => {
 };
 exports.getArgs = getArgs;
 const hasOwn = (obj, name) => {
-    return Object.prototype.hasOwnProperty.call(obj, name);
+    return Object.prototype.hasOwnProperty.call(obj !== null && obj !== void 0 ? obj : {}, name);
 };
-function checkPrivateSettingsExisted(config) {
-    return hasOwn(config, 'privateSettings');
+function getPrivateSettings(config, cmd) {
+    const commonConfig = config;
+    const currentConfig = cmd ? config === null || config === void 0 ? void 0 : config[cmd] : config;
+    if (hasOwn(currentConfig || {}, 'privateSettings') ||
+        hasOwn(commonConfig || {}, 'privateSettings')) {
+        return Object.assign(Object.assign({}, commonConfig.privateSettings), currentConfig.privateSettings);
+    }
+    return undefined;
 }
-exports.checkPrivateSettingsExisted = checkPrivateSettingsExisted;
+exports.getPrivateSettings = getPrivateSettings;
 const getCloudBaseConfig = (configPath) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const args = (0, exports.getArgs)();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.2.0-alpha.7",
+    "version": "2.2.0-alpha.9",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -32,7 +32,7 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.6",
-        "@cloudbase/lowcode-cli": "0.17.0-alpha.6",
+        "@cloudbase/lowcode-cli": "0.17.0-alpha.9",
         "@cloudbase/manager-node": "4.0.1",
         "@cloudbase/toolbox": "^0.7.3",
         "@sentry/node": "^5.10.2",

package/types/commands/lowcode/app.d.ts

@@ -18,7 +18,10 @@ export declare class LowCodeBuildApp extends Command {
     get options(): {
         cmd: string;
         childCmd: string;
-        options: any[];
+        options: {
+            flags: string;
+            desc: string;
+        }[];
         desc: string;
         requiredEnvId: boolean;
     };

package/types/commands/lowcode/utils.d.ts

@@ -2,3 +2,8 @@
 import { ChildProcess } from 'child_process';
 export declare function promisifyProcess(p: ChildProcess, pipe?: boolean): Promise<unknown>;
 export declare function getLowcodeCli(): Promise<typeof import('@cloudbase/lowcode-cli')>;
+export declare function getCmdConfig(config: any, options: {
+    cmd: string;
+    childCmd: string;
+}): any;
+export declare function getMergedOptions(config?: {}, argOptions?: {}): any;

package/types/utils/config.d.ts

@@ -1,5 +1,6 @@
 import { Arguments } from 'yargs';
 import { ICloudBaseConfig } from '@cloudbase/toolbox';
+import { Credential } from '../types';
 export interface IArgs {
     envId: string;
     region: string;
@@ -8,14 +9,14 @@ export interface IArgs {
     [x: string]: unknown;
 }
 export declare const getArgs: () => Arguments<IArgs>;
-declare type IPrivateCloudBaseRcSettings = ICloudBaseRcSettings & Required<Pick<ICloudBaseRcSettings, 'privateSettings'>>;
-export declare function checkPrivateSettingsExisted(config: ICloudBaseRcSettings): config is IPrivateCloudBaseRcSettings;
+export declare function getPrivateSettings(config: ICloudBaseRcSettings, cmd?: string): undefined | IPrivateSettings;
 declare type IAbsUrl = `http://${string}` | `https://${string}`;
 export interface IPrivateSettings {
-    secretID: string;
-    secretKey: string;
-    editorEntrypoint: IAbsUrl;
-    cliApiEntrypoint: IAbsUrl;
+    credential: Credential;
+    endpoints: {
+        editor: IAbsUrl;
+        cliApi: IAbsUrl;
+    };
     privateUin: string;
 }
 export interface ICloudBaseRcSettings extends ICloudBaseConfig {