From d8eb310220768f843720813ed821f04eedd3e4f9 Mon Sep 17 00:00:00 2001
From: Mathias Lorenzen <mll@ipaper.io>
Date: Mon, 26 Feb 2018 08:53:58 +0100
Subject: [PATCH 1/3] more fixes.

---
 types/knockout/index.d.ts | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 570f61d80b..54255c1c76 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -409,9 +409,18 @@ interface KnockoutTasks {
 }
 
 /////////////////////////////////
+type KnockoutObservableTypeParameter<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>|T[P];
+};
 type KnockoutObservableType<T> = {
     [P in keyof T]: KnockoutObservable<T[P]>;
 };
+type KnockoutObservableTypeRecursive<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>|KnockoutObservableTypeRecursive<T[P]>;
+};
+type KnockoutObservableTypeParameterRecursive<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>|T[P]|KnockoutObservableTypeRecursive<T[P]>;
+};
 
 interface KnockoutStatic {
     utils: KnockoutUtils;
@@ -443,11 +452,19 @@ interface KnockoutStatic {
     contextFor(node: any): any;
     isSubscribable(instance: any): instance is KnockoutSubscribable<any>;
     toJSON(viewModel: any, replacer?: Function, space?: any): string;
-    toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableType<T>[]|KnockoutObservableArray<KnockoutObservableType<T>>|T[]): T[];
-    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableType<T>|KnockoutObservable<KnockoutObservableType<T>>|T): T;
-    isObservable<T>(instance: KnockoutObservable<T>|T): instance is KnockoutObservable<T>;
-    isWriteableObservable<T>(instance: KnockoutObservable<T>|T): instance is KnockoutObservable<T>;
-    isComputed<T>(instance: KnockoutObservable<T>|T): instance is KnockoutComputed<T>;
+
+    toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableTypeParameterRecursive<T>[]|KnockoutObservableArray<KnockoutObservableTypeParameterRecursive<T>>|T[]): T[];
+    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableTypeParameterRecursive<T>|KnockoutObservable<KnockoutObservableTypeParameterRecursive<T>>): T;
+
+    isObservable(instance: any): instance is KnockoutObservable<any>;
+    isObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
+
+    isWriteableObservable(instance: any): instance is KnockoutObservable<any>;
+    isWriteableObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
+
+    isComputed(instance: any): instance is KnockoutComputed<any>;
+    isComputed<T>(instance: KnockoutObservable<T> | T): instance is KnockoutComputed<T>;
+
     dataFor(node: any): any;
     removeNode(node: Node): void;
     cleanNode(node: Node): Node;

From 61168b2479e69e6c4c14f2fba967fe0bc996ee23 Mon Sep 17 00:00:00 2001
From: Mathias Lorenzen <mll@ipaper.io>
Date: Mon, 26 Feb 2018 12:03:05 +0100
Subject: [PATCH 2/3] added new tests.

---
 types/knockout/index.d.ts    |  9 ++++-----
 types/knockout/test/index.ts | 13 +++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 54255c1c76..6d1dcbab59 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -416,10 +416,10 @@ type KnockoutObservableType<T> = {
     [P in keyof T]: KnockoutObservable<T[P]>;
 };
 type KnockoutObservableTypeRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>|KnockoutObservableTypeRecursive<T[P]>;
+    [P in keyof T]: KnockoutObservable<KnockoutObservableSubTypeRecursive<T[P]>|T[P]>;
 };
-type KnockoutObservableTypeParameterRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>|T[P]|KnockoutObservableTypeRecursive<T[P]>;
+type KnockoutObservableSubTypeRecursive<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>;
 };
 
 interface KnockoutStatic {
@@ -453,8 +453,7 @@ interface KnockoutStatic {
     isSubscribable(instance: any): instance is KnockoutSubscribable<any>;
     toJSON(viewModel: any, replacer?: Function, space?: any): string;
 
-    toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableTypeParameterRecursive<T>[]|KnockoutObservableArray<KnockoutObservableTypeParameterRecursive<T>>|T[]): T[];
-    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableTypeParameterRecursive<T>|KnockoutObservable<KnockoutObservableTypeParameterRecursive<T>>): T;
+    toJS(viewModel: any): any;
 
     isObservable(instance: any): instance is KnockoutObservable<any>;
     isObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
diff --git a/types/knockout/test/index.ts b/types/knockout/test/index.ts
index 36db7657ed..bc62702e0d 100644
--- a/types/knockout/test/index.ts
+++ b/types/knockout/test/index.ts
@@ -99,6 +99,19 @@ class GetterViewModel {
     public range: KnockoutObservable<any>;
 }
 
+function testToJs() {
+    var objKo = {
+        prop: ko.observable("prop"),
+        subKo: ko.observable({
+            prop: ko.observable("prop")
+        })
+    };
+
+    var objJs = ko.toJS(objKo);
+    objJs.prop; // $ExpectType any
+    objJs.subKo.prop; // $ExpectType any
+}
+
 function testGetter() {
     var model = new GetterViewModel();
 

From ac6f6b3e1f8f9abc2fcc8006d194f1b83e299206 Mon Sep 17 00:00:00 2001
From: Mathias Lorenzen <mll@ipaper.io>
Date: Mon, 26 Feb 2018 13:26:44 +0100
Subject: [PATCH 3/3] undo stuff.

---
 types/knockout/index.d.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 6d1dcbab59..dc5cc833c1 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -409,19 +409,6 @@ interface KnockoutTasks {
 }
 
 /////////////////////////////////
-type KnockoutObservableTypeParameter<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>|T[P];
-};
-type KnockoutObservableType<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>;
-};
-type KnockoutObservableTypeRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<KnockoutObservableSubTypeRecursive<T[P]>|T[P]>;
-};
-type KnockoutObservableSubTypeRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>;
-};
-
 interface KnockoutStatic {
     utils: KnockoutUtils;
     memoization: KnockoutMemoization;