tutuca 0.9.95 → 0.9.97

package/dist/tutuca-cli.js

@@ -8407,7 +8407,7 @@ class PathBuilder {
     return this.add(new SeqStep(name, key));
   }
 }
-var NONE, BindStep, FieldStep, SeqStep, SeqAccessStep, EachBindStep, EachRenderItStep, DynStep, DynEachStep, NO_EVENT_INFO, BUBBLING_EVENTS;
+var NONE, BindStep, ScopeBindStep, FieldStep, SeqStep, SeqAccessStep, EachBindStep, EachRenderItStep, DynStep, DynEachStep, NO_EVENT_INFO, BUBBLING_EVENTS;
 var init_path = __esm(() => {
   NONE = Symbol("NONE");
   BindStep = class BindStep extends Step {
@@ -8434,6 +8434,22 @@ var init_path = __esm(() => {
       return null;
     }
   };
+  ScopeBindStep = class ScopeBindStep extends BindStep {
+    constructor(val, binds = {}) {
+      super(binds);
+      this.val = val;
+    }
+    enterFrame(stack, _prev, next) {
+      const dyn = this.val.evalAsHandler(stack)?.call(stack.it) ?? {};
+      return stack.enter(next, { ...this.binds, ...dyn }, false);
+    }
+    withIndex(i) {
+      return new ScopeBindStep(this.val, { ...this.binds, key: i });
+    }
+    withKey(key) {
+      return new ScopeBindStep(this.val, { ...this.binds, key });
+    }
+  };
   FieldStep = class FieldStep extends Step {
     constructor(field) {
       super();
@@ -8492,9 +8508,9 @@ var init_path = __esm(() => {
     }
   };
   EachBindStep = class EachBindStep extends Step {
-    constructor(seqVal, key) {
+    constructor(iterInfo, key) {
       super();
-      this.seqVal = seqVal;
+      this.iterInfo = iterInfo;
       this.key = key;
     }
     lookup(v, _dval) {
@@ -8504,8 +8520,7 @@ var init_path = __esm(() => {
       return v;
     }
     enterFrame(stack, _prev, next) {
-      const item = this.seqVal.eval(stack)?.get(this.key, null);
-      return stack.enter(next, { key: this.key, value: item }, false);
+      return stack.enter(next, this.iterInfo.enrichBinds(stack, this.key), false);
     }
     toAbstractPathStep() {
       return null;
@@ -9319,7 +9334,7 @@ class WeakMapDomCache {
       const key = keys[i];
       let next = cur.get(key);
       if (!next) {
-        if (typeof key !== "object") {
+        if (!isWeakKey(key)) {
           this.badKey += 1;
           return;
         }
@@ -9332,7 +9347,7 @@ class WeakMapDomCache {
     const leaf = cur.get(lastKey);
     if (leaf)
       leaf[cacheKey] = v;
-    else if (typeof lastKey === "object")
+    else if (isWeakKey(lastKey))
       cur.set(lastKey, { [cacheKey]: v });
     else
       this.badKey += 1;
@@ -9344,6 +9359,7 @@ class WeakMapDomCache {
     return { hit, miss, badKey };
   }
 }
+var isWeakKey = (k) => k !== null && (typeof k === "object" || typeof k === "function");
 
 // src/vdom.js
 function childOpts(vnode, ns, opts) {
@@ -9833,6 +9849,9 @@ class Renderer {
   _renderMetadata(info) {
     return new VComment(`§${JSON.stringify(info)}§`);
   }
+  renderScopeMeta(nid, dom) {
+    return new VFragment([this._renderMetadata({ $: "Scope", nid }), dom]);
+  }
 }
 var DATASET_ATTRS, getSeqInfo = (seq) => isIndexed(seq) ? imIndexedIter : isKeyed(seq) ? imKeyedIter : seq?.[SEQ_INFO] ?? unkIter, normalizeRange = (start, end, size) => {
   let s = start == null ? 0 : start < 0 ? size + start : start;
@@ -10029,6 +10048,16 @@ class IterInfo {
     const enricher = this.enrichWithVal?.evalAsHandler(stack) ?? null;
     return { seq, filter, loopWith, enricher };
   }
+  enrichBinds(stack, key) {
+    const { seq, loopWith, enricher } = this.eval(stack);
+    const value = seq?.get ? seq.get(key, null) : null;
+    const binds = { key, value };
+    if (enricher) {
+      const { iterData } = unpackLoopResult(loopWith.call(stack.it, seq), seq);
+      enricher.call(stack.it, binds, key, value, iterData);
+    }
+    return binds;
+  }
 }
 function xOp(consumed = [], { wrappable = false, wrapper = null } = {}) {
   return { consumed: new Set(consumed), wrappable, wrapper };
@@ -10505,10 +10534,11 @@ var init_anode = __esm(() => {
   ScopeNode = class ScopeNode extends WrapperNode {
     render(stack, rx) {
       const binds = this.val.evalAsHandler(stack)?.call(stack.it) ?? {};
-      return this.node.render(stack.enter(stack.it, binds, false), rx);
+      const dom = this.node.render(stack.enter(stack.it, binds, false), rx);
+      return rx.renderScopeMeta(this.nodeId, dom);
     }
     toPathStep(_ctx) {
-      return new BindStep({});
+      return new ScopeBindStep(this.val);
     }
     wrapNode(node) {
       this.node = node;
@@ -10525,7 +10555,7 @@ var init_anode = __esm(() => {
       return rx.renderEachWhen(stack, this.iterInfo, this.node, this.nodeId);
     }
     toPathStep(ctx) {
-      return ctx.hasKey ? new EachBindStep(this.val, ctx.key) : null;
+      return ctx.hasKey ? new EachBindStep(this.iterInfo, ctx.key) : null;
     }
     static register = true;
   };

package/dist/tutuca-dev.ext.js

@@ -145,6 +145,23 @@ class BindStep extends Step {
   }
 }
 
+class ScopeBindStep extends BindStep {
+  constructor(val, binds = {}) {
+    super(binds);
+    this.val = val;
+  }
+  enterFrame(stack, _prev, next) {
+    const dyn = this.val.evalAsHandler(stack)?.call(stack.it) ?? {};
+    return stack.enter(next, { ...this.binds, ...dyn }, false);
+  }
+  withIndex(i) {
+    return new ScopeBindStep(this.val, { ...this.binds, key: i });
+  }
+  withKey(key) {
+    return new ScopeBindStep(this.val, { ...this.binds, key });
+  }
+}
+
 class FieldStep extends Step {
   constructor(field) {
     super();
@@ -206,9 +223,9 @@ class SeqAccessStep extends Step {
 }
 
 class EachBindStep extends Step {
-  constructor(seqVal, key) {
+  constructor(iterInfo, key) {
     super();
-    this.seqVal = seqVal;
+    this.iterInfo = iterInfo;
     this.key = key;
   }
   lookup(v, _dval) {
@@ -218,8 +235,7 @@ class EachBindStep extends Step {
     return v;
   }
   enterFrame(stack, _prev, next) {
-    const item = this.seqVal.eval(stack)?.get(this.key, null);
-    return stack.enter(next, { key: this.key, value: item }, false);
+    return stack.enter(next, this.iterInfo.enrichBinds(stack, this.key), false);
   }
   toAbstractPathStep() {
     return null;
@@ -1306,6 +1322,8 @@ class RequestHandler {
 import { isIndexed, isKeyed } from "immutable";
 
 // src/cache.js
+var isWeakKey = (k) => k !== null && (typeof k === "object" || typeof k === "function");
+
 class NullDomCache {
   get(_keys, _cacheKey) {}
   set(_keys, _cacheKey, _v) {}
@@ -1349,7 +1367,7 @@ class WeakMapDomCache {
       const key = keys[i];
       let next = cur.get(key);
       if (!next) {
-        if (typeof key !== "object") {
+        if (!isWeakKey(key)) {
           this.badKey += 1;
           return;
         }
@@ -1362,7 +1380,7 @@ class WeakMapDomCache {
     const leaf = cur.get(lastKey);
     if (leaf)
       leaf[cacheKey] = v;
-    else if (typeof lastKey === "object")
+    else if (isWeakKey(lastKey))
       cur.set(lastKey, { [cacheKey]: v });
     else
       this.badKey += 1;
@@ -1874,6 +1892,9 @@ class Renderer {
   _renderMetadata(info) {
     return new VComment(`§${JSON.stringify(info)}§`);
   }
+  renderScopeMeta(nid, dom) {
+    return new VFragment([this._renderMetadata({ $: "Scope", nid }), dom]);
+  }
 }
 var getSeqInfo = (seq) => isIndexed(seq) ? imIndexedIter : isKeyed(seq) ? imKeyedIter : seq?.[SEQ_INFO] ?? unkIter;
 var normalizeRange = (start, end, size) => {
@@ -2394,10 +2415,11 @@ class SlotNode extends WrapperNode {
 class ScopeNode extends WrapperNode {
   render(stack, rx) {
     const binds = this.val.evalAsHandler(stack)?.call(stack.it) ?? {};
-    return this.node.render(stack.enter(stack.it, binds, false), rx);
+    const dom = this.node.render(stack.enter(stack.it, binds, false), rx);
+    return rx.renderScopeMeta(this.nodeId, dom);
   }
   toPathStep(_ctx) {
-    return new BindStep({});
+    return new ScopeBindStep(this.val);
   }
   wrapNode(node) {
     this.node = node;
@@ -2415,7 +2437,7 @@ class EachNode extends WrapperNode {
     return rx.renderEachWhen(stack, this.iterInfo, this.node, this.nodeId);
   }
   toPathStep(ctx) {
-    return ctx.hasKey ? new EachBindStep(this.val, ctx.key) : null;
+    return ctx.hasKey ? new EachBindStep(this.iterInfo, ctx.key) : null;
   }
   static register = true;
 }
@@ -2434,6 +2456,16 @@ class IterInfo {
     const enricher = this.enrichWithVal?.evalAsHandler(stack) ?? null;
     return { seq, filter, loopWith, enricher };
   }
+  enrichBinds(stack, key) {
+    const { seq, loopWith, enricher } = this.eval(stack);
+    const value = seq?.get ? seq.get(key, null) : null;
+    const binds = { key, value };
+    if (enricher) {
+      const { iterData } = unpackLoopResult(loopWith.call(stack.it, seq), seq);
+      enricher.call(stack.it, binds, key, value, iterData);
+    }
+    return binds;
+  }
 }
 function xOp(consumed = [], { wrappable = false, wrapper = null } = {}) {
   return { consumed: new Set(consumed), wrappable, wrapper };

package/dist/tutuca-dev.js

@@ -7799,6 +7799,23 @@ class BindStep extends Step {
   }
 }
 
+class ScopeBindStep extends BindStep {
+  constructor(val, binds = {}) {
+    super(binds);
+    this.val = val;
+  }
+  enterFrame(stack, _prev, next) {
+    const dyn = this.val.evalAsHandler(stack)?.call(stack.it) ?? {};
+    return stack.enter(next, { ...this.binds, ...dyn }, false);
+  }
+  withIndex(i) {
+    return new ScopeBindStep(this.val, { ...this.binds, key: i });
+  }
+  withKey(key) {
+    return new ScopeBindStep(this.val, { ...this.binds, key });
+  }
+}
+
 class FieldStep extends Step {
   constructor(field) {
     super();
@@ -7860,9 +7877,9 @@ class SeqAccessStep extends Step {
 }
 
 class EachBindStep extends Step {
-  constructor(seqVal, key) {
+  constructor(iterInfo, key) {
     super();
-    this.seqVal = seqVal;
+    this.iterInfo = iterInfo;
     this.key = key;
   }
   lookup(v, _dval) {
@@ -7872,8 +7889,7 @@ class EachBindStep extends Step {
     return v;
   }
   enterFrame(stack, _prev, next) {
-    const item = this.seqVal.eval(stack)?.get(this.key, null);
-    return stack.enter(next, { key: this.key, value: item }, false);
+    return stack.enter(next, this.iterInfo.enrichBinds(stack, this.key), false);
   }
   toAbstractPathStep() {
     return null;
@@ -8957,6 +8973,8 @@ class RequestHandler {
 }
 
 // src/cache.js
+var isWeakKey = (k) => k !== null && (typeof k === "object" || typeof k === "function");
+
 class NullDomCache {
   get(_keys, _cacheKey) {}
   set(_keys, _cacheKey, _v) {}
@@ -9000,7 +9018,7 @@ class WeakMapDomCache {
       const key = keys[i];
       let next = cur.get(key);
       if (!next) {
-        if (typeof key !== "object") {
+        if (!isWeakKey(key)) {
           this.badKey += 1;
           return;
         }
@@ -9013,7 +9031,7 @@ class WeakMapDomCache {
     const leaf = cur.get(lastKey);
     if (leaf)
       leaf[cacheKey] = v;
-    else if (typeof lastKey === "object")
+    else if (isWeakKey(lastKey))
       cur.set(lastKey, { [cacheKey]: v });
     else
       this.badKey += 1;
@@ -9525,6 +9543,9 @@ class Renderer {
   _renderMetadata(info) {
     return new VComment(`§${JSON.stringify(info)}§`);
   }
+  renderScopeMeta(nid, dom) {
+    return new VFragment([this._renderMetadata({ $: "Scope", nid }), dom]);
+  }
 }
 var getSeqInfo = (seq) => isIndexed(seq) ? imIndexedIter : isKeyed(seq) ? imKeyedIter : seq?.[SEQ_INFO] ?? unkIter;
 var normalizeRange = (start, end, size) => {
@@ -10045,10 +10066,11 @@ class SlotNode extends WrapperNode {
 class ScopeNode extends WrapperNode {
   render(stack, rx) {
     const binds = this.val.evalAsHandler(stack)?.call(stack.it) ?? {};
-    return this.node.render(stack.enter(stack.it, binds, false), rx);
+    const dom = this.node.render(stack.enter(stack.it, binds, false), rx);
+    return rx.renderScopeMeta(this.nodeId, dom);
   }
   toPathStep(_ctx) {
-    return new BindStep({});
+    return new ScopeBindStep(this.val);
   }
   wrapNode(node) {
     this.node = node;
@@ -10066,7 +10088,7 @@ class EachNode extends WrapperNode {
     return rx.renderEachWhen(stack, this.iterInfo, this.node, this.nodeId);
   }
   toPathStep(ctx) {
-    return ctx.hasKey ? new EachBindStep(this.val, ctx.key) : null;
+    return ctx.hasKey ? new EachBindStep(this.iterInfo, ctx.key) : null;
   }
   static register = true;
 }
@@ -10085,6 +10107,16 @@ class IterInfo {
     const enricher = this.enrichWithVal?.evalAsHandler(stack) ?? null;
     return { seq, filter, loopWith, enricher };
   }
+  enrichBinds(stack, key) {
+    const { seq, loopWith, enricher } = this.eval(stack);
+    const value = seq?.get ? seq.get(key, null) : null;
+    const binds = { key, value };
+    if (enricher) {
+      const { iterData } = unpackLoopResult(loopWith.call(stack.it, seq), seq);
+      enricher.call(stack.it, binds, key, value, iterData);
+    }
+    return binds;
+  }
 }
 function xOp(consumed = [], { wrappable = false, wrapper = null } = {}) {
   return { consumed: new Set(consumed), wrappable, wrapper };