Merge pull request #2799 from hakubo/hapi-fix

Object is too restrictive
This commit is contained in:
Masahiro Wakame
2014-09-15 23:12:58 +09:00
+18 -18
View File
@@ -344,12 +344,12 @@ declare module Hapi {
app: any;
auth: {
isAuthenticated: boolean;
credentials: Object;
artifacts: Object;
session: Object
credentials: any;
artifacts: any;
session: any
};
domain: any;
headers: Object;
headers: any;
id: number;
info: {
received: number;
@@ -363,11 +363,11 @@ declare module Hapi {
params: any;
path: string;
payload: any;
plugins: Object;
pre: Object;
response: Object;
responses: Object;
query: Object;
plugins: any;
pre: any;
response: any;
responses: any;
query: any;
raw: {
req: any; //http.ClientRequest
res: any; //http.ClientResponse
@@ -375,15 +375,15 @@ declare module Hapi {
route: string;
server: Server;
session: any;
state: Object;
url: Object;
state: any;
url: any;
setUrl? (url: string): void;
setMethod? (method: string): void;
log (tags: string, data?: string, timestamp?: number): void;
log (tags: string, data?: Object, timestamp?: number): void;
log (tags: string, data?: any, timestamp?: number): void;
log (tags: string[], data?: string, timestamp?: number): void;
log (tags: string[], data?: Object, timestamp?: number): void;
log (tags: string[], data?: any, timestamp?: number): void;
getLog(): string[];
getLog(tag: string): string[];
getLog(tags: string[]): string[];
@@ -392,11 +392,11 @@ declare module Hapi {
export interface Response {
statusCode: number;
headers: Object;
headers: any;
source: any;
variety: string;
app: any;
plugins: Object;
plugins: any;
settings: {
encoding: string;
charset: string;
@@ -442,9 +442,9 @@ declare module Hapi {
}
}): void;
function view(template: string, context?: Object, options?: Object): Response;
function close(options?: Object): void;
function proxy(options: Object): void;
function view(template: string, context?: any, options?: any): Response;
function close(options?: any): void;
function proxy(options: any): void;
export function reply(result: any): any;
}