@cloudbase/cli 2.2.4-private.4 → 2.2.4-private.5

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.2.4-private.4",
+    "version": "2.2.4-private.5",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -32,7 +32,7 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.6",
-        "@cloudbase/lowcode-cli": "0.18.5-private.3",
+        "@cloudbase/lowcode-cli": "0.18.5-private.4",
         "@cloudbase/manager-node": "4.0.1",
         "@cloudbase/toolbox": "^0.7.4",
         "@sentry/node": "^5.10.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;