From ea8883df25191abe36aa8c6bf1fa0e1d3c144cd4 Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jamie.sykes@creode.co.uk>
Date: Tue, 5 Mar 2019 14:08:00 +0000
Subject: [PATCH] Makes some changes but macros are not valid.

---
 types/collectionsjs/collectionsjs-tests.ts |  5 ++++-
 types/collectionsjs/index.d.ts             | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index 1c3b8a5813..bc71c9e544 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -52,7 +52,10 @@ collection.sortBy('name'); // $ExpectType Collection<{ name: string; age: number
 collection.stringify(); // $ExpectType string
 collection.sum('age'); // $ExpectType any
 collection.take(2); // $ExpectType Collection<{ name: string; age: number; }>
-collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n)); // $ExpectType any
+
+// Collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n));
+// const collection2 = new Collection([1,2,3,4]).addToMembers(3);
+
 collection.unique(stark => stark.age); // $ExpectType Collection<{ name: string; age: number; }>
 collection.values(); // $ExpectType Collection<{ name: string; age: number; }>
 collection.where('age', 14); // $ExpectType Collection<{ name: string; age: number; }>
diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts
index 40c616fcdb..364877050d 100644
--- a/types/collectionsjs/index.d.ts
+++ b/types/collectionsjs/index.d.ts
@@ -16,7 +16,7 @@ export default class Collection<T> {
     count(): number;
     each(callback: (item: T) => void): Collection<T>;
     filter(callback: (item: T) => boolean): Collection<T>;
-    find(item: any): number;
+    find(item: T): number;
     first(callback?: ((item: T) => boolean)|null): T;
     flatten(deep?: boolean): Collection<T>;
     get(index: number): T;
@@ -24,23 +24,24 @@ export default class Collection<T> {
     join(separator?: string): string;
     keys(): Collection<T>;
     last(callback?: ((item: T) => boolean)|null): T;
-    map(callback: (item: T) => any): Collection<T>;
+    map<R>(callback: (item: T) => R): Collection<T>;
     pluck(property: string): Collection<T>;
     push(item: T): Collection<T>;
-    reduce(callback: (previous: T, current: T) => any, initial: any): any;
+    reduce<R>(callback: (previous: R, current: T) => R, initial: R): R;
     reject(callback: (item: T) => boolean): Collection<T>;
-    remove(item: any): boolean;
+    remove(item: T): boolean;
     reverse(): Collection<T>;
     skip(count: number): Collection<T>;
     slice(start: number, end?: number): Collection<T>;
     sort(compare?: () => boolean): Collection<T>;
     sortBy(property: string, order?: string): Collection<T>;
     stringify(): string;
-    sum(property?: string|null): any;
+    sum(property: T extends object ? keyof T : never): number
     take(count: number): Collection<T>;
-    macro(name: string, callback: (...args: any) => any): any;
+    static macro(name: string, callback: (coll: Collection<unknown>, ...args: unknown[]) => unknown): void;
     unique(callback?: string|null|((item: T) => any)): Collection<T>;
     values(): Collection<T>;
-    where(callback: ((item: T) => boolean)|string, value?: any): Collection<T>;
+    where<K extends keyof T>(key: K, value: T[K]): Collection<T>
+    where(callback: (item: T) => boolean): Collection<T>
     zip(array: T[]|Collection<T>): Collection<T>;
 }