From 6ace0b8dcdb1471c8bfe1e50c08b19f64e499c25 Mon Sep 17 00:00:00 2001 From: Qinfeng Chen Date: Thu, 11 Dec 2014 11:53:26 -0500 Subject: [PATCH 01/13] add custom shape typings --- sigmajs/sigmajs.d.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/sigmajs.d.ts index 7ffe26626..ae2b09816 100644 --- a/sigmajs/sigmajs.d.ts +++ b/sigmajs/sigmajs.d.ts @@ -31,6 +31,10 @@ declare module SigmaJs{ (key: string): string; } + interface CustomShapes { + init(sigma: Sigma): void; + } + interface DragNodes { (sigma: Sigma, renderer: Renderer): DragNodes; } @@ -78,8 +82,10 @@ declare module SigmaJs{ interface Node { color?: string; id: string; + image?: any; label?: string; size?: number; + type?: string; x?: number; y?: number; } @@ -107,6 +113,10 @@ declare module SigmaJs{ type?: string; } + interface ShapeLibrary { + enumerate(): any; + } + interface Sigma { addRenderer(): Renderer; addRenderer(configs: RendererConfigs): Renderer; @@ -253,3 +263,5 @@ declare module SigmaJs{ } declare var sigma: SigmaJs.SigmaFactory; +declare var CustomShapes: SigmaJs.CustomShapes; +declare var ShapeLibrary: SigmaJs.CustomShapes; From e23c3329fd7278a1a9da8de6f8c200d10f293faa Mon Sep 17 00:00:00 2001 From: Adam Babcock Date: Thu, 11 Dec 2014 13:56:47 -0600 Subject: [PATCH 02/13] Add nodemailer module declaration --- nodemailer/nodemailer.d.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nodemailer/nodemailer.d.ts b/nodemailer/nodemailer.d.ts index c95aee99f..a63479e83 100644 --- a/nodemailer/nodemailer.d.ts +++ b/nodemailer/nodemailer.d.ts @@ -104,3 +104,8 @@ interface Nodemailer { createTransport(type: string, path: string): Transport; createXOAuthGenerator(options: XOAuthGeneratorOptions): XOAuthGenerator; } + +declare module "nodemailer" { + var nodemailer: Nodemailer; + export = nodemailer; +} From f282c31c6188dddeef1776f71bc506e9258e3cbc Mon Sep 17 00:00:00 2001 From: wokim Date: Fri, 12 Dec 2014 18:56:03 +0900 Subject: [PATCH 03/13] Add definitions for amqp-rpc --- amqp-rpc/amqp-rpc-tests.ts | 42 +++++++++++++++++++++++ amqp-rpc/amqp-rpc.d.ts | 68 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 amqp-rpc/amqp-rpc-tests.ts create mode 100644 amqp-rpc/amqp-rpc.d.ts diff --git a/amqp-rpc/amqp-rpc-tests.ts b/amqp-rpc/amqp-rpc-tests.ts new file mode 100644 index 000000000..30d740d3e --- /dev/null +++ b/amqp-rpc/amqp-rpc-tests.ts @@ -0,0 +1,42 @@ +/// +import amqp_rpc = require('amqp-rpc'); +var rpc = amqp_rpc.factory(); + +interface Name { + name?: string; +} + +rpc.on('inc', function (param, cb) { + var prevVal = param; + var nextVal = param + 2; + cb(++param, prevVal, nextVal); +}); + +rpc.on('say.*', function (param, cb, inf) { + var arr = inf.cmd.split('.'); + var name = (param && param.name) ? param.name : 'world'; + cb(arr[1] + ' ' + name + '!'); +}); + +rpc.on('withoutCB', function (param, cb, inf) { + if (cb) { + cb('please run function without cb parameter') + } + else { + console.log('this is function withoutCB'); + } +}); + +rpc.call('inc', 5, function (param1, param2, param3) { + console.log(param1, param2, param3); +}); + +rpc.call('say.Hello', { name: 'John' }, function (msg) { + console.log('results of say.Hello:', msg); //output: Hello John! +}); + +rpc.call('withoutCB', {}, function (msg) { + console.log('withoutCB results:', msg); //output: please run function without cb parameter +}); + +rpc.call('withoutCB', {}); //output message on server side console \ No newline at end of file diff --git a/amqp-rpc/amqp-rpc.d.ts b/amqp-rpc/amqp-rpc.d.ts new file mode 100644 index 000000000..a848fd4c4 --- /dev/null +++ b/amqp-rpc/amqp-rpc.d.ts @@ -0,0 +1,68 @@ +// Type definitions for amqp-rpc v0.0.8 +// Project: https://github.com/demchenkoe/node-amqp-rpc/ +// Definitions by: Wonshik Kim +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +declare module "amqp-rpc" { + + export interface Options { + connection?: any; + url?: string; + exchangeInstance?: any; + exchange?: string; + exchange_options?: { + exclusive?: boolean; + autoDelete?: boolean; + }; + ipml_options?: { + defaultExchangeName?: string; + } + conn_options?: any; + } + + export interface CallOptions { + correlationId?: string; + autoDeleteCallback?: any; + } + + export interface HandlerOptions { + queueName?: string; + durable?: boolean; + exclusive?: boolean; + autoDelete?: boolean; + } + + export interface BroadcastOptions { + ttl?: boolean; + onResponse?: any; + context?: any; + onComplete?: any; + } + + export interface CommandInfo { + cmd?: string; + exchange?: string; + contentType?: string; + size?: number; + } + + export interface Callback { + (...args: any[]): void; + } + + export function factory(opt?: Options): amqpRPC; + + export class amqpRPC { + constructor(opt?: Options); + generateQueueName(type: string): string; + disconnect(): void; + call(cmd: string, params: T, cb?: Callback, context?: any, options?: CallOptions): string; + on(cmd: string, cb: (param?: T, cb?: Callback, info?: CommandInfo) => void, context?: any, options?: HandlerOptions): boolean; + off(cmd: string): boolean; + callBroadcast(cmd: string, params: any, options: BroadcastOptions): void; + onBroadcast(cmd: string, cb: (err: any) => void, context: any, options?: any): boolean; + offBroadcast(cmd: string): boolean; + } +} \ No newline at end of file From 13f2c691bf01fe52dda1efceeddf02203c0d120c Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Fri, 12 Dec 2014 13:49:38 -0500 Subject: [PATCH 04/13] Adding multer.d.ts for expressjs multer support --- multer/multer-tests.ts | 8 ++++++++ multer/multer.d.ts | 14 ++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 multer/multer-tests.ts create mode 100644 multer/multer.d.ts diff --git a/multer/multer-tests.ts b/multer/multer-tests.ts new file mode 100644 index 000000000..8131293f5 --- /dev/null +++ b/multer/multer-tests.ts @@ -0,0 +1,8 @@ +/// +/// + +import express = require('express'); +import multer = require('multer'); + +var app: express.Express = express(); +app.use(multer()); \ No newline at end of file diff --git a/multer/multer.d.ts b/multer/multer.d.ts new file mode 100644 index 000000000..0f0fddcba --- /dev/null +++ b/multer/multer.d.ts @@ -0,0 +1,14 @@ +// Type definitions for multer +// Project: https://github.com/expressjs/multer +// Definitions by: jt000 +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +declare module "multer" { + import express = require('express'); + + function Multer(options?: any): express.RequestHandler; + + export = Multer; +} \ No newline at end of file From 53941f20d23c5f0d1cf3646f00fec37e6846b78e Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Sat, 13 Dec 2014 11:19:59 -0500 Subject: [PATCH 05/13] Adding mockery.d.ts --- mockery/mockery-test.ts | 41 +++++++++++++++++++++++++++++++++++++++++ mockery/mockery.d.ts | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 mockery/mockery-test.ts create mode 100644 mockery/mockery.d.ts diff --git a/mockery/mockery-test.ts b/mockery/mockery-test.ts new file mode 100644 index 000000000..d8623b3aa --- /dev/null +++ b/mockery/mockery-test.ts @@ -0,0 +1,41 @@ +/// + +import mockery = require('mockery'); + +mockery.enable(); +mockery.enable({}); +mockery.enable({ + useCleanCache: true, + warnOnReplace: true, + warnOnUnregistered: true +}); + +mockery.disable(); + +var fsMock = { + stat: (path: any, cb: any) => { /* your mock code */ } +}; +mockery.registerMock('fs', fsMock); + +mockery.deregisterMock('fs'); + +mockery.registerSubstitute('fs', 'fs-mock'); + +mockery.deregisterSubstitute('fs'); + +mockery.registerAllowable('./my-source-under-test'); +mockery.registerAllowable('./my-source-under-test', true); + +mockery.deregisterAllowable('./my-source-under-test'); + +mockery.registerAllowables(['async', 'path', 'util']); + +mockery.deregisterAllowables(['async', 'path', 'util']); + +mockery.deregisterAll(); + +mockery.resetCache(); + +mockery.warnOnUnregistered(false); + +mockery.warnOnReplace(false); \ No newline at end of file diff --git a/mockery/mockery.d.ts b/mockery/mockery.d.ts new file mode 100644 index 000000000..5b9bda9fa --- /dev/null +++ b/mockery/mockery.d.ts @@ -0,0 +1,38 @@ +// Type definitions for mockery 1.4.0 +// Project: https://github.com/mfncooper/mockery +// Definitions by: jt000 +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +declare module "mockery" { + + module m { + interface MockeryEnableArgs { + useCleanCache?: boolean; + warnOnReplace?: boolean; + warnOnUnregistered?: boolean; + } + + function enable(args?: MockeryEnableArgs): void; + function disable(): void; + + function registerMock(name: string, mock: any): void; + function deregisterMock(name: string): void; + + function registerSubstitute(name: string, substitute: string): void; + function deregisterSubstitute(name: string): void; + + function registerAllowable(name: string, unhook?: boolean): void; + function deregisterAllowable(name: string): void; + + function registerAllowables(names: string[]): void; + function deregisterAllowables(names: string[]): void; + + function deregisterAll(): void; + function resetCache(): void; + function warnOnUnregistered(value: boolean): void; + function warnOnReplace(value: boolean): void; + + } + + export = m; +} \ No newline at end of file From 44729fa52695dfcefb0a8f8ea3e83e03c6691386 Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Sun, 14 Dec 2014 16:55:15 -0500 Subject: [PATCH 06/13] Adding Mocha instance for "require('mocha')" used for testrunners --- mocha/mocha-tests.ts | 55 ++++++++++++++++++++++++++++++++++++++++++++ mocha/mocha.d.ts | 41 +++++++++++++++++++++++++++++++-- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/mocha/mocha-tests.ts b/mocha/mocha-tests.ts index 672fac1cb..750a417fe 100644 --- a/mocha/mocha-tests.ts +++ b/mocha/mocha-tests.ts @@ -167,3 +167,58 @@ function test_chaining(){ .reporter('html') .reporter(function(){}); } + +import MochaDef = require('mocha'); + +function test_require_constructor_empty() { + var instance = new MochaDef(); +} + +function test_require_constructor_noOptions() { + var instance = new MochaDef({}); +} + +function test_require_constructor_allOptions() { + var instance = new MochaDef({ + grep: /[a-z]*/, + ui: 'tdd', + reporter: 'dot', + timeout: 500, + bail: true + }); +} + + +function test_require_fluentParams() { + var instance = new MochaDef(); + + instance.bail(true) + .bail() + .addFile('foo.js') + .reporter('bdd') + .ui('dot') + .grep('[a-z]*') + .grep(/[a-z]*/) + .invert() + .ignoreLeaks(true) + .checkLeaks() + .growl() + .globals('foo') + .globals(['bar', 'zap']) + .useColors(true) + .useInlineDiffs(true) + .timeout(500) + .slow(100) + .enableTimeouts(true) + .asyncOnly(false) + .noHighlighting(true) + .run(); +} + +function test_run_withOnComplete() { + var instance = new MochaDef(); + + instance.run((failures: any[]): void => { + console.log(failures); + }); +} \ No newline at end of file diff --git a/mocha/mocha.d.ts b/mocha/mocha.d.ts index 64255a7ba..2e6fa9c58 100644 --- a/mocha/mocha.d.ts +++ b/mocha/mocha.d.ts @@ -1,6 +1,6 @@ -// Type definitions for mocha 1.17.1 +// Type definitions for mocha 2.0.1 // Project: http://visionmedia.github.io/mocha/ -// Definitions by: Kazi Manzur Rashid , otiai10 +// Definitions by: Kazi Manzur Rashid , otiai10 , jt000 // Definitions: https://github.com/borisyankov/DefinitelyTyped interface Mocha { @@ -108,3 +108,40 @@ declare function afterEach(action: (done: MochaDone) => void): void; declare function suiteTeardown(action: () => void): void; declare function suiteTeardown(action: (done: MochaDone) => void): void; + +declare module "mocha" { + + class MochaInstance { + constructor(options?: { + grep?: RegExp; + ui?: string; + reporter?: string; + timeout?: number; + bail?: boolean; + }); + + bail(value?: boolean): MochaInstance; + addFile(file: string): MochaInstance; + reporter(value: string): MochaInstance; + ui(value: string): MochaInstance; + grep(value: string): MochaInstance; + grep(value: RegExp): MochaInstance; + invert(): MochaInstance; + ignoreLeaks(value: boolean): MochaInstance; + checkLeaks(): MochaInstance; + growl(): MochaInstance; + globals(value: string): MochaInstance; + globals(values: string[]): MochaInstance; + useColors(value: boolean): MochaInstance; + useInlineDiffs(value: boolean): MochaInstance; + timeout(value: number): MochaInstance; + slow(value: number): MochaInstance; + enableTimeouts(value: boolean): MochaInstance; + asyncOnly(value: boolean): MochaInstance; + noHighlighting(value: boolean): MochaInstance; + + run(onComplete?: (failures: any[]) => void): void; + } + + export = MochaInstance; +} From 19915b733f3c5b5cdb7b2ced15ce9b059368a9a5 Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Sun, 14 Dec 2014 17:12:15 -0500 Subject: [PATCH 07/13] Fixing MochaInstance.Run argument to take a function that has a number instead of an array. --- mocha/mocha-tests.ts | 2 +- mocha/mocha.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mocha/mocha-tests.ts b/mocha/mocha-tests.ts index 750a417fe..dffd86e44 100644 --- a/mocha/mocha-tests.ts +++ b/mocha/mocha-tests.ts @@ -218,7 +218,7 @@ function test_require_fluentParams() { function test_run_withOnComplete() { var instance = new MochaDef(); - instance.run((failures: any[]): void => { + instance.run((failures: number): void => { console.log(failures); }); } \ No newline at end of file diff --git a/mocha/mocha.d.ts b/mocha/mocha.d.ts index 2e6fa9c58..bc13ea774 100644 --- a/mocha/mocha.d.ts +++ b/mocha/mocha.d.ts @@ -140,7 +140,7 @@ declare module "mocha" { asyncOnly(value: boolean): MochaInstance; noHighlighting(value: boolean): MochaInstance; - run(onComplete?: (failures: any[]) => void): void; + run(onComplete?: (failures: number) => void): void; } export = MochaInstance; From 6ded05375f5c4ea73133258585f098991c9b6aa8 Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Tue, 16 Dec 2014 14:04:42 -0500 Subject: [PATCH 08/13] Adding support for chai-as-promised --- chai-as-promised/chai-as-promised-tests.ts | 0 chai-as-promised/chai-as-promised.d.ts | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 chai-as-promised/chai-as-promised-tests.ts create mode 100644 chai-as-promised/chai-as-promised.d.ts diff --git a/chai-as-promised/chai-as-promised-tests.ts b/chai-as-promised/chai-as-promised-tests.ts new file mode 100644 index 000000000..e69de29bb diff --git a/chai-as-promised/chai-as-promised.d.ts b/chai-as-promised/chai-as-promised.d.ts new file mode 100644 index 000000000..e69de29bb From 7ba61efdb72088a44eb07fd96c324966188f3e70 Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Tue, 16 Dec 2014 15:48:01 -0500 Subject: [PATCH 09/13] Re-adding chai-as-promised (prior commit contained no content) --- chai-as-promised/chai-as-promised-tests.ts | 22 ++++++++++++++ chai-as-promised/chai-as-promised.d.ts | 35 ++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/chai-as-promised/chai-as-promised-tests.ts b/chai-as-promised/chai-as-promised-tests.ts index e69de29bb..20a773cdd 100644 --- a/chai-as-promised/chai-as-promised-tests.ts +++ b/chai-as-promised/chai-as-promised-tests.ts @@ -0,0 +1,22 @@ +/// +/// + +import chai = require('chai'); +import chaiAsPromised = require('chai-as-promised'); + +chai.use(chaiAsPromised); + +var promise: any; +chai.expect(promise).to.eventually.equal(3); +chai.expect(promise).to.become(3); +chai.expect(promise).to.be.rejected; +chai.expect(promise).to.be.rejectedWith(Error); +chai.expect(promise).to.notify(() => console.log('done')); + +chai.assert.eventually.equal(promise, 4, 'Message'); +chai.assert.isFulfilled(promise, "optional message"); +chai.assert.becomes(promise, "foo", "optional message"); +chai.assert.doesNotBecome(promise, "foo", "optional message"); +chai.assert.isRejected(promise, "optional message"); +chai.assert.isRejected(promise, Error, "optional message"); +chai.assert.isRejected(promise, /error message matcher/, "optional message"); diff --git a/chai-as-promised/chai-as-promised.d.ts b/chai-as-promised/chai-as-promised.d.ts index e69de29bb..20b697bb5 100644 --- a/chai-as-promised/chai-as-promised.d.ts +++ b/chai-as-promised/chai-as-promised.d.ts @@ -0,0 +1,35 @@ +// Type definitions for chai-as-promised +// Project: https://github.com/domenic/chai-as-promised/ +// Definitions by: jt000 +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +declare module 'chai-as-promised' { + import chai = require('chai'); + + function chaiAsPromised(chai: any, utils: any): void; + + export = chaiAsPromised; +} + +declare module chai { + + interface LanguageChains { + become(expected: any): Expect; + eventually: Expect; + rejected: Expect; + rejectedWith(expected: any): Expect; + notify(fn: Function): Expect; + } + + interface Assert { + eventually: Assert; + isFulfilled(promise: any, message?: string): void; + becomes(promise: any, expected: any, message?: string): void; + doesNotBecome(promise: any, expected: any, message?: string): void; + isRejected(promise: any, message?: string): void; + isRejected(promise: any, expected: any, message?: string): void; + isRejected(promise: any, match: RegExp, message?: string): void; + } +} \ No newline at end of file From 6847664647c34e744d6d3f0249e64454133311aa Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Wed, 17 Dec 2014 15:29:34 -0500 Subject: [PATCH 10/13] Adding proxyquire.d.ts --- proxyquire/proxyquire-test.ts | 19 +++++++++++++++++++ proxyquire/proxyquire.d.ts | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 proxyquire/proxyquire-test.ts create mode 100644 proxyquire/proxyquire.d.ts diff --git a/proxyquire/proxyquire-test.ts b/proxyquire/proxyquire-test.ts new file mode 100644 index 000000000..b1985de58 --- /dev/null +++ b/proxyquire/proxyquire-test.ts @@ -0,0 +1,19 @@ +/// + +import proxyquire = require('proxyquire'); + +class Foo {} +var mock = {}; + +var myModule = proxyquire('myModule', mock); +var fooModule: Foo = proxyquire('foo', mock); + +myModule = proxyquire.noCallThru() + .load('myModule', mock); + +fooModule = proxyquire.callThru() + .load('foo', mock); + +proxyquire.preserveCache(); + +proxyquire.noPreserveCache(); diff --git a/proxyquire/proxyquire.d.ts b/proxyquire/proxyquire.d.ts new file mode 100644 index 000000000..06e1c773e --- /dev/null +++ b/proxyquire/proxyquire.d.ts @@ -0,0 +1,25 @@ +// Type definitions for Proxyquire 1.3.0 +// Project: https://github.com/thlorenz/proxyquire +// Definitions by: jt000 +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +interface Proxyquire { + + (request: string, stubs: any): any; + (request: string, stubs: any): T; + + load(request: string, stubs: any): any; + load(request: string, stubs: any): T; + + noCallThru(): Proxyquire; + callThru(): Proxyquire; + + noPreserveCache(): void; + preserveCache(): void; +} + +declare module 'proxyquire' { + + var p: Proxyquire; + export = p; +} \ No newline at end of file From 49a4ccc0ba8402d78f4e318916905d7cbdca1db5 Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Wed, 17 Dec 2014 15:35:47 -0500 Subject: [PATCH 11/13] Adding mongoose-mock.d.ts --- mongoose-mock/mongoose-mock-tests.ts | 7 +++++++ mongoose-mock/mongoose-mock.d.ts | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 mongoose-mock/mongoose-mock-tests.ts create mode 100644 mongoose-mock/mongoose-mock.d.ts diff --git a/mongoose-mock/mongoose-mock-tests.ts b/mongoose-mock/mongoose-mock-tests.ts new file mode 100644 index 000000000..4f364cf97 --- /dev/null +++ b/mongoose-mock/mongoose-mock-tests.ts @@ -0,0 +1,7 @@ +/// +/// + +import mongooseMock = require('mongoose-mock'); + +// returns a mongoose object +mongooseMock.connect('url'); \ No newline at end of file diff --git a/mongoose-mock/mongoose-mock.d.ts b/mongoose-mock/mongoose-mock.d.ts new file mode 100644 index 000000000..7bafc63ce --- /dev/null +++ b/mongoose-mock/mongoose-mock.d.ts @@ -0,0 +1,13 @@ +// Type definitions for multer +// Project: https://github.com/expressjs/multer +// Definitions by: jt000 +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +declare module "mongoose-mock" { + import mongoose = require('mongoose'); + + var mock: mongoose.Mongoose; + export = mock; +} \ No newline at end of file From 2229f4ca12c09bca6bcb5f0605ac69bc407e7405 Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Wed, 17 Dec 2014 15:40:50 -0500 Subject: [PATCH 12/13] fixing header on mongoose-mock.d.ts --- mongoose-mock/mongoose-mock.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoose-mock/mongoose-mock.d.ts b/mongoose-mock/mongoose-mock.d.ts index 7bafc63ce..90d6327b4 100644 --- a/mongoose-mock/mongoose-mock.d.ts +++ b/mongoose-mock/mongoose-mock.d.ts @@ -1,5 +1,5 @@ -// Type definitions for multer -// Project: https://github.com/expressjs/multer +// Type definitions for mongoose-mock 0.4.0 +// Project: https://github.com/JohanObrink/mongoose-mock // Definitions by: jt000 // Definitions: https://github.com/borisyankov/DefinitelyTyped From 3a022a9a6407ec0bae5d1d334e3211a7ede6c220 Mon Sep 17 00:00:00 2001 From: Jason Tremper Date: Thu, 18 Dec 2014 07:46:43 -0500 Subject: [PATCH 13/13] Fixes for PR #3313 review --- mocha/mocha.d.ts | 44 +++++++++++++++++++------------------- mockery/mockery.d.ts | 51 ++++++++++++++++++++------------------------ multer/multer.d.ts | 4 ++-- 3 files changed, 47 insertions(+), 52 deletions(-) diff --git a/mocha/mocha.d.ts b/mocha/mocha.d.ts index bc13ea774..6a2a53959 100644 --- a/mocha/mocha.d.ts +++ b/mocha/mocha.d.ts @@ -1,5 +1,5 @@ // Type definitions for mocha 2.0.1 -// Project: http://visionmedia.github.io/mocha/ +// Project: http://mochajs.org/ // Definitions by: Kazi Manzur Rashid , otiai10 , jt000 // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -111,7 +111,7 @@ declare function suiteTeardown(action: (done: MochaDone) => void): void; declare module "mocha" { - class MochaInstance { + class Mocha { constructor(options?: { grep?: RegExp; ui?: string; @@ -120,28 +120,28 @@ declare module "mocha" { bail?: boolean; }); - bail(value?: boolean): MochaInstance; - addFile(file: string): MochaInstance; - reporter(value: string): MochaInstance; - ui(value: string): MochaInstance; - grep(value: string): MochaInstance; - grep(value: RegExp): MochaInstance; - invert(): MochaInstance; - ignoreLeaks(value: boolean): MochaInstance; - checkLeaks(): MochaInstance; - growl(): MochaInstance; - globals(value: string): MochaInstance; - globals(values: string[]): MochaInstance; - useColors(value: boolean): MochaInstance; - useInlineDiffs(value: boolean): MochaInstance; - timeout(value: number): MochaInstance; - slow(value: number): MochaInstance; - enableTimeouts(value: boolean): MochaInstance; - asyncOnly(value: boolean): MochaInstance; - noHighlighting(value: boolean): MochaInstance; + bail(value?: boolean): Mocha; + addFile(file: string): Mocha; + reporter(value: string): Mocha; + ui(value: string): Mocha; + grep(value: string): Mocha; + grep(value: RegExp): Mocha; + invert(): Mocha; + ignoreLeaks(value: boolean): Mocha; + checkLeaks(): Mocha; + growl(): Mocha; + globals(value: string): Mocha; + globals(values: string[]): Mocha; + useColors(value: boolean): Mocha; + useInlineDiffs(value: boolean): Mocha; + timeout(value: number): Mocha; + slow(value: number): Mocha; + enableTimeouts(value: boolean): Mocha; + asyncOnly(value: boolean): Mocha; + noHighlighting(value: boolean): Mocha; run(onComplete?: (failures: number) => void): void; } - export = MochaInstance; + export = Mocha; } diff --git a/mockery/mockery.d.ts b/mockery/mockery.d.ts index 5b9bda9fa..f4d98de2b 100644 --- a/mockery/mockery.d.ts +++ b/mockery/mockery.d.ts @@ -5,34 +5,29 @@ declare module "mockery" { - module m { - interface MockeryEnableArgs { - useCleanCache?: boolean; - warnOnReplace?: boolean; - warnOnUnregistered?: boolean; - } - - function enable(args?: MockeryEnableArgs): void; - function disable(): void; - - function registerMock(name: string, mock: any): void; - function deregisterMock(name: string): void; - - function registerSubstitute(name: string, substitute: string): void; - function deregisterSubstitute(name: string): void; - - function registerAllowable(name: string, unhook?: boolean): void; - function deregisterAllowable(name: string): void; - - function registerAllowables(names: string[]): void; - function deregisterAllowables(names: string[]): void; - - function deregisterAll(): void; - function resetCache(): void; - function warnOnUnregistered(value: boolean): void; - function warnOnReplace(value: boolean): void; - + interface MockeryEnableArgs { + useCleanCache?: boolean; + warnOnReplace?: boolean; + warnOnUnregistered?: boolean; } - export = m; + export function enable(args?: MockeryEnableArgs): void; + export function disable(): void; + + export function registerMock(name: string, mock: any): void; + export function deregisterMock(name: string): void; + + export function registerSubstitute(name: string, substitute: string): void; + export function deregisterSubstitute(name: string): void; + + export function registerAllowable(name: string, unhook?: boolean): void; + export function deregisterAllowable(name: string): void; + + export function registerAllowables(names: string[]): void; + export function deregisterAllowables(names: string[]): void; + + export function deregisterAll(): void; + export function resetCache(): void; + export function warnOnUnregistered(value: boolean): void; + export function warnOnReplace(value: boolean): void; } \ No newline at end of file diff --git a/multer/multer.d.ts b/multer/multer.d.ts index 0f0fddcba..b188c22ae 100644 --- a/multer/multer.d.ts +++ b/multer/multer.d.ts @@ -8,7 +8,7 @@ declare module "multer" { import express = require('express'); - function Multer(options?: any): express.RequestHandler; + function multer(options?: any): express.RequestHandler; - export = Multer; + export = multer; } \ No newline at end of file