sprae 2.5.4 → 2.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sprae",
   "description": "DOM microhydration.",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "main": "src/index.js",
   "module": "src/index.js",
   "type": "module",
@@ -15,7 +15,7 @@
     "@preact/signals": "^1.1.2",
     "es-module-shims": "^1.6.2",
     "esbuild": "^0.15.14",
-    "hyperf": "^1.4.0",
+    "hyperf": "^1.5.0",
     "jsdom": "^20.0.3",
     "terser": "^5.15.1",
     "tst": "^7.1.1",

package/r&d.md

@@ -97,7 +97,7 @@
 
 -> possibly we have to just subscribe via mechanism of signals-like deps, and :with just initializes subtree with extended object
 
-## [ ] :with? -> let's use `:with="{x:1,y:2,z:3}"` for now
+## [x] :with? -> let's use `:with="{x:1,y:2,z:3}"` for now
 
   1. Get rid of :with
     + with is bad JS practice/association
@@ -223,7 +223,15 @@
   ? attach-detach?
   ? onmount-onunmount?
     - slows down domdiff
-    - can be solved as `<x :if="xxx" :="xxx ? (...) : '">` automatically
+    - can be solved as `<x :if="xxx" :="xxx && (...)'">` automatically
+
+## [x] :onmount/onunmount? -> for now no reasons
+
+  + useful for :if, :each
+  + useful to dispose listeners via :onunmount (opposed to hidden symbols)
+  - doesn't really solve disposal: if element is attached again, it would need to reattach removed listeners
+    -> can be dolved via teardowns returned from updators
+    -> nah, event listeners don't need collection, just make sure no refs to element remain
 
 ## [x] :focus="direct code", :evt="direct code" -> nah, too messy.
 
@@ -324,18 +332,20 @@
     - need to match many syntax quirks, can be tedious
       ~ can be fine to limit expressions to meaningful default: why Proxy, generators, awaits, global access etc.
   - Somewhat heavy to bundle
-    ~ 1-2kb is not super-heavy, besides signal-struct kicks out
+    ~ 1-2kb is not super-heavy, besides kicks out signal-struct (with preact signals?)
   + Scope is easier to provide: no need for signal proxy
   + Can detect access errors in advance
   + Syntax-level access to signals can be inavoidable: external signals still "leak in" (via arrays or etc.).
   + Updating simple objects should also rerender the template parts, not just signals.
   + Deps can be analyzed / implemented without signals
-  - Screwed up debugging / stacktrace (unless errored)
+  - Screwed up debugging / stacktrace (unless errored properly)
+    ~+ can actually provide better trace since no internal framework stuff is shown
   + that "unlimits" returned struct, so that any property can be added/deleted.
   - doesn't really save from `new (()=>{}).constructor` hack: we gotta substitute objects too.
   + allows easier handle of `:with="a=1,b=2,c=3"` - we just naturally get local variables without messup with global
     + we can even define locals without `let`...
   - not having "comfy" compatible JS at hand: cognitive load of whole language "layer" in-between
+  + allows `let a = 1; a;` case instead of `let a = 1; return a;`
 
 2. Use sandboxed proxy
   - tough evaluation
@@ -392,6 +402,7 @@
     .period	Period, .
     .slash	Foward Slash, /
   - conflict with dot-separated events
+  - lots of ad-hoc non-standard rules, can be handled in code
 
 ## [x] Writing props on elements (like ones in :each) -> nah, just use `:x="this.x=abc"`
 

package/readme.md

@@ -59,7 +59,7 @@ Control flow of elements.
 
 #### `:each="item, index in items"`
 
-Multiply element. `index` value starts from 1.
+Multiply element. `index` value starts from 1. Use `:key` as caching key to avoid rerendering.
 
 ```html
 <ul>

package/sprae.js

@@ -6,23 +6,23 @@ function t() {
   if (!(n > 1)) {
     var i2, t2 = false;
     while (void 0 !== r) {
-      var h2 = r;
+      var h = r;
       r = void 0;
       s++;
-      while (void 0 !== h2) {
-        var o2 = h2.o;
-        h2.o = void 0;
-        h2.f &= -3;
-        if (!(8 & h2.f) && d(h2))
+      while (void 0 !== h) {
+        var o2 = h.o;
+        h.o = void 0;
+        h.f &= -3;
+        if (!(8 & h.f) && d(h))
           try {
-            h2.c();
-          } catch (h3) {
+            h.c();
+          } catch (h2) {
             if (!t2) {
-              i2 = h3;
+              i2 = h2;
               t2 = true;
             }
           }
-        h2 = o2;
+        h = o2;
       }
     }
     s = 0;
@@ -79,25 +79,25 @@ e.prototype.S = function(i2) {
   }
 };
 e.prototype.U = function(i2) {
-  var t2 = i2.e, h2 = i2.x;
+  var t2 = i2.e, h = i2.x;
   if (void 0 !== t2) {
-    t2.x = h2;
+    t2.x = h;
     i2.e = void 0;
   }
-  if (void 0 !== h2) {
-    h2.e = t2;
+  if (void 0 !== h) {
+    h.e = t2;
     i2.x = void 0;
   }
   if (i2 === this.t)
-    this.t = h2;
+    this.t = h;
 };
 e.prototype.subscribe = function(i2) {
   var t2 = this;
   return b(function() {
-    var h2 = t2.value, o2 = 32 & this.f;
+    var h = t2.value, o2 = 32 & this.f;
     this.f &= -33;
     try {
-      i2(h2);
+      i2(h);
     } finally {
       this.f |= o2;
     }
@@ -117,11 +117,11 @@ Object.defineProperty(e.prototype, "value", { get: function() {
   if (void 0 !== i2)
     i2.i = this.i;
   return this.v;
-}, set: function(h2) {
-  if (h2 !== this.v) {
+}, set: function(h) {
+  if (h !== this.v) {
     if (s > 100)
       i();
-    this.v = h2;
+    this.v = h;
     this.i++;
     f++;
     n++;
@@ -144,33 +144,33 @@ function d(i2) {
 }
 function c(i2) {
   for (var t2 = i2.s; void 0 !== t2; t2 = t2.n) {
-    var h2 = t2.S.n;
-    if (void 0 !== h2)
-      t2.r = h2;
+    var h = t2.S.n;
+    if (void 0 !== h)
+      t2.r = h;
     t2.S.n = t2;
     t2.i = -1;
   }
 }
 function a(i2) {
-  var t2 = i2.s, h2 = void 0;
+  var t2 = i2.s, h = void 0;
   while (void 0 !== t2) {
     var o2 = t2.n;
     if (-1 === t2.i) {
       t2.S.U(t2);
       t2.n = void 0;
     } else {
-      if (void 0 !== h2)
-        h2.p = t2;
+      if (void 0 !== h)
+        h.p = t2;
       t2.p = void 0;
-      t2.n = h2;
-      h2 = t2;
+      t2.n = h;
+      h = t2;
     }
     t2.S.n = t2.r;
     if (void 0 !== t2.r)
       t2.r = void 0;
     t2 = o2;
   }
-  i2.s = h2;
+  i2.s = h;
 }
 function l(i2) {
   e.call(this, void 0);
@@ -259,14 +259,14 @@ function w(i2) {
   return new l(i2);
 }
 function y(i2) {
-  var h2 = i2.u;
+  var h = i2.u;
   i2.u = void 0;
-  if ("function" == typeof h2) {
+  if ("function" == typeof h) {
     n++;
     var r2 = o;
     o = void 0;
     try {
-      h2();
+      h();
     } catch (t2) {
       i2.f &= -2;
       i2.f |= 8;
@@ -478,12 +478,13 @@ var directives = {};
 var directives_default = (el, expr, values, name) => {
   let evt = name.startsWith("on") && name.slice(2);
   let evaluate = parseExpr(el, expr, ":" + name);
-  let value;
   if (evaluate)
     return evt ? (state) => {
-      value && removeListener(el, evt, value);
-      value = evaluate(state);
-      value && addListener(el, evt, value);
+      let value = evaluate(state);
+      if (value) {
+        addListener(el, evt, value);
+        return () => removeListener(el, evt, value);
+      }
     } : (state) => attr(el, name, evaluate(state));
 };
 var attr = (el, name, v2) => {
@@ -501,16 +502,6 @@ directives[""] = (el, expr) => {
         attr(el, dashcase(key), value[key]);
     };
 };
-var _each = Symbol(":each");
-var _ref = Symbol(":ref");
-directives["ref"] = (el, expr, state) => {
-  if (el.hasAttribute(":each")) {
-    el[_ref] = expr;
-    return;
-  }
-  ;
-  state[expr] = el;
-};
 directives["with"] = (el, expr, rootState) => {
   let evaluate = parseExpr(el, expr, "with");
   sprae(el, signalStruct(evaluate(rootState), rootState));
@@ -541,6 +532,24 @@ directives["if"] = (el, expr) => {
     }
   };
 };
+var _each = Symbol(":each");
+var _ref = Symbol(":ref");
+var _key = Symbol(":key");
+directives["ref"] = (el, expr, state) => {
+  if (el.hasAttribute(":each")) {
+    el[_ref] = expr;
+    return;
+  }
+  ;
+  state[expr] = el;
+};
+directives["key"] = (el, expr, state) => {
+  if (el.hasAttribute(":each")) {
+    el[_key] = expr;
+    return;
+  }
+  ;
+};
 directives["each"] = (tpl, expr) => {
   let each = parseForExpression(expr);
   if (!each)
@@ -548,6 +557,9 @@ directives["each"] = (tpl, expr) => {
   const holder = tpl[_each] = document.createTextNode("");
   tpl.replaceWith(holder);
   const evaluate = parseExpr(tpl, each.items, ":each");
+  const keyExpr = tpl[_key] || tpl.getAttribute(":key");
+  const itemKey = keyExpr ? parseExpr(null, keyExpr) : null;
+  tpl.removeAttribute(":key");
   const scopes = /* @__PURE__ */ new WeakMap();
   const itemEls = /* @__PURE__ */ new WeakMap();
   let curEls = [];
@@ -565,23 +577,25 @@ directives["each"] = (tpl, expr) => {
       exprError(Error("Bad list value"), tpl, expr, ":each", list);
     let newEls = [], elScopes = [];
     for (let [idx, item] of list) {
-      let itemKey = primitive_pool_default(item);
-      let el = itemEls.get(itemKey);
-      if (!el) {
+      let el, scope, key = itemKey?.({ [each.item]: item });
+      if (isPrimitive(key))
+        key = primitive_pool_default(key);
+      if (key == null)
         el = tpl.cloneNode(true);
-        itemEls.set(itemKey, el);
-      }
+      else
+        (el = itemEls.get(key)) || itemEls.set(key, el = tpl.cloneNode(true));
       newEls.push(el);
-      if (!scopes.has(itemKey)) {
-        let scope = Object.create(state);
+      if (key == null || !(scope = scopes.get(key))) {
+        scope = Object.create(state);
         scope[each.item] = item;
         if (each.index)
           scope[each.index] = idx;
         if (tpl[_ref])
           scope[tpl[_ref]] = el;
-        scopes.set(itemKey, scope);
+        if (key != null)
+          scopes.set(key, scope);
       }
-      elScopes.push(scopes.get(itemKey));
+      elScopes.push(scope);
     }
     swap_inflate_default(holder.parentNode, curEls, newEls, holder);
     curEls = newEls;
@@ -654,18 +668,19 @@ directives["value"] = (el, expr) => {
   } : (value) => el.value = value;
   return (state) => update(evaluate(state));
 };
-var _stop = Symbol("stop");
 directives["on"] = (el, expr) => {
   let evaluate = parseExpr(el, expr, ":on");
-  let listeners = {};
   return (state) => {
-    for (let evt in listeners)
-      removeListener(el, evt, listeners[evt]);
-    listeners = evaluate(state);
+    let listeners = evaluate(state);
     for (let evt in listeners)
       addListener(el, evt, listeners[evt]);
+    return () => {
+      for (let evt in listeners)
+        removeListener(el, evt, listeners[evt]);
+    };
   };
 };
+var _stop = Symbol("stop");
 var addListener = (el, evt, startFn) => {
   if (evt.indexOf("..") < 0)
     el.addEventListener(evt, startFn);
@@ -710,19 +725,19 @@ directives["aria"] = (el, expr) => {
 };
 var evaluatorMemo = {};
 function parseExpr(el, expression, dir) {
-  if (evaluatorMemo[expression])
-    return evaluatorMemo[expression];
-  let rightSideSafeExpression = /^[\n\s]*if.*\(.*\)/.test(expression) || /^(let|const)\s/.test(expression) ? `(() => { ${expression} })()` : expression;
-  let evaluate;
-  try {
-    evaluate = new Function(`__scope`, `with (__scope) { return ${rightSideSafeExpression} };`).bind(el);
-  } catch (e2) {
-    return exprError(e2, el, expression, dir);
+  let evaluate = evaluatorMemo[expression];
+  if (!evaluate) {
+    let rightSideSafeExpression = /^[\n\s]*if.*\(.*\)/.test(expression) || /^(let|const)\s/.test(expression) ? `(() => { ${expression} })()` : expression;
+    try {
+      evaluate = evaluatorMemo[expression] = new Function(`__scope`, `with (__scope) { return ${rightSideSafeExpression} };`);
+    } catch (e2) {
+      return exprError(e2, el, expression, dir);
+    }
   }
-  return evaluatorMemo[expression] = (state) => {
+  return (state) => {
     let result;
     try {
-      result = evaluate(state);
+      result = evaluate.call(el, state);
     } catch (e2) {
       return exprError(e2, el, expression, dir);
     }
@@ -743,6 +758,9 @@ ${dir}=${expression ? `"${expression}"
 function dashcase(str) {
   return str.replace(/[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g, (match) => "-" + match.toLowerCase());
 }
+function isPrimitive(obj) {
+  return typeof obj === "string" || typeof obj === "boolean" || typeof obj === "number";
+}
 
 // src/core.js
 var memo = /* @__PURE__ */ new WeakMap();
@@ -781,8 +799,14 @@ function sprae(container, values) {
     }
   };
   init(container);
-  for (let update of updates)
-    b(() => update(state));
+  for (let update of updates) {
+    let teardown;
+    b(() => {
+      if (typeof teardown === "function")
+        teardown();
+      teardown = update(state);
+    });
+  }
   Object.seal(state);
   memo.set(container, state);
   return state;

package/sprae.min.js

@@ -1 +1 @@
-function t(){throw new Error("Cycle detected")}function e(){if(n>1)n--;else{for(var t,e=!1;void 0!==r;){var i=r;for(r=void 0,o++;void 0!==i;){var s=i.o;if(i.o=void 0,i.f&=-3,!(8&i.f)&&f(i))try{i.c()}catch(i){e||(t=i,e=!0)}i=s}}if(o=0,n--,e)throw t}}var i=void 0,r=void 0,n=0,o=0,s=0;function l(t){if(void 0!==i){var e=t.n;if(void 0===e||e.t!==i)return i.s=e={i:0,S:t,p:void 0,n:i.s,t:i,e:void 0,x:void 0,r:e},t.n=e,32&i.f&&t.S(e),e;if(-1===e.i)return e.i=0,void 0!==e.p&&(e.p.n=e.n,void 0!==e.n&&(e.n.p=e.p),e.p=void 0,e.n=i.s,i.s.p=e,i.s=e),e}}function a(t){this.v=t,this.i=0,this.n=void 0,this.t=void 0}function f(t){for(var e=t.s;void 0!==e;e=e.n)if(e.S.i!==e.i||!e.S.h()||e.S.i!==e.i)return!0;return!1}function u(t){for(var e=t.s;void 0!==e;e=e.n){var i=e.S.n;void 0!==i&&(e.r=i),e.S.n=e,e.i=-1}}function h(t){for(var e=t.s,i=void 0;void 0!==e;){var r=e.n;-1===e.i?(e.S.U(e),e.n=void 0):(void 0!==i&&(i.p=e),e.p=void 0,e.n=i,i=e),e.S.n=e.r,void 0!==e.r&&(e.r=void 0),e=r}t.s=i}function c(t){a.call(this,void 0),this.x=t,this.s=void 0,this.g=s-1,this.f=4}function v(t){var r=t.u;if(t.u=void 0,"function"==typeof r){n++;var o=i;i=void 0;try{r()}catch(e){throw t.f&=-2,t.f|=8,p(t),e}finally{i=o,e()}}}function p(t){for(var e=t.s;void 0!==e;e=e.n)e.S.U(e);t.x=void 0,t.s=void 0,v(t)}function d(t){if(i!==this)throw new Error("Out-of-order effect");h(this),i=t,this.f&=-2,8&this.f&&p(this),e()}function y(t){this.x=t,this.u=void 0,this.s=void 0,this.o=void 0,this.f=32}function b(t){var e=new y(t);return e.c(),e.d.bind(e)}a.prototype.h=function(){return!0},a.prototype.S=function(t){this.t!==t&&void 0===t.e&&(t.x=this.t,void 0!==this.t&&(this.t.e=t),this.t=t)},a.prototype.U=function(t){var e=t.e,i=t.x;void 0!==e&&(e.x=i,t.e=void 0),void 0!==i&&(i.e=e,t.x=void 0),t===this.t&&(this.t=i)},a.prototype.subscribe=function(t){var e=this;return b((function(){var i=e.value,r=32&this.f;this.f&=-33;try{t(i)}finally{this.f|=r}}))},a.prototype.valueOf=function(){return this.value},a.prototype.toString=function(){return this.value+""},a.prototype.peek=function(){return this.v},Object.defineProperty(a.prototype,"value",{get:function(){var t=l(this);return void 0!==t&&(t.i=this.i),this.v},set:function(i){if(i!==this.v){o>100&&t(),this.v=i,this.i++,s++,n++;try{for(var r=this.t;void 0!==r;r=r.x)r.t.N()}finally{e()}}}}),(c.prototype=new a).h=function(){if(this.f&=-3,1&this.f)return!1;if(32==(36&this.f))return!0;if(this.f&=-5,this.g===s)return!0;if(this.g=s,this.f|=1,this.i>0&&!f(this))return this.f&=-2,!0;var t=i;try{u(this),i=this;var e=this.x();(16&this.f||this.v!==e||0===this.i)&&(this.v=e,this.f&=-17,this.i++)}catch(t){this.v=t,this.f|=16,this.i++}return i=t,h(this),this.f&=-2,!0},c.prototype.S=function(t){if(void 0===this.t){this.f|=36;for(var e=this.s;void 0!==e;e=e.n)e.S.S(e)}a.prototype.S.call(this,t)},c.prototype.U=function(t){if(a.prototype.U.call(this,t),void 0===this.t){this.f&=-33;for(var e=this.s;void 0!==e;e=e.n)e.S.U(e)}},c.prototype.N=function(){if(!(2&this.f)){this.f|=6;for(var t=this.t;void 0!==t;t=t.x)t.t.N()}},c.prototype.peek=function(){if(this.h()||t(),16&this.f)throw this.v;return this.v},Object.defineProperty(c.prototype,"value",{get:function(){1&this.f&&t();var e=l(this);if(this.h(),void 0!==e&&(e.i=this.i),16&this.f)throw this.v;return this.v}}),y.prototype.c=function(){var t=this.S();try{8&this.f||void 0===this.x||(this.u=this.x())}finally{t()}},y.prototype.S=function(){1&this.f&&t(),this.f|=1,this.f&=-9,v(this),u(this),n++;var e=i;return i=this,d.bind(this,e)},y.prototype.N=function(){2&this.f||(this.f|=2,this.o=r,r=this)},y.prototype.d=function(){this.f|=8,1&this.f||p(this)},Symbol.observable||=Symbol("observable");var m=new FinalizationRegistry((t=>t.call?.())),g=(t,e,i,r,n,o)=>{return t&&(s=(t[Symbol.observable]?.()||t).subscribe?.(e,i,r),o=s&&(()=>s.unsubscribe?.())||t.set&&t.call?.(n,e)||(t.then?.((t=>(!n&&e(t),r?.())),i)||(async o=>{try{for await(o of t){if(n)return;e(o)}r?.()}catch(t){i?.(t)}})())&&(t=>n=1),m.register(t,o),o);var s},S=t=>t&&t[x],x=Symbol("signal-struct");function w(t,e){if(S(t)&&!e)return t;if(A(t)){const n=Object.create(e||Object.getPrototypeOf(t)),o={},s=Object.getOwnPropertyDescriptors(t);for(let t in s){let e=s[t];if(e.get){let i=o[t]=new c(e.get.bind(n));Object.defineProperty(n,t,{get:()=>i.value,set:e.set?.bind(n),configurable:!1,enumerable:!0})}else{let s=e.value,l=(r=s)&&!!(r[Symbol.observable]||r[Symbol.asyncIterator]||r.call&&r.set||r.subscribe||r.then),f=o[t]=(i=s)&&i.peek?s:new a(l?void 0:A(s)?Object.seal(w(s)):Array.isArray(s)?w(s):s);l&&g(s,(t=>f.value=t)),Object.defineProperty(n,t,{get:()=>f.value,set(t){if(A(t)){if(A(f.value))try{return void Object.assign(f.value,t)}catch(t){}f.value=Object.seal(w(t))}else Array.isArray(t)?f.value=w(t):f.value=t},enumerable:!0,configurable:!1})}}return Object.defineProperty(n,x,{configurable:!1,enumerable:!1,value:!0}),n}var i,r;return Array.isArray(t)&&!S(t[0])?t.map((t=>w(t))):t}function A(t){return t&&t.constructor===Object}w.isStruct=S;var O=(t,e,i,r=null)=>{let n,o,s,l=0,a=i.length,f=e.length,{remove:u,same:h,insert:c,replace:v}=O;for(;l<a&&l<f&&h(e[l],i[l]);)l++;for(;l<a&&l<f&&h(i[a-1],e[f-1]);)r=i[(--f,--a)];if(l==f)for(;l<a;)c(r,i[l++],t);else{for(n=e[l];l<a;)s=i[l++],o=n?n.nextSibling:r,h(n,s)?n=o:l<a&&h(i[l],o)?(v(n,s,t),n=o):c(n,s,t);for(;!h(n,r);)o=n.nextSibling,u(n,t),n=o}return i};O.same=(t,e)=>t==e,O.replace=(t,e,i)=>i.replaceChild(e,t),O.insert=(t,e,i)=>i.insertBefore(e,t),O.remove=(t,e)=>e.removeChild(t);var j=O,N={},E={},W={},k={},$=(t,e,i,r)=>{let n,o=r.startsWith("on")&&r.slice(2),s=_(t,e,":"+r);if(s)return o?e=>{n&&T(t,o,n),n=s(e),n&&L(t,o,n)}:e=>P(t,r,s(e))},P=(t,e,i)=>{null==i||!1===i?t.removeAttribute(e):t.setAttribute(e,!0===i?"":"number"==typeof i||"string"==typeof i?i:"")};k[""]=(t,e)=>{let i=_(t,e,":");if(i)return e=>{let r=i(e);for(let e in r)P(t,R(e),r[e])}};var C=Symbol(":each"),U=Symbol(":ref");k.ref=(t,e,i)=>{t.hasAttribute(":each")?t[U]=e:i[e]=t},k.with=(t,e,i)=>{I(t,w(_(t,e,"with")(i),i))},k.if=(t,e)=>{let i=document.createTextNode(""),r=[_(t,e,":if")],n=[t],o=t;for(;(o=t.nextElementSibling)&&o.hasAttribute(":else");)o.removeAttribute(":else"),(e=o.getAttribute(":if"))?(o.removeAttribute(":if"),o.remove(),n.push(o),r.push(_(t,e,":else :if"))):(o.remove(),n.push(o),r.push((()=>1)));return t.replaceWith(o=i),t=>{let e=r.findIndex((e=>e(t)));n[e]!=o&&((o[C]||o).replaceWith(o=n[e]||i),I(o,t))}},k.each=(t,e)=>{let i=function(t){let e=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,i=t.match(/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/);if(!i)return;let r={};r.items=i[2].trim();let n=i[1].replace(/^\s*\(|\)\s*$/g,"").trim(),o=n.match(e);return o?(r.item=n.replace(e,"").trim(),r.index=o[1].trim()):r.item=n,r}(e);if(!i)return M(new Error,t,e);const r=t[C]=document.createTextNode("");t.replaceWith(r);const n=_(t,i.items,":each"),o=new WeakMap,s=new WeakMap;let l=[];return a=>{let f=n(a);f?"number"==typeof f?f=Array.from({length:f},((t,e)=>[e,e+1])):Array.isArray(f)?f=f.map(((t,e)=>[e+1,t])):"object"==typeof f?f=Object.entries(f):M(Error("Bad list value"),t,e,":each"):f=[];let u=[],h=[];for(let[e,r]of f){let n=null===(c=r)?E:void 0===c?W:"number"==typeof c||c instanceof Number?N[c]||(N[c]=new Number(c)):"string"==typeof c||c instanceof String?N[c]||(N[c]=new String(c)):"boolean"==typeof c||c instanceof Boolean?N[c]||(N[c]=new Boolean(c)):c,l=s.get(n);if(l||(l=t.cloneNode(!0),s.set(n,l)),u.push(l),!o.has(n)){let s=Object.create(a);s[i.item]=r,i.index&&(s[i.index]=e),t[U]&&(s[t[U]]=l),o.set(n,s)}h.push(o.get(n))}var c;j(r.parentNode,l,u,r),l=u;for(let t=0;t<u.length;t++)I(u[t],h[t])}},k.id=(t,e)=>{let i=_(t,e,":id");return e=>{return r=i(e),t.id=r||0===r?r:"";var r}},k.class=(t,e)=>{let i=_(t,e,":class"),r=t.className;return e=>{let n=i(e);t.className=r+typeof n=="string"?n:(Array.isArray(n)?n:Object.entries(n).map((([t,e])=>e?t:""))).filter(Boolean).join(" ")}},k.style=(t,e)=>{let i=_(t,e,":style"),r=t.getAttribute("style")||"";return r.endsWith(";")||(r+="; "),e=>{let n=i(e);if("string"==typeof n)t.setAttribute("style",r+n);else for(let e in n)t.style[e]=n[e]}},k.text=(t,e)=>{let i=_(t,e,":text");return e=>{let r=i(e);t.textContent=null==r?"":r}},k.value=(t,e)=>{let i,r,n=_(t,e,":value"),o="text"===t.type||""===t.type?e=>t.setAttribute("value",t.value=null==e?"":e):"TEXTAREA"===t.tagName||"text"===t.type||""===t.type?e=>(i=t.selectionStart,r=t.selectionEnd,t.setAttribute("value",t.value=null==e?"":e),i&&t.setSelectionRange(i,r)):"checkbox"===t.type?e=>(t.value=e?"on":"",P(t,"checked",e)):"select-one"===t.type?e=>{for(let e in t.options)e.removeAttribute("selected");t.value=e,t.selectedOptions[0]?.setAttribute("selected","")}:e=>t.value=e;return t=>o(n(t))};var B=Symbol("stop");k.on=(t,e)=>{let i=_(t,e,":on"),r={};return e=>{for(let e in r)T(t,e,r[e]);r=i(e);for(let e in r)L(t,e,r[e])}};var L=(t,e,i)=>{if(e.indexOf("..")<0)t.addEventListener(e,i);else{const r=e.split("..").map((t=>t.startsWith("on")?t.slice(2):t)),n=(e,o=0)=>{let s=l=>{t.removeEventListener(r[o],s),"function"!=typeof(e=e.call(t,l))&&(e=()=>{}),++o<r.length?n(e,o):i[B]||n(i)};t.addEventListener(r[o],s)};n(i)}},T=(t,e,i)=>{e.indexOf("..")>=0&&(i[B]=!0),t.removeEventListener(e,i)};k.data=(t,e)=>{let i=_(t,e,":data");return e=>{let r=i(e);for(let e in r)t.dataset[e]=r[e]}},k.aria=(t,e)=>{let i=_(t,e,":aria");return e=>(e=>{for(let i in e)P(t,"aria-"+R(i),null==e[i]?null:e[i]+"")})(i(e))};var D={};function _(t,e,i){if(D[e])return D[e];let r,n=/^[\n\s]*if.*\(.*\)/.test(e)||/^(let|const)\s/.test(e)?`(() => { ${e} })()`:e;try{r=new Function("__scope",`with (__scope) { return ${n} };`).bind(t)}catch(r){return M(r,t,e,i)}return D[e]=n=>{let o;try{o=r(n)}catch(r){return M(r,t,e,i)}return o}}function M(t,e,i,r){Object.assign(t,{element:e,expression:i}),console.warn(`∴ ${t.message}\n\n${r}=${i?`"${i}"\n\n`:""}`,e),setTimeout((()=>{throw t}),0)}function R(t){return t.replace(/[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g,(t=>"-"+t.toLowerCase()))}var F=new WeakMap;function I(t,e){if(!t.children)return;if(F.has(t))return F.get(t);const i=w(e||{}),r=[],n=(t,e=t.parentNode)=>{if(t.attributes)for(let n=0;n<t.attributes.length;){let o=t.attributes[n];if(":"!==o.name[0]){n++;continue}t.removeAttribute(o.name);let s=o.value;if(!s)continue;let l=o.name.slice(1).split(":");for(let n of l){let o=k[n]||$;if(r.push(o(t,s,i,n)||(()=>{})),F.has(t)||t.parentNode!==e)return!1}}for(let e,i=0;e=t.children[i];i++)!1===n(e,t)&&i--};n(t);for(let t of r)b((()=>t(i)));return Object.seal(i),F.set(t,i),i}var z=I;export{z as default};
+function t(){throw new Error("Cycle detected")}function e(){if(n>1)n--;else{for(var t,e=!1;void 0!==r;){var i=r;for(r=void 0,o++;void 0!==i;){var s=i.o;if(i.o=void 0,i.f&=-3,!(8&i.f)&&f(i))try{i.c()}catch(i){e||(t=i,e=!0)}i=s}}if(o=0,n--,e)throw t}}var i=void 0,r=void 0,n=0,o=0,s=0;function l(t){if(void 0!==i){var e=t.n;if(void 0===e||e.t!==i)return i.s=e={i:0,S:t,p:void 0,n:i.s,t:i,e:void 0,x:void 0,r:e},t.n=e,32&i.f&&t.S(e),e;if(-1===e.i)return e.i=0,void 0!==e.p&&(e.p.n=e.n,void 0!==e.n&&(e.n.p=e.p),e.p=void 0,e.n=i.s,i.s.p=e,i.s=e),e}}function a(t){this.v=t,this.i=0,this.n=void 0,this.t=void 0}function f(t){for(var e=t.s;void 0!==e;e=e.n)if(e.S.i!==e.i||!e.S.h()||e.S.i!==e.i)return!0;return!1}function u(t){for(var e=t.s;void 0!==e;e=e.n){var i=e.S.n;void 0!==i&&(e.r=i),e.S.n=e,e.i=-1}}function h(t){for(var e=t.s,i=void 0;void 0!==e;){var r=e.n;-1===e.i?(e.S.U(e),e.n=void 0):(void 0!==i&&(i.p=e),e.p=void 0,e.n=i,i=e),e.S.n=e.r,void 0!==e.r&&(e.r=void 0),e=r}t.s=i}function c(t){a.call(this,void 0),this.x=t,this.s=void 0,this.g=s-1,this.f=4}function v(t){var r=t.u;if(t.u=void 0,"function"==typeof r){n++;var o=i;i=void 0;try{r()}catch(e){throw t.f&=-2,t.f|=8,p(t),e}finally{i=o,e()}}}function p(t){for(var e=t.s;void 0!==e;e=e.n)e.S.U(e);t.x=void 0,t.s=void 0,v(t)}function d(t){if(i!==this)throw new Error("Out-of-order effect");h(this),i=t,this.f&=-2,8&this.f&&p(this),e()}function y(t){this.x=t,this.u=void 0,this.s=void 0,this.o=void 0,this.f=32}function b(t){var e=new y(t);return e.c(),e.d.bind(e)}a.prototype.h=function(){return!0},a.prototype.S=function(t){this.t!==t&&void 0===t.e&&(t.x=this.t,void 0!==this.t&&(this.t.e=t),this.t=t)},a.prototype.U=function(t){var e=t.e,i=t.x;void 0!==e&&(e.x=i,t.e=void 0),void 0!==i&&(i.e=e,t.x=void 0),t===this.t&&(this.t=i)},a.prototype.subscribe=function(t){var e=this;return b((function(){var i=e.value,r=32&this.f;this.f&=-33;try{t(i)}finally{this.f|=r}}))},a.prototype.valueOf=function(){return this.value},a.prototype.toString=function(){return this.value+""},a.prototype.peek=function(){return this.v},Object.defineProperty(a.prototype,"value",{get:function(){var t=l(this);return void 0!==t&&(t.i=this.i),this.v},set:function(i){if(i!==this.v){o>100&&t(),this.v=i,this.i++,s++,n++;try{for(var r=this.t;void 0!==r;r=r.x)r.t.N()}finally{e()}}}}),(c.prototype=new a).h=function(){if(this.f&=-3,1&this.f)return!1;if(32==(36&this.f))return!0;if(this.f&=-5,this.g===s)return!0;if(this.g=s,this.f|=1,this.i>0&&!f(this))return this.f&=-2,!0;var t=i;try{u(this),i=this;var e=this.x();(16&this.f||this.v!==e||0===this.i)&&(this.v=e,this.f&=-17,this.i++)}catch(t){this.v=t,this.f|=16,this.i++}return i=t,h(this),this.f&=-2,!0},c.prototype.S=function(t){if(void 0===this.t){this.f|=36;for(var e=this.s;void 0!==e;e=e.n)e.S.S(e)}a.prototype.S.call(this,t)},c.prototype.U=function(t){if(a.prototype.U.call(this,t),void 0===this.t){this.f&=-33;for(var e=this.s;void 0!==e;e=e.n)e.S.U(e)}},c.prototype.N=function(){if(!(2&this.f)){this.f|=6;for(var t=this.t;void 0!==t;t=t.x)t.t.N()}},c.prototype.peek=function(){if(this.h()||t(),16&this.f)throw this.v;return this.v},Object.defineProperty(c.prototype,"value",{get:function(){1&this.f&&t();var e=l(this);if(this.h(),void 0!==e&&(e.i=this.i),16&this.f)throw this.v;return this.v}}),y.prototype.c=function(){var t=this.S();try{8&this.f||void 0===this.x||(this.u=this.x())}finally{t()}},y.prototype.S=function(){1&this.f&&t(),this.f|=1,this.f&=-9,v(this),u(this),n++;var e=i;return i=this,d.bind(this,e)},y.prototype.N=function(){2&this.f||(this.f|=2,this.o=r,r=this)},y.prototype.d=function(){this.f|=8,1&this.f||p(this)},Symbol.observable||=Symbol("observable");var m=new FinalizationRegistry((t=>t.call?.())),g=(t,e,i,r,n,o)=>{return t&&(s=(t[Symbol.observable]?.()||t).subscribe?.(e,i,r),o=s&&(()=>s.unsubscribe?.())||t.set&&t.call?.(n,e)||(t.then?.((t=>(!n&&e(t),r?.())),i)||(async o=>{try{for await(o of t){if(n)return;e(o)}r?.()}catch(t){i?.(t)}})())&&(t=>n=1),m.register(t,o),o);var s},S=t=>t&&t[x],x=Symbol("signal-struct");function A(t,e){if(S(t)&&!e)return t;if(w(t)){const n=Object.create(e||Object.getPrototypeOf(t)),o={},s=Object.getOwnPropertyDescriptors(t);for(let t in s){let e=s[t];if(e.get){let i=o[t]=new c(e.get.bind(n));Object.defineProperty(n,t,{get:()=>i.value,set:e.set?.bind(n),configurable:!1,enumerable:!0})}else{let s=e.value,l=(r=s)&&!!(r[Symbol.observable]||r[Symbol.asyncIterator]||r.call&&r.set||r.subscribe||r.then),f=o[t]=(i=s)&&i.peek?s:new a(l?void 0:w(s)?Object.seal(A(s)):Array.isArray(s)?A(s):s);l&&g(s,(t=>f.value=t)),Object.defineProperty(n,t,{get:()=>f.value,set(t){if(w(t)){if(w(f.value))try{return void Object.assign(f.value,t)}catch(t){}f.value=Object.seal(A(t))}else Array.isArray(t)?f.value=A(t):f.value=t},enumerable:!0,configurable:!1})}}return Object.defineProperty(n,x,{configurable:!1,enumerable:!1,value:!0}),n}var i,r;return Array.isArray(t)&&!S(t[0])?t.map((t=>A(t))):t}function w(t){return t&&t.constructor===Object}A.isStruct=S;var O=(t,e,i,r=null)=>{let n,o,s,l=0,a=i.length,f=e.length,{remove:u,same:h,insert:c,replace:v}=O;for(;l<a&&l<f&&h(e[l],i[l]);)l++;for(;l<a&&l<f&&h(i[a-1],e[f-1]);)r=i[(--f,--a)];if(l==f)for(;l<a;)c(r,i[l++],t);else{for(n=e[l];l<a;)s=i[l++],o=n?n.nextSibling:r,h(n,s)?n=o:l<a&&h(i[l],o)?(v(n,s,t),n=o):c(n,s,t);for(;!h(n,r);)o=n.nextSibling,u(n,t),n=o}return i};O.same=(t,e)=>t==e,O.replace=(t,e,i)=>i.replaceChild(e,t),O.insert=(t,e,i)=>i.insertBefore(e,t),O.remove=(t,e)=>e.removeChild(t);var j=O,N={},E={},k={},W=t=>null===t?E:void 0===t?k:"number"==typeof t||t instanceof Number?N[t]||(N[t]=new Number(t)):"string"==typeof t||t instanceof String?N[t]||(N[t]=new String(t)):"boolean"==typeof t||t instanceof Boolean?N[t]||(N[t]=new Boolean(t)):t,$={},P=(t,e,i,r)=>{let n=r.startsWith("on")&&r.slice(2),o=R(t,e,":"+r);if(o)return n?e=>{let i=o(e);if(i)return D(t,n,i),()=>_(t,n,i)}:e=>C(t,r,o(e))},C=(t,e,i)=>{null==i||!1===i?t.removeAttribute(e):t.setAttribute(e,!0===i?"":"number"==typeof i||"string"==typeof i?i:"")};$[""]=(t,e)=>{let i=R(t,e,":");if(i)return e=>{let r=i(e);for(let e in r)C(t,I(e),r[e])}},$.with=(t,e,i)=>{X(t,A(R(t,e,"with")(i),i))},$.if=(t,e)=>{let i=document.createTextNode(""),r=[R(t,e,":if")],n=[t],o=t;for(;(o=t.nextElementSibling)&&o.hasAttribute(":else");)o.removeAttribute(":else"),(e=o.getAttribute(":if"))?(o.removeAttribute(":if"),o.remove(),n.push(o),r.push(R(t,e,":else :if"))):(o.remove(),n.push(o),r.push((()=>1)));return t.replaceWith(o=i),t=>{let e=r.findIndex((e=>e(t)));n[e]!=o&&((o[U]||o).replaceWith(o=n[e]||i),X(o,t))}};var U=Symbol(":each"),B=Symbol(":ref"),L=Symbol(":key");$.ref=(t,e,i)=>{t.hasAttribute(":each")?t[B]=e:i[e]=t},$.key=(t,e,i)=>{t.hasAttribute(":each")&&(t[L]=e)},$.each=(t,e)=>{let i=function(t){let e=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,i=t.match(/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/);if(!i)return;let r={};r.items=i[2].trim();let n=i[1].replace(/^\s*\(|\)\s*$/g,"").trim(),o=n.match(e);return o?(r.item=n.replace(e,"").trim(),r.index=o[1].trim()):r.item=n,r}(e);if(!i)return F(new Error,t,e);const r=t[U]=document.createTextNode("");t.replaceWith(r);const n=R(t,i.items,":each"),o=t[L]||t.getAttribute(":key"),s=o?R(null,o):null;t.removeAttribute(":key");const l=new WeakMap,a=new WeakMap;let f=[];return o=>{let u=n(o);u?"number"==typeof u?u=Array.from({length:u},((t,e)=>[e,e+1])):Array.isArray(u)?u=u.map(((t,e)=>[e+1,t])):"object"==typeof u?u=Object.entries(u):F(Error("Bad list value"),t,e,":each"):u=[];let h=[],c=[];for(let[e,r]of u){let n,f,u=s?.({[i.item]:r});("string"==typeof(v=u)||"boolean"==typeof v||"number"==typeof v)&&(u=W(u)),null==u?n=t.cloneNode(!0):(n=a.get(u))||a.set(u,n=t.cloneNode(!0)),h.push(n),null!=u&&(f=l.get(u))||(f=Object.create(o),f[i.item]=r,i.index&&(f[i.index]=e),t[B]&&(f[t[B]]=n),null!=u&&l.set(u,f)),c.push(f)}var v;j(r.parentNode,f,h,r),f=h;for(let t=0;t<h.length;t++)X(h[t],c[t])}},$.id=(t,e)=>{let i=R(t,e,":id");return e=>{return r=i(e),t.id=r||0===r?r:"";var r}},$.class=(t,e)=>{let i=R(t,e,":class"),r=t.className;return e=>{let n=i(e);t.className=r+typeof n=="string"?n:(Array.isArray(n)?n:Object.entries(n).map((([t,e])=>e?t:""))).filter(Boolean).join(" ")}},$.style=(t,e)=>{let i=R(t,e,":style"),r=t.getAttribute("style")||"";return r.endsWith(";")||(r+="; "),e=>{let n=i(e);if("string"==typeof n)t.setAttribute("style",r+n);else for(let e in n)t.style[e]=n[e]}},$.text=(t,e)=>{let i=R(t,e,":text");return e=>{let r=i(e);t.textContent=null==r?"":r}},$.value=(t,e)=>{let i,r,n=R(t,e,":value"),o="text"===t.type||""===t.type?e=>t.setAttribute("value",t.value=null==e?"":e):"TEXTAREA"===t.tagName||"text"===t.type||""===t.type?e=>(i=t.selectionStart,r=t.selectionEnd,t.setAttribute("value",t.value=null==e?"":e),i&&t.setSelectionRange(i,r)):"checkbox"===t.type?e=>(t.value=e?"on":"",C(t,"checked",e)):"select-one"===t.type?e=>{for(let e in t.options)e.removeAttribute("selected");t.value=e,t.selectedOptions[0]?.setAttribute("selected","")}:e=>t.value=e;return t=>o(n(t))},$.on=(t,e)=>{let i=R(t,e,":on");return e=>{let r=i(e);for(let e in r)D(t,e,r[e]);return()=>{for(let e in r)_(t,e,r[e])}}};var T=Symbol("stop"),D=(t,e,i)=>{if(e.indexOf("..")<0)t.addEventListener(e,i);else{const r=e.split("..").map((t=>t.startsWith("on")?t.slice(2):t)),n=(e,o=0)=>{let s=l=>{t.removeEventListener(r[o],s),"function"!=typeof(e=e.call(t,l))&&(e=()=>{}),++o<r.length?n(e,o):i[T]||n(i)};t.addEventListener(r[o],s)};n(i)}},_=(t,e,i)=>{e.indexOf("..")>=0&&(i[T]=!0),t.removeEventListener(e,i)};$.data=(t,e)=>{let i=R(t,e,":data");return e=>{let r=i(e);for(let e in r)t.dataset[e]=r[e]}},$.aria=(t,e)=>{let i=R(t,e,":aria");return e=>(e=>{for(let i in e)C(t,"aria-"+I(i),null==e[i]?null:e[i]+"")})(i(e))};var M={};function R(t,e,i){let r=M[e];if(!r){let n=/^[\n\s]*if.*\(.*\)/.test(e)||/^(let|const)\s/.test(e)?`(() => { ${e} })()`:e;try{r=M[e]=new Function("__scope",`with (__scope) { return ${n} };`)}catch(r){return F(r,t,e,i)}}return n=>{let o;try{o=r.call(t,n)}catch(r){return F(r,t,e,i)}return o}}function F(t,e,i,r){Object.assign(t,{element:e,expression:i}),console.warn(`∴ ${t.message}\n\n${r}=${i?`"${i}"\n\n`:""}`,e),setTimeout((()=>{throw t}),0)}function I(t){return t.replace(/[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g,(t=>"-"+t.toLowerCase()))}var z=new WeakMap;function X(t,e){if(!t.children)return;if(z.has(t))return z.get(t);const i=A(e||{}),r=[],n=(t,e=t.parentNode)=>{if(t.attributes)for(let n=0;n<t.attributes.length;){let o=t.attributes[n];if(":"!==o.name[0]){n++;continue}t.removeAttribute(o.name);let s=o.value;if(!s)continue;let l=o.name.slice(1).split(":");for(let n of l){let o=$[n]||P;if(r.push(o(t,s,i,n)||(()=>{})),z.has(t)||t.parentNode!==e)return!1}}for(let e,i=0;e=t.children[i];i++)!1===n(e,t)&&i--};n(t);for(let t of r){let e;b((()=>{"function"==typeof e&&e(),e=t(i)}))}return Object.seal(i),z.set(t,i),i}var Z=X;export{Z as default};

package/src/core.js

@@ -1,6 +1,6 @@
 import signalStruct from 'signal-struct';
 import defaultDirective, { directives } from './directives.js';
-import { effect, computed, batch } from '@preact/signals-core'
+import { effect } from '@preact/signals-core'
 
 // sprae element: apply directives
 const memo = new WeakMap
@@ -42,7 +42,13 @@ export default function sprae(container, values) {
 
   // call updates: subscribes directives to state;
   // state is created after inits because directives can extend init values (expose refs etc)
-  for (let update of updates) effect(() => update(state));
+  for (let update of updates) {
+    let teardown
+    effect(() => {
+      if (typeof teardown === 'function') teardown()
+      teardown = update(state)
+    });
+  }
 
   Object.seal(state);
   memo.set(container, state);

package/src/directives.js

@@ -1,8 +1,8 @@
 // directives & parsing
 import sprae from './core.js'
 import swap from 'swapdom'
-import p from 'primitive-pool'
 import signalStruct from 'signal-struct'
+import p from 'primitive-pool'
 
 // reserved directives - order matters!
 export const directives = {}
@@ -11,12 +11,12 @@ export const directives = {}
 export default (el, expr, values, name) => {
   let evt = name.startsWith('on') && name.slice(2)
   let evaluate = parseExpr(el, expr, ':'+name)
-
-  let value
   if (evaluate) return evt ? state => {
-    value && removeListener(el, evt, value)
-    value = evaluate(state)
-    value && addListener(el, evt, value)
+    let value = evaluate(state)
+    if (value) {
+      addListener(el, evt, value)
+      return () => removeListener(el, evt, value)
+    }
   }
   : state => attr(el, name, evaluate(state))
 }
@@ -35,17 +35,6 @@ directives[''] = (el, expr) => {
   }
 }
 
-const _each = Symbol(':each'), _ref = Symbol(':ref')
-
-directives['ref'] = (el, expr, state) => {
-  // make sure :ref is initialized after :each (return to avoid initializing as signal)
-  if (el.hasAttribute(':each')) {el[_ref] = expr; return};
-
-  // FIXME: wait for complex ref use-case
-  // parseExpr(el, `__scope[${expr}]=this`, ':ref')(values)
-  state[expr] = el;
-}
-
 directives['with'] = (el, expr, rootState) => {
   let evaluate = parseExpr(el, expr, 'with')
   sprae(el, signalStruct(evaluate(rootState), rootState));
@@ -82,6 +71,22 @@ directives['if'] = (el, expr) => {
   }
 }
 
+const _each = Symbol(':each'), _ref = Symbol(':ref'), _key = Symbol(':key')
+
+directives['ref'] = (el, expr, state) => {
+  // make sure :ref is initialized after :each (return to avoid initializing as signal)
+  if (el.hasAttribute(':each')) {el[_ref] = expr; return};
+
+  // FIXME: wait for complex ref use-case
+  // parseExpr(el, `__scope[${expr}]=this`, ':ref')(values)
+  state[expr] = el;
+}
+
+directives['key'] = (el, expr, state) => {
+  // make sure :ref is initialized after :each (return to avoid initializing as signal)
+  if (el.hasAttribute(':each')) {el[_key] = expr; return};
+}
+
 directives['each'] = (tpl, expr) => {
   let each = parseForExpression(expr);
   if (!each) return exprError(new Error, tpl, expr);
@@ -93,15 +98,19 @@ directives['each'] = (tpl, expr) => {
 
   const evaluate = parseExpr(tpl, each.items, ':each');
 
-  // stores scope per data item
-  const scopes = new WeakMap()
-  // element per data item
-  const itemEls = new WeakMap()
+  const keyExpr = tpl[_key] || tpl.getAttribute(':key');
+  const itemKey = keyExpr ? parseExpr(null, keyExpr) : null;
+  tpl.removeAttribute(':key')
+
+
+  const scopes = new WeakMap() // stores scope per data item
+  const itemEls = new WeakMap() // element per data item
   let curEls = []
 
   return (state) => {
     // get items
     let list = evaluate(state)
+
     if (!list) list = []
     else if (typeof list === 'number') list = Array.from({length: list}, (_, i)=>[i, i+1])
     else if (Array.isArray(list)) list = list.map((item,i) => [i+1, item])
@@ -112,23 +121,25 @@ directives['each'] = (tpl, expr) => {
     let newEls = [], elScopes = []
 
     for (let [idx, item] of list) {
-      let itemKey = p(item)
-      let el = itemEls.get(itemKey)
-      if (!el) {
-        el = tpl.cloneNode(true)
-        itemEls.set(itemKey, el)
-      }
+      let el, scope, key = itemKey?.({[each.item]: item})
+      if (isPrimitive(key)) key = p(key); // singletonize key
+
+      // we consider if data items are primitive, then nodes needn't be cached
+      // since likely they're very simple to create
+      if (key == null) el = tpl.cloneNode(true);
+      else (el = itemEls.get(key)) || itemEls.set(key, el = tpl.cloneNode(true));
+
       newEls.push(el)
 
-      if (!scopes.has(itemKey)) {
-        let scope = Object.create(state)
+      if (key == null || !(scope = scopes.get(key))) {
+        scope = Object.create(state)
         scope[each.item] = item
         if (each.index) scope[each.index] = idx;
         // provide ref, if indicated
         if (tpl[_ref]) scope[tpl[_ref]] = el
-        scopes.set(itemKey, scope)
+        if (key != null) scopes.set(key, scope)
       }
-      elScopes.push(scopes.get(itemKey))
+      elScopes.push(scope)
     }
 
     // swap is really fast & tiny
@@ -226,18 +237,19 @@ directives['value'] = (el, expr) => {
   return (state) => update(evaluate(state))
 }
 
-const _stop = Symbol('stop')
 directives['on'] = (el, expr) => {
   let evaluate = parseExpr(el, expr, ':on')
-  let listeners = {}
 
   return (state) => {
-    for (let evt in listeners) removeListener(el, evt, listeners[evt])
-    listeners = evaluate(state);
+    let listeners = evaluate(state);
     for (let evt in listeners) addListener(el, evt, listeners[evt])
+    return () => {
+      for (let evt in listeners) removeListener(el, evt, listeners[evt])
+    }
   }
 }
 
+const _stop = Symbol('stop')
 const addListener = (el, evt, startFn) => {
   if (evt.indexOf('..')<0) el.addEventListener(evt, startFn);
 
@@ -256,7 +268,6 @@ const addListener = (el, evt, startFn) => {
     nextEvt(startFn)
   }
 }
-
 const removeListener = (el, evt, fn) => {
   if (evt.indexOf('..')>=0) fn[_stop] = true
   el.removeEventListener(evt, fn);
@@ -285,31 +296,32 @@ let evaluatorMemo = {}
 // borrowed from alpine: https://github.com/alpinejs/alpine/blob/main/packages/alpinejs/src/evaluator.js#L61
 // it seems to be more robust than subscript
 function parseExpr(el, expression, dir) {
-  if (evaluatorMemo[expression]) return evaluatorMemo[expression]
-
-  // Some expressions that are useful in Alpine are not valid as the right side of an expression.
-  // Here we'll detect if the expression isn't valid for an assignement and wrap it in a self-
-  // calling function so that we don't throw an error AND a "return" statement can b e used.
-  let rightSideSafeExpression = 0
-    // Support expressions starting with "if" statements like: "if (...) doSomething()"
-    || /^[\n\s]*if.*\(.*\)/.test(expression)
-    // Support expressions starting with "let/const" like: "let foo = 'bar'"
-    || /^(let|const)\s/.test(expression)
-        ? `(() => { ${expression} })()`
-        : expression;
-
   // guard static-time eval errors
-  let evaluate
-  try {
-    evaluate = new Function(`__scope`,`with (__scope) { return ${rightSideSafeExpression} };`).bind(el)
-  } catch ( e ) {
-    return exprError(e, el, expression, dir)
+  let evaluate = evaluatorMemo[expression]
+
+  if (!evaluate) {
+    // Some expressions that are useful in Alpine are not valid as the right side of an expression.
+    // Here we'll detect if the expression isn't valid for an assignement and wrap it in a self-
+    // calling function so that we don't throw an error AND a "return" statement can b e used.
+    let rightSideSafeExpression = 0
+      // Support expressions starting with "if" statements like: "if (...) doSomething()"
+      || /^[\n\s]*if.*\(.*\)/.test(expression)
+      // Support expressions starting with "let/const" like: "let foo = 'bar'"
+      || /^(let|const)\s/.test(expression)
+          ? `(() => { ${expression} })()`
+          : expression;
+
+    try {
+      evaluate = evaluatorMemo[expression] = new Function(`__scope`,`with (__scope) { return ${rightSideSafeExpression} };`)
+    } catch ( e ) {
+      return exprError(e, el, expression, dir)
+    }
   }
 
   // guard runtime eval errors
-  return evaluatorMemo[expression] = (state) => {
+  return (state) => {
     let result
-    try { result = evaluate(state) }
+    try { result = evaluate.call(el, state); }
     catch (e) { return exprError(e, el, expression, dir) }
     return result
   }
@@ -324,3 +336,7 @@ export function exprError(error, element, expression, dir) {
 function dashcase(str) {
 	return str.replace(/[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g, (match) => '-' + match.toLowerCase());
 };
+
+function isPrimitive(obj) {
+  return typeof obj === 'string' || typeof obj === 'boolean' || typeof obj === 'number'
+}

package/test/test.js

@@ -94,6 +94,13 @@ test('props: multiprop', async () => {
   is(el.outerHTML, `<input id="0" name="0" for="0">`)
 })
 
+// FIXME: this must work without return
+test.todo('props: calculation', async () => {
+  let el = h`<x :x="let a = 5; return Array.from({length:a}, (_,i)=>i).join(' ')"></x>`
+  sprae(el);
+  is(el.outerHTML, `<x x="01234"></x>`)
+})
+
 test('data: base', async () => {
   let el = h`<input :data="{a:1, fooBar:2}"/>`
   let params = sprae(el)
@@ -359,6 +366,47 @@ test('each: condition within loop', async () => {
   is(el.innerHTML, '')
 })
 
+test('each: next items have own "this", not single one', async () => {
+  // FIXME: let el = h`<x :each="x in 3"></x>`
+  let el = h`<div><x :each="x in 3" :data="{x}" :x="log.push(x, this.dataset.x)"></x></div>`
+  let log = []
+  let state = sprae(el, {log})
+  is(state.log, [1,'1',2,'2',3,'3'])
+})
+
+test('each: unkeyed', async () => {
+  let el = h`<div><x :each="x in xs" :text="x"></x></div>`
+  let state = sprae(el, {xs:[1,2,3]})
+  is(el.children.length, 3)
+  is(el.textContent, '123')
+  // let first = el.firstChild
+  state.xs = [1,3,2]
+  // is(el.firstChild, first)
+  is(el.textContent, '132')
+  state.xs = [3,3,3]
+  is(el.textContent, '333')
+  // is(el.firstChild, first)
+})
+
+test('each: keyed', async () => {
+  // keyed
+  let el = h`<div><x :each="x in xs" :text="x" :key="x"></x></div>`
+  let state = sprae(el, {xs:[1,2,3]})
+  is(el.children.length, 3)
+  is(el.textContent, '123')
+  let first = el.firstChild
+  state.xs = [1,3,2]
+  is(el.firstChild, first)
+  is(el.textContent, '132')
+  state.xs = [3,3,3]
+  is(el.textContent, '3')
+  // is(el.firstChild, first)
+})
+
+test.todo('each: unmounted elements remove listeners', async () => {
+
+})
+
 test('on: base', () => {
   let el = h`<div :on="{click(e){log.push('click')},x}"></div>`
   let log = signal([])

package/{plan.md → todo.md}

@@ -33,9 +33,10 @@
 * [x] :text="" empty values shouldn't throw
 * [x] implement :with
 * [x] update :value without losing focus / position
+* ~~[x] run tiredown if element got removed from condition or loop (free memory)~~ no need just make sure no refs to elements stored
+* [ ] `sprae(el, newState)` can update element's state directly (as batch!?) -> must be tested against repeats in directives
 * [ ] :if :ref, :if :with -> context setters must come first always
 * [ ] frameworks benchmark
 * [ ] examples
   * [x] todomvc
-  * [ ] wave-edit
-* [ ] `sprae(el, newState)` can update element's state directly (as batch!?) -> must be tested against repeats in directives
+  * [x] waveplay