statebus 7.0.26 → 7.0.28

package/extras/tests.js

@@ -296,11 +296,15 @@ test(function url_translation (done) {
 })
 
 test(function proxy_link (done) {
-    console.log('lets test')
-
     bus.state.link_from = [{link: 'link_to'}]
     bus.state.link_to = 3
     assert(bus.state.link_from[0] !== 3, 'Link got linkified')
+    console.log('link_from is', bus.state.link_from)
+    var pass = bus.deep_equals(bus.state.link_from, [{link: 'link_to'}])
+    console.log('pass is', pass)
+    assert(pass, 'Failed proxy link unlinky test')
+
+    // assert(bus.deep_equals(bus.state.link_from, [{link: 'link_to'}]), 'Link_from looks wrong')
 
     done()
 })

package/package.json

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

package/statebus.js

@@ -1305,6 +1305,10 @@
         // get_base: Symbol('get_base')
     }
     function make_proxy () {
+        // var custom_inspect_symbol = nodejs && require('util').inspect.custom,
+        //     custom_inspect = function (depth, options) {
+        //         return '3333333333';// util.inspect(bus.unescape_from_nelson(this), options)
+        //     }
         function item_proxy (base, path, o) {
 
             // Primitives pass through unscathed
@@ -1333,9 +1337,11 @@
 
 
             return new Proxy(o, {
-                get: function get(o, k) {
+                get: function (o, k) {
                     if (k === 'inspect' || k === 'valueOf')
                         return undefined
+                    // if (custom_inspect && k === custom_inspect)
+                    //     return custom_inspect
                     if (k === symbols.is_proxy)
                         return true
                     if (typeof k === 'symbol')
@@ -1343,11 +1349,11 @@
 
                     // Compute the new path
                     var new_path = path + '[' + JSON.stringify(k) + ']'
-                    return item_proxy(base, new_path, o[escape_field_to_bus(k)])
+                    return item_proxy(base, new_path, o[escape_field_to_bus(escape_field_to_nelson(k))])
                 },
-                set: function set(o, k, v) {
+                set: function (o, k, v) {
                     var value = translate_fields(v, field => escape_field_to_bus(escape_field_to_nelson(field)))
-                    o[escape_field_to_bus(k)] = value
+                    o[escape_field_to_bus(escape_field_to_nelson(k))] = value
                     var new_path = path + '[' + JSON.stringify(k) + ']'
                     bus.set(
                         base,
@@ -1356,12 +1362,20 @@
                     )
                     return true
                 },
-                has: function has(o, k) {
-                    return o.hasOwnProperty(escape_field_to_bus(k))
+                has: function (o, k) {
+                    // if (custom_inspect && k === custom_inspect)
+                    //     return true
+                    return o.hasOwnProperty(escape_field_to_bus(escape_field_to_nelson(k)))
+                },
+                ownKeys: function () {
+                    return Object.keys(o).map(unescape_field_from_nelson).map(unescape_field_from_bus)
+                },
+                getOwnPropertyDescriptor: function (target, key) {
+                    return { enumerable: true, configurable: true, value: this.get(o, key) }
                 },
                 deleteProperty: function del (o, k) {
                     var new_path = path + '[' + JSON.stringify(k) + ']'
-                    delete o[escape_field_to_bus(k)]
+                    delete o[escape_field_to_bus(escape_field_to_nelson(k))]
                     bus.set(
                         base,
                         // Forward the patch too
@@ -1421,9 +1435,10 @@
     if (!nodejs)
         window.devtoolsFormatters = [{
             header: function (x) {
-                if (x[symbols.is_proxy])
+                if (x[symbols.is_proxy]) {
                     return ['span', {style: 'background-color: #fffbe5; padding: 3px;'},
                             JSON.stringify(x)]
+                }
                 // For function proxies:
                 // JSON.stringify(x(), null, 2)]
             },
@@ -1737,7 +1752,8 @@
         else if (typeof json === 'object' && json !== null) {
             var new_obj = {}
             for (var k in json)
-                new_obj[translate(k, json)] = translate_fields(json[k], translate)
+                if (typeof k === 'string')
+                    new_obj[translate(k, json)] = translate_fields(json[k], translate)
             result = new_obj
         }
 
@@ -1755,16 +1771,20 @@
     //  - nelSON            escapes link -> _link
     //  - JSON
     //
-    var escape_field_to_bus        = (field) => field.replace(/^(_*)key$/, '$1_key'),
-        unescape_field_from_bus    = (field) => field.replace(/^(_*)_key$/, '$1key'),
-        escape_field_to_nelson     = (field) => field.replace(/^(_*)link$/, '$1_link'),
-        unescape_field_from_nelson = (field) => field.replace(/^(_*)link$/, '$1link')
+    var escape_field_to_bus        = (field) => field_replace(field, /^(_*)key$/, '$1_key'),
+        unescape_field_from_bus    = (field) => field_replace(field, /^(_*)_key$/, '$1key'),
+        escape_field_to_nelson     = (field) => field_replace(field, /^(_*)link$/, '$1_link'),
+        unescape_field_from_nelson = (field) => field_replace(field, /^(_*)_link$/, '$1link')
 
     var escape_to_bus              = (obj)   => translate_fields(obj, escape_field_to_bus)
         unescape_from_bus          = (obj)   => translate_fields(obj, unescape_field_from_bus)
         escape_to_nelson           = (obj)   => translate_fields(obj, escape_field_to_nelson)
         unescape_from_nelson       = (obj)   => translate_fields(obj, unescape_field_from_nelson)
 
+    var field_replace = (field, pattern, replacement) => (typeof field === 'string'
+                                                          ? field.replace(pattern, replacement)
+                                                          : field)
+
     function key_id(string) { return string.match(/\/?[^\/]+\/(\d+)/)[1] }
     function key_name(string) { return string.match(/\/?([^\/]+).*/)[1] }