Merge pull request #5694 from heymagurany/master

Update Oboe.js definition
This commit is contained in:
Horiuchi_H
2015-09-08 10:27:23 +09:00
2 changed files with 73 additions and 54 deletions
+15
View File
@@ -32,3 +32,18 @@ oboe('/content')
console.error('no such content');
}
});
oboe('friends.json')
.node('friend', function (parsedJson) {
console.log('friend parsed', parsedJson);
});
oboe('friends.json')
.node({
'friend': function (parsedJson) {
console.log('friend parsed', parsedJson);
},
'!': function (parsedJson) {
console.log('root parsed', parsedJson);
}
});
+58 -54
View File
@@ -5,61 +5,65 @@
/// <reference path="../node/node.d.ts" />
declare module "oboe" {
import stream = require('stream');
function oboe(url: string): oboe.Oboe;
function oboe(options: oboe.Options): oboe.Oboe;
function oboe(stream: stream.Readable) : oboe.Oboe;
module oboe {
var drop: {};
interface Oboe {
done(callback: (result: any) => void): Oboe;
fail(callback: (result: FailReason) => void): Oboe;
node(pattern: string, callback: CallbackSignature): Oboe;
on(event: string, pattern: string, callback: CallbackSignature): Oboe;
on(eventPattern: string, callback: CallbackSignature): Oboe;
path(pattern: string, callback: CallbackSignature): Oboe;
path(listeners: any): Oboe;
removeListener(eventPattern: string, callback: CallbackSignature): Oboe;
removeListener(event: string, pattern: string, callback: CallbackSignature): Oboe;
start(callback: (status: number, headers: Object) => void): Oboe;
abort():void;
source: string;
}
interface CallbackSignature {
(node: any, pathOrHeaders: any, ancestors: Object[]): any;
}
interface Options {
url: string;
method?: string;
headers?: Object;
body?: any;
cached?: boolean;
withCredentials?: boolean;
}
interface FailReason {
thrown?: Error;
statusCode?: number;
body?: string;
jsonBody?: Object;
}
declare module oboe {
interface OboeFunction extends Function {
drop: Object;
(url: string): Oboe;
(options: Options): Oboe;
(stream: NodeJS.ReadableStream): Oboe;
}
export = oboe;
interface Oboe {
done(callback: (result: any) => void): Oboe;
fail(callback: (result: FailReason) => void): Oboe;
node(pattern: string, callback: CallbackSignature): Oboe;
node(patterns: PatternMap): Oboe;
on(event: string, pattern: string, callback: CallbackSignature): Oboe;
on(eventPattern: string, callback: CallbackSignature): Oboe;
path(pattern: string, callback: CallbackSignature): Oboe;
path(listeners: any): Oboe;
removeListener(eventPattern: string, callback: CallbackSignature): Oboe;
removeListener(event: string, pattern: string, callback: CallbackSignature): Oboe;
start(callback: (status: number, headers: Object) => void): Oboe;
abort():void;
source: string;
}
interface CallbackSignature {
(node: any, pathOrHeaders: any, ancestors: Object[]): any;
}
interface Options {
url: string;
method?: string;
headers?: Object;
body?: any;
cached?: boolean;
withCredentials?: boolean;
}
interface FailReason {
thrown?: Error;
statusCode?: number;
body?: string;
jsonBody?: Object;
}
interface PatternMap {
[pattern: string]: CallbackSignature
}
}
declare var oboe: oboe.OboeFunction;
declare module "oboe" {
export = oboe;
}