WIP: refactor evaluator / getter to be functional

Author: jordangarcia

grunt/karma.js

@@ -23,7 +23,7 @@ module.exports = {
     webpack: {
       module: {
         loaders: [
-          { test: /\.js$/, loader: 'jstransform-loader' },
+          { test: /\.js$/, loader: 'babel-loader' },
         ],
       },
     },
@@ -37,6 +37,10 @@ module.exports = {
     autoWatch: false,
 
     singleRun: true,
+
+    client: {
+      captureConsole: false,
+    },
   },
 
   phantom: {
@@ -66,7 +70,7 @@ module.exports = {
     webpack: {
       module: {
         loaders: [
-          { test: /\.js$/, loader: 'jstransform-loader' },
+          { test: /\.js$/, loader: 'babel-loader' },
         ],
         postLoaders: [
           {

package.json

@@ -27,7 +27,9 @@
     "stateless"
   ],
   "dependencies": {
-    "immutable": "^3.7.3"
+    "immutable": "^3.7.3",
+    "babel-core": "^5.8.29",
+    "babel-loader": "^5.3.2"
   },
   "devDependencies": {
     "grunt": "^0.4.5",

src/getter.js

@@ -1,3 +1,6 @@
+import Immutable from 'immutable'
+import { List } from 'immutable'
+
 var isFunction = require('./utils').isFunction
 var isArray = require('./utils').isArray
 var isKeyPath = require('./key-path').isKeyPath
@@ -36,6 +39,36 @@ function getDeps(getter) {
   return getter.slice(0, getter.length - 1)
 }
 
+/**
+ * Returns an array of deps from a getter and all its deps
+ * @param {Getter} getter
+ * @param {Immutable.Set} existing
+ * @return {Immutable.Set}
+ */
+function getFlattenedDeps(getter, existing) {
+  if (!existing) {
+    existing = Immutable.Set()
+  }
+
+  const toAdd = Immutable.Set().withMutations(set => {
+    if (!isGetter(getter)) {
+      throw new Error('getFlattenedDeps must be passed a Getter')
+    }
+
+    getDeps(getter).forEach(function(dep) {
+      if (isKeyPath(dep)) {
+        set.add(List(dep))
+      } else if (isGetter(dep)) {
+        set.union(getFlattenedDeps(dep))
+      } else {
+        throw new Error('Invalid getter, each dependency must be a KeyPath or Getter')
+      }
+    })
+  })
+
+  return existing.union(toAdd)
+}
+
 /**
  * @param {KeyPath}
  * @return {Getter}
@@ -48,10 +81,35 @@ function fromKeyPath(keyPath) {
   return [keyPath, identity]
 }
 
+/**
+ * Adds non enumerated __storeDeps property
+ * @param {Getter}
+ */
+function getStoreDeps(getter) {
+  if (getter.hasOwnProperty('__storeDeps')) {
+    return getter.__storeDeps
+  }
+
+  const storeDeps = getFlattenedDeps(getter)
+    .map(keyPath => keyPath.first())
+    .filter(x => !!x)
+
+
+  Object.defineProperty(getter, '__storeDeps', {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value: storeDeps,
+  })
+
+  return storeDeps
+}
 
-module.exports = {
-  isGetter: isGetter,
-  getComputeFn: getComputeFn,
-  getDeps: getDeps,
-  fromKeyPath: fromKeyPath,
+export {
+  isGetter,
+  getComputeFn,
+  getFlattenedDeps,
+  getStoreDeps,
+  getDeps,
+  fromKeyPath,
 }

src/main.js

@@ -1,3 +1,4 @@
+import Store from './store'
 var helpers = require('./immutable-helpers')
 
 /**
@@ -8,7 +9,7 @@ exports.Reactor = require('./reactor')
 /**
  * @return {Store}
  */
-exports.Store = require('./store')
+exports.Store = Store
 
 // export the immutable library
 exports.Immutable = require('immutable')