diff --git a/mithril/mithril.d.ts b/mithril/mithril.d.ts index e01dbcc02..3cd0e21e4 100644 --- a/mithril/mithril.d.ts +++ b/mithril/mithril.d.ts @@ -8,19 +8,15 @@ interface MithrilStatic { (selector: string, attributes: Object, children?: any): MithrilVirtualElement; (selector: string, children?: any): MithrilVirtualElement; - prop(value?: T): (value?: T) => T; - prop(promise: MithrilPromise): MithrilPromiseProperty; + prop(value?: T): (value?: T) => T; + prop(promise: MithrilPromise): MithrilPromiseProperty; withAttr(property: string, callback: (value: any) => void): (e: Event) => any; module(rootElement: Node, module: MithrilModule): void; trust(html: string): String; render(rootElement: Element, children?: any): void; render(rootElement: HTMLDocument, children?: any): void; redraw: MithrilRedraw; - route(rootElement: Element, defaultRoute: string, routes: { [key: string]: MithrilModule }): void; - route(rootElement: HTMLDocument, defaultRoute: string, routes: { [key: string]: MithrilModule }): void; - route(path: string, params?: any, shouldReplaceHistory?: boolean): void; - route(): string; - route(element: Element, isInitialized: boolean): void; + route: MithrilRoute; request(options: MithrilXHROptions): MithrilPromise; deferred(): MithrilDeferred; sync(promises: MithrilPromise[]): MithrilPromise; @@ -28,6 +24,22 @@ interface MithrilStatic { endComputation(): void; } +interface MithrilRoute { + (rootElement: Element, defaultRoute: string, routes: { [key: string]: MithrilModule }): void; + (rootElement: HTMLDocument, defaultRoute: string, routes: { [key: string]: MithrilModule }): void; + (path: string, params?: any, shouldReplaceHistory?: boolean): void; + (element: Element, isInitialized: boolean): void; + (): string; + mode: string; + param: MithrilParam; + buildQueryString(data: Object): string; + parseQueryString(queryString: string): Object; +} + +interface MithrilParam { + (param: string): string; +} + interface MithrilRedraw { (): void; strategy: (value?: string) => string; @@ -40,26 +52,26 @@ interface MithrilVirtualElement { } interface MithrilModule { - controller: Function; - view: (controller?: any) => MithrilVirtualElement; + controller: Function; + view: (controller?: any) => MithrilVirtualElement; } interface MithrilDeferred { - resolve(value?: T): void; - reject(value?: any): void; - promise: MithrilPromise; + resolve(value?: T): void; + reject(value?: any): void; + promise: MithrilPromise; } interface MithrilPromise { - (value?: T): T; - then(successCallback?: (value: T) => R, errorCallback?: (value: any) => any): MithrilPromise; - then(successCallback?: (value: T) => MithrilPromise, errorCallback?: (value: any) => any): MithrilPromise; + (value?: T): T; + then(successCallback?: (value: T) => R, errorCallback?: (value: any) => any): MithrilPromise; + then(successCallback?: (value: T) => MithrilPromise, errorCallback?: (value: any) => any): MithrilPromise; } interface MithrilPromiseProperty extends MithrilPromise { - (): T; - (value: T): T; - toJSON(): T; + (): T; + (value: T): T; + toJSON(): T; } interface MithrilXHROptions {