tutuca 0.9.65 → 0.9.66

package/dist/tutuca-cli.js

@@ -4344,49 +4344,67 @@ class Path {
     let handlers = null;
     let nodeIds = [];
     let isLeafComponent = true;
+    const crossComponent = (cidNum, vid) => {
+      const comp = comps.getComponentForId(cidNum);
+      let pushStep = true;
+      if (handlers === null && (isLeafComponent || bubbles)) {
+        handlers = findHandlers(comp, eventIds, vid, eventName);
+        if (handlers === null) {
+          if (isLeafComponent && stopOnNoEvent && !bubbles)
+            return false;
+        } else if (!isLeafComponent) {
+          pathSteps.length = 0;
+          pendingDyns.length = 0;
+          pushStep = false;
+        }
+      }
+      isLeafComponent = false;
+      for (const dyn of pendingDyns)
+        dyn.interiorCids.add(cidNum);
+      if (pushStep) {
+        const step = resolvePathStep(comp, nodeIds, vid);
+        if (step) {
+          step._originCid = cidNum;
+          pathSteps.push(step);
+          if (step instanceof DynStep) {
+            step.interiorCids.add(cidNum);
+            pendingDyns.push(step);
+          }
+        }
+      }
+      for (let i = pendingDyns.length - 1;i >= 0; i--)
+        if (pendingDyns[i].producerCompId === cidNum)
+          pendingDyns.splice(i, 1);
+      eventIds = [];
+      nodeIds = [];
+      return true;
+    };
     while (node && node !== rootNode && depth < maxDepth) {
       if (node?.dataset) {
-        const { nid, si, sk } = parseMetaComment(node.previousSibling);
         const { eid, cid, vid } = node.dataset;
         if (eid !== undefined)
           eventIds.push(eid);
-        if (cid !== undefined) {
-          const cidNum = +cid;
-          const comp = comps.getComponentForId(cidNum);
-          let pushStep = true;
-          if (handlers === null && (isLeafComponent || bubbles)) {
-            handlers = findHandlers(comp, eventIds, vid, eventName);
-            if (handlers === null) {
-              if (isLeafComponent && stopOnNoEvent && !bubbles)
-                return NO_EVENT_INFO;
-            } else if (!isLeafComponent) {
-              pathSteps.length = 0;
-              pendingDyns.length = 0;
-              pushStep = false;
-            }
-          }
-          isLeafComponent = false;
-          for (const dyn of pendingDyns)
-            dyn.interiorCids.add(cidNum);
-          if (pushStep) {
-            const step = resolvePathStep(comp, nodeIds, vid);
-            if (step) {
-              step._originCid = cidNum;
-              pathSteps.push(step);
-              if (step instanceof DynStep) {
-                step.interiorCids.add(cidNum);
-                pendingDyns.push(step);
-              }
+        const metas = metaChain(node.previousSibling);
+        let sawComp = false;
+        for (let i = 0;i < metas.length; i++) {
+          const m = metas[i];
+          if (m.$ === "Comp") {
+            sawComp = true;
+            if (!crossComponent(m.cid, m.vid))
+              return NO_EVENT_INFO;
+            const outer = metas[i + 1];
+            if (outer?.$ === "Each" && outer.nid === m.nid) {
+              nodeIds.push({ nid: outer.nid, si: outer.si, sk: outer.sk });
+              i += 1;
+            } else {
+              nodeIds.push({ nid: m.nid });
             }
+          } else {
+            nodeIds.push({ nid: m.nid, si: m.si, sk: m.sk });
           }
-          for (let i = pendingDyns.length - 1;i >= 0; i--)
-            if (pendingDyns[i].producerCompId === cidNum)
-              pendingDyns.splice(i, 1);
-          eventIds = [];
-          nodeIds = [];
         }
-        if (nid !== undefined)
-          nodeIds.push({ nid, si, sk });
+        if (!sawComp && cid !== undefined && !crossComponent(+cid, vid))
+          return NO_EVENT_INFO;
       }
       depth += 1;
       node = node.parentNode;
@@ -4400,18 +4418,17 @@ class Path {
     return Path.fromNodeAndEventName(target, type, rNode, maxDepth, comps, stopOnNoEvent);
   }
 }
-function parseMetaComment(n) {
-  if (n?.nodeType === 8 && n.textContent[0] === "§") {
-    const m = parseMetaComment(n.previousSibling);
-    if (m !== EMPTY_META)
-      return m;
+function metaChain(n) {
+  const out = [];
+  while (n?.nodeType === 8 && n.textContent[0] === "§") {
     try {
-      return JSON.parse(n.textContent.slice(1, -1));
+      out.push(JSON.parse(n.textContent.slice(1, -1)));
     } catch (err) {
       console.warn(err, n);
     }
+    n = n.previousSibling;
   }
-  return EMPTY_META;
+  return out;
 }
 function findHandlers(comp, eventIds, vid, eventName) {
   for (const eid of eventIds) {
@@ -4486,7 +4503,7 @@ class PathBuilder {
     return this.add(new SeqStep(name, key));
   }
 }
-var NONE, BindStep, FieldStep, SeqStep, SeqAccessStep, EachBindStep, EachRenderItStep, DynStep, DynEachStep, EMPTY_META, NO_EVENT_INFO, BUBBLING_EVENTS;
+var NONE, BindStep, FieldStep, SeqStep, SeqAccessStep, EachBindStep, EachRenderItStep, DynStep, DynEachStep, NO_EVENT_INFO, BUBBLING_EVENTS;
 var init_path = __esm(() => {
   NONE = Symbol("NONE");
   BindStep = class BindStep extends Step {
@@ -4634,7 +4651,6 @@ var init_path = __esm(() => {
       return producerSteps.slice(0, -1).concat(new SeqStep(last.field, key));
     }
   };
-  EMPTY_META = {};
   NO_EVENT_INFO = [null, null];
   BUBBLING_EVENTS = new Set(["drop"]);
 });
@@ -6177,6 +6193,7 @@ var init_anode = __esm(() => {
       super(nodeId, val);
       this.viewId = viewId;
     }
+    setDataAttr(_key, _val) {}
   };
   RenderNode = class RenderNode extends RenderViewId {
     render(stack, rx) {
@@ -6249,6 +6266,7 @@ var init_anode = __esm(() => {
     render(stack, _rx) {
       return this.val.eval(stack);
     }
+    setDataAttr(_key, _val) {}
   };
   RenderOnceNode = class RenderOnceNode extends BaseNode {
     constructor(node) {
@@ -14192,7 +14210,12 @@ class Renderer {
     if (cachedNode)
       return cachedNode;
     const view = viewName ? comp.getView(viewName) : stack.lookupBestView(comp.views, "main");
-    const meta = this._renderMetadata({ $: "Comp", nid: node?.nodeId ?? null });
+    const meta = this._renderMetadata({
+      $: "Comp",
+      nid: node?.nodeId ?? null,
+      cid: comp.id,
+      vid: view.name
+    });
     const dom = new VFragment([meta, this.renderView(view, stack)]);
     this.cache.set(cachePath, cacheKey, dom);
     return dom;