update to TypeScript 2.5

Author: gcanti

package.json

@@ -28,7 +28,7 @@
     "prettier": "1.5.2",
     "tslint": "4.4.2",
     "tslint-config-standard": "4.0.0",
-    "typescript": "2.4.1",
+    "typescript": "^2.5.0-dev.20170808",
     "typings-checker": "1.1.2"
   },
   "tags": [],

src/index.ts

@@ -68,11 +68,6 @@ export interface Nat {
   isZero: Bool
 }
 
-export interface Positive {
-  prev: Positive | _0
-  isZero: 'false'
-}
-
 export type _0 = { isZero: 'true' }
 export type _1 = Succ<_0>
 export type _2 = Succ<_1>
@@ -89,7 +84,7 @@ export type IsZero<N extends Nat> = N['isZero']
 
 export type Succ<N extends Nat> = { prev: N; isZero: 'false' }
 
-export type Prev<N extends Positive> = N['prev']
+export type Prev<N extends Nat> = N['prev']
 
 export type NatEq<N1 extends Nat, N2 extends Nat> = {
   true: IsZero<N2>
@@ -213,6 +208,8 @@ export type PickExact<O, K extends keyof O> = Pick<O, K> & { [K1 in StringOmit<k
 
 export type THNil = {
   IsHNil: 'true'
+  head: never
+  tail: never
 }
 
 export type THCons<H, T extends THList> = {
@@ -225,9 +222,9 @@ export type THList = THNil | THCons<any, any>
 
 export type THListIsTHNil<L extends THList> = L['IsHNil']
 
-export type THListHead<L extends THCons<any, any>> = L['head']
+export type THListHead<L extends THList> = L['head']
 
-export type THListTail<L extends THCons<any, any>> = L['tail']
+export type THListTail<L extends THList> = L['tail']
 
 export type THListLength<L extends THList> = {
   true: _0
@@ -252,14 +249,14 @@ export type UnsafeTHListGet<L extends THList, I extends Nat> = {
   false: UnsafeTHListGet<THListTail<L>, Prev<I>>
 }[IsZero<I>]
 
-export type THListReverse<L extends THList, Acc = THNil> = {
+export type THListReverse<L extends THList, Acc extends THList = THNil> = {
   true: Acc
   false: THListReverse<THListTail<L>, THCons<THListHead<L>, Acc>>
 }[THListIsTHNil<L>]
 
 /** max length = 6 */
 export type THListToTuple<L extends THList> = {
-  true: []
+  true: never
   false: {
     true: [THListHead<L>]
     false: {
@@ -305,14 +302,96 @@ export type THListToTuple<L extends THList> = {
 
 export type TupleToObject<T> = ObjectOmit<T, keyof Array<any>>
 
-export type Increment = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-
-export type TupleLength<T, I = 0> = {
-  true: TupleLength<T, Increment[I]>
-  false: I
-}[ObjectHasKey<T, I>]
-
-export type TupleToTHList<T, I = 0, L = THNil> = {
-  true: TupleToTHList<T, Increment[I], THCons<T[I], L>>
-  false: L
-}[ObjectHasKey<T, I>]
+export type TupleLength<T extends [any]> = {
+  false: 0
+  true: {
+    false: 1
+    true: {
+      false: 2
+      true: {
+        false: 3
+        true: {
+          false: 4
+          true: {
+            false: 5
+            true: {
+              false: 6
+              true: {
+                false: 7
+                true: {
+                  false: 8
+                  true: {
+                    false: 9
+                    true: 10
+                  }[ObjectHasKey<T, '9'>]
+                }[ObjectHasKey<T, '8'>]
+              }[ObjectHasKey<T, '7'>]
+            }[ObjectHasKey<T, '5'>]
+          }[ObjectHasKey<T, '5'>]
+        }[ObjectHasKey<T, '4'>]
+      }[ObjectHasKey<T, '3'>]
+    }[ObjectHasKey<T, '2'>]
+  }[ObjectHasKey<T, '1'>]
+}[ObjectHasKey<T, '0'>]
+
+export type TupleToTHList<T extends [any]> = {
+  false: THNil
+  true: {
+    false: THCons<T[0], THNil>
+    true: {
+      false: THCons<T[1], THCons<T[0], THNil>>
+      true: {
+        false: THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>
+        true: {
+          false: THCons<T[3], THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>>
+          true: {
+            false: THCons<T[4], THCons<T[3], THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>>>
+            true: {
+              false: THCons<T[5], THCons<T[4], THCons<T[3], THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>>>>
+              true: {
+                false: THCons<
+                  T[6],
+                  THCons<T[5], THCons<T[4], THCons<T[3], THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>>>>
+                >
+                true: {
+                  false: THCons<
+                    T[7],
+                    THCons<
+                      T[6],
+                      THCons<T[5], THCons<T[4], THCons<T[3], THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>>>>
+                    >
+                  >
+                  true: {
+                    false: THCons<
+                      T[8],
+                      THCons<
+                        T[7],
+                        THCons<
+                          T[6],
+                          THCons<T[5], THCons<T[4], THCons<T[3], THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>>>>
+                        >
+                      >
+                    >
+                    true: THCons<
+                      T[9],
+                      THCons<
+                        T[8],
+                        THCons<
+                          T[7],
+                          THCons<
+                            T[6],
+                            THCons<T[5], THCons<T[4], THCons<T[3], THCons<T[2], THCons<T[1], THCons<T[0], THNil>>>>>>
+                          >
+                        >
+                      >
+                    >
+                  }[ObjectHasKey<T, '9'>]
+                }[ObjectHasKey<T, '8'>]
+              }[ObjectHasKey<T, '7'>]
+            }[ObjectHasKey<T, '5'>]
+          }[ObjectHasKey<T, '5'>]
+        }[ObjectHasKey<T, '4'>]
+      }[ObjectHasKey<T, '3'>]
+    }[ObjectHasKey<T, '2'>]
+  }[ObjectHasKey<T, '1'>]
+}[ObjectHasKey<T, '0'>]

typings-checker/index.ts

@@ -97,3 +97,11 @@ type FIVE = t.NumberToString[5]
 const n2s1: FIVE = '5'
 // $ExpectError Type '"6"' is not assignable to type '"5"'
 const n2s2: FIVE = '6'
+
+const tl1: t.TupleLength<[number]> = 1
+const tl2: t.TupleLength<[number, string]> = 2
+const tl3: t.TupleLength<[number, string, boolean]> = 3
+
+type T2THList1 = t.TupleToTHList<[number]>
+type T2THList2 = t.TupleToTHList<[number, string]>
+type T2THList3 = t.TupleToTHList<[number, string, boolean]>