From 18765bde850489fc73906cbaf81969b309e9c67f Mon Sep 17 00:00:00 2001 From: Farokhcpu Date: Wed, 17 Aug 2016 10:31:49 +0200 Subject: [PATCH 1/5] adding type for move to fs-extra --- fs-extra/fs-extra-tests.ts | 26 ++++++++++++++++++++++++++ fs-extra/fs-extra.d.ts | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/fs-extra/fs-extra-tests.ts b/fs-extra/fs-extra-tests.ts index a31df8cfd7..d03faf4c3c 100644 --- a/fs-extra/fs-extra-tests.ts +++ b/fs-extra/fs-extra-tests.ts @@ -52,20 +52,46 @@ fs.copySync(src, dest, filter: /.*/ } ); + fs.createFile(file, errorCallback); fs.createFileSync(file); fs.mkdirs(dir, errorCallback); fs.mkdirs(dir, {}, errorCallback); + fs.mkdirsSync(dir); fs.mkdirsSync(dir, {}); + fs.mkdirp(dir, errorCallback); fs.mkdirp(dir, {}, errorCallback); + fs.mkdirpSync(dir); fs.mkdirpSync(dir, {}); +fs.move(src, dest, errorCallback); +fs.move(src, dest, (src: string) => { + return false; +}, errorCallback); +fs.move(src, dest, + { + clobber: true, + preserveTimestamps: true, + filter: (src: string) => {return false} + }, + errorCallback +); +fs.move(src, dest, + { + clobber: true, + preserveTimestamps: true, + filter: /.*/ + }, + errorCallback +); + fs.outputFile(file, data, errorCallback); fs.outputFileSync(file, data); + fs.outputJson(file, data, errorCallback); fs.outputJSON(file, data, errorCallback); diff --git a/fs-extra/fs-extra.d.ts b/fs-extra/fs-extra.d.ts index d052752ba9..976595a84f 100644 --- a/fs-extra/fs-extra.d.ts +++ b/fs-extra/fs-extra.d.ts @@ -31,6 +31,10 @@ declare module "fs-extra" { export function mkdirsSync(dir: string, options?: MkdirOptions): void; export function mkdirpSync(dir: string, options?: MkdirOptions): void; + export function move(src: string, dest: string, callback?: (err: Error) => void): void; + export function move(src: string, dest: string, filter: CopyFilter, callback?: (err: Error) => void): void; + export function move(src: string, dest: string, options: CopyOptions, callback?: (err: Error) => void): void; + export function outputFile(file: string, data: any, callback?: (err: Error) => void): void; export function outputFileSync(file: string, data: any): void; From 8770eab1aac67f4513d2a7f5e0f2b93a7625c4e4 Mon Sep 17 00:00:00 2001 From: Farokhcpu Date: Thu, 8 Dec 2016 17:14:05 +0100 Subject: [PATCH 2/5] fixing signature of sinon/alwaysReturned based on the http://sinonjs.org/docs/#sinonspy --- sinon/sinon.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sinon/sinon.d.ts b/sinon/sinon.d.ts index 69647534de..ba7256ab79 100644 --- a/sinon/sinon.d.ts +++ b/sinon/sinon.d.ts @@ -76,7 +76,7 @@ declare namespace Sinon { alwaysThrew(): boolean; alwaysThrew(type: string): boolean; alwaysThrew(obj: any): boolean; - alwaysReturned(): boolean; + alwaysReturned(obj: any): boolean; invokeCallback(...args: any[]): void; getCall(n: number): SinonSpyCall; reset(): void; From 45efcf3e4d1fba82bcf66ff694c76509bee47c12 Mon Sep 17 00:00:00 2001 From: Farokhcpu Date: Thu, 8 Dec 2016 17:28:34 +0100 Subject: [PATCH 3/5] increasing version number --- sinon/sinon.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sinon/sinon.d.ts b/sinon/sinon.d.ts index ba7256ab79..53590481e7 100644 --- a/sinon/sinon.d.ts +++ b/sinon/sinon.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Sinon 1.16.0 +// Type definitions for Sinon 1.16.1 // Project: http://sinonjs.org/ // Definitions by: William Sears // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped From 3ee09113bc22bf31f6c5d05510e73724caf1a389 Mon Sep 17 00:00:00 2001 From: Farokhcpu Date: Thu, 8 Dec 2016 17:29:56 +0100 Subject: [PATCH 4/5] returning back the version number to the origin number --- sinon/sinon.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sinon/sinon.d.ts b/sinon/sinon.d.ts index 53590481e7..ba7256ab79 100644 --- a/sinon/sinon.d.ts +++ b/sinon/sinon.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Sinon 1.16.1 +// Type definitions for Sinon 1.16.0 // Project: http://sinonjs.org/ // Definitions by: William Sears // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped From d2a5bf5b5a3cff20f76ead860b12be4dec6d9f62 Mon Sep 17 00:00:00 2001 From: Farokhcpu Date: Thu, 8 Dec 2016 17:46:08 +0100 Subject: [PATCH 5/5] reversing changes in fs-extra --- fs-extra/fs-extra-tests.ts | 26 -------------------------- fs-extra/fs-extra.d.ts | 4 ---- 2 files changed, 30 deletions(-) diff --git a/fs-extra/fs-extra-tests.ts b/fs-extra/fs-extra-tests.ts index d03faf4c3c..a31df8cfd7 100644 --- a/fs-extra/fs-extra-tests.ts +++ b/fs-extra/fs-extra-tests.ts @@ -52,46 +52,20 @@ fs.copySync(src, dest, filter: /.*/ } ); - fs.createFile(file, errorCallback); fs.createFileSync(file); fs.mkdirs(dir, errorCallback); fs.mkdirs(dir, {}, errorCallback); - fs.mkdirsSync(dir); fs.mkdirsSync(dir, {}); - fs.mkdirp(dir, errorCallback); fs.mkdirp(dir, {}, errorCallback); - fs.mkdirpSync(dir); fs.mkdirpSync(dir, {}); -fs.move(src, dest, errorCallback); -fs.move(src, dest, (src: string) => { - return false; -}, errorCallback); -fs.move(src, dest, - { - clobber: true, - preserveTimestamps: true, - filter: (src: string) => {return false} - }, - errorCallback -); -fs.move(src, dest, - { - clobber: true, - preserveTimestamps: true, - filter: /.*/ - }, - errorCallback -); - fs.outputFile(file, data, errorCallback); fs.outputFileSync(file, data); - fs.outputJson(file, data, errorCallback); fs.outputJSON(file, data, errorCallback); diff --git a/fs-extra/fs-extra.d.ts b/fs-extra/fs-extra.d.ts index 976595a84f..d052752ba9 100644 --- a/fs-extra/fs-extra.d.ts +++ b/fs-extra/fs-extra.d.ts @@ -31,10 +31,6 @@ declare module "fs-extra" { export function mkdirsSync(dir: string, options?: MkdirOptions): void; export function mkdirpSync(dir: string, options?: MkdirOptions): void; - export function move(src: string, dest: string, callback?: (err: Error) => void): void; - export function move(src: string, dest: string, filter: CopyFilter, callback?: (err: Error) => void): void; - export function move(src: string, dest: string, options: CopyOptions, callback?: (err: Error) => void): void; - export function outputFile(file: string, data: any, callback?: (err: Error) => void): void; export function outputFileSync(file: string, data: any): void;