From fa2d5d5e91e661d6891f1871f60652b38bcbf47d Mon Sep 17 00:00:00 2001 From: Jamie Sykes Date: Tue, 5 Mar 2019 22:51:45 +0000 Subject: [PATCH] Amend a few tests and types for linting. --- types/collectionsjs/collectionsjs-tests.ts | 10 ++-------- types/collectionsjs/index.d.ts | 6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts index 3748dc234e..5f40824445 100644 --- a/types/collectionsjs/collectionsjs-tests.ts +++ b/types/collectionsjs/collectionsjs-tests.ts @@ -41,11 +41,7 @@ collection.last(); // $ExpectType { name: string; age: number; } collection.map(stark => stark.name); // $ExpectType Collection<{ name: string; age: number; }> collection.pluck('name'); // $ExpectType Collection<{ name: string; age: number; }> collection.push({name: 'Robb Stark', age: 17}); // $ExpectType Collection<{ name: string; age: number; }> - -const value = new Collection([1, 2, 3]).reduce( - (previous, current) => previous + current, - 0 - ); // $ExpectType number +const value = new Collection([1, 2, 3]).reduce((previous, current) => previous + current, 0); // $ExpectType number collection.reject(stark => stark.age < 14); // $ExpectType Collection<{ name: string; age: number; }> collection.remove({name: 'Robb Stark', age: 17}); // $ExpectType boolean collection.reverse(); // $ExpectType Collection<{ name: string; age: number; }> @@ -56,9 +52,7 @@ 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)); -// const collection2 = new Collection([1,2,3,4]).addToMembers(3); +Collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n)); collection.unique(stark => stark.age); // $ExpectType Collection<{ name: string; age: number; }> collection.values(); // $ExpectType Collection<{ name: string; age: number; }> diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts index 364877050d..aaf92fe61e 100644 --- a/types/collectionsjs/index.d.ts +++ b/types/collectionsjs/index.d.ts @@ -36,12 +36,12 @@ export default class Collection { sort(compare?: () => boolean): Collection; sortBy(property: string, order?: string): Collection; stringify(): string; - sum(property: T extends object ? keyof T : never): number + sum(property: T extends object ? keyof T : never): number; take(count: number): Collection; static macro(name: string, callback: (coll: Collection, ...args: unknown[]) => unknown): void; unique(callback?: string|null|((item: T) => any)): Collection; values(): Collection; - where(key: K, value: T[K]): Collection - where(callback: (item: T) => boolean): Collection + where(key: K, value: T[K]): Collection; + where(callback: (item: T) => boolean): Collection; zip(array: T[]|Collection): Collection; }