Simplify toJS() (immutable-js#1384)

leebyron · web-flow · commit 316150f9c86b · 2017-10-13T16:51:56.000-07:00
This factors toJS() into its own function and simplifies the implementation to recurse within only toJS() instead of between toJS() and value.toJS(). Also, instead of sniffing for a .toJS function existing on the value, uses isImmutable() which consolidates this logic and makes it more predictable.
diff --git a/src/CollectionImpl.js b/src/CollectionImpl.js
@@ -48,6 +48,7 @@ import deepEqual from './utils/deepEqual';
 import mixin from './utils/mixin';
 import quoteString from './utils/quoteString';
 
+import { toJS } from './toJS';
 import { Map } from './Map';
 import { OrderedMap } from './OrderedMap';
 import { List } from './List';
@@ -118,9 +119,7 @@ mixin(Collection, {
   },
 
   toJS() {
-    return this.toSeq()
-      .map(toJS)
-      .toJSON();
+    return toJS(this);
   },
 
   toKeyedSeq() {
@@ -768,10 +767,6 @@ function entryMapper(v, k) {
   return [k, v];
 }
 
-function toJS(value) {
-  return value && typeof value.toJS === 'function' ? value.toJS() : value;
-}
-
 function not(predicate) {
   return function() {
     return !predicate.apply(this, arguments);
diff --git a/src/Record.js b/src/Record.js
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { toJS } from './toJS';
 import { KeyedCollection } from './Collection';
 import { keyedSeqFromValue } from './Seq';
 import { MapPrototype } from './Map';
@@ -144,7 +145,7 @@ export class Record {
   }
 
   toJS() {
-    return recordSeq(this).toJS();
+    return toJS(this);
   }
 
   __iterator(type, reverse) {
diff --git a/src/toJS.js b/src/toJS.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { Collection } from './Collection';
+import { isImmutable } from './Predicates';
+
+export function toJS(value) {
+  return isImmutable(value)
+    ? Collection(value)
+        .map(toJS)
+        .toJSON()
+    : value;
+}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`* LICENSE file in the root directory of this source tree.`
`6`	`6`	`*/`
`7`	`7`
	`8`	`+import { toJS } from './toJS';`
`8`	`9`	`import { KeyedCollection } from './Collection';`
`9`	`10`	`import { keyedSeqFromValue } from './Seq';`
`10`	`11`	`import { MapPrototype } from './Map';`
`@@ -144,7 +145,7 @@ export class Record {`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`toJS() {`
`147`		`- return recordSeq(this).toJS();`
	`148`	`+ return toJS(this);`
`148`	`149`	`}`
`149`	`150`
`150`	`151`	`__iterator(type, reverse) {`