From cc08cb7e9c2fd4974148a027ff1d1c86581092ac Mon Sep 17 00:00:00 2001
From: aleclarson <alec.stanford.larson@gmail.com>
Date: Sun, 16 Dec 2018 13:10:39 -0500
Subject: [PATCH] fix(ts): improve Draft<T> with generics

And other small improvements.

Fixes #272
---
 src/immer.d.ts | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/immer.d.ts b/src/immer.d.ts
index 68a185bc..d7ff8107 100644
--- a/src/immer.d.ts
+++ b/src/immer.d.ts
@@ -12,37 +12,27 @@ type AtomicObject =
     | Number
     | String
 
-/** Use type inference to know when an array is finite */
-type IsFinite<T extends any[]> = T extends never[]
-    ? true
-    : T extends ReadonlyArray<infer U>
-    ? (U[] extends T ? false : true)
-    : true
-
-export type DraftObject<T> = T extends object
-    ? T extends AtomicObject
-        ? T
-        : {-readonly [P in keyof T]: Draft<T[P]>}
-    : T
+type ArrayMethod = Exclude<keyof [], number>
+type Indices<T> = Exclude<keyof T, ArrayMethod>
 
-export type DraftArray<T> = Array<
-    T extends ReadonlyArray<any>
-        ? {[P in keyof T]: Draft<T>}[keyof T]
-        : DraftObject<T>
+export type DraftArray<T extends ReadonlyArray<any>> = Array<
+    {[P in Indices<T>]: Draft<T[P]>}[Indices<T>]
 >
 
-export type DraftTuple<T extends any[]> = {
-    [P in keyof T]: T[P] extends T[number] ? Draft<T[P]> : never
+export type DraftTuple<T extends ReadonlyArray<any>> = {
+    [P in keyof T]: P extends Indices<T> ? Draft<T[P]> : never
 }
 
-export type Draft<T> = T extends any[]
-    ? IsFinite<T> extends true
-        ? DraftTuple<T>
-        : DraftArray<T[number]>
+export type Draft<T> = T extends never[]
+    ? T
     : T extends ReadonlyArray<any>
-    ? DraftArray<T[number]>
+    ? T[number][] extends T
+        ? DraftArray<T>
+        : DraftTuple<T>
+    : T extends AtomicObject
+    ? T
     : T extends object
-    ? DraftObject<T>
+    ? {-readonly [P in keyof T]: Draft<T[P]>}
     : T
 
 export interface Patch {