From 170bd06de4b98fec4e676cc8cec2588746a4461c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Oct 2015 22:09:12 +1300 Subject: [PATCH] Fix del typings - Return promise rather instead of taking in a callback. #5908 --- del/del-tests.ts | 17 +++++++++-------- del/del.d.ts | 17 +++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/del/del-tests.ts b/del/del-tests.ts index b0dd984349..867781d63d 100644 --- a/del/del-tests.ts +++ b/del/del-tests.ts @@ -7,11 +7,11 @@ del(["tmp/*.js", "!tmp/unicorn.js"]); del(["tmp/*.js", "!tmp/unicorn.js"], {force: true}); -del(["tmp/*.js", "!tmp/unicorn.js"], (err, paths) => { +del(["tmp/*.js", "!tmp/unicorn.js"]).then((paths: string[]) => { console.log('Deleted files/folders:\n', paths.join('\n')); }); -del(["tmp/*.js", "!tmp/unicorn.js"], {force: true}, (err, paths) => { +del(["tmp/*.js", "!tmp/unicorn.js"], {force: true}).then((paths: string[]) => { console.log('Deleted files/folders:\n', paths.join('\n')); }); @@ -19,18 +19,19 @@ del("tmp/*.js"); del("tmp/*.js", {force: true}); -del("tmp/*.js", (err, paths) => { +del("tmp/*.js").then((paths: string[]) => { console.log('Deleted files/folders:\n', paths.join('\n')); }); -del("tmp/*.js", {force: true}, (err, paths) => { +del("tmp/*.js", {force: true}).then((paths: string[]) => { console.log('Deleted files/folders:\n', paths.join('\n')); }); -del.sync(["tmp/*.js", "!tmp/unicorn.js"]); +var paths: string[]; +paths = del.sync(["tmp/*.js", "!tmp/unicorn.js"]); -del.sync(["tmp/*.js", "!tmp/unicorn.js"], {force: true}); +paths = del.sync(["tmp/*.js", "!tmp/unicorn.js"], {force: true}); -del.sync("tmp/*.js"); +paths = del.sync("tmp/*.js"); -del.sync("tmp/*.js", {force: true}); +paths = del.sync("tmp/*.js", {force: true}); diff --git a/del/del.d.ts b/del/del.d.ts index b20bac92ce..060861d8a1 100644 --- a/del/del.d.ts +++ b/del/del.d.ts @@ -4,23 +4,20 @@ // Definitions: https://github.com/borisyankov/DefinitelyTyped /// +/// declare module "del" { import glob = require("glob"); - function Del(pattern: string): void; - function Del(pattern: string, options: Del.Options): void; - function Del(pattern: string, callback: (err: Error, deletedFiles: string[]) => any): void; - function Del(pattern: string, options: Del.Options, callback: (err: Error, deletedFiles: string[]) => any): void; + function Del(pattern: string): Promise; + function Del(pattern: string, options: Del.Options): Promise; - function Del(patterns: string[]): void; - function Del(patterns: string[], options: Del.Options): void; - function Del(patterns: string[], callback: (err: Error, deletedFiles: string[]) => any): void; - function Del(patterns: string[], options: Del.Options, callback: (err: Error, deletedFiles: string[]) => any): void; + function Del(patterns: string[]): Promise; + function Del(patterns: string[], options: Del.Options): Promise; module Del { - function sync(pattern: string, options?: Options): void; - function sync(patterns: string[], options?: Options): void; + function sync(pattern: string, options?: Options): string[]; + function sync(patterns: string[], options?: Options): string[]; interface Options extends glob.IOptions { force?: boolean