add function default options

Author: hengechang

lib/commands/functions/deploy.js

@@ -39,9 +39,30 @@ async function deploy(ctx, commandOptions) {
             functionRootPath: path_1.default.join(process.cwd(), config.functionRoot)
         });
     }
-    const newFunction = functions.find(item => item.name === name);
+    let newFunction;
+    if (functions && functions.length > 0) {
+        newFunction = functions.find(item => item.name === name);
+    }
     if (!newFunction || !newFunction.name) {
-        throw new error_1.CloudBaseError(`函数 ${name} 配置不存在`);
+        const { useDefaultFunctionDeployOptions } = await inquirer_1.default.prompt({
+            type: 'confirm',
+            name: 'useDefaultFunctionDeployOptions',
+            message: '未找到函数发布配置，使用默认配置？',
+            default: false
+        });
+        if (useDefaultFunctionDeployOptions) {
+            newFunction = {
+                name,
+                config: {
+                    runtime: 'Nodejs8.9',
+                    installDependency: true
+                },
+                handler: 'index.main'
+            };
+        }
+        else {
+            throw new error_1.CloudBaseError(`函数 ${name} 配置不存在`);
+        }
     }
     const createSpinner = ora_1.default('函数部署中...').start();
     try {

lib/commands/functions/invoke.js

@@ -40,13 +40,11 @@ async function invoke(ctx, jsonStringParams) {
         });
     }
     const func = functions.find(item => item.name === name);
-    if (!func) {
-        throw new error_1.CloudBaseError('未找到相关函数配置，请检查函数名是否正确');
-    }
+    const configParams = func && func.params ? func.params : undefined;
     const result = await function_1.invokeFunction({
         envId,
         functionName: name,
-        params: params || func.params
+        params: params || configParams
     });
     logger_1.successLog(`[${name}] 调用成功\n响应结果：\n`);
     console.log(result);

lib/utils/default-cloudbase-config.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    functionRoot: './functions',
+    functions: []
+};

lib/utils/index.js

@@ -21,6 +21,7 @@ const auth_1 = require("../auth/auth");
 const configstore_1 = require("./configstore");
 const constant_1 = require("../constant");
 const error_1 = require("../error");
+const default_cloudbase_config_1 = __importDefault(require("./default-cloudbase-config"));
 var cli_table_1 = require("./cli-table");
 exports.printCliTable = cli_table_1.printCliTable;
 var uuid_1 = require("./uuid");
@@ -152,7 +153,7 @@ async function resolveCloudBaseConfig(configPath = '') {
     if (!cloudbaseConfig.envId) {
         throw new error_1.CloudBaseError('配置文件无效，配置文件必须包含含环境 Id');
     }
-    return cloudbaseConfig;
+    return Object.assign({}, default_cloudbase_config_1.default, cloudbaseConfig);
 }
 exports.resolveCloudBaseConfig = resolveCloudBaseConfig;
 async function getEnvId(envId, configPath) {

src/commands/functions/deploy.ts

@@ -44,9 +44,30 @@ export async function deploy(ctx: FunctionContext, commandOptions) {
         })
     }
 
-    const newFunction = functions.find(item => item.name === name)
+    let newFunction
+    if (functions && functions.length > 0) {
+        newFunction = functions.find(item => item.name === name)
+    }
     if (!newFunction || !newFunction.name) {
-        throw new CloudBaseError(`函数 ${name} 配置不存在`)
+        const { useDefaultFunctionDeployOptions } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'useDefaultFunctionDeployOptions',
+            message: '未找到函数发布配置，使用默认配置？',
+            default: false
+        })
+
+        if (useDefaultFunctionDeployOptions) {
+            newFunction = {
+                name,
+                config: {
+                    runtime: 'Nodejs8.9',
+                    installDependency: true
+                },
+                handler: 'index.main'
+            }
+        } else {
+            throw new CloudBaseError(`函数 ${name} 配置不存在`)
+        }
     }
 
     const createSpinner = ora('函数部署中...').start()

src/commands/functions/invoke.ts

@@ -46,14 +46,12 @@ export async function invoke(ctx: FunctionContext, jsonStringParams: string) {
 
     const func = functions.find(item => item.name === name)
 
-    if (!func) {
-        throw new CloudBaseError('未找到相关函数配置，请检查函数名是否正确')
-    }
+    const configParams = func && func.params ? func.params : undefined
 
     const result = await invokeFunction({
         envId,
         functionName: name,
-        params: params || func.params
+        params: params || configParams
     })
     successLog(`[${name}] 调用成功\n响应结果：\n`)
     console.log(result)

src/types.ts

@@ -94,7 +94,7 @@ export interface ICloudFunctionTrigger {
 export interface ICloudFunction {
     name: string
     config: ICloudFunctionConfig
-    triggers: ICloudFunctionTrigger[]
+    triggers?: ICloudFunctionTrigger[]
     params?: Record<string, string>
     handler?: string
     ignore?: string | string[]
@@ -168,5 +168,5 @@ export interface FunctionContext {
     // 整体配置
     config: CloudBaseConfig
     // 配置文件中所有的函数
-    functions: ICloudFunction[]
+    functions?: ICloudFunction[]
 }

src/utils/default-cloudbase-config.ts

@@ -0,0 +1,4 @@
+export default {
+    functionRoot: './functions',
+    functions: []
+}

src/utils/index.ts

@@ -7,6 +7,7 @@ import { configStore } from './configstore'
 import { IConfig, Credential, AuthSecret, SSH, CloudBaseConfig } from '../types'
 import { ConfigItems } from '../constant'
 import { CloudBaseError } from '../error'
+import defaultCloudbaseConfig from './default-cloudbase-config'
 
 export { printCliTable } from './cli-table'
 export { guid6 } from './uuid'
@@ -180,7 +181,11 @@ export async function resolveCloudBaseConfig(
     if (!cloudbaseConfig.envId) {
         throw new CloudBaseError('配置文件无效，配置文件必须包含含环境 Id')
     }
-    return cloudbaseConfig
+    
+    return {
+        ...defaultCloudbaseConfig,
+        ...cloudbaseConfig
+    }
 }
 
 // 从命令行和配置文件中获取 envId

types/types.d.ts

@@ -75,7 +75,7 @@ export interface ICloudFunctionTrigger {
 export interface ICloudFunction {
     name: string;
     config: ICloudFunctionConfig;
-    triggers: ICloudFunctionTrigger[];
+    triggers?: ICloudFunctionTrigger[];
     params?: Record<string, string>;
     handler?: string;
     ignore?: string | string[];
@@ -136,5 +136,5 @@ export interface FunctionContext {
     name: string;
     envId: string;
     config: CloudBaseConfig;
-    functions: ICloudFunction[];
+    functions?: ICloudFunction[];
 }