From cbbd91a65dac1790f376332d870a5b600a99d7be Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Mon, 25 Feb 2019 15:27:34 -0800
Subject: [PATCH] Split bluebird-global function types

Now they are based on bluebird types, but do not directly refer to them.
That's because they. bluebird-global is rarely used so I don't think the
duplication is a problem.
---
 types/bluebird-global/index.d.ts | 21 ++++++++++++---------
 types/knex/knex-tests.ts         |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/types/bluebird-global/index.d.ts b/types/bluebird-global/index.d.ts
index da33188dd1..f2baa334cd 100644
--- a/types/bluebird-global/index.d.ts
+++ b/types/bluebird-global/index.d.ts
@@ -113,12 +113,15 @@
 import Bluebird = require("bluebird");
 
 declare global {
+    type IterateFunction<T, R> = (item: T, index: number, arrayLength: number) => (R | PromiseLike<R>);
     /*
      * Patch all instance method
      */
     interface Promise<T> {
-        all: Bluebird<T>["all"];
-        any: Bluebird<T>["any"];
+        all(this: Promise<Iterable<{}>>): Bluebird<T>;
+        all(): Bluebird<never>;
+        any<Q>(this: Promise<T & Iterable<Q>>): Bluebird<Q>;
+        any(): Bluebird<never>;
         asCallback: Bluebird<T>["asCallback"];
         bind: Bluebird<T>["bind"];
         call: Bluebird<T>["call"];
@@ -128,9 +131,9 @@ declare global {
         delay: Bluebird<T>["delay"];
         disposer: Bluebird<T>["disposer"];
         done: Bluebird<T>["done"];
-        each: Bluebird<T>["each"];
+        each<Q>(this: Promise<T & Iterable<Q>>, iterator: IterateFunction<Q, any>): Bluebird<T>;
         error: Bluebird<T>["error"];
-        filter: Bluebird<T>["filter"];
+        filter<Q>(this: Promise<T & Iterable<Q>>, filterer: IterateFunction<Q, boolean>, options?: Bluebird.ConcurrencyOption): Bluebird<T>;
         // finally: Bluebird<T>["finally"]; // Provided by lib.es2018.promise.d.ts
         get: Bluebird<T>["get"];
         isCancelled: Bluebird<T>["isCancelled"];
@@ -139,17 +142,17 @@ declare global {
         isRejected: Bluebird<T>["isRejected"];
         isResolved: Bluebird<T>["isResolved"];
         lastly: Bluebird<T>["lastly"];
-        map: Bluebird<T>["map"];
-        mapSeries: Bluebird<T>["mapSeries"];
+        map<U, Q>(this: Promise<T & Iterable<Q>>, mapper: IterateFunction<Q, U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+        mapSeries<U, Q>(this: Promise<T & Iterable<Q>>, iterator: IterateFunction<Q, U>): Bluebird<U[]>;
         nodeify: Bluebird<T>["nodeify"];
         props: Bluebird<T>["props"];
         race: Bluebird<T>["race"];
         reason: Bluebird<T>["reason"];
-        reduce: Bluebird<T>["reduce"];
+        reduce<U, Q>(this: Promise<T & Iterable<Q>>, reducer: (memo: U, item: Q, index: number, arrayLength: number) => (U | PromiseLike<U>), initialValue?: U): Bluebird<U>;
         reflect: Bluebird<T>["reflect"];
         return: Bluebird<T>["return"];
-        some: Bluebird<T>["some"];
-        spread: Bluebird<T>["spread"];
+        some(this: Promise<Iterable<{}>>, count: number): Bluebird<T>;
+        spread<U, Q>(this: Bluebird<T & Iterable<Q>>, fulfilledHandler: (...values: Q[]) => (U | PromiseLike<U>)): Bluebird<U>;
         suppressUnhandledRejections: Bluebird<T>["suppressUnhandledRejections"];
         tap: Bluebird<T>["tap"];
         tapCatch: Bluebird<T>["tapCatch"];
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 8b173c0887..ac0000ad9a 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -1111,6 +1111,7 @@ knex('users')
 //
 // Migrations
 //
+const name = "test";
 const config = {
   directory: "./migrations",
   extension: "js",