@cloudbase/cli 2.2.12 → 2.2.14

package/bin/cloudbase.js

@@ -3,4 +3,4 @@ const chalk = require('chalk')
 
 console.log(chalk.bold.yellowBright('\n', `Tip: cloudbase 命令可以简写为 tcb`), '\n')
 
-require('./tcb').main()
+require('./tcb')

package/bin/tcb.js

@@ -9,315 +9,205 @@ const logSymbols = require('log-symbols')
 const didYouMean = require('didyoumean')
 const updateNotifier = require('update-notifier')
 const frameworkPkg = require('@cloudbase/framework-core/package.json')
-const { CloudApiService } = require('@cloudbase/cloud-api')
-const { getCredentialWithoutCheck } = require('@cloudbase/toolbox')
-const { Confirm } = require('enquirer')
-const execa = require('execa')
 
 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, getPrivateSettings } = require('../lib/utils/config')
-const { registerCommands } = require('../lib')
-
-
-const regionSupported = ['ap-shanghai', 'ap-beijing', 'ap-guangzhou']
-const regionSupportedMap = {
-    'ap-shanghai': '上海',
-    'ap-beijing': '北京',
-    'ap-guangzhou': '广州',
-    'sh': '上海',
-    'bj': '北京',
-    'gz': '广州'
-}
+const {registerCommands} = require('../lib')
 
 async function main() {
-    let processArgv = process.argv
-    const isBeta = pkg.version.indexOf('-') > -1
-    process.CLI_VERSION = pkg.version
+let processArgv = process.argv
+const isBeta = pkg.version.indexOf('-') > -1
+process.CLI_VERSION = pkg.version
 
-    const [major, minor] = process.versions.node.split('.').slice(0, 2)
+const [major, minor] = process.versions.node.split('.').slice(0, 2)
 
-    // Node 版本检验提示
-    if (Number(major) < 8 || (Number(major) === 8 && Number(minor) < 6)) {
-        console.log(
-            chalk.bold.red(
-                '您的 Node 版本较低，CloudBase CLI 可能无法正常运行，请升级 Node 到 v8.6.0 以上！\n'
-            )
+// Node 版本检验提示
+if (Number(major) < 8 || (Number(major) === 8 && Number(minor) < 6)) {
+    console.log(
+        chalk.bold.red(
+            '您的 Node 版本较低，CloudBase CLI 可能无法正常运行，请升级 Node 到 v8.6.0 以上！\n'
         )
-    }
-
-    // Sentry 错误上报
-    Sentry.init({
-        release: pkg.version,
-        dsn: 'https://fff0077d06624655ad70d1ee25df419e@report.url.cn/sentry/1782',
-        httpsProxy: getProxy() || '',
-        serverName: os.hostname(),
-        integrations: [
-            new Sentry.Integrations.OnUnhandledRejection({
-                mode: 'none'
-            })
-        ]
-    })
-
-    // 输出版本信息
-    console.log(chalk.gray(`CloudBase CLI ${pkg.version}`))
-    console.log(chalk.gray(`CloudBase Framework ${frameworkPkg.version}`))
-
-
-    const yargsParsedResult = yargsParser(process.argv.slice(2));
-    const config = await getCloudBaseConfig(yargsParsedResult.configFile);
-    const privateSettings = getPrivateSettings(config);
-    if (privateSettings) {
-        console.log(chalk.gray(`检测到私有化配置`))
-        if (privateSettings.endpoints && privateSettings.endpoints.cliApi) {
-            // 初始化 lowcode 服务cliapi入口
-            process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL = privateSettings.endpoints.cliApi;
-        }
-
-    }
-    // 注册命令
-    await registerCommands()
+    )
+}
 
-    // 设置 Sentry 上报的用户 uin
-    Sentry.configureScope((scope) => {
-        try {
-            const credential = store.authStore.get('credential') || {}
-            scope.setUser({
-                uin: credential.uin || '',
-                ip: address.ip() || ''
-            })
-        } catch (e) {
-            Sentry.captureException(e)
-        }
-    })
+// Sentry 错误上报
+Sentry.init({
+    release: pkg.version,
+    dsn: 'https://fff0077d06624655ad70d1ee25df419e@report.url.cn/sentry/1782',
+    httpsProxy: getProxy() || '',
+    serverName: os.hostname(),
+    integrations: [
+        new Sentry.Integrations.OnUnhandledRejection({
+            mode: 'none'
+        })
+    ]
+})
 
-    // 设置 options 选项
-    program.storeOptionsAsProperties(false)
-    program.option('--verbose', '打印出内部运行信息')
-    program.option('--mode <mode>', '指定加载 env 文件的环境')
-    program.option('--config-file <path>', '设置配置文件，默认为 cloudbaserc.json')
-    program.option('-r, --region <region>', '指定环境地域')
+// 输出版本信息
+console.log(chalk.gray(`CloudBase CLI ${pkg.version}`))
+console.log(chalk.gray(`CloudBase Framework ${frameworkPkg.version}`))
 
-    if (!privateSettings) {
-        // HACK: 隐藏自动生成的 help 信息
-        program.helpOption(false)
-    }
-    const isCommandEmpty = yargsParsedResult._.length === 0;
 
-    // -v 时输出的版本信息，设置时避免影响其他命令使用 -v
-    if (isCommandEmpty) {
-        program.version(
-            `\nCLI: ${pkg.version}\nFramework: ${frameworkPkg.version}`,
-            '-v, --version',
-            '输出当前 CloudBase CLI 版本'
-        )
+const yargsParsedResult = yargsParser(process.argv.slice(2));
+const config = await getCloudBaseConfig(yargsParsedResult.configFile);
+const privateSettings = getPrivateSettings(config);
+if (privateSettings) {
+    console.log(chalk.gray(`检测到私有化配置`))
+    if(privateSettings.endpoints && privateSettings.endpoints.cliApi){
+        // 初始化 lowcode 服务cliapi入口
+        process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL = privateSettings.endpoints.cliApi;
     }
 
-    // 处理无效命令
-    program.action(() => {
-        const args = program.args
-        if (!Array.isArray(args) || !args.length) {
-            return
-        }
-        const cmd = args.join(' ')
-        console.log(chalk.bold.red('Error: ') + `${cmd} 不是有效的命令`)
-        didYouMean.threshold = 0.5
-        didYouMean.caseSensitive = false
-        const suggest = didYouMean(cmd, ALL_COMMANDS)
-        if (suggest) {
-            console.log(chalk.bold(`\n您是不是想使用命令：tcb ${suggest}\n`))
-        }
-        console.log(`💡使用 ${chalk.bold('tcb -h')} 查看所有命令`)
-    })
-
-    // 没有使用命令
-    if (isCommandEmpty) {
-        if (privateSettings) {
-            program.outputHelp()
-        } else {
-            if (['-h', '--help'].includes(processArgv[2])) {
-                // 需要隐藏的选项
-                const hideArgs = ['-h', '--help']
-                hideArgs.forEach((arg) => {
-                    const index = processArgv.indexOf(arg)
-                    if (index > -1) {
-                        processArgv.splice(index, 1)
-                    }
-                })
-                const { outputHelpInfo } = require('../lib/help')
-                outputHelpInfo()
-            } else if (!['-v', '--version'].includes(processArgv[2])) {
-                // HACK: framework 智能命令
-                const { smartDeploy } = require('../lib')
-                smartDeploy()
-            }
-        }
-    }
+}
+// 注册命令
+await registerCommands()
 
+// 设置 Sentry 上报的用户 uin
+Sentry.configureScope((scope) => {
     try {
-        program.parse(processArgv)
+        const credential = store.authStore.get('credential') || {}
+        scope.setUser({
+            uin: credential.uin || '',
+            ip: address.ip() || ''
+        })
     } catch (e) {
-        const errMsg = `${logSymbols.error} ${e.message || '参数异常，请检查您是否使用了正确的命令！'}`
-        console.log(errMsg)
+        Sentry.captureException(e)
     }
+})
 
-    /**
-     * 处理异常
-     */
-    async function errorHandler(err) {
-        process.emit('tcbError')
-        const stackIngoreErrors = ['TencentCloudSDKHttpException', 'CloudBaseError']
-        // 忽略自定义错误的错误栈
-        if (err && err.stack && !stackIngoreErrors.includes(err.name)) {
-            console.log(err.stack)
-        }
-
-        // 3 空格，兼容中文字符编码长度问题
-        if (err && err.message) {
-            let errMsg = logSymbols.error + ' ' + err.message
-            errMsg += err.requestId ? `\n${err.requestId}` : ''
-            console.log(errMsg)
-
-            // 多地域错误提示
-            if (errMsg.includes('Environment') && errMsg.includes('not found')) {
-                // 检查是否已经指定了 -r 或 --region 参数，如未指定则尝试获取地域信息
-                const regionSpecified = processArgv.indexOf('-r') !== -1 || processArgv.indexOf('--region') !== -1
-                const region = yargsParsedResult.r || yargsParsedResult.region
-                const multiRegionErrMsg = `\n此环境可能不属于当前账号，或为非${regionSupportedMap[region] || '上海'}地域环境，如需切换地域请追加参数（例：-r gz），请检查环境归属，参考多地域使用方法：https://docs.cloudbase.net/cli-v1/region.html`
-                if (!regionSpecified) {
+// 设置 options 选项
+program.storeOptionsAsProperties(false)
+program.option('--verbose', '打印出内部运行信息')
+program.option('--mode <mode>', '指定加载 env 文件的环境')
+program.option('--config-file <path>', '设置配置文件，默认为 cloudbaserc.json')
+program.option('-r, --region <region>', '指定环境地域')
 
-                    // 从 -e 参数、--envId 参数和配置文件中获取环境 id
-                    const envId = yargsParsedResult.e || yargsParsedResult.envId || config.envId
+if(!privateSettings) {
+    // HACK: 隐藏自动生成的 help 信息
+    program.helpOption(false)
+}
+const isCommandEmpty = yargsParsedResult._.length === 0;
+
+// -v 时输出的版本信息，设置时避免影响其他命令使用 -v
+if (isCommandEmpty) {
+    program.version(
+        `\nCLI: ${pkg.version}\nFramework: ${frameworkPkg.version}`,
+        '-v, --version',
+        '输出当前 CloudBase CLI 版本'
+    )
+}
 
-                    // 调用 API 接口尝试查询环境信息
-                    const predictRegion = await tryTellEnvRegion(envId)
+// 处理无效命令
+program.action(() => {
+    const args = program.args
+    if (!Array.isArray(args) || !args.length) {
+        return
+    }
+    const cmd = args.join(' ')
+    console.log(chalk.bold.red('Error: ') + `${cmd} 不是有效的命令`)
+    didYouMean.threshold = 0.5
+    didYouMean.caseSensitive = false
+    const suggest = didYouMean(cmd, ALL_COMMANDS)
+    if (suggest) {
+        console.log(chalk.bold(`\n您是不是想使用命令：tcb ${suggest}\n`))
+    }
+    console.log(`💡使用 ${chalk.bold('tcb -h')} 查看所有命令`)
+})
 
-                    if (regionSupported.includes(predictRegion)) {
-                        // 让用户选择是否切换地域
-                        const prompt = new Confirm({
-                            type: 'confirm',
-                            name: 'confirm',
-                            message: `该环境可能属于 ${regionSupportedMap[predictRegion]} 地域，是否切换地域并重新执行命令？`,
-                            initial: 'Y'
-                        })
-                        const confirm = await prompt.run()
-                        if (confirm) {
-                            // 检查原始命令是否已经追加了 -r 参数，如果有则替换，如果没有则追加
-                            const regionArgIndex = processArgv.indexOf('-r')
-                            if (regionArgIndex !== -1) {
-                                processArgv[regionArgIndex + 1] = predictRegion
-                            } else {
-                                processArgv.push('-r', predictRegion)
-                            }
-                            // 重新执行命令
-                            const newArgvStr = processArgv.slice(2).join(' ')
-                            console.log(`\n${chalk.yellow.bold('正在重新执行命令：')} tcb ${newArgvStr}\n`)
-                            await execa('tcb', processArgv.slice(2), {
-                                stdio: 'inherit'
-                            })
-                            process.emit('tcbExit')
-                            process.exit(0)
-                        } else {
-                            console.log(chalk.yellow.bold(multiRegionErrMsg))
-                        }
-                    }
-                } else {
-                    console.log(chalk.yellow.bold(multiRegionErrMsg))
+// 没有使用命令
+if (isCommandEmpty) {
+    if(privateSettings) {
+        program.outputHelp()
+    } else {
+        if (['-h', '--help'].includes(processArgv[2])) {
+            // 需要隐藏的选项
+            const hideArgs = ['-h', '--help']
+            hideArgs.forEach((arg) => {
+                const index = processArgv.indexOf(arg)
+                if (index > -1) {
+                    processArgv.splice(index, 1)
                 }
-            }
+            })
+            const { outputHelpInfo } = require('../lib/help')
+            outputHelpInfo()
+        } else if (!['-v', '--version'].includes(processArgv[2])) {
+            // HACK: framework 智能命令
+            const { smartDeploy } = require('../lib')
+            smartDeploy()
         }
+    }
+}
 
-        // 输出详细的错误信息
-        if (processArgv.includes('--verbose')) {
-            console.log(err)
-        }
+try {
+    program.parse(processArgv)
+} catch (e) {
+    const errMsg = `${logSymbols.error} ${e.message || '参数异常，请检查您是否使用了正确的命令！'}`
+    console.log(errMsg)
+}
 
-        process.emit('tcbExit')
-        setTimeout(() => {
-            process.exit(1)
-        }, 1000)
+/**
+ * 处理异常
+ */
+function errorHandler(err) {
+    process.emit('tcbError')
+    const stackIngoreErrors = ['TencentCloudSDKHttpException', 'CloudBaseError']
+    // 忽略自定义错误的错误栈
+    if (err && err.stack && !stackIngoreErrors.includes(err.name)) {
+        console.log(err.stack)
     }
 
-    const isTokenExpired = (credential, gap = 120) =>
-        credential.accessTokenExpired && Number(credential.accessTokenExpired) < Date.now() + gap * 1000
-
-    async function tryTellEnvRegion(envId) {
-        // 依次调用不同地域的 API 接口查询环境信息
-        const fetchedRegion = await Promise.all(regionSupported.map(async region => {
-            const { EnvList = [] } = await fetchEnvInfoWithRegion(envId, region)
-            if (EnvList.length !== 0 && EnvList.find(item => item.EnvId === envId)) {
-                return res.EnvList[0].Region
-            }
-            return ''
-        }))
+    // 3 空格，兼容中文字符编码长度问题
+    if (err && err.message) {
+        let errMsg = logSymbols.error + ' ' + err.message
+        errMsg += err.requestId ? `\n${err.requestId}` : ''
+        console.log(errMsg)
 
-        let predictRegion = ''
-        fetchedRegion.forEach(region => {
-            if (region) {
-                predictRegion = region
-            }
-        })
-        return predictRegion
+        // 多地域错误提示
+        if (errMsg.includes('Environment') && errMsg.includes('not found')) {
+            console.log(
+                chalk.yellow.bold(
+                    '\n此环境可能不属于当前账号，或为非上海地域环境，如需切换地域请追加参数（例：-r gz），请检查环境归属，参考多地域使用方法：https://docs.cloudbase.net/cli-v1/region.html'
+                )
+            )
+        }
     }
 
-    // 在指定地域调用 API 接口查询环境信息
-    async function fetchEnvInfoWithRegion(envId, region) {
-        let commonCredential = {}
-        const commonOpts = {
-            service: 'tcb',
-            version: '2019-09-24',
-            proxy: getProxy(),
-            timeout: 15000,
-            getCredential: async () => {
-                if (commonCredential.secretId && !isTokenExpired(commonCredential)) {
-                    return commonCredential
-                }
-                const credential = await getCredentialWithoutCheck()
-                if (!credential) {
-                    throw new Error('无有效身份信息，请使用 cloudbase login 登录')
-                }
-                commonCredential = credential
-                return {
-                    ...credential,
-                    tokenExpired: Number(credential.accessTokenExpired)
-                }
-            }
-        }
-        const apiName = 'DescribeEnvs'
-        const tcbApi = new CloudApiService({
-            ...commonOpts,
-            region
-        })
-        const res = await tcbApi.request(apiName, {
-            EnvId: envId,
-        })
-        return res
+    // 输出详细的错误信息
+    if (processArgv.includes('--verbose')) {
+        console.log(err)
     }
 
-    process.on('uncaughtException', errorHandler)
-    process.on('unhandledRejection', errorHandler)
+    process.emit('tcbExit')
+    setTimeout(() => {
+        process.exit(1)
+    }, 1000)
+}
 
-    // 检查更新
-    const ONE_DAY = 86400000
-    // Beta 版 1 个小时检查一次，稳定版 1 天检查一次
-    const CheckInterval = isBeta ? 3600000 : ONE_DAY
+process.on('uncaughtException', errorHandler)
+process.on('unhandledRejection', errorHandler)
 
-    const notifier = updateNotifier({
-        pkg,
-        distTag: isBeta ? 'beta' : 'latest',
-        // 检查更新间隔 1 天
-        updateCheckInterval: CheckInterval
-    })
+// 检查更新
+const ONE_DAY = 86400000
+// Beta 版 1 个小时检查一次，稳定版 1 天检查一次
+const CheckInterval = isBeta ? 3600000 : ONE_DAY
 
-    notifier.notify({
-        isGlobal: true
-    })
+const notifier = updateNotifier({
+    pkg,
+    distTag: isBeta ? 'beta' : 'latest',
+    // 检查更新间隔 1 天
+    updateCheckInterval: CheckInterval
+})
+
+notifier.notify({
+    isGlobal: true
+})
 
 }
 
-if (require.main === module) {
+if(require.main === module) {
     try {
         main()
     } catch (error) {
@@ -326,6 +216,4 @@ if (require.main === module) {
 }
 process.on('unhandledRejection', (err) => {
     console.log('unhandledRejection', err)
-})
-
-exports.main = main
+})

package/lib/commands/lowcode/comps.js

@@ -235,9 +235,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], LowCodeDebugComps.prototype, "execute", null);
 LowCodeDebugComps = __decorate([
-    (0, common_1.ICommand)({
-        supportPrivate: true
-    })
+    (0, common_1.ICommand)()
 ], LowCodeDebugComps);
 exports.LowCodeDebugComps = LowCodeDebugComps;
 let LowCodePublishComps = class LowCodePublishComps extends common_1.Command {

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);

package/lib/utils/net/cloud-api-request.js

@@ -18,6 +18,15 @@ const debug_logger_1 = require("../debug-logger");
 let commonCredential;
 const isTokenExpired = (credential, gap = 120) => credential.accessTokenExpired && Number(credential.accessTokenExpired) < Date.now() + gap * 1000;
 class CloudApiService {
+    static getInstance(service) {
+        var _a;
+        if ((_a = CloudApiService.serviceCacheMap) === null || _a === void 0 ? void 0 : _a[service]) {
+            return CloudApiService.serviceCacheMap[service];
+        }
+        const apiService = new CloudApiService(service);
+        CloudApiService.serviceCacheMap[service] = apiService;
+        return apiService;
+    }
     constructor(service, baseParams, version = '') {
         this.apiService = new cloud_api_1.CloudApiService({
             service,
@@ -38,15 +47,6 @@ class CloudApiService {
             })
         });
     }
-    static getInstance(service) {
-        var _a;
-        if ((_a = CloudApiService.serviceCacheMap) === null || _a === void 0 ? void 0 : _a[service]) {
-            return CloudApiService.serviceCacheMap[service];
-        }
-        const apiService = new CloudApiService(service);
-        CloudApiService.serviceCacheMap[service] = apiService;
-        return apiService;
-    }
     request(action, data = {}, method = 'POST') {
         return __awaiter(this, void 0, void 0, function* () {
             const region = this.region || (yield (0, toolbox_1.getRegion)());

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.2.12",
+    "version": "2.2.14",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
-        "build": "rimraf lib types && tsc --resolveJsonModule",
+        "build": "rimraf lib types && tsc",
         "watch": "rimraf lib types && tsc -w",
         "dev": "rimraf lib types && tsc -w",
         "eslint": "eslint \"./**/*.ts\"",
@@ -32,9 +32,9 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.6",
-        "@cloudbase/lowcode-cli": "0.18.12",
-        "@cloudbase/manager-node": "4.0.1",
-        "@cloudbase/toolbox": "^0.7.5",
+        "@cloudbase/lowcode-cli": "^0.18.5",
+        "@cloudbase/manager-node": "4.2.3",
+        "@cloudbase/toolbox": "^0.7.4",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
         "chalk": "^2.4.2",

package/types/decorators/params/common.d.ts

@@ -1,4 +1,4 @@
 import { ParamTypes } from '../constants';
-declare type GetterFunction = (target: any) => Promise<any> | any;
+type GetterFunction = (target: any) => Promise<any> | any;
 export declare const createParamDecorator: (paramtype: ParamTypes, getter: GetterFunction) => () => (target: any, key: string | symbol, index: number) => void;
 export {};

package/types/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-export declare type CustomEvent = 'logout';
+export type CustomEvent = 'logout';
 export interface ICommandContext {
     cmd: string;
     envId: string;
@@ -33,7 +33,7 @@ export interface TmpCredential {
     uin?: string;
     hash?: string;
 }
-export declare type Credential = TmpCredential & PermanentCredential;
+export type Credential = TmpCredential & PermanentCredential;
 export interface AuthSecret {
     secretId: string;
     secretKey: string;

package/types/utils/config.d.ts

@@ -10,7 +10,7 @@ export interface IArgs {
 }
 export declare const getArgs: () => Arguments<IArgs>;
 export declare function getPrivateSettings(config: ICloudBaseRcSettings, cmd?: string): undefined | IPrivateSettings;
-declare type IAbsUrl = `http://${string}` | `https://${string}`;
+type IAbsUrl = `http://${string}` | `https://${string}`;
 export interface IPrivateSettings {
     credential: Credential;
     endpoints: {

package/types/utils/fs/index.d.ts

@@ -1,5 +1,5 @@
 export * from './del';
-export declare type SizeUnit = 'KB' | 'MB' | 'GB';
+export type SizeUnit = 'KB' | 'MB' | 'GB';
 export declare function checkFullAccess(dest: string, throwError?: boolean): boolean;
 export declare function checkWritable(dest: string, throwError?: boolean): boolean;
 export declare function checkReadable(dest: string, throwError?: boolean): boolean;

package/types/utils/net/http-request.d.ts

@@ -1,7 +1,7 @@
 import _fetch, { RequestInit } from 'node-fetch';
-declare type fetchReturnType = ReturnType<typeof _fetch>;
-declare type UnPromisify<T> = T extends PromiseLike<infer U> ? U : T;
-declare type fetchReturnTypeExtracted = UnPromisify<fetchReturnType>;
+type fetchReturnType = ReturnType<typeof _fetch>;
+type UnPromisify<T> = T extends PromiseLike<infer U> ? U : T;
+type fetchReturnTypeExtracted = UnPromisify<fetchReturnType>;
 export declare function fetch(url: string, config?: RequestInit): Promise<any>;
 export declare function postFetch(url: string, data?: Record<string, any>): Promise<any>;
 export declare function fetchStream(url: any, config?: Record<string, any>): Promise<fetchReturnTypeExtracted>;

package/types/utils/output/loading.d.ts

@@ -8,7 +8,7 @@ declare class Loading {
     fail(text: string): void;
 }
 export declare const loadingFactory: () => Loading;
-declare type Task<T> = (flush: (text: string) => void, ...args: any[]) => Promise<T>;
+type Task<T> = (flush: (text: string) => void, ...args: any[]) => Promise<T>;
 export interface ILoadingOptions {
     startTip?: string;
     successTip?: string;

package/types/utils/parallel.d.ts

@@ -1,4 +1,4 @@
-export declare type AsyncTask = () => Promise<any>;
+export type AsyncTask = () => Promise<any>;
 export declare class AsyncTaskParallelController {
     maxParallel: number;
     tasks: AsyncTask[];

package/types/utils/validator.d.ts

@@ -1,4 +1,4 @@
-declare type SimpleValue = number | string | boolean;
+type SimpleValue = number | string | boolean;
 export declare function assertTruthy(val: SimpleValue | SimpleValue[], errMsg: string): void;
 export declare function assertHas(obj: any, prop: string, errMsg: any): void;
 export declare const validateIp: (ip: string) => boolean;

package/.history/.gitignore_20220624162613

@@ -1,84 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-package-lock.json
-yarn.lock
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
-dist
-
-example/**/tcb.json
-
-node_modules
-
-.idea
-.vscode/*
-!.vscode/launch.json
-
-# Test api Key
-test/api-key.js
-
-pkg/
-
-.DS_Store
-
-# Build files
-/lib
-/types

package/.history/.gitignore_20220627114054

@@ -1,86 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-package-lock.json
-yarn.lock
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
-dist
-
-example/**/tcb.json
-
-node_modules
-
-.idea
-.vscode/*
-!.vscode/launch.json
-
-# Test api Key
-test/api-key.js
-
-pkg/
-
-.DS_Store
-
-# Build files
-/lib
-/types
-
-.history

package/.history/package_20230331190630.json

@@ -1,89 +0,0 @@
-{
-    "name": "@cloudbase/cli",
-    "version": "2.2.7",
-    "description": "cli tool for cloudbase",
-    "main": "lib/index.js",
-    "scripts": {
-        "build": "rimraf lib types && tsc",
-        "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
-        "eslint": "eslint \"./**/*.ts\"",
-        "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",
-        "prepublishOnly": "npm run build"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
-    },
-    "bin": {
-        "tcb": "bin/tcb.js",
-        "cloudbase": "bin/cloudbase.js"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npm run build"
-        }
-    },
-    "author": "cwuyiqing@gmail.com",
-    "license": "ISC",
-    "dependencies": {
-        "@cloudbase/cloud-api": "^0.5.5",
-        "@cloudbase/framework-core": "^1.9.6",
-        "@cloudbase/lowcode-cli": "^0.18.7",
-        "@cloudbase/manager-node": "4.0.1",
-        "@cloudbase/toolbox": "^0.7.5",
-        "@sentry/node": "^5.10.2",
-        "address": "^1.1.2",
-        "chalk": "^2.4.2",
-        "cli-table3": "^0.5.1",
-        "commander": "7",
-        "del": "^5.1.0",
-        "didyoumean": "^1.2.2",
-        "enquirer": "^2.3.6",
-        "execa": "^4.0.3",
-        "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^5.0.1",
-        "inquirer": "^6.5.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^3.0.0",
-        "lowdb": "^1.0.0",
-        "make-dir": "^3.0.0",
-        "node-fetch": "^2.6.0",
-        "open": "^7.0.0",
-        "ora": "^4.0.2",
-        "portfinder": "^1.0.28",
-        "progress": "^2.0.3",
-        "query-string": "^6.8.1",
-        "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.7",
-        "tar-fs": "^2.0.1",
-        "terminal-link": "^2.1.1",
-        "unzipper": "^0.10.10",
-        "update-notifier": "^4.0.0",
-        "xdg-basedir": "^4.0.0",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^21.0.1"
-    },
-    "devDependencies": {
-        "@types/jest": "^27",
-        "@types/koa__router": "^8.0.11",
-        "@types/lodash": "^4.14.182",
-        "@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",
-        "@typescript-eslint/parser": "^4.8.1",
-        "eslint": "^7.14.0",
-        "eslint-config-alloy": "^3.8.2",
-        "husky": "^3.0.9",
-        "jest": "^27",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^27",
-        "typescript": "^4.7.2"
-    }
-}

package/.history/package_20230331190744.json

@@ -1,89 +0,0 @@
-{
-    "name": "@cloudbase/cli",
-    "version": "2.2.8",
-    "description": "cli tool for cloudbase",
-    "main": "lib/index.js",
-    "scripts": {
-        "build": "rimraf lib types && tsc",
-        "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
-        "eslint": "eslint \"./**/*.ts\"",
-        "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",
-        "prepublishOnly": "npm run build"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
-    },
-    "bin": {
-        "tcb": "bin/tcb.js",
-        "cloudbase": "bin/cloudbase.js"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npm run build"
-        }
-    },
-    "author": "cwuyiqing@gmail.com",
-    "license": "ISC",
-    "dependencies": {
-        "@cloudbase/cloud-api": "^0.5.5",
-        "@cloudbase/framework-core": "^1.9.6",
-        "@cloudbase/lowcode-cli": "^0.18.7",
-        "@cloudbase/manager-node": "4.0.1",
-        "@cloudbase/toolbox": "^0.7.5",
-        "@sentry/node": "^5.10.2",
-        "address": "^1.1.2",
-        "chalk": "^2.4.2",
-        "cli-table3": "^0.5.1",
-        "commander": "7",
-        "del": "^5.1.0",
-        "didyoumean": "^1.2.2",
-        "enquirer": "^2.3.6",
-        "execa": "^4.0.3",
-        "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^5.0.1",
-        "inquirer": "^6.5.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^3.0.0",
-        "lowdb": "^1.0.0",
-        "make-dir": "^3.0.0",
-        "node-fetch": "^2.6.0",
-        "open": "^7.0.0",
-        "ora": "^4.0.2",
-        "portfinder": "^1.0.28",
-        "progress": "^2.0.3",
-        "query-string": "^6.8.1",
-        "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.7",
-        "tar-fs": "^2.0.1",
-        "terminal-link": "^2.1.1",
-        "unzipper": "^0.10.10",
-        "update-notifier": "^4.0.0",
-        "xdg-basedir": "^4.0.0",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^21.0.1"
-    },
-    "devDependencies": {
-        "@types/jest": "^27",
-        "@types/koa__router": "^8.0.11",
-        "@types/lodash": "^4.14.182",
-        "@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",
-        "@typescript-eslint/parser": "^4.8.1",
-        "eslint": "^7.14.0",
-        "eslint-config-alloy": "^3.8.2",
-        "husky": "^3.0.9",
-        "jest": "^27",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^27",
-        "typescript": "^4.7.2"
-    }
-}

package/.history/src/commands/lowcode/app_20220728111717.ts

@@ -1,52 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启云开发低码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath
-        })
-    }
-}
-
-@ICommand()
-export class DanielWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch-ws',
-            options: [],
-            desc: '开启云开发低码的本地开发模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        console.log('>>> 启动啦')
-    }
-}

package/.history/src/commands/lowcode/app_20220728112031.ts

@@ -1,34 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启云开发低码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath
-        })
-    }
-}

package/.history/src/commands/lowcode/app_20220729172854.ts

@@ -1,34 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启微搭低代码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath
-        })
-    }
-}

package/.history/src/index_20220624162613.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}

package/.history/src/index_20220627113609.ts

@@ -1,15 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}
-
-console.log("daniel tcb")

package/.history/src/index_20220627114102.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}