@cloudbase/cli 2.6.0-alpha.7 → 2.7.0-alpha.0

package/lib/commands/env/base.js

@@ -27,7 +27,6 @@ const error_1 = require("../../error");
 const env_1 = require("../../env");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
-const constants_1 = require("../constants");
 let EnvListCommand = class EnvListCommand extends common_1.Command {
     get options() {
         return {
@@ -59,7 +58,7 @@ let EnvListCommand = class EnvListCommand extends common_1.Command {
                 item.Alias,
                 item.EnvId,
                 item.PackageName || '按量计费',
-                item.Source === constants_1.EnvSource.MINIAPP ? '小程序' : '云开发',
+                item.Source === 'miniapp' ? '小程序' : '云开发',
                 item.CreateTime,
                 item.Status === 'NORMAL' ? '正常' : '不可用'
             ]);

package/lib/commands/iac/index.js

@@ -0,0 +1,642 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IaCState = exports.IaCDestory = exports.IaCApply = exports.IaCDev = exports.IaCBuild = exports.IaCPull = exports.IaCInit = void 0;
+const cals_1 = require("@cloudbase/cals");
+const iac_core_1 = require("@cloudbase/iac-core");
+const type_1 = require("@cloudbase/iac-core/lib/src/type");
+const toolbox_1 = require("@cloudbase/toolbox");
+const inquirer_1 = __importDefault(require("inquirer"));
+const lodash_1 = require("lodash");
+const decorators_1 = require("../../decorators");
+const utils_1 = require("../../utils");
+const common_1 = require("../common");
+const loading = (0, toolbox_1.loadingFactory)();
+let IaCInit = class IaCInit extends common_1.Command {
+    get options() {
+        return getOptions({
+            childCmd: 'init',
+            options: [],
+            desc: '初始化资源代码项目',
+            needEnvIdOption: false,
+            resourceSupportList: iac_core_1.IAC.actionSupportedResourceTypes.init
+        });
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { resource, name, cwd = '.' } = options;
+            yield iac_core_1.IAC.resource.init(getAPIParams({
+                cwd,
+                name,
+                resource,
+                log,
+                needEnvId: false,
+                specResourceLogic: function (resource, config) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        switch (resource) {
+                            case type_1.ResourceType.SCF:
+                                {
+                                    const runtimeRes = yield inquirer_1.default.prompt({
+                                        type: 'list',
+                                        name: 'runtime',
+                                        message: '请选择运行环境',
+                                        default: type_1.IFunctionRuntime.Nodejs18_15,
+                                        choices: Object.values(type_1.IFunctionRuntime)
+                                    });
+                                    Object.assign(config, runtimeRes);
+                                    const memorySizeRes = yield inquirer_1.default.prompt({
+                                        type: 'number',
+                                        name: 'memorySize',
+                                        message: '函数内存(MB)',
+                                        default: 256
+                                    });
+                                    Object.assign(config, memorySizeRes);
+                                    const descriptionSizeRes = yield inquirer_1.default.prompt({
+                                        type: 'input',
+                                        name: 'description',
+                                        message: '描述'
+                                    });
+                                    Object.assign(config, descriptionSizeRes);
+                                }
+                                break;
+                            case type_1.ResourceType.App:
+                                {
+                                    const titleRes = yield inquirer_1.default.prompt({
+                                        type: 'input',
+                                        name: 'title',
+                                        message: '应用名称',
+                                        default: config.name
+                                    });
+                                    Object.assign(config, titleRes);
+                                }
+                                break;
+                            case type_1.ResourceType.Model:
+                                {
+                                    const titleRes = yield inquirer_1.default.prompt({
+                                        type: 'input',
+                                        name: 'title',
+                                        message: '数据模型名称',
+                                        default: config.name
+                                    });
+                                    Object.assign(config, titleRes);
+                                    const dbInstanceTypeRes = yield inquirer_1.default.prompt({
+                                        type: 'list',
+                                        name: 'dbInstanceType',
+                                        message: '数据库类型',
+                                        default: cals_1.IDatabaseDataSourceDbType.FLEXDB,
+                                        choices: Object.values(cals_1.IDatabaseDataSourceDbType)
+                                    });
+                                    Object.assign(config, dbInstanceTypeRes);
+                                    const descriptionSizeRes = yield inquirer_1.default.prompt({
+                                        type: 'input',
+                                        name: 'description',
+                                        message: '描述'
+                                    });
+                                    Object.assign(config, descriptionSizeRes);
+                                }
+                                break;
+                        }
+                    });
+                }
+            }));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.ArgsOptions)()),
+    __param(2, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], IaCInit.prototype, "execute", null);
+IaCInit = __decorate([
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
+], IaCInit);
+exports.IaCInit = IaCInit;
+let IaCPull = class IaCPull extends common_1.Command {
+    get options() {
+        return getOptions({
+            childCmd: 'pull',
+            options: [
+                {
+                    flags: '--appId <appId>',
+                    desc: '应用 ID（仅当 resource=App 时有效）'
+                }
+            ],
+            desc: '拉取资源项目代码',
+            needEnvIdOption: true,
+            resourceSupportList: iac_core_1.IAC.actionSupportedResourceTypes.pull
+        });
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { resource, name, envId, cwd = '.' } = options;
+            const { appId } = options;
+            yield iac_core_1.IAC.init({
+                getCredential: () => {
+                    return getCredential(ctx);
+                }
+            });
+            yield iac_core_1.IAC.resource.pull(getAPIParams({
+                cwd,
+                name,
+                resource,
+                envId,
+                log,
+                needEnvId: true,
+                extraData: { appId },
+                specResourceLogic: function (resource, config) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (resource === type_1.ResourceType.App) {
+                            if (!config.appId) {
+                                const appIdRes = yield showAppIdUI();
+                                Object.assign(config, { appId: appIdRes });
+                            }
+                        }
+                    });
+                }
+            }));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.ArgsOptions)()),
+    __param(2, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], IaCPull.prototype, "execute", null);
+IaCPull = __decorate([
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
+], IaCPull);
+exports.IaCPull = IaCPull;
+let IaCBuild = class IaCBuild extends common_1.Command {
+    get options() {
+        return getOptions({
+            childCmd: 'build',
+            options: [],
+            desc: '构建资源项目代码',
+            needEnvIdOption: false,
+            resourceSupportList: iac_core_1.IAC.actionSupportedResourceTypes.build
+        });
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { resource, name, cwd = '.' } = options;
+            yield iac_core_1.IAC.resource.build(getAPIParams({
+                cwd,
+                name,
+                resource,
+                log,
+                needEnvId: false
+            }));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.ArgsOptions)()),
+    __param(2, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], IaCBuild.prototype, "execute", null);
+IaCBuild = __decorate([
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
+], IaCBuild);
+exports.IaCBuild = IaCBuild;
+let IaCDev = class IaCDev extends common_1.Command {
+    get options() {
+        return getOptions({
+            childCmd: 'dev',
+            options: [
+                {
+                    flags: '--data <data>',
+                    desc: '要传递给调用函数的序列化 Event 数据（仅当 resource=SCF 时有效）'
+                },
+                {
+                    flags: '--dataPath <dataPath>',
+                    desc: '要传递给调用函数 Event 的 json 文件所在路径（仅当 resource=SCF 时有效）'
+                },
+                {
+                    flags: '--context <context>',
+                    desc: '要传递给调用函数的序列化 Context 数据（仅当 resource=SCF 时有效）'
+                },
+                {
+                    flags: '--contextPath <contextPath>',
+                    desc: '要传递给调用函数 Context 的 json 文件所在路径（仅当 resource=SCF 时有效）'
+                },
+                {
+                    flags: '--platform <platform>',
+                    desc: '运行平台，可选为 web | mp。默认为 web（仅当 resource=App 时有效）'
+                }
+            ],
+            desc: '本地开发资源项目代码',
+            needEnvIdOption: false,
+            resourceSupportList: iac_core_1.IAC.actionSupportedResourceTypes.dev
+        });
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { resource, name, cwd = '.' } = options;
+            const { data, dataPath, context, contextPath, platform } = options;
+            yield iac_core_1.IAC.init({
+                getCredential: () => {
+                    return getCredential(ctx);
+                }
+            });
+            yield iac_core_1.IAC.resource.dev(getAPIParams({
+                cwd,
+                name,
+                resource,
+                log,
+                needEnvId: false,
+                extraData: { data, dataPath, context, contextPath, platform }
+            }));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.ArgsOptions)()),
+    __param(2, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], IaCDev.prototype, "execute", null);
+IaCDev = __decorate([
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
+], IaCDev);
+exports.IaCDev = IaCDev;
+let IaCApply = class IaCApply extends common_1.Command {
+    get options() {
+        return getOptions({
+            childCmd: 'apply',
+            options: [
+                {
+                    flags: '--appId <appId>',
+                    desc: '应用 ID（仅当 resource=App 时有效）'
+                },
+                {
+                    flags: '--comment <comment>',
+                    desc: '提交信息（仅当 resource=App 时有效）'
+                }
+            ],
+            desc: '本地开发资源项目代码',
+            needEnvIdOption: true,
+            resourceSupportList: iac_core_1.IAC.actionSupportedResourceTypes.apply
+        });
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { resource, name, envId, cwd = '.' } = options;
+            const { appId, comment } = options;
+            yield iac_core_1.IAC.init({
+                getCredential: () => {
+                    return getCredential(ctx);
+                }
+            });
+            yield iac_core_1.IAC.resource.apply(getAPIParams({
+                cwd,
+                name,
+                resource,
+                envId,
+                log,
+                needEnvId: true,
+                extraData: { appId, comment },
+                specResourceLogic: function (resource, config) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                    });
+                }
+            }));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.ArgsOptions)()),
+    __param(2, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], IaCApply.prototype, "execute", null);
+IaCApply = __decorate([
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
+], IaCApply);
+exports.IaCApply = IaCApply;
+let IaCDestory = class IaCDestory extends common_1.Command {
+    get options() {
+        return getOptions({
+            childCmd: 'destory',
+            options: [
+                {
+                    flags: '--appId <appId>',
+                    desc: '应用 ID（仅当 resource=App 时有效）'
+                }
+            ],
+            desc: '删除资源',
+            needEnvIdOption: true,
+            resourceSupportList: iac_core_1.IAC.actionSupportedResourceTypes.destory
+        });
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { resource, name, envId, cwd = '.' } = options;
+            const { appId } = options;
+            yield iac_core_1.IAC.init({
+                getCredential: () => {
+                    return getCredential(ctx);
+                }
+            });
+            yield iac_core_1.IAC.resource.destory(getAPIParams({
+                cwd,
+                name,
+                resource,
+                envId,
+                log,
+                needEnvId: true,
+                extraData: { appId },
+                specResourceLogic: function (resource, config) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (resource === type_1.ResourceType.App) {
+                            if (!config.appId) {
+                                const appIdRes = yield showAppIdUI();
+                                Object.assign(config, { appId: appIdRes });
+                            }
+                        }
+                    });
+                }
+            }));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.ArgsOptions)()),
+    __param(2, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], IaCDestory.prototype, "execute", null);
+IaCDestory = __decorate([
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
+], IaCDestory);
+exports.IaCDestory = IaCDestory;
+let IaCState = class IaCState extends common_1.Command {
+    get options() {
+        return getOptions({
+            childCmd: 'state',
+            options: [
+                {
+                    flags: '--appId <appId>',
+                    desc: '应用 ID（仅当 resource=App 时有效）'
+                }
+            ],
+            desc: '查询资源信息',
+            needEnvIdOption: true,
+            resourceSupportList: iac_core_1.IAC.actionSupportedResourceTypes.state
+        });
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { resource, name, cwd = '.', envId } = options;
+            const { appId } = options;
+            yield iac_core_1.IAC.init({
+                getCredential: () => {
+                    return getCredential(ctx);
+                }
+            });
+            const data = yield iac_core_1.IAC.resource.state(getAPIParams({
+                cwd,
+                name,
+                resource,
+                envId,
+                log,
+                needEnvId: true,
+                extraData: { appId },
+                specResourceLogic: function (resource, config) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (resource === type_1.ResourceType.App) {
+                            if (!config.appId) {
+                                const appIdRes = yield showAppIdUI();
+                                Object.assign(config, { appId: appIdRes });
+                            }
+                        }
+                    });
+                }
+            }));
+            log.info(JSON.stringify(data, null, 2));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.ArgsOptions)()),
+    __param(2, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], IaCState.prototype, "execute", null);
+IaCState = __decorate([
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
+], IaCState);
+exports.IaCState = IaCState;
+function getOptions({ childCmd, options, desc, resourceSupportList, needEnvIdOption = true }) {
+    return {
+        cmd: 'iac',
+        childCmd,
+        options: (0, lodash_1.compact)([
+            {
+                flags: '--resource <resource>',
+                desc: '资源类型。当前支持 ' + resourceSupportList.join(' / ')
+            },
+            {
+                flags: '--name <name>',
+                desc: '资源名称'
+            },
+            {
+                flags: '--cwd <cwd>',
+                desc: '项目路径'
+            },
+            needEnvIdOption
+                ? {
+                    flags: '--envId <envId>',
+                    desc: '环境 Id'
+                }
+                : null,
+            ...options
+        ]),
+        desc,
+        requiredEnvId: false,
+        autoRunLogin: true
+    };
+}
+function getResource(resource) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!resource) {
+            const res = yield inquirer_1.default.prompt({
+                type: 'list',
+                name: 'resource',
+                message: '请选择资源类型',
+                choices: iac_core_1.IAC.actionSupportedResourceTypes.init
+            });
+            resource = res.resource;
+        }
+        return resource;
+    });
+}
+function trackCallback(message, log) {
+    if (message.status === 'progress') {
+        loading.start(message.details);
+    }
+    else if (message.status === 'done') {
+        loading.succeed(message.details);
+    }
+    else {
+        if (message.type === 'error') {
+            loading.fail(message.details);
+        }
+        else {
+            log.info(message.details);
+        }
+    }
+}
+function getCredential(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let credential;
+        if (ctx.hasPrivateSettings) {
+            process.env.IS_PRIVATE = 'true';
+            const privateSettings = (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd);
+            credential = privateSettings.credential;
+        }
+        else {
+            credential = yield utils_1.authSupevisor.getLoginState();
+        }
+        return credential;
+    });
+}
+function getAPIParams(config) {
+    const { cwd, resource, name, envId, log, needEnvId = true, extraData = {}, specResourceLogic } = config;
+    return {
+        cwd,
+        getResource: () => {
+            return getResource(resource);
+        },
+        getConfig: function (resource, envObj) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const config = (0, lodash_1.assignWith)(envObj, { name, envId }, extraData, function customizer(objValue, srcValue) {
+                    return (0, lodash_1.isUndefined)(objValue) ? srcValue : objValue;
+                });
+                if (!config.name) {
+                    const nameRes = yield showNameUI();
+                    Object.assign(config, { name: nameRes });
+                }
+                if (needEnvId) {
+                    if (!config.envId) {
+                        const envIdRes = yield showEnvIdUI();
+                        Object.assign(config, { envId: envIdRes });
+                    }
+                }
+                yield (specResourceLogic === null || specResourceLogic === void 0 ? void 0 : specResourceLogic(resource, config));
+                return config;
+            });
+        },
+        trackCallback: (message) => {
+            trackCallback(message, log);
+        }
+    };
+}
+function showNameUI() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield inquirer_1.default.prompt({
+            type: 'input',
+            name: 'name',
+            message: '请输入资源标识',
+            validate: function (input) {
+                if (input.trim() === '') {
+                    return '资源名称不能为空';
+                }
+                return true;
+            }
+        });
+        return res.name;
+    });
+}
+function showEnvIdUI() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield inquirer_1.default.prompt({
+            type: 'input',
+            name: 'envId',
+            message: '环境 ID',
+            validate: function (input) {
+                if (input.trim() === '') {
+                    return '环境 ID不能为空';
+                }
+                return true;
+            }
+        });
+        return res.envId;
+    });
+}
+function showAppIdUI() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield inquirer_1.default.prompt({
+            type: 'input',
+            name: 'appId',
+            message: '应用 ID',
+            validate: function (input) {
+                if (input.trim() === '') {
+                    return '应用 ID不能为空';
+                }
+                return true;
+            }
+        });
+        return res.appId;
+    });
+}

package/lib/commands/index.js

@@ -28,4 +28,4 @@ __exportStar(require("./smart"), exports);
 __exportStar(require("./lowcode"), exports);
 __exportStar(require("./run"), exports);
 __exportStar(require("./db"), exports);
-__exportStar(require("./fun"), exports);
+__exportStar(require("./iac"), exports);

package/lib/commands/lowcode/utils.js

@@ -60,11 +60,12 @@ function promisifyProcess(p, pipe = false) {
 exports.promisifyProcess = promisifyProcess;
 function getLowcodeCli() {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const key = '@cloudbase/lowcode-cli';
         const cache = new Map();
         let result;
         if (!cache.get(key)) {
-            const module = yield Promise.resolve().then(() => __importStar(require(key)));
+            const module = yield (_a = key, Promise.resolve().then(() => __importStar(require(_a))));
             cache.set(key, module);
         }
         result = cache.get(key);