ESLint 💔, Prettier 💅

package.json

@@ -33,13 +33,12 @@
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-stage-0": "^6.5.0",
     "chai": "^3.2.0",
-    "eslint": "^1.4.1",
-    "eslint-config-airbnb": "0.0.8",
     "mocha": "^2.3.2",
+    "prettier": "^0.22.0",
     "sinon": "^1.15.4"
   },
   "scripts": {
-    "lint": "eslint .",
+    "prettier": "prettier --write --single-quote src/**/*.js",
     "compile": "babel src --out-dir dist",
     "test": "NODE_ENV=test mocha --compilers js:babel-core/register",
     "prepublish": "npm run compile"

src/base.js

@@ -1,4 +1,4 @@
-import {Iterable, Map} from 'immutable';
+import { Iterable, Map } from 'immutable';
 
 import {
   listToKeyPath,
@@ -9,7 +9,7 @@ import {
   wrappedValue
 } from './utils';
 
-const {Iterator} = Iterable;
+const { Iterator } = Iterable;
 const NOT_SET = {}; // Sentinel value
 
 function Base(rootData, keyPath, updater, deref, size) {
@@ -39,8 +39,13 @@ Base.prototype = {
     if (constructKeyPath.length === 0) {
       return this;
     }
-    const value = this._rootData.getIn(newKeyPath(this._keyPath, constructKeyPath), NOT_SET);
-    return value === NOT_SET ? notSetValue : wrappedValue(this, constructKeyPath, value);
+    const value = this._rootData.getIn(
+      newKeyPath(this._keyPath, constructKeyPath),
+      NOT_SET
+    );
+    return value === NOT_SET
+      ? notSetValue
+      : wrappedValue(this, constructKeyPath, value);
   },
 
   set(key, value) {
@@ -54,7 +59,7 @@ Base.prototype = {
 
   // Needs tests
   remove(key) {
-    return updateCursor(this, m  => m.remove(key), [key]);
+    return updateCursor(this, m => m.remove(key), [key]);
   },
 
   // Needs tests
@@ -81,9 +86,11 @@ Base.prototype = {
   },
 
   updateIn(keyPath, notSetValue, updater) {
-    return updateCursor(this, m =>
-      m.updateIn(keyPath, notSetValue, updater)
-      , keyPath);
+    return updateCursor(
+      this,
+      m => m.updateIn(keyPath, notSetValue, updater),
+      keyPath
+    );
   },
 
   merge() {
@@ -120,8 +127,8 @@ Base.prototype = {
     const deref = cursor.deref();
     return do {
       if (deref && deref.__iterate) {
-        deref.__iterate((v, k) =>
-          fn(wrappedValue(cursor, [k], v), k, cursor),
+        deref.__iterate(
+          (v, k) => fn(wrappedValue(cursor, [k], v), k, cursor),
           reverse
         );
       } else {
@@ -133,8 +140,9 @@ Base.prototype = {
   __iterator(type, reverse) {
     const deref = this.deref();
     const cursor = this;
-    const iterator = deref && deref.__iterator &&
-deref.__iterator(Iterator.ENTRIES, reverse);
+    const iterator = deref &&
+      deref.__iterator &&
+      deref.__iterator(Iterator.ENTRIES, reverse);
     return new Iterator(() => {
       if (!iterator) {
         return { value: undefined, done: true };

src/cursor.js

@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import {valToKeyPath, makeCursor} from './utils';
+import { valToKeyPath, makeCursor } from './utils';
 import createAtom from 'atom-store';
 
 function cursorFrom(data, keyPath, onChange) {

src/indexed.js

@@ -1,6 +1,6 @@
-import {Seq} from 'immutable';
+import { Seq } from 'immutable';
 import Base from './base';
-import {updateCursor} from './utils';
+import { updateCursor } from './utils';
 
 function Indexed(rootData, keyPath, updater, deref, size) {
   Base.call(this, rootData, keyPath, updater, deref, size);

src/keyed.js

@@ -1,4 +1,4 @@
-import {Seq} from 'immutable';
+import { Seq } from 'immutable';
 import Base from './base';
 
 function Keyed(rootData, keyPath, updater, deref, size) {

src/utils.js

@@ -1,4 +1,4 @@
-import {Iterable, Record, Map} from 'immutable';
+import { Iterable, Record, Map } from 'immutable';
 import KeyedCursor from './keyed';
 import IndexedCursor from './indexed';
 
@@ -62,7 +62,8 @@ export function valToKeyPath(val) {
 
 export function subCursor(cursor, keyPath, value) {
   if (arguments.length < 3) {
-    return makeCursor( // call without value
+    return makeCursor(
+      // call without value
       cursor._rootData,
       newKeyPath(cursor._keyPath, keyPath),
       cursor._updater,
@@ -80,12 +81,18 @@ export function subCursor(cursor, keyPath, value) {
 
 export function updateCursor(cursor, changeFn) {
   const deepChange = arguments.length > 2;
-  const updateFn = oldState => oldState.updateIn(
+  const updateFn = oldState =>
+    oldState.updateIn(
+      cursor._keyPath,
+      deepChange ? Map() : undefined,
+      changeFn
+    );
+  return makeCursor(
+    cursor._updater(updateFn),
     cursor._keyPath,
-    deepChange ? Map() : undefined,
-    changeFn
+    cursor._updater,
+    cursor._deref
   );
-  return makeCursor(cursor._updater(updateFn), cursor._keyPath, cursor._updater, cursor._deref);
 }
 
 export function wrappedValue(cursor, keyPath, value) {