tutuca 0.9.46 → 0.9.47

package/dist/tutuca-cli.js

@@ -3927,29 +3927,48 @@ function findHandlers(comp, eventIds, vid, eventName) {
   }
   return null;
 }
+
+class StepCtx {
+  constructor(comp, nodeIds, idx, vid) {
+    this.comp = comp;
+    this.nodeIds = nodeIds;
+    this.idx = idx;
+    this.vid = vid;
+  }
+  get meta() {
+    return this.nodeIds[this.idx];
+  }
+  get key() {
+    const m = this.meta;
+    return m.si !== undefined ? +m.si : m.sk;
+  }
+  get hasKey() {
+    const m = this.meta;
+    return m.si !== undefined || m.sk !== undefined;
+  }
+  next() {
+    return this.idx + 1 < this.nodeIds.length ? new StepCtx(this.comp, this.nodeIds, this.idx + 1, this.vid) : null;
+  }
+  resolveNode() {
+    return this.comp.getNodeForId(+this.meta.nid, this.vid);
+  }
+  applyKey(pi) {
+    if (pi === null)
+      return null;
+    const m = this.meta;
+    if (m.si !== undefined)
+      return pi.withIndex(+m.si);
+    if (m.sk !== undefined)
+      return pi.withKey(m.sk);
+    return pi;
+  }
+}
 function resolvePathStep(comp, nodeIds, vid) {
   for (let i = 0;i < nodeIds.length; i++) {
-    const meta = nodeIds[i];
-    const node = comp.getNodeForId(+meta.nid, vid);
-    const key = meta.si !== undefined ? +meta.si : meta.sk;
-    if (node.pathInNext) {
-      const next = nodeIds[i + 1];
-      if (!next)
-        continue;
-      const nextNode = comp.getNodeForId(+next.nid, vid);
-      const nKey = next.si !== undefined ? +next.si : next.sk;
-      if (nextNode.toPathItemRenderIt && nKey !== undefined)
-        return nextNode.toPathItemRenderIt(nKey);
-      const pi2 = nextNode.val.toPathItem();
-      if (pi2 !== null)
-        return next.si !== undefined ? pi2.withIndex(nKey) : next.sk ? pi2.withKey(nKey) : pi2;
-      continue;
-    }
-    if (key !== undefined && node.toPathItemEachBind)
-      return node.toPathItemEachBind(key);
-    const pi = node.toPathItem();
-    if (pi !== null)
-      return meta.si !== undefined ? pi.withIndex(+meta.si) : meta.sk ? pi.withKey(meta.sk) : pi;
+    const ctx = new StepCtx(comp, nodeIds, i, vid);
+    const step = ctx.resolveNode().toPathStep(ctx);
+    if (step !== null)
+      return step;
   }
   return null;
 }
@@ -5094,8 +5113,8 @@ var init_anode = __esm(() => {
       this.nodeId = nodeId;
       this.val = val;
     }
-    toPathItem() {
-      return this.val.toPathItem();
+    toPathStep(ctx) {
+      return ctx.applyKey(this.val?.toPathItem?.() ?? null);
     }
     static parse(html, px) {
       const nodes = px.parseHTML(html);
@@ -5209,7 +5228,15 @@ var init_anode = __esm(() => {
       const newStack = stack.enter(stack.it, {}, true);
       return rx.renderIt(newStack, this.nodeId, "", this.viewId);
     }
-    pathInNext = true;
+    toPathStep(ctx) {
+      const next = ctx.next();
+      if (next === null)
+        return null;
+      const nextNode = next.resolveNode();
+      if (nextNode instanceof EachNode && next.hasKey)
+        return new EachRenderItStep(nextNode.val.name, next.key);
+      return null;
+    }
   };
   RenderEachNode = class RenderEachNode extends RenderViewId {
     constructor(nodeId, val, viewId) {
@@ -5296,7 +5323,7 @@ var init_anode = __esm(() => {
       const binds = this.val.eval(stack)?.call(stack.it) ?? {};
       return this.node.render(stack.enter(stack.it, binds, false), rx);
     }
-    toPathItem() {
+    toPathStep(_ctx) {
       return new BindStep({});
     }
     wrapNode(node) {
@@ -5313,14 +5340,8 @@ var init_anode = __esm(() => {
     render(stack, rx) {
       return rx.renderEachWhen(stack, this.iterInfo, this.node, this.nodeId);
     }
-    toPathItem() {
-      return new BindStep({});
-    }
-    toPathItemRenderIt(key) {
-      return new EachRenderItStep(this.val.name, key);
-    }
-    toPathItemEachBind(key) {
-      return new EachBindStep(this.val, key);
+    toPathStep(ctx) {
+      return ctx.hasKey ? new EachBindStep(this.val, ctx.key) : null;
     }
     static register = true;
   };
@@ -13552,8 +13573,8 @@ class Renderer {
   renderEachWhen(stack, iterInfo, view, nid) {
     const { seq, filter, loopWith, enricher } = iterInfo.eval(stack);
     const r = [];
-    const iterData = loopWith.call(stack.it, seq);
     const it = stack.it;
+    const iterData = loopWith.call(it, seq);
     this.getSeqInfo(seq)(seq, (key, value, attrName) => {
       if (filter.call(it, key, value, iterData)) {
         const cachePath = enricher ? [it, value] : [value];

package/dist/tutuca-dev.js

@@ -3538,29 +3538,48 @@ function findHandlers(comp, eventIds, vid, eventName) {
   }
   return null;
 }
+
+class StepCtx {
+  constructor(comp, nodeIds, idx, vid) {
+    this.comp = comp;
+    this.nodeIds = nodeIds;
+    this.idx = idx;
+    this.vid = vid;
+  }
+  get meta() {
+    return this.nodeIds[this.idx];
+  }
+  get key() {
+    const m = this.meta;
+    return m.si !== undefined ? +m.si : m.sk;
+  }
+  get hasKey() {
+    const m = this.meta;
+    return m.si !== undefined || m.sk !== undefined;
+  }
+  next() {
+    return this.idx + 1 < this.nodeIds.length ? new StepCtx(this.comp, this.nodeIds, this.idx + 1, this.vid) : null;
+  }
+  resolveNode() {
+    return this.comp.getNodeForId(+this.meta.nid, this.vid);
+  }
+  applyKey(pi) {
+    if (pi === null)
+      return null;
+    const m = this.meta;
+    if (m.si !== undefined)
+      return pi.withIndex(+m.si);
+    if (m.sk !== undefined)
+      return pi.withKey(m.sk);
+    return pi;
+  }
+}
 function resolvePathStep(comp, nodeIds, vid) {
   for (let i = 0;i < nodeIds.length; i++) {
-    const meta = nodeIds[i];
-    const node = comp.getNodeForId(+meta.nid, vid);
-    const key = meta.si !== undefined ? +meta.si : meta.sk;
-    if (node.pathInNext) {
-      const next = nodeIds[i + 1];
-      if (!next)
-        continue;
-      const nextNode = comp.getNodeForId(+next.nid, vid);
-      const nKey = next.si !== undefined ? +next.si : next.sk;
-      if (nextNode.toPathItemRenderIt && nKey !== undefined)
-        return nextNode.toPathItemRenderIt(nKey);
-      const pi2 = nextNode.val.toPathItem();
-      if (pi2 !== null)
-        return next.si !== undefined ? pi2.withIndex(nKey) : next.sk ? pi2.withKey(nKey) : pi2;
-      continue;
-    }
-    if (key !== undefined && node.toPathItemEachBind)
-      return node.toPathItemEachBind(key);
-    const pi = node.toPathItem();
-    if (pi !== null)
-      return meta.si !== undefined ? pi.withIndex(+meta.si) : meta.sk ? pi.withKey(meta.sk) : pi;
+    const ctx = new StepCtx(comp, nodeIds, i, vid);
+    const step = ctx.resolveNode().toPathStep(ctx);
+    if (step !== null)
+      return step;
   }
   return null;
 }
@@ -4360,8 +4379,8 @@ class ANode extends BaseNode {
     this.nodeId = nodeId;
     this.val = val;
   }
-  toPathItem() {
-    return this.val.toPathItem();
+  toPathStep(ctx) {
+    return ctx.applyKey(this.val?.toPathItem?.() ?? null);
   }
   static parse(html, px) {
     const nodes = px.parseHTML(html);
@@ -4579,7 +4598,15 @@ class RenderItNode extends RenderViewId {
     const newStack = stack.enter(stack.it, {}, true);
     return rx.renderIt(newStack, this.nodeId, "", this.viewId);
   }
-  pathInNext = true;
+  toPathStep(ctx) {
+    const next = ctx.next();
+    if (next === null)
+      return null;
+    const nextNode = next.resolveNode();
+    if (nextNode instanceof EachNode && next.hasKey)
+      return new EachRenderItStep(nextNode.val.name, next.key);
+    return null;
+  }
 }
 
 class RenderEachNode extends RenderViewId {
@@ -4675,7 +4702,7 @@ class ScopeNode extends WrapperNode {
     const binds = this.val.eval(stack)?.call(stack.it) ?? {};
     return this.node.render(stack.enter(stack.it, binds, false), rx);
   }
-  toPathItem() {
+  toPathStep(_ctx) {
     return new BindStep({});
   }
   wrapNode(node) {
@@ -4693,14 +4720,8 @@ class EachNode extends WrapperNode {
   render(stack, rx) {
     return rx.renderEachWhen(stack, this.iterInfo, this.node, this.nodeId);
   }
-  toPathItem() {
-    return new BindStep({});
-  }
-  toPathItemRenderIt(key) {
-    return new EachRenderItStep(this.val.name, key);
-  }
-  toPathItemEachBind(key) {
-    return new EachBindStep(this.val, key);
+  toPathStep(ctx) {
+    return ctx.hasKey ? new EachBindStep(this.val, ctx.key) : null;
   }
   static register = true;
 }
@@ -14450,8 +14471,8 @@ class Renderer {
   renderEachWhen(stack, iterInfo, view, nid) {
     const { seq, filter, loopWith, enricher } = iterInfo.eval(stack);
     const r = [];
-    const iterData = loopWith.call(stack.it, seq);
     const it = stack.it;
+    const iterData = loopWith.call(it, seq);
     this.getSeqInfo(seq)(seq, (key, value, attrName) => {
       if (filter.call(it, key, value, iterData)) {
         const cachePath = enricher ? [it, value] : [value];