chore: wip

Author: chrisbbreuer

storage/framework/core/collections/src/index.ts

@@ -1,4 +1,4 @@
-import { clone, deleteKeys, isArray, isFunction, isObject, nestedValue, values, variadic } from './helpers/'
+import { clone, deleteKeys, isArray, isFunction, isObject, nestedValue, values } from './helpers/'
 
 export class Collection<T> {
   protected items: T[] | Record<string, T>
@@ -13,8 +13,8 @@ export class Collection<T> {
     return this.items
   }
 
-  all(): T[] | Record<string, T> {
-    return this.items
+  all(): CollectionAll<T> {
+    return this.items as CollectionAll<T>
   }
 
   average(key?: string | ((item: T) => number)): number {
@@ -48,9 +48,11 @@ export class Collection<T> {
     return new (this.constructor as any)(([] as T[]).concat(...(this.items as any[])))
   }
 
-  combine(values: T[]): Collection<T> {
+  combine<U extends unknown[]>(values: U): Collection<{ [K in T[number]]: U[number] }> {
     if (Array.isArray(this.items) && Array.isArray(values)) {
-      return new Collection(Object.fromEntries(this.items.map((key, index) => [key, values[index]])))
+      return new Collection(Object.fromEntries(this.items.map((key, index) => [key, values[index]]))) as Collection<{
+        [K in T[number]]: U[number]
+      }>
     }
 
     throw new Error('Cannot combine non-array collections')
@@ -1949,7 +1951,11 @@ function SymbolIterator() {
   }
 }
 
-export const collect = <T extends object | number>(collection?: T | T[] | Collection<T>): Collection<T> =>
-  new Collection<T>(collection)
+export function collect<T extends object | any[]>(items: T): Collection<T> {
+  return new Collection(items)
+}
+
+type IsArray<T> = T extends any[] ? true : false
+type CollectionAll<T> = IsArray<T> extends true ? T : { [K in keyof T]: T[K] }
 
 export default collect

storage/framework/core/collections/tests/collections.test.ts

@@ -9,7 +9,7 @@ describe('@stacksjs/collections', () => {
 
   describe('all() method', () => {
     it('should return all items, simple array', () => {
-      expect(collect<number>([1, 2, 3, 4, 5]).all()).toEqual([1, 2, 3, 4, 5])
+      expect(collect([1, 2, 3, 4, 5]).all()).toEqual([1, 2, 3, 4, 5])
     })
 
     it('should recursively return all items', () => {
@@ -76,7 +76,7 @@ describe('@stacksjs/collections', () => {
   })
 
   it('collapse()', () => {
-    const collection = collect<number | number[]>([[1], [2, 3], [4, 5]])
+    const collection = collect([[1], [2, 3], [4, 5]])
     expect(collection.collapse().all()).toEqual([1, 2, 3, 4, 5])
   })