@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/utils/auth.js

@@ -1,13 +1,4 @@
 "use strict";
-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.getLoginState = exports.authSupevisor = void 0;
 const toolbox_1 = require("@cloudbase/toolbox");
@@ -19,10 +10,8 @@ exports.authSupevisor = toolbox_1.AuthSupevisor.getInstance({
     timeout: constant_1.REQUEST_TIMEOUT,
     throwError: true
 });
-function getLoginState() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const state = exports.authSupevisor.getLoginState();
-        return state;
-    });
+async function getLoginState() {
+    const state = exports.authSupevisor.getLoginState();
+    return state;
 }
 exports.getLoginState = getLoginState;

package/lib/utils/checkTcbrEnv.js

@@ -1,13 +1,4 @@
 "use strict";
-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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,29 +31,27 @@ ${(0, i18n_1.t)('更新云托管服务')}：tcb run service:update --envId <envI
 ${(0, i18n_1.t)('部署云托管服务')}：tcb run deploy --envId <envId> --serviceName <serviceName> --containerPort <containerPort>
 ${(0, i18n_1.t)('更新服务基础配置')}：tcb run service:config --envId <envId> --serviceName <serviceName>
 `;
-function checkTcbrEnv(envId, isTcbr) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (envId === undefined) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('请使用 -e 或 --envId 指定环境 ID'));
-        }
-        const { data: res } = yield (0, tcbrApi_1.callTcbrApi)('DescribeCloudRunEnvs', {
-            EnvId: envId
-        });
-        const { EnvList } = res;
-        const envInfo = EnvList === null || EnvList === void 0 ? void 0 : EnvList.find((item) => (item === null || item === void 0 ? void 0 : item.EnvId) === envId);
-        if (envInfo === undefined) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('无法读取到有效的环境信息，请检查环境 ID 是否正确\nrequestId: {{requestId}}', { requestId: res === null || res === void 0 ? void 0 : res.RequestId }));
-        }
-        if ((envInfo.EnvType === 'tcbr' && isTcbr) || (envInfo.EnvType !== 'tcbr' && !isTcbr)) {
-            return 0;
-        }
-        else if (envInfo.EnvType === 'tcbr' && !isTcbr) {
-            return 1;
-        }
-        else if (envInfo.EnvType !== 'tcbr' && isTcbr) {
-            return 2;
-        }
+async function checkTcbrEnv(envId, isTcbr) {
+    if (envId === undefined) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('请使用 -e 或 --envId 指定环境 ID'));
+    }
+    const { data: res } = await (0, tcbrApi_1.callTcbrApi)('DescribeCloudRunEnvs', {
+        EnvId: envId
     });
+    const { EnvList } = res;
+    const envInfo = EnvList === null || EnvList === void 0 ? void 0 : EnvList.find((item) => (item === null || item === void 0 ? void 0 : item.EnvId) === envId);
+    if (envInfo === undefined) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('无法读取到有效的环境信息，请检查环境 ID 是否正确\nrequestId: {{requestId}}', { requestId: res === null || res === void 0 ? void 0 : res.RequestId }));
+    }
+    if ((envInfo.EnvType === 'tcbr' && isTcbr) || (envInfo.EnvType !== 'tcbr' && !isTcbr)) {
+        return 0;
+    }
+    else if (envInfo.EnvType === 'tcbr' && !isTcbr) {
+        return 1;
+    }
+    else if (envInfo.EnvType !== 'tcbr' && isTcbr) {
+        return 2;
+    }
 }
 exports.checkTcbrEnv = checkTcbrEnv;
 function logEnvCheck(envId, warningType) {

package/lib/utils/cli-table.js

@@ -10,7 +10,12 @@ function printHorizontalTable(head, data = [], options) {
     if (!(data === null || data === void 0 ? void 0 : data.length)) {
         console.log((0, i18n_1.t)('列表数据为空'));
     }
-    const table = new cli_table3_1.default(Object.assign({ head, style: { head: ['yellow'] }, colAligns: new Array(head.length).fill('center') }, options));
+    const table = new cli_table3_1.default({
+        head,
+        style: { head: ['yellow'] },
+        colAligns: new Array(head.length).fill('center'),
+        ...options
+    });
     data.forEach((item) => {
         table.push(item);
     });

package/lib/utils/config.js

@@ -1,13 +1,4 @@
 "use strict";
-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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -34,12 +25,12 @@ function getPrivateSettings(config, cmd) {
     const currentConfig = cmd ? config === null || config === void 0 ? void 0 : config[cmd] : config;
     if (hasOwn(currentConfig || {}, 'privateSettings') ||
         hasOwn(commonConfig || {}, 'privateSettings')) {
-        return Object.assign(Object.assign({}, commonConfig.privateSettings), currentConfig.privateSettings);
+        return { ...commonConfig.privateSettings, ...currentConfig.privateSettings };
     }
     return undefined;
 }
 exports.getPrivateSettings = getPrivateSettings;
-const getCloudBaseConfig = (configPath) => __awaiter(void 0, void 0, void 0, function* () {
+const getCloudBaseConfig = async (configPath) => {
     var _a;
     const args = (0, exports.getArgs)();
     if (args._.includes('help') || args.help) {
@@ -50,10 +41,10 @@ const getCloudBaseConfig = (configPath) => __awaiter(void 0, void 0, void 0, fun
     const parser = new toolbox_1.ConfigParser({
         configPath: specificConfigPath
     });
-    const config = yield parser.get();
+    const config = await parser.get();
     if ((config === null || config === void 0 ? void 0 : config.functionDefaultConfig) && ((_a = config === null || config === void 0 ? void 0 : config.functions) === null || _a === void 0 ? void 0 : _a.length)) {
         config.functions = config.functions.map((rawConfig) => lodash_1.default.merge({}, config.functionDefaultConfig, rawConfig));
     }
     return config;
-});
+};
 exports.getCloudBaseConfig = getCloudBaseConfig;

package/lib/utils/dts.js

@@ -1,43 +1,33 @@
 "use strict";
-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.generateDataModelDTS = void 0;
 const json_schema_to_typescript_1 = require("json-schema-to-typescript");
 const lodash_1 = require("lodash");
 const tools_1 = require("./tools");
 const i18n_1 = require("../i18n");
-function generateDataModelDTS(dataModelList) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const dtsList = yield Promise.all(dataModelList.map((item) => __awaiter(this, void 0, void 0, function* () {
-            let dts = yield _handleOne(item.name, item.schema);
-            return {
-                name: item.name,
-                title: item.title,
-                dts
-            };
-        })));
-        const result = `
+async function generateDataModelDTS(dataModelList) {
+    const dtsList = await Promise.all(dataModelList.map(async (item) => {
+        let dts = await _handleOne(item.name, item.schema);
+        return {
+            name: item.name,
+            title: item.title,
+            dts
+        };
+    }));
+    const result = `
 import { DataModelMethods } from "@cloudbase/wx-cloud-client-sdk";
 ${dtsList.map((item) => item.dts).join('\n')}
 
 interface IModels {
 ${dtsList
-            .map((item) => {
-            return `
+        .map((item) => {
+        return `
     /**
     * ${(0, i18n_1.t)('数据模型')}：${item.title}
     */ 
     ${_toValidFieldName(item.name)}: DataModelMethods<${getModelInterfaceName(item.name)}>;`;
-        })
-            .join('\n')}    
+    })
+        .join('\n')}    
 }
 
 declare module "@cloudbase/wx-cloud-client-sdk" {
@@ -49,106 +39,101 @@ declare global {
         models: IModels;
     }
 }`;
-        return result;
-        function _handleOne(name, schema) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!(schema === null || schema === void 0 ? void 0 : schema.properties))
-                    return `interface ${getModelInterfaceName(name)} {}`;
-                Object.keys(schema.properties).forEach((key) => {
-                    if (schema.properties[key]['x-system']) {
-                        delete schema.properties[key];
-                    }
-                });
-                Object.keys(schema.properties).forEach((key) => {
-                    const field = schema.properties[key];
-                    if (['related', 'father-son'].includes(field.format)) {
-                        schema.properties[`@${key}`] = {
+    return result;
+    async function _handleOne(name, schema) {
+        if (!(schema === null || schema === void 0 ? void 0 : schema.properties))
+            return `interface ${getModelInterfaceName(name)} {}`;
+        Object.keys(schema.properties).forEach((key) => {
+            if (schema.properties[key]['x-system']) {
+                delete schema.properties[key];
+            }
+        });
+        Object.keys(schema.properties).forEach((key) => {
+            const field = schema.properties[key];
+            if (['related', 'father-son'].includes(field.format)) {
+                schema.properties[`@${key}`] = {
+                    type: 'object',
+                    description: (0, i18n_1.t)('关联{{title}}对象', { title: field.title }),
+                    properties: {
+                        v1: {
                             type: 'object',
-                            description: (0, i18n_1.t)('关联{{title}}对象', { title: field.title }),
                             properties: {
-                                v1: {
-                                    type: 'object',
-                                    properties: {
-                                        record: {
-                                            type: 'string',
-                                            format: field.format,
-                                            'x-parent': {
-                                                parentDataSourceName: field['x-parent'].parentDataSourceName
-                                            }
-                                        }
+                                record: {
+                                    type: 'string',
+                                    format: field.format,
+                                    'x-parent': {
+                                        parentDataSourceName: field['x-parent'].parentDataSourceName
                                     }
                                 }
                             }
-                        };
-                        schema.properties[key].format = '';
+                        }
                     }
-                });
-                schema = JSON.parse(JSON.stringify(schema, (_, value) => {
-                    if ((0, lodash_1.has)(value, 'title') && !(0, lodash_1.has)(value, 'title.title')) {
-                        (0, lodash_1.set)(value, 'description', value['title'] + '\n' + value['description']);
-                        delete value['title'];
+                };
+                schema.properties[key].format = '';
+            }
+        });
+        schema = JSON.parse(JSON.stringify(schema, (_, value) => {
+            if ((0, lodash_1.has)(value, 'title') && !(0, lodash_1.has)(value, 'title.title')) {
+                (0, lodash_1.set)(value, 'description', value['title'] + '\n' + value['description']);
+                delete value['title'];
+            }
+            return value;
+        }));
+        const dts = await _compile(name, schema);
+        return dts;
+    }
+    async function _compile(name, jsonschema) {
+        try {
+            let dts = await (0, json_schema_to_typescript_1.compile)(jsonschema, getModelInterfaceName(name), {
+                additionalProperties: false,
+                bannerComment: '',
+                format: true,
+                unknownAny: false,
+                customName(_schema) {
+                    var _a, _b;
+                    const format = _schema.format;
+                    let name = '';
+                    if (['one-one', 'many-one', 'related', 'father-son'].includes(format)) {
+                        name = getModelInterfaceName((_a = _schema === null || _schema === void 0 ? void 0 : _schema['x-parent']) === null || _a === void 0 ? void 0 : _a.parentDataSourceName);
                     }
-                    return value;
-                }));
-                const dts = yield _compile(name, schema);
-                return dts;
-            });
-        }
-        function _compile(name, jsonschema) {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    let dts = yield (0, json_schema_to_typescript_1.compile)(jsonschema, getModelInterfaceName(name), {
-                        additionalProperties: false,
-                        bannerComment: '',
-                        format: true,
-                        unknownAny: false,
-                        customName(_schema) {
-                            var _a, _b;
-                            const format = _schema.format;
-                            let name = '';
-                            if (['one-one', 'many-one', 'related', 'father-son'].includes(format)) {
-                                name = getModelInterfaceName((_a = _schema === null || _schema === void 0 ? void 0 : _schema['x-parent']) === null || _a === void 0 ? void 0 : _a.parentDataSourceName);
-                            }
-                            if (['one-many', 'many-many'].includes(format)) {
-                                name = `ARRAY_TYPE_${getModelInterfaceName((_b = _schema === null || _schema === void 0 ? void 0 : _schema['x-parent']) === null || _b === void 0 ? void 0 : _b.parentDataSourceName)}`;
-                            }
-                            if (name) {
-                                name = `${name}_TAIL${(0, tools_1.uuidv4)()}_END_`;
-                            }
-                            return name || undefined;
-                        }
-                    });
-                    dts = dts
-                        .replace(/export interface/g, 'interface')
-                        .replace(/ARRAY_TYPE_(.*);/g, '$1[]')
-                        .replace(/_TAIL.*?_END_/g, '')
-                        .replace(/[\s\S]*?(?=interface)/, '');
-                    return dts;
-                }
-                catch (e) {
-                    console.error((0, i18n_1.t)('_compile error: {{error}}', { error: e }));
-                    return '';
+                    if (['one-many', 'many-many'].includes(format)) {
+                        name = `ARRAY_TYPE_${getModelInterfaceName((_b = _schema === null || _schema === void 0 ? void 0 : _schema['x-parent']) === null || _b === void 0 ? void 0 : _b.parentDataSourceName)}`;
+                    }
+                    if (name) {
+                        name = `${name}_TAIL${(0, tools_1.uuidv4)()}_END_`;
+                    }
+                    return name || undefined;
                 }
             });
+            dts = dts
+                .replace(/export interface/g, 'interface')
+                .replace(/ARRAY_TYPE_(.*);/g, '$1[]')
+                .replace(/_TAIL.*?_END_/g, '')
+                .replace(/[\s\S]*?(?=interface)/, '');
+            return dts;
         }
-        function _toValidFieldName(name) {
-            let result = name.replace(/[^a-zA-Z0-9_$]/g, '_');
-            if (/^[0-9]/.test(result)) {
-                result = '_' + result;
-            }
-            return result;
+        catch (e) {
+            console.error((0, i18n_1.t)('_compile error: {{error}}', { error: e }));
+            return '';
         }
-        function getModelInterfaceName(name) {
-            if (!name)
-                return '';
-            return (0, lodash_1.upperFirst)((0, lodash_1.deburr)(`IModal_${name}`)
-                .replace(/(^\s*[^a-zA-Z_$])|([^a-zA-Z_$\d])/g, ' ')
-                .replace(/^_[a-z]/g, (match) => match.toUpperCase())
-                .replace(/_[a-z]/g, (match) => match.substr(1, match.length).toUpperCase())
-                .replace(/([\d$]+[a-zA-Z])/g, (match) => match.toUpperCase())
-                .replace(/\s+([a-zA-Z])/g, (match) => (0, lodash_1.trim)(match.toUpperCase()))
-                .replace(/\s/g, ''));
+    }
+    function _toValidFieldName(name) {
+        let result = name.replace(/[^a-zA-Z0-9_$]/g, '_');
+        if (/^[0-9]/.test(result)) {
+            result = '_' + result;
         }
-    });
+        return result;
+    }
+    function getModelInterfaceName(name) {
+        if (!name)
+            return '';
+        return (0, lodash_1.upperFirst)((0, lodash_1.deburr)(`IModal_${name}`)
+            .replace(/(^\s*[^a-zA-Z_$])|([^a-zA-Z_$\d])/g, ' ')
+            .replace(/^_[a-z]/g, (match) => match.toUpperCase())
+            .replace(/_[a-z]/g, (match) => match.substr(1, match.length).toUpperCase())
+            .replace(/([\d$]+[a-zA-Z])/g, (match) => match.toUpperCase())
+            .replace(/\s+([a-zA-Z])/g, (match) => (0, lodash_1.trim)(match.toUpperCase()))
+            .replace(/\s/g, ''));
+    }
 }
 exports.generateDataModelDTS = generateDataModelDTS;