update builds

Author: SaulDoesCode

dist/rilti.js

@@ -263,6 +263,40 @@
   merge.able = o => isArr(o) ||
     (o != null && typeof o === 'object' && !isFunc(o.then))
 
+  const emitter = (host = Object.create(null), listeners = new Map()) => Object.assign(host, {
+    emit: infinify((event, ...data) => exports.runAsync(() => {
+      if (listeners.has(event)) {
+        for (const h of listeners.get(event)) h.apply(null, data)
+      }
+    })),
+    on: infinify((event, handler) => {
+      if (!listeners.has(event)) listeners.set(event, new Set())
+      listeners.get(event).add(handler)
+      const manager = () => host.off(event, handler)
+      manager.off = manager
+      manager.on = () => {
+        manager()
+        return host.on(event, handler)
+      }
+      manager.once = () => {
+        manager()
+        return host.once(event, handler)
+      }
+      return manager
+    }),
+    once: infinify((event, handler) => host.on(event, function h () {
+      handler(...arguments)
+      host.off(event, h)
+    })),
+    off: infinify((event, handler) => {
+      if (listeners.has(event)) {
+        const ls = listeners.get(event)
+        ls.delete(handler)
+        if (!ls.size) listeners.delete(event)
+      }
+    })
+  })
+
   /* global Node NodeList */
 
   const listen = function (once, target, type, fn, options = false) {
@@ -520,11 +554,19 @@
       }
 
       if (bind) {
+        const isinput = isInput(el)
         for (const key in bind) {
           if (key in el) throw new Error('databind overwrites property')
-          const b = databind(bind[key], el)
-          Object.defineProperty(bind, key, { get () { return b.ops.val }, set: b })
-          Object.defineProperty(bind, '$' + key, { value: b })
+          bind[key].host = proxied || el
+          bind[key].isinput = isinput
+          const b = databind(bind[key])
+          Object.defineProperty(bind, key, {
+            get () { return b.val },
+            set: b.change
+          })
+          Object.defineProperty(bind, '$' + key, {
+            value: b
+          })
         }
         el.bind = bind
       }
@@ -885,89 +927,81 @@
   }
   domfn.empty = domfn.clear
 
-  const databind = (ops, host) => {
-    if (!ops) ops = {}
-    const change = (newval, force, silent) => {
-      if (newval == null) return ops.val
-      if (isFunc(newval)) newval = newval(ops.val, ops)
-      if (force || (newval !== ops.val)) {
-        ops.old = ops.val
-        ops.val = newval
-        if (ops.change) {
-          const res = ops.change(ops.val, ops)
-          if (res != null && ops.val !== res) ops.val = res
-        }
-        if (!silent) {
-          change.observers.forEach(o => {
-            o(o.key != null ? view[o.key](ops.val, ops) : ops.val, ops)
-          })
-        }
-        if (ops.key && ops.host) {
-          ops.host[ops.key] = ops.view ? ops.view(ops.val, ops) : ops.val
+  const databind = ops => {
+    const core = emitter()
+    core.ops = ops
+    core.host = ops.host
+    core.val = ops.val != null ? ops.val : ''
+    delete ops.val
+    core.change = val => {
+      if (val === core.val) return
+      if (core.ops.change) {
+        const out = core.ops.change(val, core)
+        if (out != null && out !== val) val = out
+      }
+      core.emit.change(core.val = val)
+      if (core.ops.views) {
+        for (const name in core.ops.views) {
+          const out = core.ops.views[name](val, core)
+          if (out != null) core.emit[name](out, core)
         }
       }
-      return change
     }
-    change.change = change
-    change.ops = ops
-    change.observers = new Set()
-    change.observe = infinify((key, fn) => {
-      if (isFunc(key)) [fn, key] = [key, null]
-      if (key) fn.key = key
-      const off = () => {
-        change.observers.delete(fn)
-        return off
+
+    core.view = infinify((key, fn) => {
+      if (key in core.ops.views) {
+        return fn ? fn(core.ops.views[key](core.val, core), core) : core.ops.views[key](core.val, core)
       }
-      return ((off.off = off).on = () => {
-        change.observers.add(fn)
-        return off
-      })()
-    })
-    const view = change.view = infinify((key, fn) => {
-      if (key in view) return fn ? fn(view[key](ops.val, ops), ops) : view[key](ops.val, ops)
-      if (key === 'view') return fn ? fn(ops.view(ops.val, ops), ops) : ops.view(ops.val, ops)
-      if (key === '') return fn ? fn(ops.val, ops) : ops.val
-      view[key] = fn
+      if (!isFunc(fn)) throw new TypeError('databind view needs function')
+      core.ops.views[key] = fn
     })
-    if (ops.views) for (const key in ops.views) view(key, ops.views[key])
-    ops.$change = change
-    change.stop = ops.$stop = () => {
-      if (ops.isinput) ops.inputUpdaters.off()
-      if (ops.stop) ops.stop(ops.host, ops)
-      change.observers.clear()
-    }
-    change.text = (host, fn) => {
-      const text$$1 = new Text()
-      if (isStr(host)) {
-        text$$1.off = change.observe(host, val => { text$$1.textContent = val })
-      } else {
-        text$$1.off = change.observe(val => {
-          text$$1.textContent = ops.view ? ops.view(ops.val, ops) : ops.val
-        })
+
+    core.stop = () => {
+      for (const bind of core.binds) {
+        bind.off()
+        if (bind.inputUpdaters) bind.inputUpdaters.off()
       }
-      if (isFunc(fn)) fn(text$$1, ops)
-      return text$$1
+      core.bind = core.change = null
     }
 
-    if (host) {
-      ops.host = host
-      if (isEl(host) || isProxyNode(host)) {
-        if (isInput(host)) {
-          ops.isinput = true
-          ops.host = $(host)
-          const inputUpdate = e => change(host.value)
-          ops.inputUpdaters = ops.host.on({
-            input: inputUpdate,
-            keyup: inputUpdate,
-            blur: inputUpdate,
-            focus: inputUpdate
-          })
+    core.binds = new Set()
+    core.bind = new Proxy((host, key, view) => {
+      if (isStr(key) && key.includes(':')) [view, key] = key.split(':')
+      if (isInput(host)) {
+        [view, key] = [key, 'value']
+        const inputUpdate = e => {
+          core.change(host[key])
         }
+        var inputUpdaters = ops.host.on({
+          input: inputUpdate,
+          keyup: inputUpdate,
+          blur: inputUpdate,
+          focus: inputUpdate
+        })
       }
-      if (ops.init) ops.init(host, ops)
-      if ('val' in ops) change(ops.val, true)
-    }
-    return change
+      const handle = core.on[isStr(view) ? view : 'change'](val => {
+        if (host[key] !== val) host[key] = val
+      })
+      if (inputUpdaters) handle.inputUpdaters = inputUpdaters
+      host[key] = isStr(view) ? core.view(view) : core.val
+      core.binds.add(handle)
+      return handle
+    }, {
+      get (_, key) {
+        if (key in core) return Reflect.get(core, key)
+        if (key in core.ops.views) return core.ops.views[key](core.val, core)
+      },
+      set (_, key, val) {
+        if (key === 'change') core.ops.change = val
+        else if (key === 'val') core.val = val
+        else Reflect.set(core, key, val)
+        return true
+      }
+    })
+
+    if (core.ops.host) core.bind(core.ops.host, core.ops.key)
+
+    return core
   }
 
   /* global Node Element */
@@ -1290,9 +1324,12 @@
 
     if (!Created(el)) {
       if (bind) {
+        const isinput = isInput(el)
         for (const key in bind) {
-          const b = databind(bind[key], proxied)
-          Object.defineProperty(el, key, { get () { return b.ops.val }, set: b })
+          bind[key].host = proxied
+          bind[key].isinput = isinput
+          const b = databind(bind[key])
+          Object.defineProperty(el, key, { get () { return b.val }, set: b.change })
           Object.defineProperty(el, '$' + key, { value: b })
         }
       }
@@ -1400,6 +1437,7 @@
   exports.component = component
   exports.componentReady = componentReady
   exports.databind = databind
+  exports.emitter = emitter
   exports.run = run
   exports.render = render
   exports.query = query