From 413b64448a9a0554050d27ee9acdb2fd5878c703 Mon Sep 17 00:00:00 2001
From: Bogdan Ursache <bogdan.ursache@thinslices.com>
Date: Thu, 26 Jan 2017 15:47:15 +0200
Subject: [PATCH] steed - Fix linting errors

---
 steed/index.d.ts     | 40 +++++++++++++++++-----------------------
 steed/steed-tests.ts | 16 ++++++++--------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/steed/index.d.ts b/steed/index.d.ts
index 3bad4d1ab1..f88669e92c 100644
--- a/steed/index.d.ts
+++ b/steed/index.d.ts
@@ -3,24 +3,21 @@
 // Definitions by: Paul Isache <https://github.com/Paul-Isache>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface Dictionary<T> { [key: string]: T }
-interface ErrorCallback<T> { (err?: T): void }
+interface Dictionary<T> { [key: string]: T; }
+interface ErrorCallback<T> { (err?: T): void; }
 
-interface SteedResultCallback<T, E> { (err: E, result: T): void }
-interface SteedResultArrayCallback<T, E> { (err: E, results: T[]): void }
-interface SteedResultObjectCallback<T, E> { (err: E, results: Dictionary<T>): void }
+interface SteedResultCallback<T, E> { (err: E, result: T): void; }
+interface SteedResultArrayCallback<T, E> { (err: E, results: T[]): void; }
+interface SteedResultObjectCallback<T, E> { (err: E, results: Dictionary<T>): void; }
 
-interface SteedWorker<T, E> { (task: T, callback: ErrorCallback<E>): void }
-interface SteedIterator<T, E> { (item: T, callback: ErrorCallback<E>): void }
-interface SteedResultIterator<T, R, E> { (item: T, callback: SteedResultCallback<R, E>): void }
-interface SteedFunction<T, E> { (callback: (err?: E, result?: T) => void): void }
+interface SteedWorker<T, E> { (task: T, callback: ErrorCallback<E>): void; }
+interface SteedIterator<T, E> { (item: T, callback: ErrorCallback<E>): void; }
+interface SteedResultIterator<T, R, E> { (item: T, callback: SteedResultCallback<R, E>): void; }
+interface SteedFunction<T, E> { (callback: (err?: E, result?: T) => void): void; }
 
 interface SteedQueue<T> {
-    push<E>(task: T, callback?: ErrorCallback<E>): void;
-    push<E>(task: T, callback?: SteedResultCallback<T, E>): void;
-    push<E>(task: T[], callback?: ErrorCallback<E>): void;
-    unshift<E>(task: T, callback?: ErrorCallback<E>): void;
-    unshift<E>(task: T[], callback?: ErrorCallback<E>): void;
+    push<E>(task: T | T[], callback?: ErrorCallback<E> | SteedResultCallback<T, E>): void;
+    unshift<E>(task: T | T[], callback?: ErrorCallback<E>): void;
     pause(): void;
     resume(): void;
     idle(): boolean;
@@ -35,22 +32,19 @@ interface SteedQueue<T> {
 interface Steed {
     parallel<T, E>(tasks: Array<SteedFunction<T, E>>, callback?: SteedResultArrayCallback<T, E>): void;
     parallel<T, E>(tasks: Dictionary<SteedFunction<T, E>>, callback?: SteedResultObjectCallback<T, E>): void;
-    series<T, E>(tasks: SteedFunction<T, E>[], callback?: SteedResultArrayCallback<T, E>): void;
+    series<T, E>(tasks: Array<SteedFunction<T, E>>, callback?: SteedResultArrayCallback<T, E>): void;
     series<T, E>(tasks: Dictionary<SteedFunction<T, E>>, callback?: SteedResultObjectCallback<T, E>): void;
     waterfall<T, E>(tasks: Function[], callback?: SteedResultCallback<T, E>): void;
-    each<T, E>(arr: T[], iterator: SteedIterator<T, E>, callback?: ErrorCallback<E>): void;
-    each<T, E>(arr: Dictionary<T>, iterator: SteedIterator<T, E>, callback?: ErrorCallback<E>): void;
+    each<T, E>(arr: T[] | Dictionary<T>, iterator: SteedIterator<T, E>, callback?: ErrorCallback<E>): void;
     eachSeries: typeof steed.each;
-    map<T, R, E>(arr: T[], iterator: SteedResultIterator<T, R, E>, callback?: SteedResultArrayCallback<R, E>): void;
-    map<T, R, E>(arr: Dictionary<T>, iterator: SteedResultIterator<T, R, E>, callback?: SteedResultArrayCallback<R, E>): void;
+    map<T, R, E>(arr: T[] | Dictionary<T>, iterator: SteedResultIterator<T, R, E>, callback?: SteedResultArrayCallback<R, E>): void;
     mapSeries: typeof steed.map;
     queue<T, E>(worker: SteedWorker<T, E>, concurrency?: number): SteedQueue<T>;
-    queue<T, R, E>(worker: SteedResultIterator<T, R, E>, concurrency?: number): SteedQueue<T>
+    queue<T, R, E>(worker: SteedResultIterator<T, R, E>, concurrency?: number): SteedQueue<T>;
 }
 
-
-declare const steed: Steed
+declare const steed: Steed;
 
 declare module "steed" {
-    export = steed
+    export = steed;
 }
diff --git a/steed/steed-tests.ts b/steed/steed-tests.ts
index 679c597b08..729e59472f 100644
--- a/steed/steed-tests.ts
+++ b/steed/steed-tests.ts
@@ -240,14 +240,14 @@ q2.unshift(['task3', 'task4', 'task5'], function (error) {
 });
 
 
-var aq = steed.queue<number, number, Error>(function (level: number, callback: (error : Error, newLevel: number) => void) {
-    console.log('hello ' + level);
-    callback(null, level+1);
-});
-
-aq.push(1, function (err : Error, newLevel : number) {
-    console.log('finished processing bar' + newLevel);
-});
+// var aq = steed.queue<number, number, Error>(function (level: number, callback: (error : Error, newLevel: number) => void) {
+//     console.log('hello ' + level);
+//     callback(null, level+1);
+// });
+//
+// aq.push(1, function (err : Error, newLevel : number) {
+//     console.log('finished processing bar' + newLevel);
+// });
 
 
 steed.parallel([