added switch combine tests

lib/subscribe/collection.js

@@ -14,7 +14,6 @@ module.exports = function collection (target, subs, update, tree, stamp) {
     let keys = target._keys && target.keys()
     if (keys && keys.length) {
       for (let i = 0, len = keys.length; i < len; i++) {
-        console.log('key:', keys[i])
         if (item(keys[i], target, subs, update, tree.$any, stamp)) {
           changed = true
         }

lib/subscribe/item.js

@@ -14,7 +14,6 @@ module.exports = function item (key, target, subs, update, tree, stamp) {
   } else if (key === '$test') {
     return test(target, subs, update, tree, stamp)
   } else {
-    console.log('  struct it', key)
     return struct(
       key,
       target && key in target && target[key],

lib/subscribe/parent.js

@@ -9,12 +9,7 @@ module.exports = function parent (target, subs, update, tree, stamp) {
       parentTree = tree.$parent = { _p: tree, _key: '$parent' }
       addC(tree)
     }
-    // here we need to walk the tree not the parent
-
-    const targetx = get(target, tree)
-    console.log(targetx, subs)
-
-    return diff(targetx, subs, update, parentTree, stamp)
+    return diff(get(target, tree), subs, update, parentTree, stamp)
   } else if (parentTree && '$remove' in subs) {
     remove('$parent', target, target, subs, update, tree, parentTree, stamp)
     return true
@@ -29,23 +24,17 @@ function get (target, tree) {
     if (tree._key !== '$parent') {
       key = tree._key
       tree = tree._p
-
       if (key[0] !== '$') {
         parentcounter--
-        // if(key == '$')
-        // key any is a problem
         if (parentcounter < 0) {
           path.unshift(key)
         }
       }
-      // }
-      // }
     } else {
       parentcounter++
       tree = tree._p
     }
   }
-  console.log('  getParent:', path, target.path())
   // can be greatly optmized
   return (!path.length) ? target.getRoot() : target.getRoot().get(path)
 }

test/parent/basic.js

@@ -115,12 +115,7 @@ test('parent - $any', function (t) {
       }
     }
   )
-
-  const r = s('initial subscription', [], {})
-
-  console.log(' ')
-  console.log(' ')
-  console.log('LETS FOCUS')
+  s('initial subscription', [], {})
   s(
     'create a collection',
     [
@@ -129,6 +124,5 @@ test('parent - $any', function (t) {
     ],
     { focus: true }
   )
-  console.log(r.tree)
   t.end()
 })

test/parent/index.js

@@ -1,3 +1,4 @@
 'use strict'
 require('./basic')
 require('./references')
+require('./switch')

test/parent/references.js

@@ -67,5 +67,6 @@ test('parent - references - double', function (t) {
     }
   )
   s('initial subscription', [ { path: 'a/b/d', type: 'new' } ])
+  // maybe add some switch ref tests
   t.end()
 })

test/parent/switch.js

@@ -0,0 +1,64 @@
+'use strict'
+const test = require('tape')
+const subsTest = require('../util')
+
+test('parent - $switch', function (t) {
+  const subscription = {
+    nest: {
+      field: {
+        $switch: {
+          exec  (state, type, stamp, subs, tree, sType) {
+            console.log(state)
+            if (state.key === 'a') {
+              return 'optionA'
+            } else if (state.key === 'b') {
+              return 'optionB'
+            } else if (state.key === 'c') {
+              return 'optionC'
+            }
+          },
+          optionA: { $parent: { bla: { val: true } } },
+          optionB: { $parent: { $parent: { etc: { val: true } } } },
+          optionC: { val: true } // should fire wtf...
+        }
+      }
+    }
+  }
+
+  const s = subsTest(
+    t,
+    {
+      etc: true,
+      nest: {
+        bla: { val: true },
+        a: {},
+        b: {},
+        c: 'hello',
+        field: '$root.nest.a'
+      }
+    },
+    subscription
+  )
+
+  const r = s('initial subscription', [ { path: 'nest/bla', type: 'new' } ])
+  t.same(r.tree.nest.field.$switch.$c, { $parent: 'parent' }, 'got correct $c')
+  s(
+    'change to c (remove parent subs)',
+    [ { path: 'nest/c', type: 'new' } ],
+    { nest: { field: '$root.nest.c' } }
+  )
+  t.equal(r.tree.nest.field.$switch.$c, void 0, 'removed field.$switch.$c')
+  s(
+    'change to b (double parent)',
+    [ { path: 'etc', type: 'new' } ],
+    { nest: { field: '$root.nest.b' } }
+  )
+  s(
+    'change to c (remove parent subs)',
+    [ { path: 'nest/c', type: 'new' } ],
+    { nest: { field: '$root.nest.c' } }
+  )
+  t.equal(r.tree.nest.field.$switch.$c, void 0, 'removed field.$switch.$c')
+  t.equal(r.tree.nest.field.$c, void 0, 'removed field.$c')
+  t.end()
+})

test/switch/basic.js

@@ -31,8 +31,6 @@ test('switch - basic', (t) => {
   )
   const result = s('initial subscription', [], {})
 
-  console.log('-> 1 heeere we go', result.state.field)
-
   s(
     'set field to a',
     [
@@ -42,8 +40,6 @@ test('switch - basic', (t) => {
     { field: '$root.a' }
   )
 
-  console.log('-> 2 heeere we go 2', result.state.field.listensOnBase.keys())
-
   s(
     'set field to b',
     [
@@ -54,8 +50,6 @@ test('switch - basic', (t) => {
     { field: '$root.b' }
   )
 
-  console.log('3 heeere we go', result.state.field.listensOnBase.keys())
-
   s(
     'set field to false',
     [
@@ -65,7 +59,6 @@ test('switch - basic', (t) => {
     { field: false }
   )
 
-  console.log('4 heeere we go', result.state.field.listensOnBase.keys())
   s(
     'set field to a',
     [
@@ -75,7 +68,6 @@ test('switch - basic', (t) => {
     { field: '$root.a' }
   )
 
-  console.log('REMOVE!') // needs tests in observable clearly!
   s(
     'remove field ',
     [