@estjs/template 0.0.17-beta.3 → 0.0.17-beta.4

package/dist/template.dev.js

@@ -369,23 +369,31 @@ function resolveHydrationKey(parent) {
   const el = parent;
   return (_c = (_b = el.dataset.hk) != null ? _b : (_a2 = parent.closest("[data-hk]")) == null ? void 0 : _a2.dataset.hk) != null ? _c : null;
 }
+function expectedHydrationSlot(parent, index) {
+  if (_isHydrating && parent) {
+    const key = resolveHydrationKey(parent);
+    if (key) return `${key}-${index}`;
+  }
+  return String(index);
+}
 function hydrationMarker(parent, index) {
-  if (!_isHydrating || !parent || index < 0) return null;
-  const key = parent instanceof Element ? resolveHydrationKey(parent) : null;
-  const expected = key ? `${key}-${index}` : String(index);
+  if (!parent || index < 0) return null;
+  const expected = expectedHydrationSlot(parent instanceof Element ? parent : null, index);
+  let fallbackIndex = 0;
   let cursor = parent.firstChild;
   while (cursor) {
-    if (cursor.nodeType === Node.COMMENT_NODE && cursor.data === expected) {
-      return cursor;
+    if (cursor.nodeType === Node.COMMENT_NODE) {
+      const comment = cursor;
+      if (comment.data === expected) return comment;
+      if (!_isHydrating && comment.data === "" && fallbackIndex++ === index) return comment;
     }
     cursor = cursor.nextSibling;
   }
   return null;
 }
 function hydrationAnchor(parent, index) {
-  if (!_isHydrating || !(parent instanceof Element) || index < 0) return null;
-  const key = resolveHydrationKey(parent);
-  const expected = key ? `${key}-${index}` : String(index);
+  if (!(parent instanceof Element) || index < 0) return null;
+  const expected = expectedHydrationSlot(parent, index);
   let cursor = parent.firstChild;
   while (cursor) {
     if (cursor instanceof Element && cursor.getAttribute(HYDRATION_ANCHOR_ATTR) === expected) {