statebus 7.2.2 → 7.2.4

package/extras/tests.js

@@ -1129,17 +1129,14 @@ test(function proxies (done) {
 
     state.foo = 3
     // This should set into _
-    console.assert(bus.validate(bus.cache.foo,
-                                {key: 'foo', _: 3}))
+    assert(bus.validate(bus.cache.foo, {key: 'foo', _: 3}))
 
 
     state.foo = {a: 5}
     // This should set directly on it
-    console.assert(bus.validate(bus.cache.foo,
-                                {key: 'foo', a: 5}))
+    assert(bus.validate(bus.cache.foo, {key: 'foo', a: 5}))
     state.foo.b = 6
-    console.assert(bus.validate(bus.cache.foo,
-                                {key: 'foo', b: 6}))
+    assert(bus.validate(bus.cache.foo, {key: 'foo', b: 6}))
 
     state.bar = [3]
     state.foo = {a: 3, bar: state.bar}
@@ -1158,6 +1155,23 @@ test(function proxies (done) {
     // Getting a normal property should do a get
 })
 
+test(function proxy_link_escaping (done) {
+    var bus = require('../statebus')()
+    var state = bus.state
+
+    // See that links get escaped
+    state.foo = {link: "bar"}
+    assert(bus.validate(bus.cache.foo,
+                        {key: "foo", val: {_link: "bar"}}))
+
+    // And unescaped
+    // log("state.foo", state.foo)
+    // log("state.foo", JSON.stringify(state.foo))
+    assert(bus.validate(state.foo, {link: "bar"}))
+
+    done()
+})
+
 test(function path_parts (done) {
     bus.honk = 3
     bus('path/:part1/:part2/stuff/:part3/more*').getter = function (key, path, t) {

package/package.json

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

package/statebus.js

@@ -1456,6 +1456,9 @@
         link: Symbol('link')
     }
 
+    if (nodejs)
+        var util = require('util')
+
     // The top-level Proxy object holds HTTP resources
     var top_level_proxy = new Proxy(cache, {
         get: function get(o, k) {
@@ -1484,6 +1487,7 @@
             return true // Report success to Proxy
         }
     })
+    bus.state = top_level_proxy
 
     // The proxy within; a recursive tree holds each piece of JSON in a resource
     function json_proxy (base, path, o) {
@@ -1530,6 +1534,8 @@
 
         var proxy = new Proxy(target, {
             get: function (o, k) {
+                // console.log('proxy get:', o, k)
+
                 if (k === 'inspect' || k === 'valueOf')
                     return undefined
                 if (k === symbols.is_proxy)
@@ -1561,15 +1567,17 @@
                 )
                 return true
             },
-            // has: function (o, k) {
-            //     return o.hasOwnProperty(escape_field_json_to_bus(k))
-            // },
-            // ownKeys: function () {
-            //     return Object.keys(target).map(unescape_field_bus_to_json)
-            // },
-            // getOwnPropertyDescriptor: function (target, key) {
-            //     return { enumerable: true, configurable: true, value: this.get(target, key) }
-            // },
+            has: function (o, k) {
+                return o.hasOwnProperty(escape_field_json_to_bus(k))
+            },
+            ownKeys: function () {
+                return Object.keys(target).map(unescape_field_bus_to_json)
+            },
+            getOwnPropertyDescriptor: function (target, key) {
+                return { enumerable: true, configurable: true,
+                         value: this.get(target, escape_field_json_to_bus(key))
+                       }
+            },
             deleteProperty: function del (target, k) {
                 var new_path = path + '[' + JSON.stringify(k) + ']'
                 var escaped_key = escape_field_json_to_bus(k)
@@ -1589,8 +1597,6 @@
         return proxy
     }
 
-    bus.state = top_level_proxy
-
     // This doesn't work because custom inspectors only work when the
     // util.inspect.custom symbol is defined on the "target" of the
     // proxy... which right now is `cache` for the top_level_proxy.  I could
@@ -1609,20 +1615,22 @@
     //     }
     // }
 
-    // This is temporary code to wrap the cache as a flat key/valuel store
-    // that returns raw objects, dereferencing .val.  We can remove it once we
-    // remove the internal .val stuff from statebus.
-    function raw_proxy () {
-        return new Proxy(cache, {
-            get: function get(o, k) { return bus.cache[k].val },
-            set: function set(o, key, val) {
-                return false
-            },
-            deleteProperty: function del (o, k) {
-                return false
-            }
-        })
-    }
+    // This is disabled because it's not being used.
+    //
+    // // This is temporary code to wrap the cache as a flat key/valuel store
+    // // that returns raw objects, dereferencing .val.  We can remove it once we
+    // // remove the internal .val stuff from statebus.
+    // function raw_proxy () {
+    //     return new Proxy(cache, {
+    //         get: function get(o, k) { return bus.cache[k].val },
+    //         set: function set(o, key, val) {
+    //             return false
+    //         },
+    //         deleteProperty: function del (o, k) {
+    //             return false
+    //         }
+    //     })
+    // }
 
 
     // Old link code: