@cloudbase/cli 2.3.12-alpha.7 → 2.3.12

package/lib/commands/common.js

@@ -134,7 +134,7 @@ class Command extends events_1.EventEmitter {
         }
     }
     createProgram(instance, deprecate, newCmd) {
-        const { cmd, desc, options, args = [], requiredEnvId = true, withoutAuth = false } = this.options;
+        const { cmd, desc, options, requiredEnvId = true, withoutAuth = false } = this.options;
         instance.storeOptionsAsProperties(false);
         options.forEach((option) => {
             const { hideHelp } = option;
@@ -145,9 +145,6 @@ class Command extends events_1.EventEmitter {
                 instance.option(option.flags, option.desc);
             }
         });
-        const argsStr = args.map((argItem) => argItem.flags).join(' ');
-        if (argsStr)
-            instance.arguments(argsStr);
         instance.description(desc);
         instance.action((...args) => __awaiter(this, void 0, void 0, function* () {
             const params = args.slice(0, -1);

package/lib/commands/index.js

@@ -27,4 +27,3 @@ __exportStar(require("./framework"), exports);
 __exportStar(require("./smart"), exports);
 __exportStar(require("./lowcode"), exports);
 __exportStar(require("./run"), exports);
-__exportStar(require("./addon"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.3.12-alpha.7",
+    "version": "2.3.12",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -33,8 +33,7 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
-        "@cloudbase/lowcode-cli": "^0.20.5",
-        "@cloudbase/addon-cli": "0.0.4",
+        "@cloudbase/lowcode-cli": "^0.21.1",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",
         "@sentry/node": "^5.10.2",

package/types/commands/common.d.ts

@@ -6,9 +6,6 @@ interface ICommandOption {
     desc: string;
     hideHelp?: boolean;
 }
-interface ICommandArgument {
-    flags: string;
-}
 export interface ICommandOptions {
     deprecateCmd?: string;
     cmd: string;
@@ -17,7 +14,6 @@ export interface ICommandOptions {
         desc: string;
     };
     childSubCmd?: string;
-    args?: ICommandArgument[];
     options: ICommandOption[];
     desc: string;
     requiredEnvId?: boolean;

package/types/commands/index.d.ts

@@ -11,4 +11,3 @@ export * from './framework';
 export * from './smart';
 export * from './lowcode';
 export * from './run';
-export * from './addon';

package/lib/commands/addon/index.js

@@ -1,170 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddonPush = exports.AddonPull = void 0;
-const cloud_api_1 = require("@cloudbase/cloud-api");
-const toolbox_1 = require("@cloudbase/toolbox");
-const decorators_1 = require("../../decorators");
-const utils_1 = require("../../utils");
-const common_1 = require("../common");
-let AddonPull = class AddonPull extends common_1.Command {
-    get options() {
-        return getOptions({
-            childCmd: 'pull',
-            options: [
-                {
-                    flags: '--envId <envId>',
-                    desc: '环境 ID'
-                }
-            ],
-            desc: '拉取插件/资源代码',
-            requiredEnvId: true,
-            hasNameArg: true
-        });
-    }
-    execute(ctx, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cloudService = yield getCloudServiceInstance(ctx);
-            const { resource } = options;
-            const { name } = getParams(ctx.params);
-            Promise.resolve().then(() => __importStar(require('@cloudbase/addon-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
-                yield res.pull({ name, resource, envId: ctx.envId, cloudService });
-            }));
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.CmdContext)()),
-    __param(1, (0, decorators_1.ArgsOptions)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], AddonPull.prototype, "execute", null);
-AddonPull = __decorate([
-    (0, common_1.ICommand)({
-        supportPrivate: true
-    })
-], AddonPull);
-exports.AddonPull = AddonPull;
-let AddonPush = class AddonPush extends common_1.Command {
-    get options() {
-        return getOptions({
-            childCmd: 'push',
-            desc: '推送插件/资源代码',
-            options: [],
-            requiredEnvId: true,
-            hasNameArg: false
-        });
-    }
-    execute(ctx, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cloudService = yield getCloudServiceInstance(ctx);
-            const { resource } = options;
-            Promise.resolve().then(() => __importStar(require('@cloudbase/addon-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
-                yield res.push({ cloudService, envId: ctx.envId, resource });
-            }));
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.CmdContext)()),
-    __param(1, (0, decorators_1.ArgsOptions)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], AddonPush.prototype, "execute", null);
-AddonPush = __decorate([
-    (0, common_1.ICommand)({
-        supportPrivate: true
-    })
-], AddonPush);
-exports.AddonPush = AddonPush;
-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_1.getPrivateSettings)(ctx.config, this.options.cmd);
-            credential = privateSettings.credential;
-        }
-        else {
-            credential = yield utils_1.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 })
-        };
-    });
-}
-function getOptions({ childCmd, options, desc, requiredEnvId, hasNameArg }) {
-    return {
-        cmd: 'addon',
-        childCmd,
-        options: [
-            {
-                flags: '--resource <resource>',
-                desc: '资源名称。当想操作指定资源而非插件时使用。当前支持 automation / block'
-            },
-            ...options
-        ],
-        args: hasNameArg ? [{ flags: '[name]' }] : [],
-        desc,
-        requiredEnvId
-    };
-}
-function getParams(ctxParams) {
-    const params = ctxParams.filter((param) => typeof param === 'string');
-    return {
-        name: params[0]
-    };
-}

package/types/commands/addon/index.d.ts

@@ -1,9 +0,0 @@
-import { Command, ICommandOptions } from '../common';
-export declare class AddonPull extends Command {
-    get options(): ICommandOptions;
-    execute(ctx: any, options: any): Promise<void>;
-}
-export declare class AddonPush extends Command {
-    get options(): ICommandOptions;
-    execute(ctx: any, options: any): Promise<void>;
-}