close #93

Author: jeremydaly

index.d.ts

@@ -39,7 +39,7 @@ export declare interface App {
 export declare type Middleware = (req: Request, res: Response, next: Middleware) => void;
 export declare type ErrorHandlingMiddleware = (error: Error, req: Request, res: Response, next: ErrorHandlingMiddleware) => void;
 export declare type ErrorCallback = (error?: Error) => void;
-export declare type HandlerFunction = (req: Request, res: Response, next?: NextFunction) => void | {} | Promise<{}>;
+export declare type HandlerFunction = (req?: Request, res?: Response, next?: NextFunction) => void | {} | Promise<{}>;
 export declare type LoggerFunction = (message: string) => void;
 export declare type NextFunction = () => void;
 export declare type TimestampFunction = () => string;

index.js

@@ -88,7 +88,7 @@ class API {
 
     // Extract the execution stack
     let stack = args.map((fn,i) => {
-      if (typeof fn === 'function' && (fn.length === 3 || (fn.length === 2 && i === args.length-1)))
+      if (typeof fn === 'function' && (fn.length === 3 || (i === args.length-1)))
         return fn
       throw new ConfigurationError('Route-based middleware must have 3 parameters')
     })

test/routes.js

@@ -28,10 +28,15 @@ api.get('/', function(req,res) {
   res.status(200).json({ method: 'get', status: 'ok' })
 })
 
+
 api.get('/return', async function(req,res) {
   return { method: 'get', status: 'ok' }
 })
 
+api.get('/returnNoArgs', async () => {
+  return { method: 'get', status: 'ok' }
+})
+
 api2.get('/', function(req,res) {
   res.status(200).json({ method: 'get', status: 'ok' })
 })
@@ -310,6 +315,18 @@ describe('Route Tests:', function() {
     }) // end it
 
 
+    it('Simple path w/ async return (no args)', async function() {
+      let _event = Object.assign({},event,{ path: '/returnNoArgs' })
+      let result = await new Promise(r => api.run(_event,{},(e,res) => { r(res) }))
+      expect(result).to.deep.equal({
+        multiValueHeaders: { 'content-type': ['application/json'] },
+        statusCode: 200,
+        body: '{"method":"get","status":"ok"}',
+        isBase64Encoded: false
+      })
+    }) // end it
+
+
     it('Simple path, no `context`', async function() {
       let _event = Object.assign({},event,{})
       let result = await new Promise(r => api.run(_event,null,(e,res) => { r(res) }))
@@ -1029,7 +1046,7 @@ describe('Route Tests:', function() {
 
   describe('Configuration errors', function() {
 
-    it('Missing handler', async function() {
+    it('Missing handler (w/ route)', async function() {
       let error
       try {
         const api_error1 = require('../index')({ version: 'v1.0' })
@@ -1042,8 +1059,7 @@ describe('Route Tests:', function() {
       expect(error.message).to.equal('No handler or middleware specified for GET method on /test-missing-handler route.')
     }) // end it
 
-    // TODO: ???
-    it('Missing callback', async function() {
+    it('Missing handler', async function() {
       let error
       try {
         const api_error1 = require('../index')({ version: 'v1.0' })