Clean up formatting to make memoizers more uniform

Author: dustingetz

src/Cursor.js

@@ -5,10 +5,11 @@ import {makeSwapFromReact, makeValueFromReact, isReactCmp} from './ReactAdapter'
 
 let debug = process.env.NODE_ENV !== 'production';
 
+
 let makeRefinedSwap = memoized(
   (swapFn, paths) => refToHash(swapFn) + hashRecord(paths),
-  (swapFn, paths) => (f) => swapFn(rootAt(paths, f))
-);
+  (swapFn, paths) => (f) => swapFn(rootAt(paths, f)));
+
 
 class Cursor {
   constructor (value, swapFn) {
@@ -27,17 +28,14 @@ class Cursor {
 }
 
 
-let NewCursor_ = (value, swap) => new Cursor(value, swap);
+let NewCursor = memoized(
+    (value, swap) => refToHash(swap) + hashRecord(value),
+    (value, swap) => new Cursor(value, swap));
 
-// reuse the same cursor instance for same {value swap},
-let hasher = (value, swap) => refToHash(swap) + hashRecord(value);
-let NewCursor = memoized(hasher, NewCursor_);
 
+Cursor.build = (value, swap) => isReactCmp(value)
+    ? NewCursor(makeValueFromReact(value), makeSwapFromReact(value))
+    : NewCursor(value, swap);
 
-Cursor.build = (value, swap) => {
-  return isReactCmp(value)
-      ? NewCursor(makeValueFromReact(value), makeSwapFromReact(value))
-      : NewCursor(value, swap);
-};
 
 export default Cursor;

src/RefCursor.js

@@ -2,15 +2,16 @@ import {memoized, refToHash, hashRecord, getIn, rootAt} from './util';
 import {merge, push, unshift, splice} from 'update-in';
 import {makeDerefFromReact, makeSwapFromReact, isReactCmp} from './ReactAdapter';
 
+
 let makeRefinedSwap = memoized(
   (swapFn, paths) => refToHash(swapFn) + hashRecord(paths),
-  (swapFn, paths) => (f) => swapFn(rootAt(paths, f))
-);
+  (swapFn, paths) => (f) => swapFn(rootAt(paths, f)));
+
 
 let makeRefinedDeref = memoized(
   (deref, paths) => refToHash(deref) + hashRecord(paths),
-  (deref, paths) => () => getIn(deref(), paths)
-);
+  (deref, paths) => () => getIn(deref(), paths));
+
 
 class RefCursor {
   constructor (deref, swapFn) {
@@ -29,17 +30,14 @@ class RefCursor {
 }
 
 
-let NewRefCursor_ = (deref, swap) => new RefCursor(deref, swap);
+let NewRefCursor = memoized(
+    (deref, swap) => refToHash(deref) + refToHash(swap),
+    (deref, swap) => new RefCursor(deref, swap));
 
-// reuse the same cursor instance for same {deref swap paths}
-let hasher = (deref, swap) => refToHash(deref) + refToHash(swap);
-let NewRefCursor = memoized(hasher, NewRefCursor_);
 
+RefCursor.build = (deref, swap) => isReactCmp(deref)
+    ? NewRefCursor(makeDerefFromReact(deref), makeSwapFromReact(deref))
+    : NewRefCursor(deref, swap);
 
-RefCursor.build = (deref, swap) => {
-  return isReactCmp(deref)
-      ? NewRefCursor(makeDerefFromReact(deref), makeSwapFromReact(deref))
-      : NewRefCursor(deref, swap);
-};
 
 export default RefCursor;