statebus 7.0.23 → 7.0.25

package/client-library.js

@@ -575,7 +575,18 @@
     // ================================================================
     // React v12 Support
 
-    bus.libs.react12.improve_react = () => {
+    bus.libs.react12.reactive_dom = () => {
+
+        // The window.dom object lets the user define new react components as
+        // functions
+        window.dom = window.dom || new Proxy({}, {
+            get: function (o, k) { return o[k] },
+            set: function (o, k, v) {
+                o[k] = v
+                window[k] = make_component(k, v)
+                return true
+            }
+        })
 
         function better_element(el) {
             // To do:
@@ -661,7 +672,7 @@
 
         make_better_input("INPUT", window.INPUT)
         make_better_input("TEXTAREA", window.TEXTAREA)
-        make_syncarea()
+        // make_syncarea()
 
         // Make IMG accept data from state:
         var og_img = window.IMG
@@ -691,6 +702,23 @@
         }
     }
 
+    bus.libs.react12.coffreact = () => {
+        bus.libs.react12.reactive_dom()
+        load_coffee()
+        if (dom.BODY)
+            document.addEventListener(
+                'DOMContentLoaded',
+                () => {
+                    React.render((window.Body || window.body || window.BODY)(), document.body)
+                },
+                false
+            )
+    }
+
+
+    // ================================================================
+    // React v17 Support
+
     bus.libs.react17.reactive_dom = () => {
         // The window.dom object lets the user define new react components as
         // functions

package/extras/tests.js

@@ -325,7 +325,7 @@ test(function translate_fields (done) {
     // Test 1
     var tests = tests1
     for (var i=0; i<tests.length; i++) {
-        var trans = bus.translate_fields(tests[i][0], bus.unescape_from_bus)
+        var trans = bus.unescape_from_bus(tests[i][0])
         assert(bus.deep_equals(trans, tests[i][1]),
                'Bad translation1: ' + i + ' ' + JSON.stringify(trans))
     }
@@ -333,7 +333,7 @@ test(function translate_fields (done) {
     // Test 2
     tests = tests2
     for (var i=0; i<tests2.length; i++) {
-        var trans = bus.translate_fields(tests[i][0], bus.escape_to_bus)
+        var trans = bus.escape_to_bus(tests[i][0])
         assert(bus.deep_equals(trans, tests[i][1]),
                'Bad translation2: ' + i + ' ' + JSON.stringify(trans))
     }

package/package.json

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

package/statebus.js

@@ -1343,11 +1343,11 @@
 
                     // Compute the new path
                     var new_path = path + '[' + JSON.stringify(k) + ']'
-                    return item_proxy(base, new_path, o[escape_to_bus(k)])
+                    return item_proxy(base, new_path, o[escape_field_to_bus(k)])
                 },
                 set: function set(o, k, v) {
-                    var value = translate_fields(v, field => escape_to_bus(escape_to_nelson(field)))
-                    o[escape_to_bus(k)] = value
+                    var value = translate_fields(v, field => escape_field_to_bus(escape_field_to_nelson(field)))
+                    o[escape_field_to_bus(k)] = value
                     var new_path = path + '[' + JSON.stringify(k) + ']'
                     bus.set(
                         base,
@@ -1357,11 +1357,11 @@
                     return true
                 },
                 has: function has(o, k) {
-                    return o.hasOwnProperty(escape_to_bus(k))
+                    return o.hasOwnProperty(escape_field_to_bus(k))
                 },
                 deleteProperty: function del (o, k) {
                     var new_path = path + '[' + JSON.stringify(k) + ']'
-                    delete o[escape_to_bus(k)]
+                    delete o[escape_field_to_bus(k)]
                     bus.set(
                         base,
                         // Forward the patch too
@@ -1372,7 +1372,7 @@
                 // For function proxies:
                 //
                 // apply: function apply (o, This, args) {
-                //     return translate_fields(o, unescape_from_bus)
+                //     return translate_fields(o, unescape_field_from_bus)
                 // }
             })}
 
@@ -1394,12 +1394,12 @@
             set: function set(o, key, val) {
                 bus.set({
                     key: key,
-                    val: translate_fields(val, field => escape_to_bus(escape_to_nelson(field)))
+                    val: translate_fields(val, field => escape_field_to_bus(escape_field_to_nelson(field)))
                 })
                 return true
             },
             deleteProperty: function del (o, k) {
-                bus.delete(escape_to_bus(k))
+                bus.delete(escape_field_to_bus(k))
                 return true // Report success to Proxy
             },
             // For function proxies:
@@ -1755,11 +1755,15 @@
     //  - nelSON            escapes link -> _link
     //  - JSON
     //
-    var escape_to_bus        = (field) => field.replace(/^(_*)key$/, '$1_key'),
-        unescape_from_bus    = (field) => field.replace(/^(_*)_key$/, '$1key'),
-        escape_to_nelson     = (field) => field.replace(/^(_*)link$/, '$1_key'),
-        unescape_from_nelson = (field) => field.replace(/^(_*)link$/, '$1_key')
-
+    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$/, '$1_link')
+
+    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)
 
     function key_id(string) { return string.match(/\/?[^\/]+\/(\d+)/)[1] }
     function key_name(string) { return string.match(/\/?([^\/]+).*/)[1] }