jaxs 0.7.3 → 0.8.0

package/dist/jaxs.d.ts

@@ -96,10 +96,7 @@ declare const buildRouter: (
 
 declare type BusEventMatcher = string | RegExp
 
-export declare type BusListener<T> = (
-  payload: T,
-  listenerKit: ListenerKit,
-) => void
+export declare type BusListener<T> = (listenerKit: ListenerKit<T>) => void
 
 declare const catchAll: RouteMatcher
 
@@ -273,7 +270,17 @@ declare class JaxsBus {
   subscribe<T>(matcher: BusEventMatcher, listener: BusListener<T>): Unsubscribe
   publish<T>(event: string, payload: T): void
   addListenerOptions(options: AppAdditionListenerOptions): void
-  listenerOptions(event: string): ListenerKit
+  listenerOptions<T>(
+    event: string,
+    payload: T,
+  ): {
+    publish: any
+    payload: T
+    state: State
+    document: Document
+    window: Window
+    eventName: string
+  }
 }
 
 declare type JaxsElement = Element & JsxIded & JsxEventMapped
@@ -399,8 +406,14 @@ declare interface JsxIded {
 
 declare const linkNavigationEvent = 'go-to-href'
 
-declare type ListenerKit = AppAdditionListenerOptions &
-  DefaultBusListenerOptions
+declare type ListenerKit<T> = {
+  state: State
+  document: Document
+  window: Window
+  publish: PublishFunction
+  eventName: string
+  payload: T
+}
 
 declare const locationChangeEvent = 'navigation:location-change'
 
@@ -414,7 +427,11 @@ export declare namespace messageBus {
   }
 }
 
-declare const navigate: (path: string, { publish, window }: ListenerKit) => void
+declare const navigate: ({
+  payload: path,
+  publish,
+  window,
+}: ListenerKit<string>) => void
 
 export declare namespace navigation {
   export {
@@ -435,9 +452,9 @@ declare type NullInstructionData = Record<string, never>
 
 declare type NullValues = null | undefined
 
-declare const onLinkClick: (domEvent: MouseEvent, options: ListenerKit) => void
+declare const onLinkClick: (listenerKit: ListenerKit<MouseEvent>) => void
 
-declare const onLocationChange: (_: null, listenerOptions: ListenerKit) => void
+declare const onLocationChange: (listenerKit: ListenerKit<null>) => void
 
 declare interface PeriodicPublisher {
   event: string

package/dist/jaxs.js

@@ -17,7 +17,7 @@ const tt = (e) => typeof e == 'string',
     const r = {}
     for (const n in t) {
       const i = t[n],
-        a = (l) => s(i, l)
+        a = (c) => s(i, c)
       e.addEventListener(n, a),
         (r[n] = {
           domEvent: n,
@@ -288,14 +288,15 @@ const wt = (e, t, s) => {
     const t = e.closest('[href]')
     return (t && t.getAttribute('href')) || ''
   },
-  E = (e, { publish: t, window: s }) => {
+  E = ({ payload: e, publish: t, window: s }) => {
     s.history.pushState(null, '', e), t(m, null)
   },
-  F = (e, t) => {
-    if (!e || !e.target) return
-    e.preventDefault()
-    const s = V(e.target)
-    E(s, t)
+  F = (e) => {
+    const t = e.payload
+    if (!t || !t.target) return
+    t.preventDefault()
+    const s = V(t.target)
+    E({ ...e, payload: s })
   },
   L = (e) =>
     e
@@ -306,23 +307,23 @@ const wt = (e, t, s) => {
         const r = s.split('=')
         return (t[r[0]] = r[1]), t
       }, {}),
-  z = (e, t) => {
-    const { state: s, publish: r, window: n } = t,
-      { host: i, pathname: a, search: l } = n.location,
-      u = a,
-      d = L(l),
-      c = {
-        host: i,
-        path: u,
-        query: d,
+  z = (e) => {
+    const { state: t, publish: s, window: r } = e,
+      { host: n, pathname: i, search: a } = r.location,
+      c = i,
+      u = L(a),
+      h = {
+        host: n,
+        path: c,
+        query: u,
       }
-    s.store('route').update(c), r(D, c)
+    t.store('route').update(h), s(D, h)
   },
   B = (e) => {
     const { subscribe: t } = e
     t(k, F),
-      t($, (s, r) => {
-        E(s, r)
+      t($, (s) => {
+        E(s)
       })
   },
   K = (e) => {
@@ -356,7 +357,7 @@ class C {
     subscribe: n,
     bus: i,
     state: a,
-    renderKit: l,
+    renderKit: c,
   }) {
     ;(this.window = t),
       (this.document = s),
@@ -364,7 +365,7 @@ class C {
       (this.subscribe = n),
       (this.bus = i),
       (this.state = a),
-      (this.renderKit = l),
+      (this.renderKit = c),
       (this.roots = [])
   }
   render(t, s) {
@@ -507,17 +508,18 @@ class J {
     ]
       .sort((n, i) => n.index - i.index)
       .forEach((n) => {
-        n.listener(s, this.listenerOptions(t))
+        n.listener(this.listenerOptions(t, s))
       })
   }
   addListenerOptions(t) {
     this.options = t
   }
-  listenerOptions(t) {
+  listenerOptions(t, s) {
     return {
       eventName: t,
       ...this.options,
       publish: this.publish.bind(this),
+      payload: s,
     }
   }
 }
@@ -953,47 +955,47 @@ const S = (e) => {
       n = e.attributes,
       i = n.length,
       a = t.attributes,
-      l = a.length
-    let u, d, c
+      c = a.length
+    let u, h, d
     for (u = 0; u < i; u++) {
-      c = null
-      const h = n.item(u)
-      if (h) {
-        for (d = 0; d < l; d++) {
-          const p = a.item(d)
-          if (p && h.name == p.name) {
-            c = p
+      d = null
+      const l = n.item(u)
+      if (l) {
+        for (h = 0; h < c; h++) {
+          const p = a.item(h)
+          if (p && l.name == p.name) {
+            d = p
             break
           }
         }
-        c
-          ? h.value !== c.value &&
+        d
+          ? l.value !== d.value &&
             r.push(
               qt(e, t, {
-                name: h.name,
-                value: c.value,
+                name: l.name,
+                value: d.value,
                 isSvg: s,
               }),
             )
-          : r.push(Ct(e, t, { name: h.name, isSvg: s }))
+          : r.push(Ct(e, t, { name: l.name, isSvg: s }))
       }
     }
-    for (u = 0; u < l; u++) {
-      c = null
-      const h = a.item(u)
-      if (h) {
-        for (d = 0; d < i; d++) {
-          const p = n.item(d)
-          if (p && p.name == h.name) {
-            c = p
+    for (u = 0; u < c; u++) {
+      d = null
+      const l = a.item(u)
+      if (l) {
+        for (h = 0; h < i; h++) {
+          const p = n.item(h)
+          if (p && p.name == l.name) {
+            d = p
             break
           }
         }
-        c ||
+        d ||
           r.push(
             It(e, t, {
-              name: h.name,
-              value: h.value,
+              name: l.name,
+              value: l.value,
               isSvg: s,
             }),
           )
@@ -1008,15 +1010,15 @@ const S = (e) => {
       i = Object.keys(r),
       a = Object.keys(n)
     return (
-      i.forEach((l) => {
-        const u = r[l],
-          d = n[l]
-        d
-          ? d.busEvent !== u.busEvent &&
+      i.forEach((c) => {
+        const u = r[c],
+          h = n[c]
+        h
+          ? h.busEvent !== u.busEvent &&
             s.push(
               Ht(e, t, {
-                name: l,
-                targetValue: d.listener,
+                name: c,
+                targetValue: h.listener,
                 sourceValue: u.listener,
               }),
             )
@@ -1027,14 +1029,14 @@ const S = (e) => {
               }),
             )
       }),
-      a.forEach((l) => {
-        const u = r[l],
-          d = n[l]
+      a.forEach((c) => {
+        const u = r[c],
+          h = n[c]
         u ||
           s.push(
             Gt(e, t, {
-              name: d.domEvent,
-              value: d.listener,
+              name: h.domEvent,
+              value: h.listener,
             }),
           )
       }),
@@ -1063,14 +1065,14 @@ const S = (e) => {
       const n = e,
         i = t,
         a = re(n, i),
-        l = s(n.childNodes, i.childNodes, n)
-      r = a.concat(l)
+        c = s(n.childNodes, i.childNodes, n)
+      r = a.concat(c)
     } else if (e.nodeType === 1) {
       const n = e,
         i = t,
         a = se(n, i),
-        l = s(n.childNodes, i.childNodes, n)
-      r = a.concat(l)
+        c = s(n.childNodes, i.childNodes, n)
+      r = a.concat(c)
     } else e.nodeType === 3 && (r = ne(e, t))
     return r
   },
@@ -1079,14 +1081,14 @@ const S = (e) => {
       n = oe(e, t),
       i = S(e),
       a = S(t),
-      l = []
+      c = []
     let u = 0
     for (; u < n; u++) {
-      const c = e[u],
-        h = t[u]
-      if (h && a.check(h)) {
-        const p = i.pullMatch(h)
-        a.clear(h),
+      const d = e[u],
+        l = t[u]
+      if (l && a.check(l)) {
+        const p = i.pullMatch(l)
+        a.clear(l),
           p.element
             ? (p.index !== u &&
                 r.push(
@@ -1095,25 +1097,25 @@ const S = (e) => {
                     index: u,
                   }),
                 ),
-              l.push({
+              c.push({
                 source: p.element,
-                target: h,
+                target: l,
               }))
-            : c
-              ? a.check(c)
-                ? r.push(b(h, { parent: s, index: u }))
-                : (i.clear(c), r.push(Ut(c, h)))
-              : r.push(b(h, { parent: s, index: u }))
-      } else c && i.pullMatch(c).element && r.push(N(c))
+            : d
+              ? a.check(d)
+                ? r.push(b(l, { parent: s, index: u }))
+                : (i.clear(d), r.push(Ut(d, l)))
+              : r.push(b(l, { parent: s, index: u }))
+      } else d && i.pullMatch(d).element && r.push(N(d))
     }
-    i.remaining().forEach(({ element: c }) => {
-      r.push(N(c))
+    i.remaining().forEach(({ element: d }) => {
+      r.push(N(d))
     })
-    const d = l.reduce(
-      (c, { source: h, target: p }) => c.concat(ie(h, p, X)),
+    const h = c.reduce(
+      (d, { source: l, target: p }) => d.concat(ie(l, p, X)),
       [],
     )
-    return r.concat(d).sort(Wt)
+    return r.concat(h).sort(Wt)
   },
   oe = (e, t) => {
     const s = e.length,

package/dist/jaxs.umd.cjs

@@ -26,7 +26,7 @@
       const n = {}
       for (const r in t) {
         const i = t[r],
-          a = (l) => s(i, l)
+          a = (c) => s(i, c)
         e.addEventListener(r, a),
           (n[r] = { domEvent: r, busEvent: i, listener: a })
       }
@@ -288,14 +288,15 @@
       const t = e.closest('[href]')
       return (t && t.getAttribute('href')) || ''
     },
-    E = (e, { publish: t, window: s }) => {
+    E = ({ payload: e, publish: t, window: s }) => {
       s.history.pushState(null, '', e), t(b, null)
     },
-    F = (e, t) => {
-      if (!e || !e.target) return
-      e.preventDefault()
-      const s = V(e.target)
-      E(s, t)
+    F = (e) => {
+      const t = e.payload
+      if (!t || !t.target) return
+      t.preventDefault()
+      const s = V(t.target)
+      E({ ...e, payload: s })
     },
     L = (e) =>
       e
@@ -306,19 +307,19 @@
           const n = s.split('=')
           return (t[n[0]] = n[1]), t
         }, {}),
-    z = (e, t) => {
-      const { state: s, publish: n, window: r } = t,
-        { host: i, pathname: a, search: l } = r.location,
-        u = a,
-        d = L(l),
-        c = { host: i, path: u, query: d }
-      s.store('route').update(c), n(D, c)
+    z = (e) => {
+      const { state: t, publish: s, window: n } = e,
+        { host: r, pathname: i, search: a } = n.location,
+        c = i,
+        u = L(a),
+        h = { host: r, path: c, query: u }
+      t.store('route').update(h), s(D, h)
     },
     B = (e) => {
       const { subscribe: t } = e
       t(k, F),
-        t($, (s, n) => {
-          E(s, n)
+        t($, (s) => {
+          E(s)
         })
     },
     K = (e) => {
@@ -352,7 +353,7 @@
       subscribe: r,
       bus: i,
       state: a,
-      renderKit: l,
+      renderKit: c,
     }) {
       ;(this.window = t),
         (this.document = s),
@@ -360,7 +361,7 @@
         (this.subscribe = r),
         (this.bus = i),
         (this.state = a),
-        (this.renderKit = l),
+        (this.renderKit = c),
         (this.roots = [])
     }
     render(t, s) {
@@ -490,14 +491,19 @@
       ]
         .sort((r, i) => r.index - i.index)
         .forEach((r) => {
-          r.listener(s, this.listenerOptions(t))
+          r.listener(this.listenerOptions(t, s))
         })
     }
     addListenerOptions(t) {
       this.options = t
     }
-    listenerOptions(t) {
-      return { eventName: t, ...this.options, publish: this.publish.bind(this) }
+    listenerOptions(t, s) {
+      return {
+        eventName: t,
+        ...this.options,
+        publish: this.publish.bind(this),
+        payload: s,
+      }
     }
   }
   const G = () => {
@@ -863,37 +869,37 @@
         r = e.attributes,
         i = r.length,
         a = t.attributes,
-        l = a.length
-      let u, d, c
+        c = a.length
+      let u, h, d
       for (u = 0; u < i; u++) {
-        c = null
-        const h = r.item(u)
-        if (h) {
-          for (d = 0; d < l; d++) {
-            const m = a.item(d)
-            if (m && h.name == m.name) {
-              c = m
+        d = null
+        const l = r.item(u)
+        if (l) {
+          for (h = 0; h < c; h++) {
+            const m = a.item(h)
+            if (m && l.name == m.name) {
+              d = m
               break
             }
           }
-          c
-            ? h.value !== c.value &&
-              n.push(Xt(e, t, { name: h.name, value: c.value, isSvg: s }))
-            : n.push(Qt(e, t, { name: h.name, isSvg: s }))
+          d
+            ? l.value !== d.value &&
+              n.push(Xt(e, t, { name: l.name, value: d.value, isSvg: s }))
+            : n.push(Qt(e, t, { name: l.name, isSvg: s }))
         }
       }
-      for (u = 0; u < l; u++) {
-        c = null
-        const h = a.item(u)
-        if (h) {
-          for (d = 0; d < i; d++) {
-            const m = r.item(d)
-            if (m && m.name == h.name) {
-              c = m
+      for (u = 0; u < c; u++) {
+        d = null
+        const l = a.item(u)
+        if (l) {
+          for (h = 0; h < i; h++) {
+            const m = r.item(h)
+            if (m && m.name == l.name) {
+              d = m
               break
             }
           }
-          c || n.push(Wt(e, t, { name: h.name, value: h.value, isSvg: s }))
+          d || n.push(Wt(e, t, { name: l.name, value: l.value, isSvg: s }))
         }
       }
       return n
@@ -905,24 +911,24 @@
         i = Object.keys(n),
         a = Object.keys(r)
       return (
-        i.forEach((l) => {
-          const u = n[l],
-            d = r[l]
-          d
-            ? d.busEvent !== u.busEvent &&
+        i.forEach((c) => {
+          const u = n[c],
+            h = r[c]
+          h
+            ? h.busEvent !== u.busEvent &&
               s.push(
                 te(e, t, {
-                  name: l,
-                  targetValue: d.listener,
+                  name: c,
+                  targetValue: h.listener,
                   sourceValue: u.listener,
                 }),
               )
             : s.push(Yt(e, t, { name: u.domEvent, value: u.listener }))
         }),
-        a.forEach((l) => {
-          const u = n[l],
-            d = r[l]
-          u || s.push(Zt(e, t, { name: d.domEvent, value: d.listener }))
+        a.forEach((c) => {
+          const u = n[c],
+            h = r[c]
+          u || s.push(Zt(e, t, { name: h.domEvent, value: h.listener }))
         }),
         s
       )
@@ -949,14 +955,14 @@
         const r = e,
           i = t,
           a = ce(r, i),
-          l = s(r.childNodes, i.childNodes, r)
-        n = a.concat(l)
+          c = s(r.childNodes, i.childNodes, r)
+        n = a.concat(c)
       } else if (e.nodeType === 1) {
         const r = e,
           i = t,
           a = ae(r, i),
-          l = s(r.childNodes, i.childNodes, r)
-        n = a.concat(l)
+          c = s(r.childNodes, i.childNodes, r)
+        n = a.concat(c)
       } else e.nodeType === 3 && (n = le(e, t))
       return n
     },
@@ -965,32 +971,32 @@
         r = de(e, t),
         i = Y(e),
         a = Y(t),
-        l = []
+        c = []
       let u = 0
       for (; u < r; u++) {
-        const c = e[u],
-          h = t[u]
-        if (h && a.check(h)) {
-          const m = i.pullMatch(h)
-          a.clear(h),
+        const d = e[u],
+          l = t[u]
+        if (l && a.check(l)) {
+          const m = i.pullMatch(l)
+          a.clear(l),
             m.element
               ? (m.index !== u && n.push(_(m.element, { parent: s, index: u })),
-                l.push({ source: m.element, target: h }))
-              : c
-                ? a.check(c)
-                  ? n.push(_(h, { parent: s, index: u }))
-                  : (i.clear(c), n.push(Ht(c, h)))
-                : n.push(_(h, { parent: s, index: u }))
-        } else c && i.pullMatch(c).element && n.push(W(c))
+                c.push({ source: m.element, target: l }))
+              : d
+                ? a.check(d)
+                  ? n.push(_(l, { parent: s, index: u }))
+                  : (i.clear(d), n.push(Ht(d, l)))
+                : n.push(_(l, { parent: s, index: u }))
+        } else d && i.pullMatch(d).element && n.push(W(d))
       }
-      i.remaining().forEach(({ element: c }) => {
-        n.push(W(c))
+      i.remaining().forEach(({ element: d }) => {
+        n.push(W(d))
       })
-      const d = l.reduce(
-        (c, { source: h, target: m }) => c.concat(he(h, m, tt)),
+      const h = c.reduce(
+        (d, { source: l, target: m }) => d.concat(he(l, m, tt)),
         [],
       )
-      return n.concat(d).sort(se)
+      return n.concat(h).sort(se)
     },
     de = (e, t) => {
       const s = e.length,

package/package.json

@@ -2,7 +2,7 @@
   "name": "jaxs",
   "description": "Modular J/TSX application framework",
   "private": false,
-  "version": "0.7.3",
+  "version": "0.8.0",
   "type": "module",
   "scripts": {
     "build": "vite build; npm run lint",
@@ -11,7 +11,7 @@
     "e2e:server": "vite dev --config ./cypress/apps/vite.config.js",
     "e2e": "cypress open",
     "e2e:ci": "cypress run",
-    "lint": "prettier . --write"
+    "lint": "prettier . --write && tsc --noEmit"
   },
   "files": [
     "dist"