From eeb4b9969a09ec1bebc392cfded34d2f0b831ae1 Mon Sep 17 00:00:00 2001 From: Dmitri Trofimov Date: Wed, 16 Jan 2019 16:13:17 +0200 Subject: [PATCH] Fixed "whitespace" lint rule --- types/async/index.d.ts | 6 ++-- types/async/test/index.ts | 62 +++++++++++++++++++-------------------- types/async/tslint.json | 3 +- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/types/async/index.d.ts b/types/async/index.d.ts index e12ac11c93..87386b13ee 100644 --- a/types/async/index.d.ts +++ b/types/async/index.d.ts @@ -46,7 +46,7 @@ export interface AsyncQueue { running(): number; idle(): boolean; concurrency: number; - push(task: T | T[], callback?: AsyncResultCallback): void; + push(task: T | T[], callback?: AsyncResultCallback): void; unshift(task: T | T[], callback?: ErrorCallback): void; remove(filter: (node: DataContainer) => boolean): void; saturated: () => any; @@ -70,7 +70,7 @@ export interface AsyncPriorityQueue { concurrency: number; started: boolean; paused: boolean; - push(task: T | T[], priority: number, callback?: AsyncResultArrayCallback): void; + push(task: T | T[], priority: number, callback?: AsyncResultArrayCallback): void; saturated: () => any; empty: () => any; drain: () => any; @@ -189,7 +189,7 @@ export function autoInject(tasks: any, callback?: AsyncResultCallback export function retry(opts: number, task: (callback : AsyncResultCallback, results: any) => void, callback: AsyncResultCallback): void; export function retry(opts: { times: number, interval: number|((retryCount: number) => number) }, task: (callback: AsyncResultCallback, results : any) => void, callback: AsyncResultCallback): void; export function retryable(opts: number | {times: number, interval: number}, task: AsyncFunction): AsyncFunction; -export function apply(fn: Function, ...args: any[]): AsyncFunction; +export function apply(fn: Function, ...args: any[]): AsyncFunction; export function nextTick(callback: Function, ...args: any[]): void; export const setImmediate: typeof nextTick; diff --git a/types/async/test/index.ts b/types/async/test/index.ts index 2e23b3e90b..354103eea5 100644 --- a/types/async/test/index.ts +++ b/types/async/test/index.ts @@ -9,23 +9,23 @@ declare var path: { exists: (path: string, callback?: (err: Error, exists: boolean) => any) => void; }; -function funcStringCbErrBoolean(v:string, cb:(err:Error,res:boolean) => void) {} +function funcStringCbErrBoolean(v: string, cb: (err: Error, res: boolean) => void) {} function callback() { } -async.map(['file1', 'file2', 'file3'], fs.stat, function (err:Error, results:Array) { }); -async.mapSeries(['file1', 'file2', 'file3'], fs.stat, function (err:Error, results:Array) { }); -async.mapLimit(['file1', 'file2', 'file3'], 2, fs.stat, function (err:Error, results:Array) { }); +async.map(['file1', 'file2', 'file3'], fs.stat, function (err: Error, results: Array) { }); +async.mapSeries(['file1', 'file2', 'file3'], fs.stat, function (err: Error, results: Array) { }); +async.mapLimit(['file1', 'file2', 'file3'], 2, fs.stat, function (err: Error, results: Array) { }); -async.filter(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array) { }); -async.filterSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array) { }); -async.filterLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,results:Array) { }); -async.select(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array) { }); -async.selectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array) { }); -async.selectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,results:Array) { }); +async.filter(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, results: Array) { }); +async.filterSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, results: Array) { }); +async.filterLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err: Error, results: Array) { }); +async.select(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, results: Array) { }); +async.selectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, results: Array) { }); +async.selectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err: Error, results: Array) { }); -async.reject(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array) { }); -async.rejectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array) { }); -async.rejectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,results:Array) { }); +async.reject(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, results: Array) { }); +async.rejectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, results: Array) { }); +async.rejectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err: Error, results: Array) { }); async.parallel([ function () { }, @@ -49,9 +49,9 @@ var openFilesObj = { file2: "fileTwo" } -var saveFile = function (file:string,cb:(err:Error)=>void) { } -async.each(openFiles, saveFile, function (err:Error) { }); -async.eachSeries(openFiles, saveFile, function (err:Error) { }); +var saveFile = function (file: string, cb: (err: Error) => void) { } +async.each(openFiles, saveFile, function (err: Error) { }); +async.eachSeries(openFiles, saveFile, function (err: Error) { }); var documents: any, requestApi: any; async.eachLimit(documents, 20, requestApi, function (err) { }); @@ -80,9 +80,9 @@ async.foldl(numArray, 0, reducer, function (err, result) { }); async.reduceRight(numArray, 0, reducer, function (err, result) { }); async.foldr(numArray, 0, reducer, function (err, result) { }); -async.detect(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error,result:string) { }); -async.detectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err,result) { }); -async.detectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err,result) { }); +async.detect(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, result: string) { }); +async.detectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err, result) { }); +async.detectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err, result) { }); async.sortBy(['file1', 'file2', 'file3'], function (file, callback) { fs.stat(file, function (err, stats) { @@ -90,13 +90,13 @@ async.sortBy(['file1', 'file2', 'file3'], function (file, callback) { }); }, function (err, results) { }); -async.some(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { }); -async.someLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,result:boolean) { }); -async.any(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { }); +async.some(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, result: boolean) { }); +async.someLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err: Error, result: boolean) { }); +async.any(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, result: boolean) { }); -async.every(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { }); -async.everyLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,result:boolean) { }); -async.all(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { }); +async.every(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, result: boolean) { }); +async.everyLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err: Error, result: boolean) { }); +async.all(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error, result: boolean) { }); async.concat(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { }); async.concatSeries(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { }); @@ -273,9 +273,9 @@ async.waterfall([ ], function (err, result) { }); -var q = async.queue(function (task: any, callback: (err?:Error,msg?:string) => void) { +var q = async.queue(function (task: any, callback: (err?: Error, msg?: string) => void) { console.log('hello ' + task.name); - callback(undefined,'a message.'); + callback(undefined, 'a message.'); }, 2); @@ -294,7 +294,7 @@ q.push([{ name: 'baz' }, { name: 'bay' }, { name: 'bax' }], function (err) { }); q.push({name: 'foo'}, function (err, msg) { - console.log('foo finished with a message "'+ msg! + '"'); + console.log('foo finished with a message "' + msg! + '"'); }); q.unshift({ name: 'foo' }); @@ -364,7 +364,7 @@ if (q2Length !== q2.length()) { var aq = async.queue(function (level: number, callback: (error?: Error, newLevel?: number) => void) { console.log('hello ' + level); - callback(undefined, level+1); + callback(undefined, level + 1); }); aq.push(1, function (err : Error, newLevel : number) { @@ -442,10 +442,10 @@ async.retry({ times: 3, interval: (retryCount) => 200 * retryCount }, function ( async.parallel([ - function (callback: ( err:Error, val:string ) => void ) { }, + function (callback: ( err: Error, val: string ) => void ) { }, function (callback) { } ], -function (err:Error,results:Array) { +function (err: Error, results: Array) { async.series([ function (callback) { }, function email_link(callback) { } diff --git a/types/async/tslint.json b/types/async/tslint.json index d973a60bcf..1d2ccab47b 100644 --- a/types/async/tslint.json +++ b/types/async/tslint.json @@ -25,7 +25,6 @@ "space-within-parens": false, // HAS ISSUES "trim-file": false, // HAS ISSUES "typedef-whitespace": false, // HAS ISSUES - "unified-signatures": false, // HAS ISSUES - "whitespace": true // PRODUCES ERRORS WHEN REMOVED + "unified-signatures": false // HAS ISSUES } }