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

package/lib/commands/functions/invoke.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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 };
 };
@@ -51,78 +42,81 @@ let InvokeFunction = class InvokeFunction extends common_1.Command {
             desc: (0, i18n_1.t)('触发云端部署的云函数')
         };
     }
-    execute(ctx, argsParams, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { envId, config: { functions }, options } = ctx;
-            const name = argsParams === null || argsParams === void 0 ? void 0 : argsParams[0];
-            let isBatchInvoke = false;
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            if (!name) {
-                const { isBatch } = yield inquirer_1.default.prompt({
-                    type: 'confirm',
-                    name: 'isBatch',
-                    message: (0, i18n_1.t)('无云函数名称，是否需要触发配置文件中的全部云函数？'),
-                    default: false
-                });
-                isBatchInvoke = isBatch;
-                if (!isBatchInvoke) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称！'));
-                }
+    async execute(ctx, argsParams, log) {
+        const { envId, config: { functions }, options } = ctx;
+        const name = argsParams === null || argsParams === void 0 ? void 0 : argsParams[0];
+        let isBatchInvoke = false;
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        if (!name) {
+            const { isBatch } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'isBatch',
+                message: (0, i18n_1.t)('无云函数名称，是否需要触发配置文件中的全部云函数？'),
+                default: false
+            });
+            isBatchInvoke = isBatch;
+            if (!isBatchInvoke) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称！'));
             }
-            let params;
-            const jsonStringParams = options.params;
-            if (jsonStringParams) {
-                try {
-                    params = JSON.parse(jsonStringParams);
-                }
-                catch (e) {
-                    console.log(e);
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('jsonStringParams 参数不是正确的 JSON 字符串'));
-                }
+        }
+        let params;
+        const jsonStringParams = options.params;
+        if (jsonStringParams) {
+            try {
+                params = JSON.parse(jsonStringParams);
+            }
+            catch (e) {
+                console.log(e);
+                throw new error_1.CloudBaseError((0, i18n_1.t)('jsonStringParams 参数不是正确的 JSON 字符串'));
             }
-            if (isBatchInvoke) {
-                return functionService.batchInvokeFunctions({
-                    envId,
-                    functions,
-                    log: true
-                });
+        }
+        if (isBatchInvoke) {
+            return functionService.batchInvokeFunctions({
+                envId,
+                functions,
+                log: true
+            });
+        }
+        const func = functions.find((item) => item.name === name);
+        const configParams = (func === null || func === void 0 ? void 0 : func.params) ? func.params : undefined;
+        params = params || configParams;
+        const result = await functionService.invokeFunction(name, params);
+        if (result.InvokeResult === 0) {
+            log.success((0, i18n_1.t)('[{{name}}] 调用成功\n', { name }));
+        }
+        else {
+            log.error((0, i18n_1.t)('[{{name}}] 调用失败\n', { name }));
+        }
+        const ResMap = {
+            Duration: (0, i18n_1.t)('运行时间'),
+            MemUsage: (0, i18n_1.t)('内存占用'),
+            BillDuration: (0, i18n_1.t)('计费时间'),
+            FunctionRequestId: (0, i18n_1.t)('请求 Id '),
+            RetMsg: (0, i18n_1.t)('返回结果'),
+            ErrMsg: (0, i18n_1.t)('错误信息'),
+            Log: (0, i18n_1.t)('调用日志')
+        };
+        const formatInfo = {
+            ...result,
+            Duration: Number(result.Duration).toFixed(2) + 'ms',
+            MemUsage: Number(Number(result.MemUsage) / Math.pow(1024, 2)).toFixed(2) + 'MB',
+            BillDuration: result.BillDuration + 'ms'
+        };
+        const logInfo = Object.keys(ResMap)
+            .map((key) => {
+            if (key === 'Log') {
+                return `${chalk_1.default.bold.cyan(ResMap[key])}：\n${formatInfo[key]}`;
             }
-            const func = functions.find((item) => item.name === name);
-            const configParams = (func === null || func === void 0 ? void 0 : func.params) ? func.params : undefined;
-            params = params || configParams;
-            const result = yield functionService.invokeFunction(name, params);
-            if (result.InvokeResult === 0) {
-                log.success((0, i18n_1.t)('[{{name}}] 调用成功\n', { name }));
+            else if (result.InvokeResult === 0 && key === 'ErrMsg') {
+                return false;
             }
             else {
-                log.error((0, i18n_1.t)('[{{name}}] 调用失败\n', { name }));
+                return `${chalk_1.default.bold.cyan(ResMap[key])}：${formatInfo[key]}`;
             }
-            const ResMap = {
-                Duration: (0, i18n_1.t)('运行时间'),
-                MemUsage: (0, i18n_1.t)('内存占用'),
-                BillDuration: (0, i18n_1.t)('计费时间'),
-                FunctionRequestId: (0, i18n_1.t)('请求 Id '),
-                RetMsg: (0, i18n_1.t)('返回结果'),
-                ErrMsg: (0, i18n_1.t)('错误信息'),
-                Log: (0, i18n_1.t)('调用日志')
-            };
-            const formatInfo = Object.assign(Object.assign({}, result), { Duration: Number(result.Duration).toFixed(2) + 'ms', MemUsage: Number(Number(result.MemUsage) / Math.pow(1024, 2)).toFixed(2) + 'MB', BillDuration: result.BillDuration + 'ms' });
-            const logInfo = Object.keys(ResMap)
-                .map((key) => {
-                if (key === 'Log') {
-                    return `${chalk_1.default.bold.cyan(ResMap[key])}：\n${formatInfo[key]}`;
-                }
-                else if (result.InvokeResult === 0 && key === 'ErrMsg') {
-                    return false;
-                }
-                else {
-                    return `${chalk_1.default.bold.cyan(ResMap[key])}：${formatInfo[key]}`;
-                }
-            })
-                .filter((item) => item)
-                .join('\n');
-            console.log(logInfo);
-        });
+        })
+            .filter((item) => item)
+            .join('\n');
+        console.log(logInfo);
     }
 };
 __decorate([

package/lib/commands/functions/layer/bind.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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.UnAttachFileLayer = exports.AttachFileLayer = void 0;
 const enquirer_1 = require("enquirer");
@@ -38,7 +29,10 @@ const LayerStatusMap = {
 };
 let AttachFileLayer = class AttachFileLayer extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.layerCommonOptions)('bind <name>')), { deprecateCmd: 'functions:layer:bind <name>', options: [
+        return {
+            ...(0, common_2.layerCommonOptions)('bind <name>'),
+            deprecateCmd: 'functions:layer:bind <name>',
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -47,69 +41,69 @@ let AttachFileLayer = class AttachFileLayer extends common_1.Command {
                     flags: '--code-secret, <codeSecret>',
                     desc: (0, i18n_1.t)('代码加密的函数的 CodeSecret')
                 }
-            ], desc: (0, i18n_1.t)('绑定文件层到云函数') });
+            ],
+            desc: (0, i18n_1.t)('绑定文件层到云函数')
+        };
     }
-    execute(envId, params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { codeSecret } = options;
-            const fnName = params === null || params === void 0 ? void 0 : params[0];
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const envFunctions = yield functionService.listAllFunctions({
-                envId
-            });
-            const exist = envFunctions.find((fn) => fn.FunctionName === fnName);
-            if (!exist) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('当前环境不存在此函数 [{{fnName}}]', { fnName }));
-            }
-            const listLayersRes = yield functionService.listLayers({
-                offset: 0,
-                limit: 200,
-            });
-            const layers = listLayersRes.Layers || [];
-            loading.stop();
-            const newLayers = layers.map((item) => ({
-                name: `[${LayerStatusMap[item.Status] || (0, i18n_1.t)('异常')}] ${item.LayerName}`,
-                value: item.LayerName
-            }));
-            if (!newLayers.length) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('没有可用的文件层，请先创建文件层！'));
-            }
-            const { layer } = yield (0, enquirer_1.prompt)({
-                type: 'select',
-                name: 'layer',
-                message: (0, i18n_1.t)('选择文件层名称'),
-                choices: newLayers,
-                result(choices) {
-                    const keys = Object.values(this.map(choices));
-                    return keys[0];
-                }
-            });
-            let listLayerVersionsRes = yield functionService.listLayerVersions({
-                name: layer
-            });
-            let layerVersions = listLayerVersionsRes.LayerVersions || [];
-            const versions = layerVersions.map((item) => String(item.LayerVersion));
-            if (!versions.length) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('没有可用的文件层版本，请先创建文件层版本！'));
+    async execute(envId, params, options) {
+        const { codeSecret } = options;
+        const fnName = params === null || params === void 0 ? void 0 : params[0];
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const envFunctions = await functionService.listAllFunctions({
+            envId
+        });
+        const exist = envFunctions.find((fn) => fn.FunctionName === fnName);
+        if (!exist) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('当前环境不存在此函数 [{{fnName}}]', { fnName }));
+        }
+        const listLayersRes = await functionService.listLayers({
+            offset: 0,
+            limit: 200,
+        });
+        const layers = listLayersRes.Layers || [];
+        loading.stop();
+        const newLayers = layers.map((item) => ({
+            name: `[${LayerStatusMap[item.Status] || (0, i18n_1.t)('异常')}] ${item.LayerName}`,
+            value: item.LayerName
+        }));
+        if (!newLayers.length) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('没有可用的文件层，请先创建文件层！'));
+        }
+        const { layer } = await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'layer',
+            message: (0, i18n_1.t)('选择文件层名称'),
+            choices: newLayers,
+            result(choices) {
+                const keys = Object.values(this.map(choices));
+                return keys[0];
             }
-            const { version } = yield (0, enquirer_1.prompt)({
-                type: 'select',
-                name: 'version',
-                message: (0, i18n_1.t)('选择文件层版本'),
-                choices: versions
-            });
-            loading.start((0, i18n_1.t)('文件层绑定中...'));
-            yield functionService.attachLayer({
-                envId,
-                functionName: fnName,
-                layerName: layer,
-                layerVersion: Number(version),
-                codeSecret
-            });
-            loading.succeed((0, i18n_1.t)('文件层绑定成功！'));
         });
+        let listLayerVersionsRes = await functionService.listLayerVersions({
+            name: layer
+        });
+        let layerVersions = listLayerVersionsRes.LayerVersions || [];
+        const versions = layerVersions.map((item) => String(item.LayerVersion));
+        if (!versions.length) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('没有可用的文件层版本，请先创建文件层版本！'));
+        }
+        const { version } = await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'version',
+            message: (0, i18n_1.t)('选择文件层版本'),
+            choices: versions
+        });
+        loading.start((0, i18n_1.t)('文件层绑定中...'));
+        await functionService.attachLayer({
+            envId,
+            functionName: fnName,
+            layerName: layer,
+            layerVersion: Number(version),
+            codeSecret
+        });
+        loading.succeed((0, i18n_1.t)('文件层绑定成功！'));
     }
 };
 __decorate([
@@ -127,7 +121,10 @@ AttachFileLayer = __decorate([
 exports.AttachFileLayer = AttachFileLayer;
 let UnAttachFileLayer = class UnAttachFileLayer extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.layerCommonOptions)('unbind <name>')), { deprecateCmd: 'functions:layer:unbind <name>', options: [
+        return {
+            ...(0, common_2.layerCommonOptions)('unbind <name>'),
+            deprecateCmd: 'functions:layer:unbind <name>',
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -136,44 +133,44 @@ let UnAttachFileLayer = class UnAttachFileLayer extends common_1.Command {
                     flags: '--code-secret, <codeSecret>',
                     desc: (0, i18n_1.t)('代码加密的函数的 CodeSecret')
                 }
-            ], desc: (0, i18n_1.t)('删除云函数绑定的文件层') });
+            ],
+            desc: (0, i18n_1.t)('删除云函数绑定的文件层')
+        };
     }
-    execute(envId, params, options) {
+    async execute(envId, params, options) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { codeSecret } = options;
-            const fnName = params === null || params === void 0 ? void 0 : params[0];
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            const detail = yield functionService.getFunctionDetail(fnName, codeSecret);
-            if (!((_a = detail === null || detail === void 0 ? void 0 : detail.Layers) === null || _a === void 0 ? void 0 : _a.length)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('该云函数未绑定文件层！'));
+        const { codeSecret } = options;
+        const fnName = params === null || params === void 0 ? void 0 : params[0];
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        const detail = await functionService.getFunctionDetail(fnName, codeSecret);
+        if (!((_a = detail === null || detail === void 0 ? void 0 : detail.Layers) === null || _a === void 0 ? void 0 : _a.length)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('该云函数未绑定文件层！'));
+        }
+        loading.stop();
+        const layers = detail.Layers.map((item) => ({
+            name: (0, i18n_1.t)('名称：{{layerName}} / 版本： {{layerVersion}}', { layerName: item.LayerName, layerVersion: item.LayerVersion }),
+            value: item
+        }));
+        const { layer } = await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'layer',
+            message: (0, i18n_1.t)('选择文件层'),
+            choices: layers,
+            result(choice) {
+                return this.map(choice)[choice];
             }
-            loading.stop();
-            const layers = detail.Layers.map((item) => ({
-                name: (0, i18n_1.t)('名称：{{layerName}} / 版本： {{layerVersion}}', { layerName: item.LayerName, layerVersion: item.LayerVersion }),
-                value: item
-            }));
-            const { layer } = yield (0, enquirer_1.prompt)({
-                type: 'select',
-                name: 'layer',
-                message: (0, i18n_1.t)('选择文件层'),
-                choices: layers,
-                result(choice) {
-                    return this.map(choice)[choice];
-                }
-            });
-            loading.start((0, i18n_1.t)('文件层解绑中...'));
-            yield functionService.unAttachLayer({
-                envId,
-                functionName: fnName,
-                layerName: layer.LayerName,
-                layerVersion: layer.LayerVersion,
-                codeSecret
-            });
-            loading.succeed((0, i18n_1.t)('文件层解绑成功！'));
         });
+        loading.start((0, i18n_1.t)('文件层解绑中...'));
+        await functionService.unAttachLayer({
+            envId,
+            functionName: fnName,
+            layerName: layer.LayerName,
+            layerVersion: layer.LayerVersion,
+            codeSecret
+        });
+        loading.succeed((0, i18n_1.t)('文件层解绑成功！'));
     }
 };
 __decorate([

package/lib/commands/functions/layer/create.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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 };
 };
@@ -35,7 +26,10 @@ const toolbox_1 = require("@cloudbase/toolbox");
 const i18n_1 = require("../../../i18n");
 let CreateFileLayer = class CreateFileLayer extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.layerCommonOptions)('create <alias>')), { deprecateCmd: 'functions:layer:create <alias>', options: [
+        return {
+            ...(0, common_2.layerCommonOptions)('create <alias>'),
+            deprecateCmd: 'functions:layer:create <alias>',
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -44,33 +38,33 @@ let CreateFileLayer = class CreateFileLayer extends common_1.Command {
                     flags: '--file, <file>',
                     desc: (0, i18n_1.t)('文件路径')
                 }
-            ], desc: (0, i18n_1.t)('创建函数文件层') });
+            ],
+            desc: (0, i18n_1.t)('创建函数文件层')
+        };
     }
-    execute(envId, options, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const functionsService = yield (0, function_1.getFunctionService)(envId);
-            const alias = params === null || params === void 0 ? void 0 : params[0];
-            const { file } = options;
-            const layerName = `${alias}_${envId}`;
-            const listLayerRes = yield functionsService.listLayers({
-                offset: 0,
-                limit: 200
-            });
-            const layers = listLayerRes.Layers || [];
-            if (layers.find(({ LayerName }) => LayerName === layerName)) {
-                throw new toolbox_1.CloudBaseError((0, i18n_1.t)('层名称 {{layerName}} 已被您的当前环境或其他环境占用，请换用别的名称', { layerName }));
-            }
-            const filePath = path_1.default.resolve(file);
-            const runtimes = ['Nodejs14.18', 'Nodejs12.16', 'Nodejs8.9', 'Php7', 'Java8'];
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('文件层创建中...'));
-            yield functionsService.createLayer({
-                name: layerName,
-                runtimes,
-                contentPath: filePath
-            });
-            loading.succeed((0, i18n_1.t)('文件层创建成功！'));
+    async execute(envId, options, params) {
+        const functionsService = await (0, function_1.getFunctionService)(envId);
+        const alias = params === null || params === void 0 ? void 0 : params[0];
+        const { file } = options;
+        const layerName = `${alias}_${envId}`;
+        const listLayerRes = await functionsService.listLayers({
+            offset: 0,
+            limit: 200
+        });
+        const layers = listLayerRes.Layers || [];
+        if (layers.find(({ LayerName }) => LayerName === layerName)) {
+            throw new toolbox_1.CloudBaseError((0, i18n_1.t)('层名称 {{layerName}} 已被您的当前环境或其他环境占用，请换用别的名称', { layerName }));
+        }
+        const filePath = path_1.default.resolve(file);
+        const runtimes = ['Nodejs14.18', 'Nodejs12.16', 'Nodejs8.9', 'Php7', 'Java8'];
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('文件层创建中...'));
+        await functionsService.createLayer({
+            name: layerName,
+            runtimes,
+            contentPath: filePath
         });
+        loading.succeed((0, i18n_1.t)('文件层创建成功！'));
     }
 };
 __decorate([

package/lib/commands/functions/layer/delete.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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.DeleteFileLayer = void 0;
 const enquirer_1 = require("enquirer");
@@ -32,51 +23,54 @@ const common_2 = require("./common");
 const i18n_1 = require("../../../i18n");
 let DeleteFileLayer = class DeleteFileLayer extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.layerCommonOptions)('delete')), { deprecateCmd: 'functions:layer:delete', options: [
+        return {
+            ...(0, common_2.layerCommonOptions)('delete'),
+            deprecateCmd: 'functions:layer:delete',
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
                 }
-            ], desc: (0, i18n_1.t)('删除当前环境的文件层') });
+            ],
+            desc: (0, i18n_1.t)('删除当前环境的文件层')
+        };
     }
-    execute(envId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            const listLayersRes = yield functionService.listLayers({
-                offset: 0,
-                limit: 200,
-            });
-            loading.stop();
-            const layers = listLayersRes.Layers || [];
-            if (!layers.length) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('当前环境没有可用的文件层，请先创建文件层！'));
-            }
-            const { layer } = yield (0, enquirer_1.prompt)({
-                type: 'select',
-                name: 'layer',
-                message: (0, i18n_1.t)('选择文件层名称'),
-                choices: layers.map((item) => item.LayerName)
-            });
-            let listLayerVersionsRes = yield functionService.listLayerVersions({
-                name: layer
-            });
-            const layerVersions = listLayerVersionsRes.LayerVersions || [];
-            const versions = layerVersions.map((item) => String(item.LayerVersion));
-            const { version } = yield (0, enquirer_1.prompt)({
-                type: 'select',
-                name: 'version',
-                message: (0, i18n_1.t)('选择文件层版本'),
-                choices: versions
-            });
-            loading.start((0, i18n_1.t)('文件层删除中...'));
-            yield functionService.deleteLayerVersion({
-                name: layer,
-                version: Number(version)
-            });
-            loading.succeed((0, i18n_1.t)('文件层删除成功！'));
+    async execute(envId) {
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        const listLayersRes = await functionService.listLayers({
+            offset: 0,
+            limit: 200,
+        });
+        loading.stop();
+        const layers = listLayersRes.Layers || [];
+        if (!layers.length) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('当前环境没有可用的文件层，请先创建文件层！'));
+        }
+        const { layer } = await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'layer',
+            message: (0, i18n_1.t)('选择文件层名称'),
+            choices: layers.map((item) => item.LayerName)
+        });
+        let listLayerVersionsRes = await functionService.listLayerVersions({
+            name: layer
+        });
+        const layerVersions = listLayerVersionsRes.LayerVersions || [];
+        const versions = layerVersions.map((item) => String(item.LayerVersion));
+        const { version } = await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'version',
+            message: (0, i18n_1.t)('选择文件层版本'),
+            choices: versions
+        });
+        loading.start((0, i18n_1.t)('文件层删除中...'));
+        await functionService.deleteLayerVersion({
+            name: layer,
+            version: Number(version)
         });
+        loading.succeed((0, i18n_1.t)('文件层删除成功！'));
     }
 };
 __decorate([