Revert "fix: for null type"

This reverts commit 0e0feb5.
global-121 · Nov 18, 2024 · a2c40a5 · a2c40a5
1 parent 7d497f5
commit a2c40a5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/find-options/FindReturnType.ts b/src/find-options/FindReturnType.ts
@@ -12,9 +12,9 @@ type TruthyKeys<T> = {
     [K in keyof T]: true extends T[K] ? K : T[K] extends object ? K : never
 }[keyof T]
 
-type ExtractUndefined<T> = Exclude<T, Exclude<T, undefined>>
+type ExtractNil<T> = Exclude<T, Exclude<T, undefined | null>>
 
-type ArrayType<I, E> = Array<I> | ExtractUndefined<E>
+type ArrayType<I, E> = Array<I> | ExtractNil<E>
 
 export type FindReturnType<
     Entity extends ObjectLiteral,
@@ -58,10 +58,6 @@ export type FindReturnType<
                   ? FindReturnType<Entity[R], Select[R], undefined>
                   : Entity[R]
               : Entity[R]
-      } & {
-          [R in Select extends FindOptionsSelectByString<Entity>
-              ? Select[number]
-              : never]: Entity[R]
       } & {
           [R in Relation extends FindOptionsRelationByString
               ? never
@@ -82,4 +78,8 @@ export type FindReturnType<
                   ? FindReturnType<Entity[R], undefined, Relation[R]>
                   : Entity[R]
               : Entity[R]
+      } & {
+          [R in Select extends FindOptionsSelectByString<Entity>
+              ? Select[number]
+              : never]: Entity[R]
       }