@cloudbase/cli 1.10.0 → 1.12.2-alpha.0

package/bin/tcb.js

@@ -84,7 +84,7 @@ if (yargs.argv._.length === 0) {
 // 处理无效命令
 program.action((command) => {
     const args = command.args
-    if (!args.length) {
+    if (!Array.isArray(args) || !args.length) {
         return
     }
     const cmd = args.join(' ')

package/lib/commands/common.js

@@ -111,9 +111,15 @@ class Command extends events_1.EventEmitter {
     }
     createProgram(instance, deprecate, newCmd) {
         const { cmd, desc, options, requiredEnvId = true, withoutAuth = false } = this.options;
-        instance.storeOptionsAsProperties(false).passCommandToAction(false);
+        instance.storeOptionsAsProperties(false);
         options.forEach((option) => {
-            instance.option(option.flags, option.desc);
+            const { hideHelp } = option;
+            if (hideHelp) {
+                instance.addOption(new commander_1.Option(option.flags, option.desc).hideHelp());
+            }
+            else {
+                instance.option(option.flags, option.desc);
+            }
         });
         instance.description(desc);
         instance.action((...args) => __awaiter(this, void 0, void 0, function* () {
@@ -136,7 +142,7 @@ class Command extends events_1.EventEmitter {
                 params,
                 options: cmdOptions
             };
-            this.emit('preHandle', ctx, args);
+            this.emit('preHandle', ctx, args.slice(0, -1));
             yield this.preHandle();
             if (deprecate) {
                 console.log(chalk_1.default.bold.yellowBright('\n', `⚠️  此命令将被废弃，请使用新的命令 tcb ${newCmd} 代替`), '\n');

package/lib/commands/lowcode/comps.js

@@ -1,10 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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);
 };
@@ -24,7 +43,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LowCodePublishComps = exports.LowCodeDebugComps = exports.LowCodeBuildComps = exports.LowCodeCreateComps = void 0;
+exports.LowCodePublishVersionComps = exports.LowCodePublishComps = exports.LowCodeDebugComps = exports.LowCodeBuildComps = exports.LowCodeCreateComps = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const common_1 = require("../common");
@@ -38,6 +57,7 @@ const child_process_1 = require("child_process");
 const enquirer_1 = require("enquirer");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const util_1 = require("util");
+const semver = __importStar(require("semver"));
 const cloudService = utils_1.CloudApiService.getInstance('lowcode');
 const DEFAULE_TEMPLATE_PATH = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcc/template.zip';
 let LowCodeCreateComps = class LowCodeCreateComps extends common_1.Command {
@@ -202,17 +222,22 @@ let LowCodePublishComps = class LowCodePublishComps extends common_1.Command {
                 {
                     flags: '--verbose',
                     desc: '是否打印详细日志'
+                },
+                {
+                    flags: '--admin',
+                    desc: '是否使用admin接口',
+                    hideHelp: true
                 }
             ],
             desc: '发布组件库',
             requiredEnvId: false
         };
     }
-    execute(ctx, log) {
+    execute(ctx, log, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const config = ctx.config.lowcodeCustomComponents;
             if (config) {
-                yield (0, lowcode_cli_1.gracePublishComps)(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log }));
+                yield (0, lowcode_cli_1.gracePublishComps)(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: Boolean(options.admin) }));
                 log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！');
                 return;
             }
@@ -242,14 +267,100 @@ __decorate([
     (0, decorators_1.InjectParams)(),
     __param(0, (0, decorators_1.CmdContext)()),
     __param(1, (0, decorators_1.Log)()),
+    __param(2, (0, decorators_1.ArgsOptions)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, decorators_1.Logger]),
+    __metadata("design:paramtypes", [Object, decorators_1.Logger, Object]),
     __metadata("design:returntype", Promise)
 ], LowCodePublishComps.prototype, "execute", null);
 LowCodePublishComps = __decorate([
     (0, common_1.ICommand)()
 ], LowCodePublishComps);
 exports.LowCodePublishComps = LowCodePublishComps;
+let LowCodePublishVersionComps = class LowCodePublishVersionComps extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'lowcode',
+            childCmd: 'publishVersion',
+            options: [
+                {
+                    flags: '--verbose',
+                    desc: '是否打印详细日志'
+                },
+                {
+                    flags: '--comment <comment>',
+                    desc: '版本备注',
+                },
+                {
+                    flags: '--tag <version>',
+                    desc: '版本号'
+                },
+                {
+                    flags: '--admin',
+                    desc: '是否使用admin接口',
+                    hideHelp: true
+                }
+            ],
+            desc: '发布组件库版本',
+            requiredEnvId: false
+        };
+    }
+    execute(ctx, options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { tag, comment, admin } = options;
+            if (!comment) {
+                log.error('请使用 --comment 填写版本注释');
+                return;
+            }
+            if (!tag) {
+                log.error('请使用 --tag 填写符合semver的版本号');
+                return;
+            }
+            if (!semver.valid(tag)) {
+                log.error('组件库版本不符合semver标准');
+                return;
+            }
+            const config = ctx.config.lowcodeCustomComponents;
+            if (!config) {
+                log.error('组件库 - 请添加组件库配置到cloudbaserc.json 以使用该命令');
+            }
+            const res = yield (0, lowcode_cli_1.publishVersion)(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: options.admin }), 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 {
+                    log.error('组件库 - 未知错误');
+                }
+                return;
+            }
+        });
+    }
+};
+__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)
+], LowCodePublishVersionComps.prototype, "execute", null);
+LowCodePublishVersionComps = __decorate([
+    (0, common_1.ICommand)()
+], LowCodePublishVersionComps);
+exports.LowCodePublishVersionComps = LowCodePublishVersionComps;
 function _download(compsPath, compsName) {
     return __awaiter(this, void 0, void 0, function* () {
         yield (0, utils_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {

package/lib/commands/storage/storage.js

@@ -60,19 +60,29 @@ let UploadCommand = class UploadCommand extends common_1.Command {
                 {
                     flags: '-e, --envId <envId>',
                     desc: '环境 Id'
+                },
+                { flags: '--times <times>', desc: '设置上传重试次数，默认值为 1' },
+                {
+                    flags: '--interval <interval>',
+                    desc: '设置上传失败时，重试时间间隔(毫秒)，默认值为 500'
                 }
             ],
             desc: '上传文件/文件夹'
         };
     }
-    execute(envId, params, log) {
+    execute(envId, params, options, log) {
         return __awaiter(this, void 0, void 0, function* () {
             const localPath = params === null || params === void 0 ? void 0 : params[0];
             const cloudPath = params === null || params === void 0 ? void 0 : params[1];
+            const retryCount = options === null || options === void 0 ? void 0 : options.times;
+            const retryInterval = options === null || options === void 0 ? void 0 : options.interval;
             const resolveLocalPath = path_1.default.resolve(localPath);
             if (!(0, utils_1.checkFullAccess)(resolveLocalPath)) {
                 throw new error_1.CloudBaseError('文件未找到！');
             }
+            if (retryCount > 10) {
+                throw new error_1.CloudBaseError('上传重试次数为 0-10 次之间');
+            }
             const loading = (0, utils_1.loadingFactory)();
             loading.start('准备上传中...');
             const storageService = yield getStorageService(envId);
@@ -104,7 +114,10 @@ let UploadCommand = class UploadCommand extends common_1.Command {
                         else {
                             successFiles.push(fileInfo.Key);
                         }
-                    }
+                    },
+                    retryCount: retryCount || 1,
+                    retryInterval,
+                    parallel: 20
                 });
                 log.success(`文件共计 ${totalFiles} 个`);
                 log.success(`文件上传成功 ${successFiles.length} 个`);
@@ -139,9 +152,10 @@ __decorate([
     (0, decorators_1.InjectParams)(),
     __param(0, (0, decorators_1.EnvId)()),
     __param(1, (0, decorators_1.ArgsParams)()),
-    __param(2, (0, decorators_1.Log)()),
+    __param(2, (0, decorators_1.ArgsOptions)()),
+    __param(3, (0, decorators_1.Log)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger]),
+    __metadata("design:paramtypes", [Object, Object, Object, decorators_1.Logger]),
     __metadata("design:returntype", Promise)
 ], UploadCommand.prototype, "execute", null);
 UploadCommand = __decorate([
@@ -183,7 +197,8 @@ let DownloadCommand = class DownloadCommand extends common_1.Command {
             if (dir) {
                 yield storageService.downloadDirectory({
                     localPath: resolveLocalPath,
-                    cloudPath
+                    cloudPath,
+                    parallel: 20
                 });
             }
             else {

package/lib/storage.js

@@ -25,11 +25,14 @@ function uploadFile(options) {
 exports.uploadFile = uploadFile;
 function uploadDirectory(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { envId, localPath, cloudPath } = options;
+        const { envId, localPath, cloudPath, retryInterval, parallel, retryCount } = options;
         const storageService = yield (0, utils_1.getStorageService)(envId);
         return storageService.uploadDirectory({
             localPath,
-            cloudPath
+            cloudPath,
+            retryInterval,
+            retryCount,
+            parallel
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "1.10.0",
+    "version": "1.12.2-alpha.0",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -11,7 +11,8 @@
         "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
         "tsc": "tsc",
         "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
-        "postinstall": "node ./post-install.js || exit 0"
+        "postinstall": "node ./post-install.js || exit 0",
+        "prepublishOnly": "npm run build"
     },
     "repository": {
         "type": "git",
@@ -21,13 +22,18 @@
         "tcb": "bin/tcb.js",
         "cloudbase": "bin/cloudbase.js"
     },
+    "husky": {
+        "hooks": {
+            "pre-commit": "npm run build && git add ."
+        }
+    },
     "author": "cwuyiqing@gmail.com",
     "license": "ISC",
     "dependencies": {
         "@cloudbase/cloud-api": "^0.4.0",
         "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "^0.12.2",
-        "@cloudbase/manager-node": "3.12.0",
+        "@cloudbase/lowcode-cli": "^0.12.3",
+        "@cloudbase/manager-node": "^3.12.0",
         "@cloudbase/toolbox": "^0.7.2",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
@@ -67,6 +73,7 @@
         "@types/lodash": "^4.14.149",
         "@types/node": "^12.12.38",
         "@types/node-fetch": "^2.5.4",
+        "@types/react": "^17.0.37",
         "@types/semver": "^7.3.9",
         "@types/webpack-dev-server": "^3.11.1",
         "@typescript-eslint/eslint-plugin": "^4.8.1",

package/tsconfig.json

@@ -6,6 +6,7 @@
         "outDir": "lib",
         "removeComments": true,
         "types": ["node"],
+        "skipLibCheck": true,
         "esModuleInterop": true,
         "declaration": true,
         "declarationDir": "./types",

package/types/commands/common.d.ts

@@ -4,6 +4,7 @@ import { ICommandContext } from '../types';
 interface ICommandOption {
     flags: string;
     desc: string;
+    hideHelp?: boolean;
 }
 export interface ICommandOptions {
     deprecateCmd?: string;

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

@@ -43,12 +43,35 @@ export declare class LowCodePublishComps extends Command {
     get options(): {
         cmd: string;
         childCmd: string;
-        options: {
+        options: ({
             flags: string;
             desc: string;
-        }[];
+            hideHelp?: undefined;
+        } | {
+            flags: string;
+            desc: string;
+            hideHelp: boolean;
+        })[];
+        desc: string;
+        requiredEnvId: boolean;
+    };
+    execute(ctx: any, log: Logger, options: any): Promise<void>;
+}
+export declare class LowCodePublishVersionComps extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: ({
+            flags: string;
+            desc: string;
+            hideHelp?: undefined;
+        } | {
+            flags: string;
+            desc: string;
+            hideHelp: boolean;
+        })[];
         desc: string;
         requiredEnvId: boolean;
     };
-    execute(ctx: any, log?: Logger): Promise<void>;
+    execute(ctx: any, options: any, log?: Logger): Promise<void>;
 }

package/types/commands/storage/storage.d.ts

@@ -11,7 +11,7 @@ export declare class UploadCommand extends Command {
         }[];
         desc: string;
     };
-    execute(envId: any, params: any, log: Logger): Promise<void>;
+    execute(envId: any, params: any, options: any, log: Logger): Promise<void>;
 }
 export declare class DownloadCommand extends Command {
     get options(): {

package/types/storage.d.ts

@@ -3,6 +3,9 @@ interface IStorageOptions {
     envId: string;
     localPath: string;
     cloudPath: string;
+    parallel?: number;
+    retryCount?: number;
+    retryInterval?: number;
 }
 interface IStorageCloudOptions {
     envId: string;