From 5b73d190ef56658e2e18a32f6a3a995845f871dc Mon Sep 17 00:00:00 2001 From: Dmitri1337 Date: Wed, 16 Jan 2019 18:32:50 +0200 Subject: [PATCH] Fixed "semicolon" lint rule --- types/async/index.d.ts | 8 ++-- types/async/test/es6-generators.ts | 70 +++++++++++++++--------------- types/async/test/explicit.ts | 14 +++--- types/async/test/index.ts | 30 ++++++------- types/async/tslint.json | 1 - 5 files changed, 61 insertions(+), 62 deletions(-) diff --git a/types/async/index.d.ts b/types/async/index.d.ts index f8ba7e0c2d..6260eb9344 100644 --- a/types/async/index.d.ts +++ b/types/async/index.d.ts @@ -12,7 +12,7 @@ export as namespace async; export interface Dictionary { [key: string]: T; } -export type IterableCollection = T[] | IterableIterator | Dictionary +export type IterableCollection = T[] | IterableIterator | Dictionary; export interface ErrorCallback { (err?: E | null): void; } export interface AsyncBooleanResultCallback { (err?: E | null, truthValue?: boolean): void; } @@ -31,7 +31,7 @@ export interface AsyncBooleanIterator { (item: T, callback: AsyncB export interface AsyncWorker { (task: T, callback: ErrorCallback): void; } export interface AsyncVoidFunction { (callback: ErrorCallback): void; } -export type AsyncAutoTasks, E> = { [K in keyof R]: AsyncAutoTask } +export type AsyncAutoTasks, E> = { [K in keyof R]: AsyncAutoTask }; export type AsyncAutoTask, E> = AsyncAutoTaskFunctionWithoutDependencies | Array>; export interface AsyncAutoTaskFunctionWithoutDependencies { (cb: AsyncResultCallback | ErrorCallback): void; } export interface AsyncAutoTaskFunction, E = Error> { (results: R, cb: AsyncResultCallback | ErrorCallback): void; } @@ -41,7 +41,7 @@ export interface DataContainer { } export interface CallbackContainer { - callback: Function + callback: Function; } export interface PriorityContainer { @@ -61,7 +61,7 @@ export interface AsyncQueue { empty: () => any; drain: () => any; paused: boolean; - pause(): void + pause(): void; resume(): void; kill(): void; workersList, CallbackContainer>(): TWorker[]; diff --git a/types/async/test/es6-generators.ts b/types/async/test/es6-generators.ts index b67e7daad7..ec9d51e245 100644 --- a/types/async/test/es6-generators.ts +++ b/types/async/test/es6-generators.ts @@ -10,45 +10,45 @@ function eachOfIterator(item: T, key: K, callback: (err: Error) => void function concatIterator(item: T, callback: (err: E, res: R[]) => void) { } -async.map(collectionGenerator(), funcMapIterator, funcMapComplete) -async.mapSeries(collectionGenerator(), funcMapIterator, funcMapComplete) -async.mapLimit(collectionGenerator(), 2, funcMapIterator, funcMapComplete) +async.map(collectionGenerator(), funcMapIterator, funcMapComplete); +async.mapSeries(collectionGenerator(), funcMapIterator, funcMapComplete); +async.mapLimit(collectionGenerator(), 2, funcMapIterator, funcMapComplete); -async.filter(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }) -async.filterSeries(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }) -async.filterLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, results: any[]) { }) -async.select(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }) -async.selectSeries(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }) -async.selectLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, results: any[]) { }) +async.filter(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }); +async.filterSeries(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }); +async.filterLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, results: any[]) { }); +async.select(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }); +async.selectSeries(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }); +async.selectLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, results: any[]) { }); -async.reject(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }) -async.rejectSeries(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }) -async.rejectLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, results: any[]) { }) +async.reject(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }); +async.rejectSeries(collectionGenerator(), booleanIterator, function (err: Error, results: any[]) { }); +async.rejectLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, results: any[]) { }); -async.each(collectionGenerator(), eachIterator, function (err: Error) { }) -async.eachLimit(collectionGenerator(), 2, eachIterator, function (err: Error) { }) -async.eachSeries(collectionGenerator(), eachIterator, function (err: Error) { }) -async.eachOf(collectionGenerator(), eachOfIterator, function (err: Error) { }) -async.eachOfLimit(collectionGenerator(), 2, eachOfIterator, function (err: Error) { }) -async.eachOfSeries(collectionGenerator(), eachOfIterator, function (err: Error) { }) -async.forEach(collectionGenerator(), eachIterator, function (err: Error) { }) -async.forEachLimit(collectionGenerator(), 2, eachIterator, function (err: Error) { }) -async.forEachSeries(collectionGenerator(), eachIterator, function (err: Error) { }) -async.forEachOf(collectionGenerator(), eachOfIterator, function (err: Error) { }) -async.forEachOfLimit(collectionGenerator(), 2, eachOfIterator, function (err: Error) { }) -async.forEachOfSeries(collectionGenerator(), eachOfIterator, function (err: Error) { }) +async.each(collectionGenerator(), eachIterator, function (err: Error) { }); +async.eachLimit(collectionGenerator(), 2, eachIterator, function (err: Error) { }); +async.eachSeries(collectionGenerator(), eachIterator, function (err: Error) { }); +async.eachOf(collectionGenerator(), eachOfIterator, function (err: Error) { }); +async.eachOfLimit(collectionGenerator(), 2, eachOfIterator, function (err: Error) { }); +async.eachOfSeries(collectionGenerator(), eachOfIterator, function (err: Error) { }); +async.forEach(collectionGenerator(), eachIterator, function (err: Error) { }); +async.forEachLimit(collectionGenerator(), 2, eachIterator, function (err: Error) { }); +async.forEachSeries(collectionGenerator(), eachIterator, function (err: Error) { }); +async.forEachOf(collectionGenerator(), eachOfIterator, function (err: Error) { }); +async.forEachOfLimit(collectionGenerator(), 2, eachOfIterator, function (err: Error) { }); +async.forEachOfSeries(collectionGenerator(), eachOfIterator, function (err: Error) { }); -async.every(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }) -async.everyLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, res: boolean) { }) -async.everySeries(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }) +async.every(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }); +async.everyLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, res: boolean) { }); +async.everySeries(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }); -async.some(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }) -async.someLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, res: boolean) { }) -async.someSeries(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }) +async.some(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }); +async.someLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, res: boolean) { }); +async.someSeries(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }); -async.detect(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }) -async.detectLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, res: boolean) { }) -async.detectSeries(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }) +async.detect(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }); +async.detectLimit(collectionGenerator(), 2, booleanIterator, function (err: Error, res: boolean) { }); +async.detectSeries(collectionGenerator(), booleanIterator, function (err: Error, res: boolean) { }); -async.concat(collectionGenerator(), concatIterator, (err: Error, res: any[]) => { }) -async.concatSeries(collectionGenerator(), concatIterator, (err: Error, res: any[]) => { }) +async.concat(collectionGenerator(), concatIterator, (err: Error, res: any[]) => { }); +async.concatSeries(collectionGenerator(), concatIterator, (err: Error, res: any[]) => { }); diff --git a/types/async/test/explicit.ts b/types/async/test/explicit.ts index 39d831fd65..eaa62d3f06 100644 --- a/types/async/test/explicit.ts +++ b/types/async/test/explicit.ts @@ -18,7 +18,7 @@ async.series(taskArray, function (err, results) { if (results) { let first = results[0]; if (first) { - console.log(first.match(/o/)) + console.log(first.match(/o/)); } } }); @@ -26,7 +26,7 @@ async.parallel(taskArray, function (err, results) { if (results) { let first = results[0]; if (first) { - console.log(first.match(/o/)) + console.log(first.match(/o/)); } } }); @@ -34,7 +34,7 @@ async.parallelLimit(taskArray, 3, function (err, results) { if (results) { let first = results[0]; if (first) { - console.log(first.match(/o/)) + console.log(first.match(/o/)); } } }); @@ -55,17 +55,17 @@ var taskDict: Lookup = { callback(undefined, 2); }, 100); } -} +}; async.series(taskDict, function(err, results) { let one = results['one']; - console.log(one && one.toFixed(1)) + console.log(one && one.toFixed(1)); }); async.parallel(taskDict, function(err, results) { let one = results['one']; - console.log(one && one.toFixed(1)) + console.log(one && one.toFixed(1)); }); async.parallelLimit(taskDict, 3, function(err, results) { let one = results['one']; - console.log(one && one.toFixed(1)) + console.log(one && one.toFixed(1)); }); diff --git a/types/async/test/index.ts b/types/async/test/index.ts index 1b1c794044..5117199024 100644 --- a/types/async/test/index.ts +++ b/types/async/test/index.ts @@ -47,9 +47,9 @@ var openFiles = ['file1', 'file2']; var openFilesObj = { file1: "fileOne", file2: "fileTwo" -} +}; -var saveFile = function (file: string, cb: (err: Error) => void) { } +var saveFile = function (file: string, cb: (err: Error) => void) { }; async.each(openFiles, saveFile, function (err: Error) { }); async.eachSeries(openFiles, saveFile, function (err: Error) { }); @@ -71,7 +71,7 @@ async.forEachOfLimit(openFilesObj, 2, forEachOfIterator, function (err) { }); var numArray = [1, 2, 3]; function reducer(memo: any, item: any, callback: any) { process.nextTick(function () { - callback(null, memo + item) + callback(null, memo + item); }); } async.reduce(numArray, 0, reducer, function (err, result) { }); @@ -153,16 +153,16 @@ async.series({ function (err, results) { }); async.times(5, function(n, next) { - next(undefined as any, n) + next(undefined as any, n); }, function(err, results) { - console.log(results) -}) + console.log(results); +}); async.timesSeries(5, function(n, next) { - next(undefined as any, n) + next(undefined as any, n); }, function(err, results) { - console.log(results) -}) + console.log(results); +}); async.parallel([ function (callback) { @@ -250,8 +250,8 @@ async.until(whileTest, whileFn, function (err) { }); async.doWhilst(whileFn, doWhileTest, function (err) { }); async.doUntil(whileFn, doWhileTest, function (err) { }); -async.during(function (testCallback) { testCallback(new Error(), false); }, function (callback) { callback() }, function (error) { console.log(error) }); -async.doDuring(function (callback) { callback() }, function (testCallback) { testCallback(new Error(), false); }, function (error) { console.log(error) }); +async.during(function (testCallback) { testCallback(new Error(), false); }, function (callback) { callback(); }, function (error) { console.log(error); }); +async.doDuring(function (callback) { callback(); }, function (testCallback) { testCallback(new Error(), false); }, function (error) { console.log(error); }); async.forever(function (errBack) { errBack(new Error("Not going on forever.")); }, @@ -281,7 +281,7 @@ var q = async.queue(function (task: any, callback: (err?: Error, msg?: stri q.drain = function () { console.log('all items have been processed'); -} +}; q.push({ name: 'foo' }); @@ -315,15 +315,15 @@ var qIsIdle : boolean = q.idle(); q.saturated = function() { console.log('queue is saturated.'); -} +}; q.empty = function() { console.log('queue is empty.'); -} +}; q.drain = function() { console.log('queue was drained.'); -} +}; q.pause(); q.resume(); diff --git a/types/async/tslint.json b/types/async/tslint.json index 2074a7856c..220166f178 100644 --- a/types/async/tslint.json +++ b/types/async/tslint.json @@ -18,7 +18,6 @@ "prefer-for-of": false, // HAS ISSUES "prefer-method-signature": false, // HAS ISSUES "prefer-template": false, // HAS ISSUES - "semicolon": false, // HAS ISSUES "space-before-function-paren": false, // HAS ISSUES "space-within-parens": false, // HAS ISSUES "typedef-whitespace": false, // HAS ISSUES