From ac22449387f3b4caeba7593e096137a55fa8ed81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Oborn=C3=ADk?= Date: Sat, 8 Mar 2014 15:38:17 +0100 Subject: [PATCH 1/3] added 'next' interface, route binding methods can have multiple request handlers and accepts arrays of handlers --- restify/restify.d.ts | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/restify/restify.d.ts b/restify/restify.d.ts index 40bc8b4a3a..7a01a4c61a 100644 --- a/restify/restify.d.ts +++ b/restify/restify.d.ts @@ -52,12 +52,37 @@ declare module "restify" { interface Server extends http.Server { use: (... handler: any[]) => any; - post: (route: any, routeCallBack: RequestHandler) => any; - patch: (route: any, routeCallBack: RequestHandler) => any; - put: (route: any, routeCallBack: RequestHandler) => any; - del: (route: any, routeCallBack: RequestHandler) => any; - get: (route: any, routeCallBack: RequestHandler) => any; - head: (route: any, routeCallBack: RequestHandler) => any; + + post(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): any; + post(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): any; + post(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): any; + post(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): any; + + patch(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): any; + patch(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): any; + patch(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): any; + patch(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): any; + + put(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): any; + put(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): any; + put(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): any; + put(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): any; + + del(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): any; + del(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): any; + del(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): any; + del(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): any; + + get(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): any; + get(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): any; + get(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): any; + get(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): any; + + head(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): any; + head(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): any; + head(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): any; + head(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): any; + name: string; version: string; log: Object; @@ -124,8 +149,12 @@ declare module "restify" { overrides?: Object; } + interface next { + (err?: any): any; + } + interface RequestHandler { - (req: Request, res: Response, next: Function): any; + (req: Request, res: Response, next: next): any; } export function createServer(options?: ServerOptions): Server; From 5eaf82aa6a8ecba0a9da289036bacc1c32bb92f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Oborn=C3=ADk?= Date: Sat, 8 Mar 2014 15:50:08 +0100 Subject: [PATCH 2/3] method Server.use can accept arrays of RequestHandlers --- restify/restify.d.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/restify/restify.d.ts b/restify/restify.d.ts index 7a01a4c61a..ca047e17da 100644 --- a/restify/restify.d.ts +++ b/restify/restify.d.ts @@ -51,7 +51,10 @@ declare module "restify" { } interface Server extends http.Server { - use: (... handler: any[]) => any; + use(handler: RequestHandler, ...handlers: RequestHandler[]): any; + use(handler: RequestHandler[], ...handlers: RequestHandler[]): any; + use(handler: RequestHandler, ...handlers: RequestHandler[][]): any; + use(handler: RequestHandler[], ...handlers: RequestHandler[][]): any; post(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): any; post(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): any; @@ -89,9 +92,9 @@ declare module "restify" { acceptable: string[]; url: string; address: () => addressInterface; - listen: (... args: any[]) => any; - close: (... args: any[]) => any; - pre: (routeCallBack: RequestHandler) => any; + listen(... args: any[]): any; + close(... args: any[]): any; + pre(routeCallBack: RequestHandler): any; } From f788ac6ca45061c34ff5fd3671a792f3432aafa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Oborn=C3=ADk?= Date: Sun, 9 Mar 2014 06:23:11 +0100 Subject: [PATCH 3/3] renamed 'next' intarface to 'Next' --- restify/restify.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/restify/restify.d.ts b/restify/restify.d.ts index ca047e17da..2afacc520f 100644 --- a/restify/restify.d.ts +++ b/restify/restify.d.ts @@ -152,12 +152,12 @@ declare module "restify" { overrides?: Object; } - interface next { + interface Next { (err?: any): any; } interface RequestHandler { - (req: Request, res: Response, next: next): any; + (req: Request, res: Response, next: Next): any; } export function createServer(options?: ServerOptions): Server;