tutuca 0.9.95 → 0.9.97

package/dist/tutuca.ext.js

@@ -47,6 +47,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();
@@ -108,9 +125,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) {
@@ -120,8 +137,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;
@@ -1208,6 +1224,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) {}
@@ -1251,7 +1269,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;
         }
@@ -1264,7 +1282,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;
@@ -1776,6 +1794,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) => {
@@ -2296,10 +2317,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;
@@ -2317,7 +2339,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;
 }
@@ -2336,6 +2358,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.js

@@ -4420,6 +4420,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();
@@ -4481,9 +4498,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) {
@@ -4493,8 +4510,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;
@@ -5578,6 +5594,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) {}
@@ -5621,7 +5639,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;
         }
@@ -5634,7 +5652,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;
@@ -6146,6 +6164,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) => {
@@ -6666,10 +6687,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;
@@ -6687,7 +6709,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;
 }
@@ -6706,6 +6728,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 };