@cloudbase/cli 2.6.0-alpha.8 → 2.7.0-alpha.2

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

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,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.0-alpha.8",
+    "version": "2.7.0-alpha.2",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -20,8 +20,8 @@
         "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
     },
     "bin": {
-        "cloudbase": "bin/cloudbase.js",
-        "tcb": "bin/tcb.js"
+        "tcb": "bin/tcb.js",
+        "cloudbase": "bin/cloudbase.js"
     },
     "husky": {
         "hooks": {
@@ -33,7 +33,7 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
-        "@cloudbase/functions-framework": "1.0.0-beta.11",
+        "@cloudbase/iac-core": "^0.0.2-alpha.4",
         "@cloudbase/lowcode-cli": "^0.21.1",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",
@@ -49,13 +49,13 @@
         "fs-extra": "^8.1.0",
         "https-proxy-agent": "^5.0.1",
         "inquirer": "^6.5.0",
+        "inquirer-autocomplete-prompt": "2.0.1",
         "json-schema-to-typescript": "^14.0.5",
         "lodash": "^4.17.21",
         "log-symbols": "^3.0.0",
         "lowdb": "^1.0.0",
         "make-dir": "^3.0.0",
         "node-fetch": "^2.6.0",
-        "nodemon": "^3.1.4",
         "open": "^7.0.0",
         "ora": "^4.0.2",
         "portfinder": "^1.0.28",
@@ -73,6 +73,7 @@
     },
     "devDependencies": {
         "@types/fs-extra": "^11.0.4",
+        "@types/inquirer-autocomplete-prompt": "^3.0.3",
         "@types/jest": "^27",
         "@types/koa__router": "^8.0.11",
         "@types/lodash": "^4.14.182",

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

@@ -0,0 +1,58 @@
+import { Logger } from '../../decorators';
+import { Command, ICommandOptions } from '../common';
+export declare class IaCInitRepo extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        desc: string;
+        requiredEnvId: boolean;
+        autoRunLogin: boolean;
+    };
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCPullRepoConfig extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        desc: string;
+        requiredEnvId: boolean;
+        autoRunLogin: boolean;
+    };
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCInit extends Command {
+    get options(): ICommandOptions;
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCPull extends Command {
+    get options(): ICommandOptions;
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCBuild extends Command {
+    get options(): ICommandOptions;
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCDev extends Command {
+    get options(): ICommandOptions;
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCApply extends Command {
+    get options(): ICommandOptions;
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCDestory extends Command {
+    get options(): ICommandOptions;
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}
+export declare class IaCState extends Command {
+    get options(): ICommandOptions;
+    execute(ctx: any, options: any, log: Logger): Promise<void>;
+}

package/types/commands/index.d.ts

@@ -12,4 +12,4 @@ export * from './smart';
 export * from './lowcode';
 export * from './run';
 export * from './db';
-export * from './fun';
+export * from './iac';

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/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
-}

package/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

package/lib/commands/constants.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvStatus = exports.EnvSource = void 0;
-exports.EnvSource = {
-    MINIAPP: 'miniapp',
-    QCLOUD: 'qcloud'
-};
-exports.EnvStatus = {
-    NORMAL: 'NORMAL',
-    UNAVAILABLE: 'UNAVAILABLE'
-};