@cloudbase/cli 2.3.11 → 2.3.12-alpha.1

package/lib/commands/addon/index.js

@@ -0,0 +1,173 @@
+"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 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 tcbService = yield getTcbServiceInstance(ctx);
+            const { name, resource } = getParams(ctx.params, true);
+            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, tcbService });
+            }));
+        });
+    }
+};
+__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 tcbService = yield getTcbServiceInstance(ctx);
+            const { resource } = getParams(ctx.params, false);
+            Promise.resolve().then(() => __importStar(require('@cloudbase/addon-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
+                yield res.push({ tcbService, 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 getTcbServiceInstance(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();
+        }
+        const tcbService = cloud_api_1.CloudApiService.getInstance({ service: 'tcb', credential });
+        return tcbService;
+    });
+}
+function getOptions({ childCmd, options, desc, requiredEnvId, hasNameArg }) {
+    return {
+        cmd: 'addon',
+        childCmd,
+        options,
+        args: hasNameArg
+            ? [{ flags: '[resource]' }, { flags: '[name]' }]
+            : [{ flags: '[resource]' }],
+        desc,
+        requiredEnvId
+    };
+}
+function getParams(ctxParams, hasNameArg) {
+    const params = ctxParams.filter((param) => typeof param === 'string');
+    let name, resource;
+    if (hasNameArg) {
+        if (params.length === 1) {
+            name = params[0];
+        }
+        else if (params.length === 2) {
+            resource = params[0];
+            name = params[1];
+        }
+    }
+    else {
+        if (params.length === 1) {
+            resource = params[0];
+        }
+    }
+    return {
+        name,
+        resource
+    };
+}

package/lib/commands/common.js

@@ -134,7 +134,7 @@ class Command extends events_1.EventEmitter {
         }
     }
     createProgram(instance, deprecate, newCmd) {
-        const { cmd, desc, options, requiredEnvId = true, withoutAuth = false } = this.options;
+        const { cmd, desc, options, args = [], requiredEnvId = true, withoutAuth = false } = this.options;
         instance.storeOptionsAsProperties(false);
         options.forEach((option) => {
             const { hideHelp } = option;
@@ -145,6 +145,9 @@ 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,3 +27,4 @@ __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.11",
+    "version": "2.3.12-alpha.1",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -34,6 +34,7 @@
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
         "@cloudbase/lowcode-cli": "^0.20.5",
+        "@cloudbase/addon-cli": "0.0.1-alpha.3",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",
         "@sentry/node": "^5.10.2",

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

@@ -0,0 +1,9 @@
+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>;
+}

package/types/commands/common.d.ts

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

package/types/commands/index.d.ts

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