@constela/runtime 2.0.3 → 2.0.4

package/dist/index.js

@@ -16167,20 +16167,22 @@ function hydrateElement(node, el, ctx) {
     hydrateChildren(node.children, el, ctx);
   }
 }
-function findSsrIfBranchMarker(parent, beforeNode) {
-  let current = beforeNode ? beforeNode.previousSibling : parent.lastChild;
-  while (current) {
-    if (current.nodeType === Node.COMMENT_NODE) {
-      const comment2 = current;
-      const text3 = comment2.textContent;
-      if (text3 === "if:then") return { branch: "then", marker: comment2 };
-      if (text3 === "if:else") return { branch: "else", marker: comment2 };
-      if (text3 === "if:none") return { branch: "none", marker: comment2 };
-    }
-    if (current.nodeType === Node.ELEMENT_NODE) break;
-    current = current.previousSibling;
+function collectIfMarkers(parent) {
+  const markers = [];
+  for (let i = 0; i < parent.childNodes.length; i++) {
+    const child = parent.childNodes[i];
+    if (child.nodeType === Node.COMMENT_NODE) {
+      const text3 = child.textContent;
+      if (text3 === "if:then") {
+        markers.push({ branch: "then", marker: child });
+      } else if (text3 === "if:else") {
+        markers.push({ branch: "else", marker: child });
+      } else if (text3 === "if:none") {
+        markers.push({ branch: "none", marker: child });
+      }
+    }
   }
-  return null;
+  return markers;
 }
 function hydrateChildren(children, parent, ctx) {
   const domChildren = [];
@@ -16190,6 +16192,8 @@ function hydrateChildren(children, parent, ctx) {
       domChildren.push(child);
     }
   }
+  const ifMarkers = collectIfMarkers(parent);
+  let ifMarkerIndex = 0;
   let domIndex = 0;
   for (let i = 0; i < children.length; i++) {
     const childNode = children[i];
@@ -16224,14 +16228,15 @@ function hydrateChildren(children, parent, ctx) {
         ...ctx.route && { route: ctx.route }
       });
       const clientBranch = Boolean(clientCondition) ? "then" : ifNode.else ? "else" : "none";
-      const domChild = domChildren[domIndex];
-      const ssrInfo = findSsrIfBranchMarker(parent, domChild || null);
+      const ssrInfo = ifMarkerIndex < ifMarkers.length ? ifMarkers[ifMarkerIndex] : null;
+      ifMarkerIndex++;
       const ssrBranch = ssrInfo?.branch ?? null;
       const ssrHasDom = ssrBranch === "then" || ssrBranch === "else";
       if (ssrInfo?.marker) {
         ssrInfo.marker.remove();
       }
-      if (ssrHasDom && domChild) {
+      if (ssrHasDom && domChildren[domIndex]) {
+        const domChild = domChildren[domIndex];
         hydrateIf(ifNode, domChild, ctx, { ssrBranch, clientBranch });
         domIndex++;
       } else if (ssrBranch === "none") {
@@ -16240,6 +16245,7 @@ function hydrateChildren(children, parent, ctx) {
         });
       } else {
         const hasDomForIf = Boolean(clientCondition) || Boolean(ifNode.else);
+        const domChild = domChildren[domIndex];
         if (hasDomForIf && domChild) {
           hydrate(childNode, domChild, ctx);
           domIndex++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constela/runtime",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Runtime DOM renderer for Constela UI framework",
   "type": "module",
   "main": "./dist/index.js",
@@ -18,8 +18,8 @@
     "dompurify": "^3.3.1",
     "marked": "^17.0.1",
     "shiki": "^3.20.0",
-    "@constela/core": "0.18.2",
-    "@constela/compiler": "0.15.8"
+    "@constela/compiler": "0.15.8",
+    "@constela/core": "0.18.2"
   },
   "devDependencies": {
     "@types/dompurify": "^3.2.0",