fix: Array handling

Author: tomek-ch

templates/api.ejs

@@ -114,10 +114,12 @@ type Flatten<T> = T extends any[] ? T[number] : T
         }[keyof T]
     : P
 
-  type FetchKeysArray<ResponseModel> = ResponseModel extends {
-    results?: Array<infer DataModel>
-    count?: number
-  }
+  type FetchKeysArray<ResponseModel> = ResponseModel extends (infer DataModel)[]
+    ? DotNotationKeys<DataModel>[]
+    : ResponseModel extends {
+        results?: Array<infer DataModel>
+        count?: number
+      }
     ? DotNotationKeys<DataModel>[]
     : DotNotationKeys<ResponseModel>[]
 
@@ -151,6 +153,8 @@ type Flatten<T> = T extends any[] ? T[number] : T
 
   type PickKeysFromArray<ResponseModel, Keys extends string[]> = Keys extends never[]
   ? ResponseModel
+  : ResponseModel extends (infer DataModel)[]
+  ? Merge<ObjectWithKeysFromArray<DataModel, Keys>>[]
   : ResponseModel extends { results?: Array<infer DataModel>; count?: number }
   ? Merge<
       Modify<

test/__generated-api.ts

@@ -1747,10 +1747,12 @@ type DotNotationKeys<T, P extends string = ''> = IsAny<T> extends true
       }[keyof T]
   : P
 
-type FetchKeysArray<ResponseModel> = ResponseModel extends {
-  results?: Array<infer DataModel>
-  count?: number
-}
+type FetchKeysArray<ResponseModel> = ResponseModel extends (infer DataModel)[]
+  ? DotNotationKeys<DataModel>[]
+  : ResponseModel extends {
+      results?: Array<infer DataModel>
+      count?: number
+    }
   ? DotNotationKeys<DataModel>[]
   : DotNotationKeys<ResponseModel>[]
 
@@ -1787,6 +1789,8 @@ type PickKeysFromArray<
   Keys extends string[]
 > = Keys extends never[]
   ? ResponseModel
+  : ResponseModel extends (infer DataModel)[]
+  ? Merge<ObjectWithKeysFromArray<DataModel, Keys>>[]
   : ResponseModel extends { results?: Array<infer DataModel>; count?: number }
   ? Merge<
       Modify<

test/__snapshots__/index.test.ts.snap

@@ -1750,10 +1750,12 @@ type DotNotationKeys<T, P extends string = ''> = IsAny<T> extends true
       }[keyof T]
   : P
 
-type FetchKeysArray<ResponseModel> = ResponseModel extends {
-  results?: Array<infer DataModel>
-  count?: number
-}
+type FetchKeysArray<ResponseModel> = ResponseModel extends (infer DataModel)[]
+  ? DotNotationKeys<DataModel>[]
+  : ResponseModel extends {
+      results?: Array<infer DataModel>
+      count?: number
+    }
   ? DotNotationKeys<DataModel>[]
   : DotNotationKeys<ResponseModel>[]
 
@@ -1790,6 +1792,8 @@ type PickKeysFromArray<
   Keys extends string[]
 > = Keys extends never[]
   ? ResponseModel
+  : ResponseModel extends (infer DataModel)[]
+  ? Merge<ObjectWithKeysFromArray<DataModel, Keys>>[]
   : ResponseModel extends { results?: Array<infer DataModel>; count?: number }
   ? Merge<
       Modify<

test/index.test.ts

@@ -126,6 +126,13 @@ describe('PickKeys', () => {
       type ResponseModel = { key1: string }
       expectTypeOf<PickKeys<ResponseModel, {}>>().toEqualTypeOf<ResponseModel>()
     })
+    it('handles arrays', () => {
+      type DataModel = { key1: string; key2: string }
+      type ResponseModel = DataModel[]
+      expectTypeOf<PickKeys<ResponseModel, { key1: true }>>().toEqualTypeOf<
+        { key1: string }[]
+      >()
+    })
   })
   describe('based on FetchKeys array', () => {
     it('picks keys from object', () => {
@@ -158,6 +165,13 @@ describe('PickKeys', () => {
         PickKeys<ResponseModel, never[]>
       >().toEqualTypeOf<ResponseModel>()
     })
+    it('handles arrays', () => {
+      type DataModel = { key1: string; key2: string }
+      type ResponseModel = DataModel[]
+      expectTypeOf<PickKeys<ResponseModel, ['key1']>>().toEqualTypeOf<
+        { key1: string }[]
+      >()
+    })
   })
 })
 
@@ -199,6 +213,12 @@ describe('FetchKeys', () => {
       | 'key1'[]
     >()
   })
+  it('handles arrays', () => {
+    type MyFetchKeys = FetchKeys<{ key1: string }[]>
+    expectTypeOf<MyFetchKeys>().toEqualTypeOf<
+      { key1?: true | undefined } | 'key1'[]
+    >()
+  })
 })
 
 const clone = <T extends object>(object: T) =>