statebus 7.2.4 → 7.2.6

package/extras/tests.js

@@ -480,7 +480,7 @@ else
         ))
 
         log('Gonna deep_quals between:',
-            bus.raw(bus.state).nested,
+            bus.cache.nested.val,
             [ 99, { a: { link: 'a' } } ])
 
         assert(bus.deep_equals(

package/package.json

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

package/server-library.js

@@ -2371,31 +2371,34 @@ function import_server (bus, make_statebus, options)
     // Installs a GET handler at route that gets state from a getter function
     // Note: Makes too many textbusses.  Should re-use one.
     http_serve: function http_serve (route, getter) {
-        var textbus = make_statebus()
-        textbus.label = 'textbus'
-        var watched = new Set()
-        textbus('*').getter = (filename, old) => {
-            return {etag: Math.random() + '',
-                    _: getter(filename)}
+        if (!this.filebus) {
+            this.filebus = make_statebus()
+            this.filebus.label = 'filebus'
         }
+        var filebus = this.filebus
+
+        filebus('*').getter = (filename, old) => ({
+            etag: Math.random() + '',
+            contents: getter(filename)
+        })
         bus.http.get(route, (req, res) => {
             var path = req.path
-            var etag = textbus.cache[path] && textbus.cache[path].etag
+            var etag = filebus.cache[path] && filebus.cache[path].etag
             if (etag && req.get('If-None-Match') === etag) {
                 res.status(304).end()
                 return
             }
 
-            textbus.get(req.path) // So that textbus never clears the cache
-            textbus.get(req.path, function cb (o) {
+            filebus.get(req.path) // So that filebus never clears the cache
+            filebus.get(req.path, function cb (o) {
                 res.setHeader('Cache-Control', 'public')
                 // res.setHeader('Cache-Control', 'public, max-age='
                 //               + (60 * 60 * 24 * 30))  // 1 month
                 res.setHeader('ETag', o.etag)
                 res.setHeader('Access-Control-Allow-Origin', '*')
                 res.setHeader('Content-Type', 'application/javascript')
-                res.send(o._)
-                textbus.forget(o.key, cb)  // But we do want to forget the cb
+                res.send(o.contents)
+                filebus.forget(o.key, cb)  // But we do want to forget the cb
             })
         })
     },

package/statebus.js

@@ -963,45 +963,11 @@
         // We're currently calling that (param1,param2:val2) part "function params", and presuming
         // that it exists in the () part of the pattern like in /foo/bar*().
         function func_args () {
-            // This code is copied from Raphael Walker's parser.coffee
-            function split_once (str, char) {
-                var i = str.indexOf(char)
-                return i === -1 ? [str, ""] : [str.slice(0, i), str.slice(i + 1)]
-            }
-
-            // Function Strings -- an alternative to query strings
-            //
-            function parse_function_string (str) {
-                // Coffeescript doesn't have object comprehensions :(
-                var ret = {}
-
-                // Now process the string:
-                str
-                    // Pull out the parentheses
-                    .slice(1, -1)
-                    // Split by commas. TODO: Allow spaces after commas?
-                    .split(",")
-                    // Delete empty parts (this ensures that empty strings
-                    // will properly result in empty func_string, and allows trailing
-                    // commas)
-                    .filter(part => part.length)
-                    .forEach(part => {
-                        // If the part has a comma, its a key:value, otherwise
-                        // it's just a singleton
-                        var [k, v] = split_once(part, ":")
-                        
-                        if (v.length === 0) ret[k] = true
-                        // If the value is itself a func_string params object, parse it recursively
-                        else if (v.startsWith("(")) ret[k] = parse_function_string(v)
-                        else ret[k] = v
-                    })
-                return ret
-            }
             // console.log('Getting func_args from', func.statebus_binding.args)
             if (!(func.statebus_binding.args
                   && func.statebus_binding.args.func_args))
                 return undefined
-            return parse_function_string(func.statebus_binding.args.func_args)
+            return funcarg_parse(func.statebus_binding.args.func_args)
         }
         var f = reactive(function () {
             // Initialize transaction
@@ -1447,6 +1413,62 @@
             bus.get_once(key, (o) => resolve(o)))
     }
 
+    // ******************
+    // Function Args -- an alternative to Query Params
+
+    // Parse a funcarg string.
+
+    function funcarg_parse (str) {
+        // Coffeescript doesn't have object comprehensions :(
+        var ret = {}
+
+        function split_once (str, char) {
+            var i = str.indexOf(char)
+            return i === -1 ? [str, ""] : [str.slice(0, i), str.slice(i + 1)]
+        }
+
+        // Now process the string:
+        str
+            // Pull out the parentheses
+            .slice(1, -1)
+            // Split by commas. TODO: Allow spaces after commas?
+            .split(",")
+            // Delete empty parts (this ensures that empty strings
+            // will properly result in empty func_string, and allows trailing
+            // commas)
+            .filter(part => part.length)
+            .forEach(part => {
+                // If the part has a comma, its a key:value, otherwise
+                // it's just a singleton
+                var [k, v] = split_once(part, ":")
+
+                if (v.length === 0) ret[k] = true
+                // If the value is itself a func_string params object, parse it recursively
+                else if (v.startsWith("(")) ret[k] = funcarg_parse(v)
+                else ret[k] = v
+            })
+        return ret
+    }
+
+    // Generate a funcarg string
+    function funcarg_stringify (obj) {
+        var inner = Object.entries(obj)
+        // Allowed values in KSON are: object, string, true
+        // Arrays are in fact objects, and we don't need to treat them differently.
+        // Their order won't change!
+            .filter(([k, v]) => v)
+            .sort()
+            .map(([k, v]) => {
+                if (typeof v === "boolean") return k
+                if (typeof v === "string") return `${k}:${v}`
+                if (typeof v === "object") return `${k}:${funcarg_string(v)}`
+                return ""
+            })
+            .join(",")
+        return inner.length ? `(${inner})` : ""
+    }
+
+
     // ******************
     // Proxy
 
@@ -1541,7 +1563,7 @@
                 if (k === symbols.is_proxy)
                     return true
                 if (k === symbols.raw)
-                    return o
+                    return unescape_bus_to_json(o)
 
                 // Compute the new path
                 var new_path = path + '[' + JSON.stringify(k) + ']'
@@ -2717,6 +2739,7 @@
                'old_subspace new_subspace bindings run_handler bind unbind reactive uncallback',
                'versions new_version',
                'aget client_bus_for',
+               'funcarg_parse funcarg_stringify',
                'funk_key funk_name funks key_id key_name id',
                'pending_gets gets_in gets_out loading_keys loading once',
                'global_funk busses rerunnable_funks',