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

package/dist/template.dev.js

@@ -1,4 +1,4 @@
-import { getActiveScope, runWithScope, onCleanup, __objRest, createScope, disposeScope, __async } from './chunk-R6JICOKI.dev.js';
+import { getActiveScope, runWithScope, onCleanup, __objRest, createScope, disposeScope, __async } from './chunk-PYFF2HI3.dev.js';
 import { normalizeClassName, SPREAD_NAME, isObject, warn, startsWith, isSpecialBooleanAttr, isBooleanAttr, includeBooleanAttr, isSymbol, isString, isArray, kebabCase, camelCase, capitalize, HYDRATION_ANCHOR_ATTR, isBrowser, error, isPromise, isFunction, isOn, coerceArray } from '@estjs/shared';
 import { effect, shallowReactive, isSignal, isComputed, isReactive, signal } from '@estjs/signals';
 
@@ -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) {
@@ -930,6 +938,7 @@ var Component = class {
     for (const key of Object.getOwnPropertyNames(this.reactiveProps)) {
       delete this.reactiveProps[key];
     }
+    this.state = 0 /* INITIAL */;
   }
   /**
    * Apply props that bind to the root DOM element rather than flowing into
@@ -1067,8 +1076,8 @@ function createApp(component, target) {
   return {
     root: rootNode,
     unmount: () => {
-      disposeScope(scope);
       rootNode == null ? void 0 : rootNode.destroy();
+      disposeScope(scope);
     }
   };
 }
@@ -1100,8 +1109,8 @@ function hydrate(component, target) {
   return {
     root: rootNode,
     unmount: () => {
-      disposeScope(scope);
       rootNode == null ? void 0 : rootNode.destroy();
+      disposeScope(scope);
     }
   };
 }
@@ -1815,6 +1824,7 @@ function defineClientAsyncComponent(loader, options) {
     };
     const render = (fn, fnProps) => {
       if (!alive) return;
+      if (owner && owner.isDestroyed) return;
       if (viewScope) {
         disposeScope(viewScope);
         viewScope = null;
@@ -1930,9 +1940,7 @@ function For(props) {
   };
   const clearFallback = () => {
     for (const node of fallbackNodes) {
-      if (node.parentNode) {
-        node.parentNode.removeChild(node);
-      }
+      removeNode(node);
     }
     fallbackNodes = [];
   };