tw-framework 2.0.0 → 2.0.1

package/dist/tw-runtime-client.mjs

@@ -6,6 +6,34 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 var currentEffect = null;
 var batchDepth = 0;
 var batchedEffects = /* @__PURE__ */ new Set();
+var pendingSubs = null;
+var isFlushing = false;
+function flushPendingSubs() {
+  if (isFlushing || !pendingSubs) return;
+  isFlushing = true;
+  try {
+    let guard = 0;
+    while (pendingSubs && pendingSubs.size > 0 && guard++ < 1e5) {
+      const batchOf = pendingSubs;
+      pendingSubs = /* @__PURE__ */ new Set();
+      for (const sub of batchOf) {
+        try {
+          sub();
+        } catch (e) {
+          console.error("[TW Reactivity] Signal subscriber error:", e);
+        }
+      }
+    }
+  } finally {
+    isFlushing = false;
+    pendingSubs = null;
+  }
+}
+function enqueueSubs(subs) {
+  if (!pendingSubs) pendingSubs = /* @__PURE__ */ new Set();
+  for (const s of subs) pendingSubs.add(s);
+  if (batchDepth === 0) flushPendingSubs();
+}
 function startBatch() {
   batchDepth++;
 }
@@ -15,13 +43,7 @@ function endBatch() {
     batchDepth = 0;
     const effects = Array.from(batchedEffects);
     batchedEffects.clear();
-    for (const eff of effects) {
-      try {
-        eff();
-      } catch (e) {
-        console.error("[TW Reactivity] Batch effect error:", e);
-      }
-    }
+    enqueueSubs(effects);
   }
 }
 function batch(fn) {
@@ -50,19 +72,9 @@ var SignalImpl = class {
     if (this.equals(this.value, value)) return;
     this.value = value;
     if (batchDepth > 0) {
-      for (const sub of this.subscribers) {
-        batchedEffects.add(sub);
-      }
-    } else {
-      const subs = Array.from(this.subscribers);
-      for (const sub of subs) {
-        try {
-          sub();
-        } catch (e) {
-          console.error("[TW Reactivity] Signal subscriber error:", e);
-        }
-      }
+      for (const sub of this.subscribers) batchedEffects.add(sub);
     }
+    enqueueSubs(this.subscribers);
   }
   update(fn) {
     this.set(fn(this.value));
@@ -136,14 +148,11 @@ var ComputedImpl = class {
     return this.cachedValue;
   }
   notify() {
-    const subs = Array.from(this.subscribers);
-    for (const sub of subs) {
-      try {
-        sub();
-      } catch (e) {
-        console.error("[TW Reactivity] Computed subscriber error:", e);
-      }
+    if (batchDepth > 0) {
+      for (const sub of this.subscribers) batchedEffects.add(sub);
+      return;
     }
+    enqueueSubs(this.subscribers);
   }
   set(_value) {
     throw new Error("Cannot set a computed signal");
@@ -3143,10 +3152,12 @@ function diffTextNode(oldNode, newText) {
   return { kind: "text", text: newText };
 }
 var HTML_ESCAPE_MAP = {
-  "&": "&",
-  "<": "<",
-  ">": ">",
-  '"': '"',
+  // These four mapped to THEMSELVES, so a <script> tag passed through
+  // untouched -- only ' was actually escaped.
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': "&quot;",
   "'": "&#39;"
 };
 var HTML_ESCAPE_REGEX = /[&<>"']/g;
@@ -6964,8 +6975,19 @@ async function hydrateElementById(id, component, root = typeof document !== "und
   );
 }
 function markForHydration(element, componentId, props) {
+  if (!element || typeof componentId !== "string") return;
   element.setAttribute(HYDRATE_ATTR, componentId);
-  element.setAttribute("data-tw-props", JSON.stringify(props));
+  let serialised = null;
+  if (props && typeof props === "object") {
+    try {
+      serialised = JSON.stringify(props);
+    } catch {
+      serialised = null;
+    }
+  }
+  if (serialised !== null && serialised !== void 0) {
+    element.setAttribute("data-tw-props", serialised);
+  }
 }
 function unmarkForHydration(element) {
   element.removeAttribute(HYDRATE_ATTR);
@@ -10195,15 +10217,21 @@ function usePathname(opts) {
 function matchPathPattern(path, pattern) {
   const pSeg = path.split("/").filter(Boolean);
   const tSeg = pattern.split("/").filter(Boolean);
-  if (pSeg.length !== tSeg.length) return { matches: false, params: {}, score: 0 };
+  const catchAllAt = tSeg.findIndex((t2) => t2.startsWith("[...") || t2.startsWith(":..."));
+  if (catchAllAt === -1) {
+    if (pSeg.length !== tSeg.length) return { matches: false, params: {}, score: 0 };
+  } else if (pSeg.length < tSeg.length) {
+    return { matches: false, params: {}, score: 0 };
+  }
   const params = {};
   let literal = 0;
   for (let i = 0; i < tSeg.length; i++) {
     const t2 = tSeg[i];
     const isParam = t2.startsWith("[") && t2.endsWith("]") || t2.startsWith(":");
     if (isParam) {
-      const name = t2.startsWith("[") ? t2.slice(1, -1).replace(/\.\.\.$/, "") : t2.slice(1);
-      params[name] = decodeURIComponent(pSeg[i]);
+      const name = t2.startsWith("[") ? t2.slice(1, -1).replace(/^\.\.\./, "") : t2.slice(1);
+      const isCatchAll = t2.startsWith("[...") || t2.startsWith(":...");
+      params[name] = isCatchAll ? pSeg.slice(i).map((seg) => decodeURIComponent(seg)).join("/") : decodeURIComponent(pSeg[i]);
     } else if (t2 !== pSeg[i]) {
       return { matches: false, params: {}, score: 0 };
     } else {
@@ -11002,9 +11030,11 @@ var ReactiveValue = class {
     };
   }
   _notify() {
+    var _a;
+    const current2 = (_a = this.value) != null ? _a : this._value;
     for (const l of this._listeners) {
       try {
-        l();
+        l(current2);
       } catch {
       }
     }
@@ -11049,7 +11079,11 @@ function defineStore(idOrDefinition, maybeDefinition) {
     const getterDeps = Object.values(reactiveState);
     for (const key of Object.keys(getters)) {
       const getter = getters[key];
-      getterValues[key] = computed4(getterDeps, getter);
+      getterValues[key] = computed4(getterDeps, () => {
+        const snap = {};
+        for (const k of Object.keys(reactiveState)) snap[k] = reactiveState[k].value;
+        return getter.call(snap, snap);
+      });
     }
     const subscribers = /* @__PURE__ */ new Set();
     const actionListeners = /* @__PURE__ */ new Set();
@@ -11093,7 +11127,7 @@ function defineStore(idOrDefinition, maybeDefinition) {
       const fn = actions[key];
       boundActions[key] = (...args) => {
         actionListeners.forEach((cb) => cb({ name: key, args }));
-        return fn.call(ctx, stateProxy, ...args);
+        return fn.call(stateProxy, stateProxy, ...args);
       };
     }
     for (const rv of Object.values(reactiveState)) {
@@ -12162,7 +12196,9 @@ var VirtualList = class {
     return this.container.scrollTop;
   }
   getFirstVisibleIndex() {
-    return this.visibleRange.start;
+    var _a, _b;
+    const last = Math.max(0, (_b = (_a = this.options) == null ? void 0 : _a.itemCount) != null ? _b : 0 - 1);
+    return Math.min(Math.max(this.visibleRange.start, 0), last);
   }
   getLastVisibleIndex() {
     return this.visibleRange.end;