sprae 10.7.0 → 10.8.1

package/core.js

@@ -12,8 +12,8 @@ export const memo = new WeakMap();
 
 // sprae element: apply directives
 export default function sprae(el, values) {
-  // text nodes, comments etc - but collections are fine
-  if (!el?.children) return
+  // text nodes, comments etc
+  if (!el?.childNodes) return
 
   // repeated call can be caused by :each with new objects with old keys needs an update
   if (memo.has(el)) {
@@ -38,35 +38,35 @@ export default function sprae(el, values) {
   return state;
 
   function init(el, parent = el.parentNode) {
-    if (el.attributes) {
-      // init generic-name attributes second
-      for (let i = 0; i < el.attributes.length;) {
-        let attr = el.attributes[i];
-
-        if (attr.name[0] === ':') {
-          el.removeAttribute(attr.name);
-
-          // multiple attributes like :id:for=""
-          let names = attr.name.slice(1).split(':')
-
-          // NOTE: secondary directives don't stop flow nor extend state, so no need to check
-          for (let name of names) {
-            let dir = directive[name] || directive.default
-            let evaluate = (dir.parse || parse)(attr.value, parse)
-            let dispose = dir(el, evaluate, state, name);
-            if (dispose) disposes.push(dispose);
-          }
-
-          // stop if element was spraed by internal directive
-          if (memo.has(el)) return el[_dispose] && disposes.push(el[_dispose])
-
-          // stop if element is skipped (detached) like in case of :if or :each
-          if (el.parentNode !== parent) return
-        } else i++;
-      }
+    if (!el.childNodes) return // ignore text nodes, comments etc
+
+    // init generic-name attributes second
+    for (let i = 0; i < el.attributes?.length;) {
+      let attr = el.attributes[i];
+
+      if (attr.name[0] === ':') {
+        el.removeAttribute(attr.name);
+
+        // multiple attributes like :id:for=""
+        let names = attr.name.slice(1).split(':')
+
+        // NOTE: secondary directives don't stop flow nor extend state, so no need to check
+        for (let name of names) {
+          let dir = directive[name] || directive.default
+          let evaluate = (dir.parse || parse)(attr.value, parse)
+          let dispose = dir(el, evaluate, state, name);
+          if (dispose) disposes.push(dispose);
+        }
+
+        // stop if element was spraed by internal directive
+        if (memo.has(el)) return el[_dispose] && disposes.push(el[_dispose])
+
+        // stop if element is skipped (detached) like in case of :if or :each
+        if (el.parentNode !== parent) return
+      } else i++;
     }
 
-    for (let child of [...el.children]) init(child, el);
+    for (let child of [...el.childNodes]) init(child, el);
   };
 }
 
@@ -97,3 +97,28 @@ sprae.use = s => {
   s.signal && use(s);
   s.compile && (compile = s.compile);
 }
+
+
+// instantiated <template> fragment holder, like persisting fragment but with minimal API surface
+export const frag = (tpl) => {
+  if (!tpl.nodeType) return tpl // existing tpl
+
+  // ensure at least one node
+  tpl.content.appendChild(document.createTextNode(''))
+
+  let content = tpl.content.cloneNode(true),
+    attributes = [...tpl.attributes],
+    childNodes = [...content.childNodes]
+
+  return {
+    childNodes,
+    content,
+    remove: () => content.append(...childNodes),
+    replaceWith(el) {
+      childNodes[0].before(el)
+      content.append(...childNodes)
+    },
+    attributes,
+    removeAttribute(name) { attributes.splice(attributes.findIndex(a => a.name === name), 1) }
+  }
+}

package/directive/each.js

@@ -1,13 +1,11 @@
-import sprae, { directive } from "../core.js";
+import sprae, { directive, frag } from "../core.js";
 import store, { _change, _signals } from "../store.js";
 import { effect, untracked, computed } from '../signal.js';
 
 
-export const _each = Symbol(":each");
-
 directive.each = (tpl, [itemVar, idxVar, evaluate], state) => {
   // we need :if to be able to replace holder instead of tpl for :if :each case
-  const holder = (tpl[_each] = document.createTextNode(""));
+  const holder = (document.createTextNode(""));
   tpl.replaceWith(holder);
 
   // we re-create items any time new items are produced
@@ -58,18 +56,14 @@ directive.each = (tpl, [itemVar, idxVar, evaluate], state) => {
               [itemVar]: cur[_signals]?.[idx] || cur[idx],
               [idxVar]: keys ? keys[idx] : idx
             }, state),
-            el = (tpl.content || tpl).cloneNode(true),
-            frag = tpl.content ?
-              // fake fragment to allow sprae multiple elements
-              { children: [...el.children], remove() { this.children.map(el => el.remove()) } } :
-              el;
+            el = tpl.content ? frag(tpl) : tpl.cloneNode(true);
 
-          holder.before(el);
-          sprae(frag, scope);
+          holder.before(el.content || el);
+          sprae(el, scope);
 
           // signal/holder disposal removes element
           ((cur[_signals] ||= [])[i] ||= {})[Symbol.dispose] = () => {
-            frag[Symbol.dispose](), frag.remove()
+            el[Symbol.dispose](), el.remove()
           };
         }
       }

package/directive/if.js

@@ -1,48 +1,35 @@
-import sprae, { directive, memo } from "../core.js";
-import { _each } from './each.js';
+import sprae, { directive, memo, frag } from "../core.js";
 import { effect } from "../signal.js";
 
 // :if is interchangeable with :each depending on order, :if :each or :each :if have different meanings
 // as for :if :with - :if must init first, since it is lazy, to avoid initializing component ahead of time by :with
 // we consider :with={x} :if={x} case insignificant
 const _prevIf = Symbol("if");
-directive.if = (ifEl, evaluate, state) => {
-  let parent = ifEl.parentNode,
-    next = ifEl.nextElementSibling,
+directive.if = (el, evaluate, state) => {
+  let next = el.nextElementSibling,
     holder = document.createTextNode(''),
+    curEl, ifEl, elseEl;
 
-    // actual replaceable els (takes <template>)
-    cur, ifs, elses, none = [];
+  el.replaceWith(holder)
 
-  ifEl.after(holder) // mark end of modifying section
-
-  ifEl.remove(), cur = none
-
-  ifs = ifEl.content ? [...ifEl.content.childNodes] : [ifEl]
+  ifEl = el.content ? frag(el) : el
+  memo.set(ifEl, null) // mark all el as fake-spraed, because we have to sprae for real on insert
 
   if (next?.hasAttribute(":else")) {
     next.removeAttribute(":else");
     // if next is :else :if - leave it for its own :if handler
-    if (next.hasAttribute(":if")) elses = none;
-    else next.remove(), elses = next.content ? [...next.content.childNodes] : [next];
-  } else elses = none;
-
-  // we mark all els as fake-spraed, because we have to sprae for real on insert
-  for (let el of [...ifs, ...elses]) memo.set(el, null)
+    if (!next.hasAttribute(":if")) next.remove(), elseEl = next.content ? frag(next) : next, memo.set(elseEl, null)
+  }
 
   return effect(() => {
-    const newEls = evaluate(state) ? ifs : ifEl[_prevIf] ? none : elses;
-    if (next) next[_prevIf] = newEls === ifs
-    if (cur != newEls) {
-      // :if :each
-      if (cur[0]?.[_each]) cur = [cur[0][_each]]
-
-      for (let el of cur) el.remove();
-      cur = newEls;
-      for (let el of cur) {
-        parent.insertBefore(el, holder)
-        memo.get(el) === null && memo.delete(el) // remove fake memo to sprae as new
-        sprae(el, state)
+    const newEl = evaluate(state) ? ifEl : el[_prevIf] ? null : elseEl;
+    if (next) next[_prevIf] = newEl === ifEl
+    if (curEl != newEl) {
+      curEl?.remove()
+      if (curEl = newEl) {
+        holder.before(curEl.content || curEl)
+        memo.get(curEl) === null && memo.delete(curEl) // remove fake memo to sprae as new
+        sprae(curEl, state)
       }
     }
   });

package/directive/text.js

@@ -1,9 +1,14 @@
-import { directive } from "../core.js";
+import { directive, frag } from "../core.js";
 import { effect } from "../signal.js";
 
 // set text content
 directive.text = (el, evaluate, state) => {
-  if (el.content) el.replaceWith(el = document.createTextNode('')) // <template :text="abc"/>
+  // <template :text="a"/> or previously initialized template
+  if (el.content) {
+    let tplfrag = frag(el)
+    if (el !== tplfrag) el.replaceWith(tplfrag.content);
+    el = tplfrag.childNodes[0];
+  }
 
   return effect(() => {
     let value = evaluate(state);

package/dist/sprae.js

@@ -126,7 +126,7 @@ var _dispose = Symbol.dispose ||= Symbol("dispose");
 var directive = {};
 var memo = /* @__PURE__ */ new WeakMap();
 function sprae(el, values) {
-  if (!el?.children)
+  if (!el?.childNodes)
     return;
   if (memo.has(el)) {
     return Object.assign(memo.get(el), values);
@@ -142,28 +142,28 @@ function sprae(el, values) {
   };
   return state;
   function init(el2, parent = el2.parentNode) {
-    if (el2.attributes) {
-      for (let i = 0; i < el2.attributes.length; ) {
-        let attr2 = el2.attributes[i];
-        if (attr2.name[0] === ":") {
-          el2.removeAttribute(attr2.name);
-          let names = attr2.name.slice(1).split(":");
-          for (let name of names) {
-            let dir = directive[name] || directive.default;
-            let evaluate = (dir.parse || parse)(attr2.value, parse);
-            let dispose = dir(el2, evaluate, state, name);
-            if (dispose)
-              disposes.push(dispose);
-          }
-          if (memo.has(el2))
-            return el2[_dispose] && disposes.push(el2[_dispose]);
-          if (el2.parentNode !== parent)
-            return;
-        } else
-          i++;
-      }
+    if (!el2.childNodes)
+      return;
+    for (let i = 0; i < el2.attributes?.length; ) {
+      let attr2 = el2.attributes[i];
+      if (attr2.name[0] === ":") {
+        el2.removeAttribute(attr2.name);
+        let names = attr2.name.slice(1).split(":");
+        for (let name of names) {
+          let dir = directive[name] || directive.default;
+          let evaluate = (dir.parse || parse)(attr2.value, parse);
+          let dispose = dir(el2, evaluate, state, name);
+          if (dispose)
+            disposes.push(dispose);
+        }
+        if (memo.has(el2))
+          return el2[_dispose] && disposes.push(el2[_dispose]);
+        if (el2.parentNode !== parent)
+          return;
+      } else
+        i++;
     }
-    for (let child of [...el2.children])
+    for (let child of [...el2.childNodes])
       init(child, el2);
   }
   ;
@@ -191,6 +191,25 @@ sprae.use = (s) => {
   s.signal && use(s);
   s.compile && (compile = s.compile);
 };
+var frag = (tpl) => {
+  if (!tpl.nodeType)
+    return tpl;
+  tpl.content.appendChild(document.createTextNode(""));
+  let content = tpl.content.cloneNode(true), attributes = [...tpl.attributes], childNodes = [...content.childNodes];
+  return {
+    childNodes,
+    content,
+    remove: () => content.append(...childNodes),
+    replaceWith(el) {
+      childNodes[0].before(el);
+      content.append(...childNodes);
+    },
+    attributes,
+    removeAttribute(name) {
+      attributes.splice(attributes.findIndex((a) => a.name === name), 1);
+    }
+  };
+};
 
 // node_modules/ulive/dist/ulive.es.js
 var ulive_es_exports = {};
@@ -256,10 +275,36 @@ var batch2 = (fn) => {
 };
 var untracked2 = (fn, prev, v) => (prev = current, current = null, v = fn(), current = prev, v);
 
+// directive/if.js
+var _prevIf = Symbol("if");
+directive.if = (el, evaluate, state) => {
+  let next = el.nextElementSibling, holder = document.createTextNode(""), curEl, ifEl, elseEl;
+  el.replaceWith(holder);
+  ifEl = el.content ? frag(el) : el;
+  memo.set(ifEl, null);
+  if (next?.hasAttribute(":else")) {
+    next.removeAttribute(":else");
+    if (!next.hasAttribute(":if"))
+      next.remove(), elseEl = next.content ? frag(next) : next, memo.set(elseEl, null);
+  }
+  return effect(() => {
+    const newEl = evaluate(state) ? ifEl : el[_prevIf] ? null : elseEl;
+    if (next)
+      next[_prevIf] = newEl === ifEl;
+    if (curEl != newEl) {
+      curEl?.remove();
+      if (curEl = newEl) {
+        holder.before(curEl.content || curEl);
+        memo.get(curEl) === null && memo.delete(curEl);
+        sprae(curEl, state);
+      }
+    }
+  });
+};
+
 // directive/each.js
-var _each = Symbol(":each");
 directive.each = (tpl, [itemVar, idxVar, evaluate], state) => {
-  const holder = tpl[_each] = document.createTextNode("");
+  const holder = document.createTextNode("");
   tpl.replaceWith(holder);
   let cur, keys2, prevl = 0;
   const items = computed(() => {
@@ -295,13 +340,11 @@ directive.each = (tpl, [itemVar, idxVar, evaluate], state) => {
           let idx = i, scope = store({
             [itemVar]: cur[_signals]?.[idx] || cur[idx],
             [idxVar]: keys2 ? keys2[idx] : idx
-          }, state), el = (tpl.content || tpl).cloneNode(true), frag = tpl.content ? { children: [...el.children], remove() {
-            this.children.map((el2) => el2.remove());
-          } } : el;
-          holder.before(el);
-          sprae(frag, scope);
+          }, state), el = tpl.content ? frag(tpl) : tpl.cloneNode(true);
+          holder.before(el.content || el);
+          sprae(el, scope);
           ((cur[_signals] ||= [])[i] ||= {})[Symbol.dispose] = () => {
-            frag[Symbol.dispose](), frag.remove();
+            el[Symbol.dispose](), el.remove();
           };
         }
       }
@@ -324,42 +367,6 @@ directive.each.parse = (expr, parse2) => {
   return [itemVar, idxVar, parse2(itemsExpr)];
 };
 
-// directive/if.js
-var _prevIf = Symbol("if");
-directive.if = (ifEl, evaluate, state) => {
-  let parent = ifEl.parentNode, next = ifEl.nextElementSibling, holder = document.createTextNode(""), cur, ifs, elses, none = [];
-  ifEl.after(holder);
-  ifEl.remove(), cur = none;
-  ifs = ifEl.content ? [...ifEl.content.childNodes] : [ifEl];
-  if (next?.hasAttribute(":else")) {
-    next.removeAttribute(":else");
-    if (next.hasAttribute(":if"))
-      elses = none;
-    else
-      next.remove(), elses = next.content ? [...next.content.childNodes] : [next];
-  } else
-    elses = none;
-  for (let el of [...ifs, ...elses])
-    memo.set(el, null);
-  return effect(() => {
-    const newEls = evaluate(state) ? ifs : ifEl[_prevIf] ? none : elses;
-    if (next)
-      next[_prevIf] = newEls === ifs;
-    if (cur != newEls) {
-      if (cur[0]?.[_each])
-        cur = [cur[0][_each]];
-      for (let el of cur)
-        el.remove();
-      cur = newEls;
-      for (let el of cur) {
-        parent.insertBefore(el, holder);
-        memo.get(el) === null && memo.delete(el);
-        sprae(el, state);
-      }
-    }
-  });
-};
-
 // directive/ref.js
 directive.ref = (el, expr, state) => {
   state[expr] = el;
@@ -387,8 +394,12 @@ directive.html = (el, evaluate, state) => {
 
 // directive/text.js
 directive.text = (el, evaluate, state) => {
-  if (el.content)
-    el.replaceWith(el = document.createTextNode(""));
+  if (el.content) {
+    let tplfrag = frag(el);
+    if (el !== tplfrag)
+      el.replaceWith(tplfrag.content);
+    el = tplfrag.childNodes[0];
+  }
   return effect(() => {
     let value = evaluate(state);
     el.textContent = value == null ? "" : value;

package/dist/sprae.min.js

@@ -1 +1 @@
-var e,t,r,l,n,s=Object.defineProperty,o=Symbol("signals"),a=Symbol("length");function i(t,r){if(!t)return t;if(t[o])return t;if(Array.isArray(t))return function(t){let r;if(t[o])return t;let l=e(t.length),n=Array(t.length).fill();const s=new Proxy(n,{get:(s,c)=>"symbol"==typeof c?c===a?l:c===o?n:n[c]:"length"===c?u[r]?l.peek():l.value:(r=c,n[c]?n[c].valueOf():c<n.length?(n[c]=e(i(t[c]))).value:void 0),set(e,t,r){if("length"===t){for(let e=r,t=n.length;e<t;e++)delete s[e];return l.value=n.length=r,!0}return c(n,t,r),t>=l.peek()&&(l.value=n.length=Number(t)+1),!0},deleteProperty:(e,t)=>(n[t]&&f(n,t),1)});return s}(t);if(t.constructor!==Object)return t;let l={...r?.[o]},s=e(Object.values(t).length);const p=new Proxy(l,{get:(e,t)=>t===a?s:t===o?l:l[t]?.valueOf(),set:(e,t,r,n)=>(n=l[t],c(l,t,r),n??++s.value,1),deleteProperty:(e,t)=>(l[t]&&(f(l,t),s.value--),1),ownKeys:()=>(s.value,Reflect.ownKeys(l))});for(let e in t){const r=Object.getOwnPropertyDescriptor(t,e);r?.get?(l[e]=n(r.get.bind(p)))._set=r.set?.bind(p):(l[e]=void 0,c(l,e,t[e]))}return p}var u={push:1,pop:1,shift:1,unshift:1,splice:1};function c(t,n,s){let o=t[n];if("_"===n[0])t[n]=s;else if(o)if(s===o.peek());else if(o._set)o._set(s);else if(Array.isArray(s)&&Array.isArray(o.peek())){const e=o.peek();e[a]?r((()=>{l((()=>{let t=0,r=s.length;for(;t<r;t++)e[t]=s[t];e.length=r}))})):o.value=s}else o.value=i(s);else t[n]=o=s?.peek?s:e(i(s))}function f(e,t){const r=e[t],l=r[Symbol.dispose];l&&delete r[Symbol.dispose],delete e[t],l?.()}var p=Symbol.dispose||=Symbol("dispose"),d={},y=new WeakMap;function h(e,t){if(!e?.children)return;if(y.has(e))return Object.assign(y.get(e),t);const r=i(t||{}),l=[];return function e(t,n=t.parentNode){if(t.attributes)for(let e=0;e<t.attributes.length;){let s=t.attributes[e];if(":"===s.name[0]){t.removeAttribute(s.name);let e=s.name.slice(1).split(":");for(let n of e){let e=d[n]||d.default,o=e(t,(e.parse||g)(s.value,g),r,n);o&&l.push(o)}if(y.has(t))return t[p]&&l.push(t[p]);if(t.parentNode!==n)return}else e++}for(let r of[...t.children])e(r,t)}(e),y.has(e)||y.set(e,r),e[p]=()=>{for(;l.length;)l.pop()();y.delete(e)},r}var m,v={},g=(e,t,r)=>{if(r=v[e=e.trim()])return r;try{r=m(e)}catch(r){b(r,t,e)}return v[e]=r},b=(e,t,r="")=>{throw Object.assign(e,{message:`∴ ${e.message}\n\n${t}${r?`="${r}"\n\n`:""}`,expr:r})};h.use=s=>{s.signal&&function(s){e=s.signal,t=s.effect,n=s.computed,l=s.batch||(e=>e()),r=s.untracked||l}(s),s.compile&&(m=s.compile)};var k,A,S={};((e,t)=>{for(var r in t)s(e,r,{get:t[r],enumerable:!0})})(S,{batch:()=>x,computed:()=>N,effect:()=>O,signal:()=>w,untracked:()=>j});var w=(e,t,r=new Set)=>((t={get value(){return k?.deps.push(r.add(k)),e},set value(t){if(t!==e){e=t;for(let e of r)A?A.add(e):e()}},peek:()=>e}).toJSON=t.then=t.toString=t.valueOf=()=>t.value,t),O=(e,t,r,l)=>(l=(r=l=>{t?.call?.(),l=k,k=r;try{t=e()}finally{k=l}}).deps=[],r(),e=>{for(t?.call?.();e=l.pop();)e.delete(r)}),N=(e,t=w(),r,l)=>((r={get value(){return l||=O((()=>t.value=e())),t.value},peek:t.peek}).toJSON=r.then=r.toString=r.valueOf=()=>r.value,r),x=e=>{let t=A;t||(A=new Set);try{e()}finally{if(!t){t=A,A=null;for(const e of t)e()}}},j=(e,t,r)=>(t=k,k=null,r=e(),k=t,r),$=Symbol(":each");d.each=(e,[l,s,u],c)=>{const f=e[$]=document.createTextNode("");e.replaceWith(f);let p,d,y=0;const m=n((()=>{d=null;let e=u(c);return"number"==typeof e&&(e=Array.from({length:e},((e,t)=>t+1))),e?.constructor===Object&&(d=Object.keys(e),e=Object.values(e)),e||[]})),v=()=>{r((()=>{let t=0,r=m.value,n=r.length;if(p&&!p[a]){for(let e of p[o]||[])e[Symbol.dispose]();p=null,y=0}if(n<y)p.length=n;else{if(p)for(;t<y;t++)p[t]=r[t];else p=r;for(;t<n;t++){p[t]=r[t];let n=t,a=i({[l]:p[o]?.[n]||p[n],[s]:d?d[n]:n},c),u=(e.content||e).cloneNode(!0),y=e.content?{children:[...u.children],remove(){this.children.map((e=>e.remove()))}}:u;f.before(u),h(y,a),((p[o]||=[])[t]||={})[Symbol.dispose]=()=>{y[Symbol.dispose](),y.remove()}}}y=n}))};let g=0;return t((()=>{m.value[a]?.value,g?g++:(v(),queueMicrotask((()=>(g&&v(),g=0))))}))},d.each.parse=(e,t)=>{let[r,l]=e.split(/\s+in\s+/),[n,s="$"]=r.split(/\s*,\s*/);return[n,s,t(l)]};var E=Symbol("if");d.if=(e,r,l)=>{let n,s,o,a=e.parentNode,i=e.nextElementSibling,u=document.createTextNode(""),c=[];e.after(u),e.remove(),n=c,s=e.content?[...e.content.childNodes]:[e],i?.hasAttribute(":else")?(i.removeAttribute(":else"),i.hasAttribute(":if")?o=c:(i.remove(),o=i.content?[...i.content.childNodes]:[i])):o=c;for(let e of[...s,...o])y.set(e,null);return t((()=>{const t=r(l)?s:e[E]?c:o;if(i&&(i[E]=t===s),n!=t){n[0]?.[$]&&(n=[n[0][$]]);for(let e of n)e.remove();n=t;for(let e of n)a.insertBefore(e,u),null===y.get(e)&&y.delete(e),h(e,l)}}))},d.ref=(e,t,r)=>{r[t]=e},d.ref.parse=e=>e,d.with=(e,r,l)=>{let n;return t((()=>{let t=r(l);h(e,n?t:n=i(t,l))}))},d.html=(e,t,r)=>{let l=t(r);if(!l)return;let n=(l.content||l).cloneNode(!0);e.replaceChildren(n),h(e,r)},d.text=(e,r,l)=>(e.content&&e.replaceWith(e=document.createTextNode("")),t((()=>{let t=r(l);e.textContent=null==t?"":t}))),d.class=(e,r,l)=>{let n=new Set;return t((()=>{let t=r(l),s=new Set;t&&("string"==typeof t?t.split(" ").map((e=>s.add(e))):Array.isArray(t)?t.map((e=>e&&s.add(e))):Object.entries(t).map((([e,t])=>t&&s.add(e))));for(let t of n)s.has(t)?s.delete(t):e.classList.remove(t);for(let t of n=s)e.classList.add(t)}))},d.style=(e,r,l)=>{let n=e.getAttribute("style")||"";return n.endsWith(";")||(n+="; "),t((()=>{let t=r(l);if("string"==typeof t)e.setAttribute("style",n+t);else{e.setAttribute("style",n);for(let r in t)e.style.setProperty(r,t[r])}}))},d.default=(e,r,l,n)=>{if(!n.startsWith("on"))return t((()=>{let t=r(l);if(n)W(e,n,t);else for(let r in t)W(e,D(r),t[r])}));const s=n.split("..").map((t=>{let r={evt:"",target:e,test:()=>!0};return r.evt=(t.startsWith("on")?t.slice(2):t).replace(/\.(\w+)?-?([-\w]+)?/g,((e,t,l="")=>(r.test=P[t]?.(r,...l.split("-"))||r.test,""))),r}));if(1==s.length)return t((()=>f(r(l),s[0])));let o,a,i,u=0;const c=e=>{i=f((t=>(i(),a=e?.(t),(u=++u%s.length)?c(a):o&&c(o))),s[u])};return t((()=>(o=r(l),!i&&c(o),()=>o=null)));function f(e,{evt:t,target:r,test:l,defer:n,stop:s,prevent:o,immediate:a,...i}){n&&(e=n(e));const u=r=>{try{l(r)&&(s&&(a?r.stopImmediatePropagation():r.stopPropagation()),o&&r.preventDefault(),e?.(r))}catch(r){b(r,`:on${t}`,e)}};return r.addEventListener(t,u,i),()=>r.removeEventListener(t,u,i)}};var P={prevent(e){e.prevent=!0},stop(e){e.stop=!0},immediate(e){e.immediate=!0},once(e){e.once=!0},passive(e){e.passive=!0},capture(e){e.capture=!0},window(e){e.target=window},document(e){e.target=document},throttle(e,t){e.defer=e=>C(e,t?Number(t)||0:108)},debounce(e,t){e.defer=e=>_(e,t?Number(t)||0:108)},outside:e=>t=>{let r=e.target;return!(r.contains(t.target)||!1===t.target.isConnected||r.offsetWidth<1&&r.offsetHeight<1)},self:e=>t=>t.target===e.target,ctrl:(e,...t)=>e=>T.ctrl(e)&&t.every((t=>T[t]?T[t](e):e.key===t)),shift:(e,...t)=>e=>T.shift(e)&&t.every((t=>T[t]?T[t](e):e.key===t)),alt:(e,...t)=>e=>T.alt(e)&&t.every((t=>T[t]?T[t](e):e.key===t)),meta:(e,...t)=>e=>T.meta(e)&&t.every((t=>T[t]?T[t](e):e.key===t)),arrow:()=>T.arrow,enter:()=>T.enter,esc:()=>T.esc,tab:()=>T.tab,space:()=>T.space,delete:()=>T.delete,digit:()=>T.digit,letter:()=>T.letter,char:()=>T.char},T={ctrl:e=>e.ctrlKey||"Control"===e.key||"Ctrl"===e.key,shift:e=>e.shiftKey||"Shift"===e.key,alt:e=>e.altKey||"Alt"===e.key,meta:e=>e.metaKey||"Meta"===e.key||"Command"===e.key,arrow:e=>e.key.startsWith("Arrow"),enter:e=>"Enter"===e.key,esc:e=>e.key.startsWith("Esc"),tab:e=>"Tab"===e.key,space:e=>" "===e.key||"Space"===e.key||" "===e.key,delete:e=>"Delete"===e.key||"Backspace"===e.key,digit:e=>/^\d$/.test(e.key),letter:e=>/^\p{L}$/gu.test(e.key),char:e=>/^\S$/.test(e.key)},W=(e,t,r)=>{null==r||!1===r?e.removeAttribute(t):e.setAttribute(t,!0===r?"":"number"==typeof r||"string"==typeof r?r:"")},C=(e,t)=>{let r,l,n=s=>{r=!0,setTimeout((()=>{if(r=!1,l)return l=!1,n(s),e(s)}),t)};return t=>r?l=!0:(n(t),e(t))},_=(e,t)=>{let r;return l=>{clearTimeout(r),r=setTimeout((()=>{r=null,e(l)}),t)}},D=e=>e.replace(/[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g,(e=>"-"+e.toLowerCase()));d.value=(e,r,l)=>{let n,s,o="text"===e.type||""===e.type?t=>e.setAttribute("value",e.value=null==t?"":t):"TEXTAREA"===e.tagName||"text"===e.type||""===e.type?t=>(n=e.selectionStart,s=e.selectionEnd,e.setAttribute("value",e.value=null==t?"":t),n&&e.setSelectionRange(n,s)):"checkbox"===e.type?t=>(e.checked=t,W(e,"checked",t)):"select-one"===e.type?t=>{for(let t in e.options)t.removeAttribute("selected");e.value=t,e.selectedOptions[0]?.setAttribute("selected","")}:t=>e.value=t;return t((()=>o(r(l))))},d.fx=(e,r,l)=>t((()=>r(l))),h.use(S),h.use({compile:e=>h.constructor("__scope",`with (__scope) { return ${e} };`)});var K=h;export{K as default};
+var e,t,r,l,n,s=Object.defineProperty,o=Symbol("signals"),a=Symbol("length");function i(t,r){if(!t)return t;if(t[o])return t;if(Array.isArray(t))return function(t){let r;if(t[o])return t;let l=e(t.length),n=Array(t.length).fill();const s=new Proxy(n,{get:(s,c)=>"symbol"==typeof c?c===a?l:c===o?n:n[c]:"length"===c?u[r]?l.peek():l.value:(r=c,n[c]?n[c].valueOf():c<n.length?(n[c]=e(i(t[c]))).value:void 0),set(e,t,r){if("length"===t){for(let e=r,t=n.length;e<t;e++)delete s[e];return l.value=n.length=r,!0}return c(n,t,r),t>=l.peek()&&(l.value=n.length=Number(t)+1),!0},deleteProperty:(e,t)=>(n[t]&&f(n,t),1)});return s}(t);if(t.constructor!==Object)return t;let l={...r?.[o]},s=e(Object.values(t).length);const p=new Proxy(l,{get:(e,t)=>t===a?s:t===o?l:l[t]?.valueOf(),set:(e,t,r,n)=>(n=l[t],c(l,t,r),n??++s.value,1),deleteProperty:(e,t)=>(l[t]&&(f(l,t),s.value--),1),ownKeys:()=>(s.value,Reflect.ownKeys(l))});for(let e in t){const r=Object.getOwnPropertyDescriptor(t,e);r?.get?(l[e]=n(r.get.bind(p)))._set=r.set?.bind(p):(l[e]=void 0,c(l,e,t[e]))}return p}var u={push:1,pop:1,shift:1,unshift:1,splice:1};function c(t,n,s){let o=t[n];if("_"===n[0])t[n]=s;else if(o)if(s===o.peek());else if(o._set)o._set(s);else if(Array.isArray(s)&&Array.isArray(o.peek())){const e=o.peek();e[a]?r((()=>{l((()=>{let t=0,r=s.length;for(;t<r;t++)e[t]=s[t];e.length=r}))})):o.value=s}else o.value=i(s);else t[n]=o=s?.peek?s:e(i(s))}function f(e,t){const r=e[t],l=r[Symbol.dispose];l&&delete r[Symbol.dispose],delete e[t],l?.()}var p=Symbol.dispose||=Symbol("dispose"),d={},y=new WeakMap;function h(e,t){if(!e?.childNodes)return;if(y.has(e))return Object.assign(y.get(e),t);const r=i(t||{}),l=[];return function e(t,n=t.parentNode){if(t.childNodes){for(let e=0;e<t.attributes?.length;){let s=t.attributes[e];if(":"===s.name[0]){t.removeAttribute(s.name);let e=s.name.slice(1).split(":");for(let n of e){let e=d[n]||d.default,o=e(t,(e.parse||g)(s.value,g),r,n);o&&l.push(o)}if(y.has(t))return t[p]&&l.push(t[p]);if(t.parentNode!==n)return}else e++}for(let r of[...t.childNodes])e(r,t)}}(e),y.has(e)||y.set(e,r),e[p]=()=>{for(;l.length;)l.pop()();y.delete(e)},r}var m,v={},g=(e,t,r)=>{if(r=v[e=e.trim()])return r;try{r=m(e)}catch(r){b(r,t,e)}return v[e]=r},b=(e,t,r="")=>{throw Object.assign(e,{message:`∴ ${e.message}\n\n${t}${r?`="${r}"\n\n`:""}`,expr:r})};h.use=s=>{s.signal&&function(s){e=s.signal,t=s.effect,n=s.computed,l=s.batch||(e=>e()),r=s.untracked||l}(s),s.compile&&(m=s.compile)};var k,A,w=e=>{if(!e.nodeType)return e;e.content.appendChild(document.createTextNode(""));let t=e.content.cloneNode(!0),r=[...e.attributes],l=[...t.childNodes];return{childNodes:l,content:t,remove:()=>t.append(...l),replaceWith(e){l[0].before(e),t.append(...l)},attributes:r,removeAttribute(e){r.splice(r.findIndex((t=>t.name===e)),1)}}},S={};((e,t)=>{for(var r in t)s(e,r,{get:t[r],enumerable:!0})})(S,{batch:()=>W,computed:()=>x,effect:()=>O,signal:()=>N,untracked:()=>j});var N=(e,t,r=new Set)=>((t={get value(){return k?.deps.push(r.add(k)),e},set value(t){if(t!==e){e=t;for(let e of r)A?A.add(e):e()}},peek:()=>e}).toJSON=t.then=t.toString=t.valueOf=()=>t.value,t),O=(e,t,r,l)=>(l=(r=l=>{t?.call?.(),l=k,k=r;try{t=e()}finally{k=l}}).deps=[],r(),e=>{for(t?.call?.();e=l.pop();)e.delete(r)}),x=(e,t=N(),r,l)=>((r={get value(){return l||=O((()=>t.value=e())),t.value},peek:t.peek}).toJSON=r.then=r.toString=r.valueOf=()=>r.value,r),W=e=>{let t=A;t||(A=new Set);try{e()}finally{if(!t){t=A,A=null;for(const e of t)e()}}},j=(e,t,r)=>(t=k,k=null,r=e(),k=t,r),T=Symbol("if");d.if=(e,r,l)=>{let n,s,o,a=e.nextElementSibling,i=document.createTextNode("");return e.replaceWith(i),s=e.content?w(e):e,y.set(s,null),a?.hasAttribute(":else")&&(a.removeAttribute(":else"),a.hasAttribute(":if")||(a.remove(),o=a.content?w(a):a,y.set(o,null))),t((()=>{const t=r(l)?s:e[T]?null:o;a&&(a[T]=t===s),n!=t&&(n?.remove(),(n=t)&&(i.before(n.content||n),null===y.get(n)&&y.delete(n),h(n,l)))}))},d.each=(e,[l,s,u],c)=>{const f=document.createTextNode("");e.replaceWith(f);let p,d,y=0;const m=n((()=>{d=null;let e=u(c);return"number"==typeof e&&(e=Array.from({length:e},((e,t)=>t+1))),e?.constructor===Object&&(d=Object.keys(e),e=Object.values(e)),e||[]})),v=()=>{r((()=>{let t=0,r=m.value,n=r.length;if(p&&!p[a]){for(let e of p[o]||[])e[Symbol.dispose]();p=null,y=0}if(n<y)p.length=n;else{if(p)for(;t<y;t++)p[t]=r[t];else p=r;for(;t<n;t++){p[t]=r[t];let n=t,a=i({[l]:p[o]?.[n]||p[n],[s]:d?d[n]:n},c),u=e.content?w(e):e.cloneNode(!0);f.before(u.content||u),h(u,a),((p[o]||=[])[t]||={})[Symbol.dispose]=()=>{u[Symbol.dispose](),u.remove()}}}y=n}))};let g=0;return t((()=>{m.value[a]?.value,g?g++:(v(),queueMicrotask((()=>(g&&v(),g=0))))}))},d.each.parse=(e,t)=>{let[r,l]=e.split(/\s+in\s+/),[n,s="$"]=r.split(/\s*,\s*/);return[n,s,t(l)]},d.ref=(e,t,r)=>{r[t]=e},d.ref.parse=e=>e,d.with=(e,r,l)=>{let n;return t((()=>{let t=r(l);h(e,n?t:n=i(t,l))}))},d.html=(e,t,r)=>{let l=t(r);if(!l)return;let n=(l.content||l).cloneNode(!0);e.replaceChildren(n),h(e,r)},d.text=(e,r,l)=>{if(e.content){let t=w(e);e!==t&&e.replaceWith(t.content),e=t.childNodes[0]}return t((()=>{let t=r(l);e.textContent=null==t?"":t}))},d.class=(e,r,l)=>{let n=new Set;return t((()=>{let t=r(l),s=new Set;t&&("string"==typeof t?t.split(" ").map((e=>s.add(e))):Array.isArray(t)?t.map((e=>e&&s.add(e))):Object.entries(t).map((([e,t])=>t&&s.add(e))));for(let t of n)s.has(t)?s.delete(t):e.classList.remove(t);for(let t of n=s)e.classList.add(t)}))},d.style=(e,r,l)=>{let n=e.getAttribute("style")||"";return n.endsWith(";")||(n+="; "),t((()=>{let t=r(l);if("string"==typeof t)e.setAttribute("style",n+t);else{e.setAttribute("style",n);for(let r in t)e.style.setProperty(r,t[r])}}))},d.default=(e,r,l,n)=>{if(!n.startsWith("on"))return t((()=>{let t=r(l);if(n)E(e,n,t);else for(let r in t)E(e,D(r),t[r])}));const s=n.split("..").map((t=>{let r={evt:"",target:e,test:()=>!0};return r.evt=(t.startsWith("on")?t.slice(2):t).replace(/\.(\w+)?-?([-\w]+)?/g,((e,t,l="")=>(r.test=$[t]?.(r,...l.split("-"))||r.test,""))),r}));if(1==s.length)return t((()=>f(r(l),s[0])));let o,a,i,u=0;const c=e=>{i=f((t=>(i(),a=e?.(t),(u=++u%s.length)?c(a):o&&c(o))),s[u])};return t((()=>(o=r(l),!i&&c(o),()=>o=null)));function f(e,{evt:t,target:r,test:l,defer:n,stop:s,prevent:o,immediate:a,...i}){n&&(e=n(e));const u=r=>{try{l(r)&&(s&&(a?r.stopImmediatePropagation():r.stopPropagation()),o&&r.preventDefault(),e?.(r))}catch(r){b(r,`:on${t}`,e)}};return r.addEventListener(t,u,i),()=>r.removeEventListener(t,u,i)}};var $={prevent(e){e.prevent=!0},stop(e){e.stop=!0},immediate(e){e.immediate=!0},once(e){e.once=!0},passive(e){e.passive=!0},capture(e){e.capture=!0},window(e){e.target=window},document(e){e.target=document},throttle(e,t){e.defer=e=>P(e,t?Number(t)||0:108)},debounce(e,t){e.defer=e=>_(e,t?Number(t)||0:108)},outside:e=>t=>{let r=e.target;return!(r.contains(t.target)||!1===t.target.isConnected||r.offsetWidth<1&&r.offsetHeight<1)},self:e=>t=>t.target===e.target,ctrl:(e,...t)=>e=>C.ctrl(e)&&t.every((t=>C[t]?C[t](e):e.key===t)),shift:(e,...t)=>e=>C.shift(e)&&t.every((t=>C[t]?C[t](e):e.key===t)),alt:(e,...t)=>e=>C.alt(e)&&t.every((t=>C[t]?C[t](e):e.key===t)),meta:(e,...t)=>e=>C.meta(e)&&t.every((t=>C[t]?C[t](e):e.key===t)),arrow:()=>C.arrow,enter:()=>C.enter,esc:()=>C.esc,tab:()=>C.tab,space:()=>C.space,delete:()=>C.delete,digit:()=>C.digit,letter:()=>C.letter,char:()=>C.char},C={ctrl:e=>e.ctrlKey||"Control"===e.key||"Ctrl"===e.key,shift:e=>e.shiftKey||"Shift"===e.key,alt:e=>e.altKey||"Alt"===e.key,meta:e=>e.metaKey||"Meta"===e.key||"Command"===e.key,arrow:e=>e.key.startsWith("Arrow"),enter:e=>"Enter"===e.key,esc:e=>e.key.startsWith("Esc"),tab:e=>"Tab"===e.key,space:e=>" "===e.key||"Space"===e.key||" "===e.key,delete:e=>"Delete"===e.key||"Backspace"===e.key,digit:e=>/^\d$/.test(e.key),letter:e=>/^\p{L}$/gu.test(e.key),char:e=>/^\S$/.test(e.key)},E=(e,t,r)=>{null==r||!1===r?e.removeAttribute(t):e.setAttribute(t,!0===r?"":"number"==typeof r||"string"==typeof r?r:"")},P=(e,t)=>{let r,l,n=s=>{r=!0,setTimeout((()=>{if(r=!1,l)return l=!1,n(s),e(s)}),t)};return t=>r?l=!0:(n(t),e(t))},_=(e,t)=>{let r;return l=>{clearTimeout(r),r=setTimeout((()=>{r=null,e(l)}),t)}},D=e=>e.replace(/[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g,(e=>"-"+e.toLowerCase()));d.value=(e,r,l)=>{let n,s,o="text"===e.type||""===e.type?t=>e.setAttribute("value",e.value=null==t?"":t):"TEXTAREA"===e.tagName||"text"===e.type||""===e.type?t=>(n=e.selectionStart,s=e.selectionEnd,e.setAttribute("value",e.value=null==t?"":t),n&&e.setSelectionRange(n,s)):"checkbox"===e.type?t=>(e.checked=t,E(e,"checked",t)):"select-one"===e.type?t=>{for(let t in e.options)t.removeAttribute("selected");e.value=t,e.selectedOptions[0]?.setAttribute("selected","")}:t=>e.value=t;return t((()=>o(r(l))))},d.fx=(e,r,l)=>t((()=>r(l))),h.use(S),h.use({compile:e=>h.constructor("__scope",`with (__scope) { return ${e} };`)});var K=h;export{K as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sprae",
   "description": "DOM microhydration.",
-  "version": "10.7.0",
+  "version": "10.8.1",
   "main": "./sprae.js",
   "module": "./sprae.js",
   "type": "module",

package/readme.md

@@ -4,7 +4,7 @@
 
 _Sprae_ is open & minimalistic progressive enhancement framework.<br/>
 Perfect for small-scale websites, static pages, landings, prototypes, or lightweight UI.<br/>
-
+A light, fast and sweet alternative to alpine, petit-vue etc.
 
 ## Usage
 
@@ -24,7 +24,7 @@ Perfect for small-scale websites, static pages, landings, prototypes, or lightwe
 </script>
 ```
 
-Sprae evaluates `:`-directives and evaporates them, returning reactive state.
+Sprae evaluates `:`-directives and evaporates them, returning reactive state for updates.
 
 ## Directives
 
@@ -59,9 +59,6 @@ Multiply element.
   <dt :text="item.term"/>
   <dd :text="item.definition"/>
 </template>
-
-<!-- prevent FOUC -->
-<style>[:each] {visibility: hidden}</style>
 ```
 
 #### `:text="value"`
@@ -271,7 +268,8 @@ Trigger when element is connected / disconnected from DOM.
 
 ## Signals
 
-Sprae can take signal values. Signals provider can be switched to any preact-flavored implementation:
+Sprae uses signals for reactivity and can take signal values as inputs.
+Signals provider can be switched to any preact-flavored implementation:
 
 ```js
 import sprae from 'sprae';
@@ -346,6 +344,7 @@ import * as signals from '@preact/signals'
 import compile from 'subscript'
 
 // standard directives
+import 'sprae/directive/default.js'
 import 'sprae/directive/if.js'
 import 'sprae/directive/text.js'
 
@@ -361,20 +360,25 @@ sprae.use(signals)
 sprae.use({ compile })
 ```
 
-<!-- ## Dispose
-
-To destroy state and detach sprae handlers, call `element[Symbol.dispose]()`. -->
+## Hints
 
+* To prevent [FOUC](https://en.wikipedia.org/wiki/Flash_of_unstyled_content) add `<style>[:each],[:if],[:else] {visibility: hidden}</style>`
+* Attributes order matters, eg. `<li :each="el in els" :text="el.name"></li>` is not the same as `<li :text="el.name" :each="el in els"></li>`
+* To destroy state and detach sprae handlers, call `element[Symbol.dispose]()`.
+* State getters/setters work as computed effects, eg. `sprae(el, { x:1, get x2(){ return this.x * 2} })`.
+* `this` keyword is not used, to get access to current element use `<input :ref="el" :text="el.value"/>`
+* Async/await is not supported in attributes, it's a strong indicator you need to put these methods into state.
 
 ## Justification
 
 * [Template-parts](https://github.com/dy/template-parts) is stuck with native HTML quirks ([parsing table](https://github.com/github/template-parts/issues/24), [SVG attributes](https://github.com/github/template-parts/issues/25), [liquid syntax](https://shopify.github.io/liquid/tags/template/#raw) conflict etc).
 * [Alpine](https://github.com/alpinejs/alpine) / [petite-vue](https://github.com/vuejs/petite-vue) / [lucia](https://github.com/aidenyabi/lucia) escape native HTML quirks, but have excessive API (`:`, `x-`, `{}`, `@`, `$`), tend to [self-encapsulate](https://github.com/alpinejs/alpine/discussions/3223) and not care about size/performance.
 
-_Sprae_ holds open & minimalistic philosophy:
+_Sprae_ holds open, sweet & minimalistic philosophy:
 * Slim `:` API and _signals_ reactivity.
 * Pluggable directives & configurable internals.
 * Small, safe & performant.
+* Bits of organic sugar.
 * Aims at making developers happy 🫰
 
 <!--