From c3541fe0b95cb3debef191a2467f43d991cb0775 Mon Sep 17 00:00:00 2001 From: Paul Loyd Date: Sun, 24 Nov 2013 01:44:37 +0300 Subject: [PATCH 1/3] Correct assert module --- node/node.d.ts | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index ef959a86b..f7e07a365 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1075,10 +1075,21 @@ declare module "util" { } declare module "assert" { - function internal (booleanValue: boolean, message?: string): void; + function internal (value: any, message?: string): void; module internal { - export function fail(actual: any, expected: any, message: string, operator: string): void; - export function assert(value: any, message: string): void; + export class AssertionError implements Error { + name: string; + message: string; + actual: any; + expected: any; + operator: string; + generatedMessage: boolean; + + constructor(options?: {message?: string; actual?: any; expected?: any; + operator?: string; stackStartFunction?: Function}); + } + + export function fail(actual?: any, expected?: any, message?: string, operator?: string): void; export function ok(value: any, message?: string): void; export function equal(actual: any, expected: any, message?: string): void; export function notEqual(actual: any, expected: any, message?: string): void; @@ -1086,8 +1097,10 @@ declare module "assert" { export function notDeepEqual(acutal: any, expected: any, message?: string): void; export function strictEqual(actual: any, expected: any, message?: string): void; export function notStrictEqual(actual: any, expected: any, message?: string): void; - export function throws(block: any, error?: any, messsage?: string): void; - export function doesNotThrow(block: any, error?: any, messsage?: string): void; + export function throws(block: Function, error?: Function, message?: string): void; + export function throws(block: Function, error?: RegExp, message?: string): void; + export function throws(block: Function, error?: (err: any) => boolean, message?: string): void; + export function doesNotThrow(block: Function, message?: string): void; export function ifError(value: any): void; } From f2a4348c200ad851b820e4fde801b076513a097e Mon Sep 17 00:00:00 2001 From: Paul Loyd Date: Sun, 24 Nov 2013 01:51:59 +0300 Subject: [PATCH 2/3] Correct domain module --- node/node.d.ts | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index f7e07a365..3ae03b21f 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1124,13 +1124,20 @@ declare module "tty" { declare module "domain" { import events = require("events"); - export interface Domain extends events.NodeEventEmitter { } + export class Domain extends events.EventEmitter { + run(fn: Function): void; + add(emitter: events.NodeEventEmitter): void; + remove(emitter: events.NodeEventEmitter): void; + bind(cb: (err: Error, data: any) => any): any; + intercept(cb: (data: any) => any): any; + dispose(): void; + + addListener(event: string, listener: Function): Domain; + on(event: string, listener: Function): Domain; + once(event: string, listener: Function): Domain; + removeListener(event: string, listener: Function): Domain; + removeAllListeners(event?: string): Domain; + } export function create(): Domain; - export function run(fn: Function): void; - export function add(emitter: events.NodeEventEmitter): void; - export function remove(emitter: events.NodeEventEmitter): void; - export function bind(cb: (er: Error, data: any) =>any): any; - export function intercept(cb: (data: any) => any): any; - export function dispose(): void; } From 70a2f13438e09785c9212734f18a6a082314e959 Mon Sep 17 00:00:00 2001 From: Paul Loyd Date: Sun, 24 Nov 2013 18:00:30 +0400 Subject: [PATCH 3/3] Fix assert module --- node/node.d.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index 3ae03b21f..7b5c97119 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1097,10 +1097,20 @@ declare module "assert" { export function notDeepEqual(acutal: any, expected: any, message?: string): void; export function strictEqual(actual: any, expected: any, message?: string): void; export function notStrictEqual(actual: any, expected: any, message?: string): void; - export function throws(block: Function, error?: Function, message?: string): void; - export function throws(block: Function, error?: RegExp, message?: string): void; - export function throws(block: Function, error?: (err: any) => boolean, message?: string): void; - export function doesNotThrow(block: Function, message?: string): void; + export var throws: { + (block: Function, message?: string): void; + (block: Function, error: Function, message?: string): void; + (block: Function, error: RegExp, message?: string): void; + (block: Function, error: (err: any) => boolean, message?: string): void; + } + + export var doesNotThrow: { + (block: Function, message?: string): void; + (block: Function, error: Function, message?: string): void; + (block: Function, error: RegExp, message?: string): void; + (block: Function, error: (err: any) => boolean, message?: string): void; + } + export function ifError(value: any): void; }