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

package/dist/template.dev.js

@@ -1,5 +1,5 @@
 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 { normalizeClassName, SPREAD_NAME, isObject, warn, startsWith, isSpecialBooleanAttr, isBooleanAttr, includeBooleanAttr, isSymbol, isString, isArray, kebabCase, camelCase, capitalize, HYDRATION_ANCHOR_ATTR, isBrowser, error, isPromise, isFunction, isOn, coerceArray, isNumber } from '@estjs/shared';
 import { effect, shallowReactive, isSignal, isComputed, isReactive, signal } from '@estjs/signals';
 
 var REF_KEY = "ref";
@@ -148,6 +148,7 @@ function patchClass(el, prev, next2, isSVG = false) {
 }
 var normalizeClass = normalizeClassName;
 var importantRE = /\s*!important$/;
+var styleDeclRE = /(?:^|;)\s*([a-z][a-z\d-]*)\s*:/gi;
 var prefixes = ["Webkit", "Moz", "ms"];
 var prefixCache = {};
 function patchStyle(el, prev, next2) {
@@ -172,9 +173,9 @@ function patchStyle(el, prev, next2) {
       }
     }
   } else if (prev && isString(prev)) {
-    const declRE = /(?:^|;)\s*([a-z][a-z\d-]*)\s*:/gi;
+    styleDeclRE.lastIndex = 0;
     let match;
-    while ((match = declRE.exec(prev)) !== null) {
+    while ((match = styleDeclRE.exec(prev)) !== null) {
       const key = match[1].trim();
       if (key && next2 && isObject(next2) && next2[key] == null) {
         setStyle(style, key, "");
@@ -369,23 +370,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) {
@@ -637,7 +646,7 @@ function normalizeNode(node) {
 }
 function insert(parent, nodeFactory, before) {
   if (!parent) return;
-  const parentScope = getActiveScope();
+  let parentScope = getActiveScope();
   let renderedNodes = [];
   let isFirstRun = true;
   const resolveNodes = (raw) => {
@@ -679,6 +688,7 @@ function insert(parent, nodeFactory, before) {
     effectRunner.stop();
     for (const node of renderedNodes) removeNode(node);
     renderedNodes = [];
+    parentScope = null;
   });
   return renderedNodes;
 }
@@ -816,9 +826,9 @@ function syncDescriptors(target, source, pruneMissing = false) {
     Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
   }
   if (pruneMissing) {
-    const sourceKeys = Object.getOwnPropertyNames(source);
+    const sourceKeySet = new Set(Object.getOwnPropertyNames(source));
     for (const key of Object.getOwnPropertyNames(target)) {
-      if (!sourceKeys.includes(key)) delete target[key];
+      if (!sourceKeySet.has(key)) delete target[key];
     }
   }
 }
@@ -1380,12 +1390,10 @@ function bindElement(node, prop, getter, setter, modifiers = {}) {
     onCleanup(() => runner.stop());
   }
 }
-
-// src/utils.ts
 function unwrapSlotValue(raw) {
   let v = raw;
   if (Array.isArray(v) && v.length === 1) v = v[0];
-  return typeof v === "function" ? v() : v;
+  return isFunction(v) ? v() : v;
 }
 function useChildren(props) {
   const desc = Object.getOwnPropertyDescriptor(props, "children");
@@ -1703,49 +1711,50 @@ function createResource(fetcher, options) {
   const error4 = signal(null);
   const state = signal("pending");
   let fetchId = 0;
-  let currentPromise = null;
-  let suspenseRegistered = false;
+  let controller = null;
   const suspenseContext = inject(SuspenseContext, null);
-  const fetch = () => __async(null, null, function* () {
-    const currentFetchId = ++fetchId;
+  const doFetch = () => __async(null, null, function* () {
+    const id = ++fetchId;
+    controller == null ? void 0 : controller.abort();
+    controller = new AbortController();
     loading.value = true;
     state.value = "pending";
     error4.value = null;
-    suspenseRegistered = false;
-    if (suspenseContext) {
-      suspenseContext.increment();
+    let promise;
+    try {
+      promise = Promise.resolve(fetcher(controller.signal));
+    } catch (error_) {
+      error4.value = error_ instanceof Error ? error_ : new Error(String(error_));
+      state.value = "errored";
+      loading.value = false;
+      return;
     }
+    suspenseContext == null ? void 0 : suspenseContext.register(promise);
     try {
-      const promise = fetcher();
-      currentPromise = promise;
-      promise.catch(() => {
-      });
       const result = yield promise;
-      if (currentFetchId === fetchId) {
+      if (id === fetchId) {
         value.value = result;
         state.value = "ready";
         loading.value = false;
       }
     } catch (error_) {
-      if (currentFetchId === fetchId) {
-        error4.value = error_ instanceof Error ? error_ : new Error(String(error_));
-        state.value = "errored";
+      if (id !== fetchId) return;
+      if (error_ instanceof DOMException && error_.name === "AbortError") {
         loading.value = false;
+        return;
       }
-    } finally {
-      if (suspenseContext) {
-        suspenseContext.decrement();
-      }
+      error4.value = error_ instanceof Error ? error_ : new Error(String(error_));
+      state.value = "errored";
+      loading.value = false;
     }
   });
-  fetch();
-  const resource = (() => {
-    if (!suspenseRegistered && loading.value && currentPromise && suspenseContext) {
-      suspenseRegistered = true;
-      suspenseContext.register(currentPromise);
-    }
-    return value.value;
+  doFetch();
+  onCleanup(() => {
+    fetchId++;
+    controller == null ? void 0 : controller.abort();
+    controller = null;
   });
+  const resource = (() => value.value);
   resource.loading = loading;
   resource.error = error4;
   resource.state = state;
@@ -1756,9 +1765,7 @@ function createResource(fetcher, options) {
       loading.value = false;
       error4.value = null;
     },
-    refetch: () => __async(null, null, function* () {
-      yield fetch();
-    })
+    refetch: () => doFetch()
   };
   return [resource, actions];
 }
@@ -1942,9 +1949,14 @@ function For(props) {
     const parentScope = (_a2 = getActiveScope()) != null ? _a2 : ownerScope;
     const scope = createScope(parentScope);
     let mountedNodes = [];
-    runWithScope(scope, () => {
-      mountedNodes = mountValue(renderFn(item, index), parent, before);
-    });
+    try {
+      runWithScope(scope, () => {
+        mountedNodes = mountValue(renderFn(item, index), parent, before);
+      });
+    } catch (error4) {
+      disposeScope(scope);
+      throw error4;
+    }
     return { key, item, nodes: mountedNodes, scope };
   };
   const disposeItem = (entry) => {
@@ -2145,16 +2157,17 @@ function whenTransitionEnds(el, type, explicit, resolve2) {
   const finish = () => {
     if (done) return;
     done = true;
+    clearTimeout(timer);
     el.removeEventListener(info.event, onEnd);
     resolve2();
   };
   const onEnd = () => finish();
   el.addEventListener(info.event, onEnd);
-  setTimeout(finish, info.timeout + 1);
+  const timer = setTimeout(finish, info.timeout + 1);
 }
 function resolveDuration(d, dir) {
   if (d == null) return null;
-  if (typeof d === "number") return d;
+  if (isNumber(d)) return d;
   return d[dir];
 }
 function validateSlot(value) {
@@ -2471,9 +2484,14 @@ function TransitionGroup(props) {
     const parentScope = getActiveScope();
     const scope = createScope(parentScope);
     let raw;
-    runWithScope(scope, () => {
-      raw = childrenFn(item, index);
-    });
+    try {
+      runWithScope(scope, () => {
+        raw = childrenFn(item, index);
+      });
+    } catch (error4) {
+      disposeScope(scope);
+      throw error4;
+    }
     const { el, comp } = resolveItemElement(raw, wrapper);
     if (!el) {
       disposeScope(scope);