From 4f226b26506896b04d0c37efe6b267a64c3734d1 Mon Sep 17 00:00:00 2001 From: vvakame Date: Thu, 3 Apr 2014 09:31:52 +0900 Subject: [PATCH] fix urlrouter/urlrouter.d.ts --- urlrouter/urlrouter-tests.ts | 2 +- urlrouter/urlrouter.d.ts | 120 +++++++++++++++++------------------ 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/urlrouter/urlrouter-tests.ts b/urlrouter/urlrouter-tests.ts index c1411c3a3..713b8cfe4 100644 --- a/urlrouter/urlrouter-tests.ts +++ b/urlrouter/urlrouter-tests.ts @@ -16,4 +16,4 @@ var req: urlrouter.ServerRequest; var res: urlrouter.ServerResponse; function next() { } -result(req, res, next); \ No newline at end of file +result(req, res, next); diff --git a/urlrouter/urlrouter.d.ts b/urlrouter/urlrouter.d.ts index 925484308..732f7a05c 100644 --- a/urlrouter/urlrouter.d.ts +++ b/urlrouter/urlrouter.d.ts @@ -5,65 +5,65 @@ /// -declare module "_UrlRouterInternal" { - import http = require("http"); - - export interface ServerRequest extends http.ServerRequest { - params: any; - } - - export interface ServerResponse extends http.ServerResponse { - - } - - export interface App { - // https://github.com/visionmedia/node-methods/blob/master/index.js - get(urlpattern: string, handler: HttpHandler): void; - post(urlpattern: string, handler: HttpHandler): void; - put(urlpattern: string, handler: HttpHandler): void; - head(urlpattern: string, handler: HttpHandler): void; - delete(urlpattern: string, handler: HttpHandler): void; - options(urlpattern: string, handler: HttpHandler): void; - trace(urlpattern: string, handler: HttpHandler): void; - copy(urlpattern: string, handler: HttpHandler): void; - lock(urlpattern: string, handler: HttpHandler): void; - mkcol(urlpattern: string, handler: HttpHandler): void; - move(urlpattern: string, handler: HttpHandler): void; - propfind(urlpattern: string, handler: HttpHandler): void; - proppatch(urlpattern: string, handler: HttpHandler): void; - unlock(urlpattern: string, handler: HttpHandler): void; - report(urlpattern: string, handler: HttpHandler): void; - mkactivity(urlpattern: string, handler: HttpHandler): void; - checkout(urlpattern: string, handler: HttpHandler): void; - merge(urlpattern: string, handler: HttpHandler): void; - "m-search"(urlpattern: string, handler: HttpHandler): void; - notify(urlpattern: string, handler: HttpHandler): void; - subscribe(urlpattern: string, handler: HttpHandler): void; - unsubscribe(urlpattern: string, handler: HttpHandler): void; - patch(urlpattern: string, handler: HttpHandler): void; - search(urlpattern: string, handler: HttpHandler): void; - - all(urlpattern: string, handler: HttpHandler): void; - redirect(urlpattern: string, to: string): void; - } - - export interface Options { - paramsName?: string; - pageNotFound?: (req: ServerRequest, res: ServerResponse) => void; - errorHandler?: (err:Error, req: ServerRequest, res: ServerResponse) => void; - } - - export function _UrlRouterfunc(handler: (app: App) => void, options?: any): void; - - export interface HttpHandler { - (req: ServerRequest, res: ServerResponse, next?: () => void): void; - } - -} - declare module "urlrouter" { - import _UrlRouterInternal = require("_UrlRouterInternal"); + import http = require("http"); - function _UrlRouterInternal(handler: (app: _UrlRouterInternal.App) => void): _UrlRouterInternal.HttpHandler; - export = _UrlRouterInternal; -} \ No newline at end of file + function UrlRouterInternal(handler:(app:UrlRouterInternal.App) => void):UrlRouterInternal.HttpHandler; + + module UrlRouterInternal { + + + interface ServerRequest extends http.ServerRequest { + params: any; + } + + interface ServerResponse extends http.ServerResponse { + + } + + interface App { + // https://github.com/visionmedia/node-methods/blob/master/index.js + get(urlpattern:string, handler:HttpHandler): void; + post(urlpattern:string, handler:HttpHandler): void; + put(urlpattern:string, handler:HttpHandler): void; + head(urlpattern:string, handler:HttpHandler): void; + delete(urlpattern:string, handler:HttpHandler): void; + options(urlpattern:string, handler:HttpHandler): void; + trace(urlpattern:string, handler:HttpHandler): void; + copy(urlpattern:string, handler:HttpHandler): void; + lock(urlpattern:string, handler:HttpHandler): void; + mkcol(urlpattern:string, handler:HttpHandler): void; + move(urlpattern:string, handler:HttpHandler): void; + propfind(urlpattern:string, handler:HttpHandler): void; + proppatch(urlpattern:string, handler:HttpHandler): void; + unlock(urlpattern:string, handler:HttpHandler): void; + report(urlpattern:string, handler:HttpHandler): void; + mkactivity(urlpattern:string, handler:HttpHandler): void; + checkout(urlpattern:string, handler:HttpHandler): void; + merge(urlpattern:string, handler:HttpHandler): void; + "m-search"(urlpattern:string, handler:HttpHandler): void; + notify(urlpattern:string, handler:HttpHandler): void; + subscribe(urlpattern:string, handler:HttpHandler): void; + unsubscribe(urlpattern:string, handler:HttpHandler): void; + patch(urlpattern:string, handler:HttpHandler): void; + search(urlpattern:string, handler:HttpHandler): void; + + all(urlpattern:string, handler:HttpHandler): void; + redirect(urlpattern:string, to:string): void; + } + + interface Options { + paramsName?: string; + pageNotFound?: (req:ServerRequest, res:ServerResponse) => void; + errorHandler?: (err:Error, req:ServerRequest, res:ServerResponse) => void; + } + + function _UrlRouterfunc(handler:(app:App) => void, options?:any):void; + + interface HttpHandler { + (req:ServerRequest, res:ServerResponse, next?:() => void): void; + } + } + + export = UrlRouterInternal; +}