Fix lint error / warnings

Author: jordangarcia

.eslintrc

@@ -2,14 +2,16 @@
   "env": {
     "node": true,
     "browser": true,
-    "amd": true
+    "amd": true,
+    "es6": true
   },
   "ecmaFeatures": {
     "arrowFunctions": true,
     "classes": true,
     "defaultParams": true,
     "destructuring": true,
     "forOf": true,
+    "modules": true,
     "objectLiteralShorthandMethods": true,
     "objectLiteralShorthandProperties": true,
     "spread": true,
@@ -58,7 +60,7 @@
     "use-isnan": 1,
     "valid-jsdoc": 0,
     "valid-typeof": 1,
-    "block-scoped-var": 1,
+    "block-scoped-var": 0,
     "complexity": 0,
     "consistent-return": 0,
     "curly": 1,

grunt/sauce.js

@@ -70,8 +70,8 @@ var batches = {
   },
 }
 
-for (var key in batches) {
-  value = batches[key]
+for (var key in batches) { // eslint-disable-line guard-for-in
+  var value = batches[key]
 
   exports[key] = {
     sauceLabs: sauceConfig,

src/create-react-mixin.js

@@ -1,5 +1,17 @@
 import { each } from './utils'
 
+/**
+ * Returns a mapping of the getDataBinding keys to
+ * the reactor values
+ */
+function getState(reactor, data) {
+  var state = {}
+  each(data, function(value, key) {
+    state[key] = reactor.evaluate(value)
+  })
+  return state
+}
+
 /**
  * @param {Reactor} reactor
  */
@@ -31,14 +43,3 @@ export default function(reactor) {
   }
 }
 
-/**
- * Returns a mapping of the getDataBinding keys to
- * the reactor values
- */
-function getState(reactor, data) {
-  var state = {}
-  each(data, function(value, key) {
-    state[key] = reactor.evaluate(value)
-  })
-  return state
-}

src/reactor.js

@@ -2,9 +2,9 @@ import Immutable from 'immutable'
 import createReactMixin from './create-react-mixin'
 import fns from './reactor/fns'
 import { isKeyPath } from './key-path'
-import { isGetter, fromKeyPath } from './getter'
+import { isGetter } from './getter'
 import { toJS } from './immutable-helpers'
-import { isArray, toFactory } from './utils'
+import { toFactory } from './utils'
 import { ReactorState, ObserverState } from './reactor/records'
 
 /**
@@ -19,7 +19,7 @@ import { ReactorState, ObserverState } from './reactor/records'
 class Reactor {
   constructor(config = {}) {
     const initialReactorState = new ReactorState({
-      debug: config.debug
+      debug: config.debug,
     })
 
     this.prevReactorState = initialReactorState
@@ -77,7 +77,7 @@ class Reactor {
       getter = []
     }
     let { observerState, entry } = fns.addObserver(this.observerState, getter, handler)
-    this.observerState = observerState;
+    this.observerState = observerState
     return () => {
       this.observerState = fns.removeObserverByEntry(this.observerState, entry)
     }
@@ -142,7 +142,7 @@ class Reactor {
     console.warn('Deprecation warning: `registerStore` will no longer be supported in 1.1, use `registerStores` instead')
     /* eslint-enable no-console */
     this.registerStores({
-      [id]: store
+      [id]: store,
     })
   }
 
@@ -215,8 +215,8 @@ class Reactor {
         return
       }
 
-      const getter = entry.get('getter');
-      const handler = entry.get('handler');
+      const getter = entry.get('getter')
+      const handler = entry.get('handler')
 
       const prevEvaluateResult = fns.evaluate(this.prevReactorState, getter)
       const currEvaluateResult = fns.evaluate(this.reactorState, getter)

src/reactor/fns.js

@@ -376,8 +376,6 @@ function isCached(reactorState, keyPathOrGetter) {
     return false
   }
 
-  const storeStates = entry.get('storeStates')
-
   return entry.get('storeStates').every((stateId, storeId) => {
     return reactorState.getIn(['storeStates', storeId]) === stateId
   })
@@ -401,7 +399,7 @@ function cacheValue(reactorState, getter, value) {
     })
   })
 
-  return reactorState.setIn(['cache', getter], Immutable.Map({
+  return reactorState.setIn(['cache', cacheKey], Immutable.Map({
     value: value,
     storeStates: storeStates,
     dispatchId: dispatchId,

src/utils.js

@@ -154,7 +154,7 @@ exports.toFactory = function(Klass) {
     return new Klass(...args)
   }
 
-  Factory.__proto__ = Klass
+  Factory.__proto__ = Klass // eslint-disable-line no-proto
   Factory.prototype = Klass.prototype
   return Factory
 }

tests/reactor-fns-tests.js

@@ -1,27 +1,30 @@
-import Immutable, { Map, List, Set, is } from 'immutable'
-import { Reactor, Store } from '../src/main'
+/*eslint-disable one-var, comma-dangle*/
+import { Map, Set, is } from 'immutable'
+import { Store } from '../src/main'
 import fns from '../src/reactor/fns'
 import { ReactorState, ObserverState } from '../src/reactor/records'
 import { toImmutable } from '../src/immutable-helpers'
 
 describe('reactor fns', () => {
   describe('#registerStores', () => {
-    let reactorState, store1, store2
+    let reactorState
+    let store1
+    let store2
     let nextReactorState
 
     beforeEach(() => {
       reactorState = new ReactorState()
       store1 = new Store({
         getInitialState() {
           return toImmutable({
-            foo: 'bar'
+            foo: 'bar',
           })
-        }
+        },
       })
       store2 = new Store({
         getInitialState() {
           return 2
-        }
+        },
       })
 
       nextReactorState = fns.registerStores(reactorState, {
@@ -33,7 +36,7 @@ describe('reactor fns', () => {
     it('should update reactorState.stores', () => {
       const expectedStores = Map({
         store1,
-        store2
+        store2,
       })
       expect(is(nextReactorState.get('stores'), expectedStores)).toBe(true)
     })
@@ -80,24 +83,24 @@ describe('reactor fns', () => {
       store1 = new Store({
         getInitialState() {
           return toImmutable({
-            foo: 'bar'
+            foo: 'bar',
           })
         },
         initialize() {
           this.on('set1', (state, payload) => state.set('foo', payload))
-        }
+        },
       })
       store2 = new Store({
         getInitialState() {
           return 2
         },
         initialize() {
           this.on('set2', (state, payload) => payload)
-        }
+        },
       })
 
       initialReactorState = fns.resetDirtyStores(
-        fns.registerStores(reactorState, { store1, store2, })
+        fns.registerStores(reactorState, { store1, store2 })
       )
     })
 
@@ -116,9 +119,9 @@ describe('reactor fns', () => {
         const result = nextReactorState.get('state')
         const expected = Map({
           store1: Map({
-            foo: 'bar'
+            foo: 'bar',
           }),
-          store2: 3
+          store2: 3,
         })
         expect(is(result, expected)).toBe(true)
       })
@@ -154,9 +157,9 @@ describe('reactor fns', () => {
         const result = nextReactorState.get('state')
         const expected = Map({
           store1: Map({
-            foo: 'bar'
+            foo: 'bar',
           }),
-          store2: 2
+          store2: 2,
         })
         expect(is(result, expected)).toBe(true)
       })
@@ -184,32 +187,32 @@ describe('reactor fns', () => {
     beforeEach(() => {
       const stateToLoad = {
         store1: {
-          foo: 'baz'
+          foo: 'baz',
         },
         // invalid storekey -> ignore
-        store3: 'wtf'
+        store3: 'wtf',
       }
 
       const reactorState = new ReactorState()
       store1 = new Store({
         getInitialState() {
           return toImmutable({
-            foo: 'bar'
+            foo: 'bar',
           })
         },
 
         deserialize(state) {
           return toImmutable(state)
-        }
+        },
       })
       store2 = new Store({
         getInitialState() {
           return 2
-        }
+        },
       })
 
       initialReactorState = fns.resetDirtyStores(
-        fns.registerStores(reactorState, { store1, store2, })
+        fns.registerStores(reactorState, { store1, store2 })
       )
 
       nextReactorState = fns.loadState(initialReactorState, stateToLoad)
@@ -250,7 +253,7 @@ describe('reactor fns', () => {
       store1 = new Store({
         getInitialState() {
           return toImmutable({
-            foo: 'bar'
+            foo: 'bar',
           })
         },
         initialize() {
@@ -264,7 +267,7 @@ describe('reactor fns', () => {
         handleReset() {
           // override reset method and return different value
           return 3
-        }
+        },
       })
 
       initialReactorState = fns.resetDirtyStores(
@@ -341,7 +344,7 @@ describe('reactor fns', () => {
             getterKey: getter,
             getter: getter,
             handler: handler,
-          })]
+          })],
         ])
         const result = nextObserverState.get('observersMap')
         expect(is(expected, result)).toBe(true)
@@ -462,8 +465,6 @@ describe('reactor fns', () => {
           ])
         })
         const result = nextObserverState
-        console.log(expected.toJS())
-        console.log(result.toJS())
         expect(is(expected, result)).toBe(true)
       })
     })
@@ -496,10 +497,9 @@ describe('reactor fns', () => {
           ])
         })
         const result = nextObserverState
-        console.log('expected', expected.toJS())
-        console.log(result.toJS())
         expect(is(expected, result)).toBe(true)
       })
     })
   })
 })
+/*eslint-enable one-var, comma-dangle*/

tests/reactor-tests.js

@@ -255,7 +255,7 @@ describe('Reactor', () => {
         checkoutActions.setTaxPercent(5)
         var getter = [
           ['taxPercent'],
-          (percent) => percent * 2
+          (percent) => percent * 2,
         ]
         var result = reactor.evaluate(getter)
         expect(result).toBe(10)
@@ -277,7 +277,7 @@ describe('Reactor', () => {
           t => {
             taxPercentSpy()
             return t
-          }
+          },
         ]
 
         subtotalGetter = [