statebus 7.1.1 → 7.1.2

package/extras/tests.js

@@ -319,61 +319,61 @@ test(function proxy_link (done) {
     done()
 })
 
-test(function proxy_links_through1 (done) {
-    var bus = require('../statebus')()
-
-    // First try to dereference through three links
+// Disable the version of proxy_links_through where the user does not have to
+// explicitly traverse links with ._()
+if (true)
+    test(function proxy_links_through2 (done) {
+        var bus = require('../statebus')()
 
-    bus.state.a = [bus.link('b')]
-    bus.state.b = bus.link('c')
-    bus.state.c = 'see'
-    
-    log('state.c is', bus.state.c)
-    log('state.b is', bus.state.b, 'from cache', bus.cache.b)
-    log('state.a is', bus.state.a)
-    log('state.a[0] is', bus.state.a[0])
-    log('state.a[0] is', bus.state.a[0])
-    assert(bus.state.a[0] === 'see')
+        // First try to dereference through three links
 
-    // Add a little more wrapping and try some more
+        bus.state.a = [bus.link('b')]
+        bus.state.b = bus.link('c')
+        bus.state.c = 'see'
 
-    bus.state.nested = [99, {a: bus.link('a')}]
-    log('nested is', bus.state.nested)
-    log('nested[1].a[0] is', bus.state.nested[1].a[0])
-    assert(bus.state.nested[1].a[0] === 'see')
+        log('state.c is', bus.state.c)
+        log('state.b is', bus.state.b, 'from cache', bus.cache.b)
+        log('state.a is', bus.state.a)
+        log('state.a[0] is', bus.state.a[0])
+        log('state.a[0]._() is', bus.state.a[0]._())
+        log('state.a[0]._()._() is', bus.state.a[0]._()._())
+        assert(bus.state.a[0]._()._() === 'see')
 
-    // Now try to go raw at the top-level
+        // Add a little more wrapping and try some more
 
-    log('Raw is', bus.state[bus.symbols.raw].nested)
-    log('Raw is', bus.raw(bus.state).nested)
-    assert(bus.deep_equals(
-        bus.state[bus.symbols.raw].nested,
-        bus.raw(bus.state).nested
-    ))
+        bus.state.nested = [99, {a: bus.link('a')}]
+        log('nested is', bus.state.nested)
+        log('nested[1].a._()[0]._()._() is', bus.state.nested[1].a._()[0]._()._())
+        assert(bus.state.nested[1].a._()[0]._()._() === 'see')
 
-    log('Gonna deep_quals between:',
-        bus.raw(bus.state).nested,
-        [ 99, { a: { link: 'a' } } ])
+        // Now try to go raw at the top-level
 
-    assert(bus.deep_equals(
-        bus.raw(bus.state).nested,
-        [ 99, { a: { link: 'a' } } ]
-    ))
+        log('Raw is', bus.state[bus.symbols.raw].nested)
+        log('Raw is', bus.raw(bus.state).nested)
+        assert(bus.deep_equals(
+            bus.state[bus.symbols.raw].nested,
+            bus.raw(bus.state).nested
+        ))
 
-    // Now try to go raw within
+        log('Gonna deep_quals between:',
+            bus.raw(bus.state).nested,
+            [ 99, { a: { link: 'a' } } ])
 
-    log('Raw inner is', bus.raw(bus.state.nested[1]))
+        assert(bus.deep_equals(
+            bus.raw(bus.state).nested,
+            [ 99, { a: { link: 'a' } } ]
+        ))
 
-    log('Bad raw call is', bus.raw(bus.state.nested[0]))
+        // Now try to go raw within
 
-    done()
-})
+        log('Raw inner is', bus.raw(bus.state.nested[1]))
 
+        log('Bad raw call is', bus.raw(bus.state.nested[0]))
 
-// Disable the version of proxy_links_through where the user has to explicitly
-// traverse links with ()
-if (false)
-    test(function proxy_links_through2 (done) {
+        done()
+    })
+else
+    test(function proxy_links_through1 (done) {
         var bus = require('../statebus')()
 
         // First try to dereference through three links
@@ -386,16 +386,15 @@ if (false)
         log('state.b is', bus.state.b, 'from cache', bus.cache.b)
         log('state.a is', bus.state.a)
         log('state.a[0] is', bus.state.a[0])
-        log('state.a[0]() is', bus.state.a[0]())
-        log('state.a[0]()() is', bus.state.a[0]()())
-        assert(bus.state.a[0]()() === 'see')
+        log('state.a[0] is', bus.state.a[0])
+        assert(bus.state.a[0] === 'see')
 
         // Add a little more wrapping and try some more
 
         bus.state.nested = [99, {a: bus.link('a')}]
         log('nested is', bus.state.nested)
-        log('nested[1].a()[0]()() is', bus.state.nested[1].a()[0]()())
-        assert(bus.state.nested[1].a()[0]()() === 'see')
+        log('nested[1].a[0] is', bus.state.nested[1].a[0])
+        assert(bus.state.nested[1].a[0] === 'see')
 
         // Now try to go raw at the top-level
 
@@ -406,9 +405,9 @@ if (false)
             bus.raw(bus.state).nested
         ))
 
-        console.log('Gonna deep_quals between:',
-                    bus.raw(bus.state).nested,
-                    [ 99, { a: { link: 'a' } } ])
+        log('Gonna deep_quals between:',
+            bus.raw(bus.state).nested,
+            [ 99, { a: { link: 'a' } } ])
 
         assert(bus.deep_equals(
             bus.raw(bus.state).nested,
@@ -425,6 +424,27 @@ if (false)
     })
 
 
+test(function copy_link (done) {
+    var bus = require('../statebus')(), state = bus.state
+
+    state.a = [bus.link('b')]
+    state.b = 3
+    state.copy_of_a = state.a
+    state.copy_of_a0 = state.a[0]
+
+    console.log(bus.cache.a)
+    console.log(bus.cache.b)
+    console.log(bus.cache.copy_of_a)
+    console.log(bus.cache.copy_of_a0)
+
+    assert(bus.cache.a.val[0].link === 'b')
+    assert(bus.cache.b.val === 3)
+    assert(bus.cache.copy_of_a.val[0].link === 'b')
+    assert(bus.cache.copy_of_a0.val.link === 'b')
+
+    done()
+})
+
 
 test(function translate_fields (done) {
     // Translate Statebus -> Proxy format

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "statebus",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {

package/statebus.js

@@ -1497,9 +1497,9 @@
 
         // We recursively descend through {key: ...} links
         if (typeof o === 'object' && 'link' in o) {
-            var new_base = bus.get(o.link)
-            return json_proxy(new_base, '', new_base.val)
-            // return link(o.link)
+            // var new_base = bus.get(o.link)
+            // return json_proxy(new_base, '', new_base.val)
+            return link(o.link)
         }
 
 
@@ -1597,7 +1597,11 @@
     //    - We auto-dereference the key, with another get()
     //    - So the user actually sees the value of the resource on the other side of the link
     function link (url) {
-        return {[symbols.link]: url}
+        return {
+            link: url,
+            [symbols.link]: true,
+            _: (args, o) => (o = get(url), json_proxy(o, '', o.val))
+        }
     }
 
     // // The proxy object for links.  Disabled for now.
@@ -2098,7 +2102,7 @@
     var escape_json_to_bus = (obj) => {
         obj = translate_fields(obj, escape_field_json_to_bus)
         return deep_map(obj, o => (typeof o === 'object' && symbols.link in o
-                                   ? {link: o[symbols.link]}
+                                   ? {link: o.link}
                                    : o))
     }
     var unescape_bus_to_json = (obj) =>