@vertz/ui 0.2.34 → 0.2.36

package/dist/shared/{chunk-rdz5k67m.js → chunk-7dngshyk.js}

@@ -864,6 +864,13 @@ function query(source, options = {}) {
   function getCacheKey() {
     return cacheKeyComputed.value;
   }
+  function resolveCurrentCacheKey() {
+    if (currentEffectKey) {
+      const depHash = depHashSignal.peek();
+      return depHash ? `${currentEffectKey}:${depHash}` : currentEffectKey;
+    }
+    return getCacheKey();
+  }
   let currentRetainedKey = null;
   const retainable = "retain" in cache && "release" in cache;
   function retainKey(key) {
@@ -904,6 +911,7 @@ function query(source, options = {}) {
   const error = signal(undefined);
   const idle = signal(initialData === undefined);
   const entityBacked = signal(false);
+  let currentEffectKey;
   function normalizeToEntityStore(result) {
     if (!entityMeta)
       return;
@@ -1018,12 +1026,33 @@ function query(source, options = {}) {
   let ssrHydrated = false;
   let navPrefetchDeferred = false;
   if (!isSSR() && initialData === undefined) {
-    const hydrationKey = customKey ?? baseKey;
+    let hydrationKey;
+    const hasSSRData = !!globalThis.__VERTZ_SSR_DATA__;
+    if (customKey) {
+      hydrationKey = customKey;
+    } else if (hasSSRData) {
+      try {
+        const raw = callThunkWithCapture();
+        if (raw !== null) {
+          if (isQueryDescriptor(raw)) {
+            if (raw._entity && !entityMeta) {
+              entityMeta = raw._entity;
+            }
+          } else {
+            raw.catch(() => {});
+          }
+        }
+      } catch {}
+      hydrationKey = getCacheKey();
+    } else {
+      hydrationKey = baseKey;
+    }
     const isNavigation = isNavPrefetchActive();
     ssrHydrationCleanup = hydrateQueryFromSSR(hydrationKey, (result) => {
       normalizeToEntityStore(result);
       rawData.value = result;
       loading.value = false;
+      idle.value = false;
       cache.set(hydrationKey, result);
       ssrHydrated = true;
     }, { persistent: isNavigation });
@@ -1140,7 +1169,7 @@ function query(source, options = {}) {
     handleFetchPromise(fetchPromise, id, key);
   }
   function refetch() {
-    const key = getCacheKey();
+    const key = resolveCurrentCacheKey();
     currentRetainedKey = null;
     cache.delete(key);
     getInflight().delete(key);
@@ -1184,10 +1213,12 @@ function query(source, options = {}) {
           isFirst = false;
           return;
         }
-        if (!isQueryDescriptor(trackRaw)) {
+        const descriptorKey = isQueryDescriptor(trackRaw) ? trackRaw._key : undefined;
+        if (!descriptorKey) {
           trackRaw.catch(() => {});
         }
-        const derivedKey = untrack(() => getCacheKey());
+        const depHash2 = untrack(() => depHashSignal.value);
+        const derivedKey = descriptorKey ? depHash2 ? `${descriptorKey}:${depHash2}` : descriptorKey : untrack(() => getCacheKey());
         const cached = untrack(() => cache.get(derivedKey));
         if (cached !== undefined) {
           retainKey(derivedKey);
@@ -1253,7 +1284,9 @@ function query(source, options = {}) {
     untrack(() => {
       idle.value = false;
     });
-    const key = effectKey ?? untrack(() => getCacheKey());
+    const depHash = untrack(() => depHashSignal.value);
+    currentEffectKey = effectKey;
+    const key = effectKey ? depHash ? `${effectKey}:${depHash}` : effectKey : untrack(() => getCacheKey());
     if (!customKey && !effectKey) {
       const existing = untrack(() => getInflight().get(key));
       if (existing) {
@@ -1339,7 +1372,7 @@ function query(source, options = {}) {
         rawData.value = undefined;
         loading.value = true;
       });
-      const cacheKey = untrack(() => getCacheKey());
+      const cacheKey = untrack(() => resolveCurrentCacheKey());
       cache.delete(cacheKey);
       const queryKey = customKey ?? meta.entityType;
       getEntityStore().queryIndices.clear(queryKey);

package/dist/shared/{chunk-mm9ms792.js → chunk-pkhyqntn.js}

@@ -458,7 +458,7 @@ function createRouter(routes, initialUrlOrOptions, maybeOptions) {
       }
     }
   }
-  async function applyNavigation(url2, preMatch, transitionConfig) {
+  async function applyNavigation(url2, preMatch, transitionConfig, skipLoaders) {
     if (currentAbort) {
       currentAbort.abort();
     }
@@ -476,7 +476,9 @@ function createRouter(routes, initialUrlOrOptions, maybeOptions) {
     if (match) {
       visitedUrls.add(normalizeUrl(url2));
       searchParams.value = match.search;
-      await runLoaders(match, gen, abort.signal);
+      if (!skipLoaders) {
+        await runLoaders(match, gen, abort.signal);
+      }
     } else {
       searchParams.value = {};
       if (gen === navigationGen) {
@@ -487,8 +489,11 @@ function createRouter(routes, initialUrlOrOptions, maybeOptions) {
   }
   async function navigate(input) {
     const navUrl = buildNavigationUrl(input.to, input);
+    const navMatch = matchRoute(routes, navUrl);
+    const navPathname = navUrl.split("?")[0]?.split("#")[0] || "/";
+    const isSearchParamOnly = window.location.pathname === navPathname;
     const gen = ++navigateGen;
-    const handle = startPrefetch(navUrl);
+    const handle = isSearchParamOnly ? null : startPrefetch(navUrl);
     if (input.replace) {
       window.history.replaceState(null, "", navUrl);
     } else {
@@ -500,9 +505,8 @@ function createRouter(routes, initialUrlOrOptions, maybeOptions) {
     }
     if (gen !== navigateGen)
       return;
-    const match = matchRoute(routes, navUrl);
-    const transitionConfig = input.viewTransition ?? match?.route.viewTransition ?? options?.viewTransition;
-    await applyNavigation(navUrl, match, transitionConfig);
+    const transitionConfig = isSearchParamOnly ? undefined : input.viewTransition ?? navMatch?.route.viewTransition ?? options?.viewTransition;
+    await applyNavigation(navUrl, navMatch, transitionConfig, isSearchParamOnly);
   }
   async function revalidate() {
     const match = current.value;

package/dist/src/index.d.ts

@@ -1296,8 +1296,27 @@ type ExtractParams<T extends string> = [ExtractParamsFromSegments<WithoutWildcar
 * - Fallback: `string` → `string` (backward compat)
 */
 type PathWithParams<T extends string> = T extends `${infer Before}*` ? `${PathWithParams<Before>}${string}` : T extends `${infer Before}:${string}/${infer After}` ? `${Before}${string}/${PathWithParams<`${After}`>}` : T extends `${infer Before}:${string}` ? `${Before}${string}` : T;
-/** Union of route pattern keys from a route map. */
-type RoutePattern<TRouteMap extends Record<string, unknown>> = keyof TRouteMap & string;
+/**
+* Join parent and child route path segments.
+* - `JoinPaths<'/', '/brands'>` → `'/brands'`
+* - `JoinPaths<'/admin', '/settings'>` → `'/admin/settings'`
+* - `JoinPaths<'', '/brands'>` → `'/brands'`
+*/
+type JoinPaths<
+	Parent extends string,
+	Child extends string
+> = Parent extends "" | "/" ? Child : Child extends "/" ? Parent : `${Parent}${Child}`;
+/**
+* Union of all route pattern keys from a route map, including nested children.
+* Recursively walks `children` and concatenates parent + child paths.
+* Short-circuits to `string` for index signatures (backward compat).
+*/
+type RoutePattern<
+	TRouteMap extends Record<string, unknown>,
+	_Prefix extends string = ""
+> = string extends keyof TRouteMap ? string : { [K in keyof TRouteMap & string] : JoinPaths<_Prefix, K> | (TRouteMap[K] extends {
+	children: infer C extends Record<string, unknown>;
+} ? RoutePattern<C, JoinPaths<_Prefix, K>> : never) }[keyof TRouteMap & string];
 /**
 * Union of all valid URL shapes for a route map.
 * Maps each route pattern key through `PathWithParams` to produce the accepted URL shapes.
@@ -1424,8 +1443,22 @@ type TypedRoutes<T extends Record<string, RouteConfigLike> = RouteDefinitionMap>
 */
 type InferRouteMap<T> = T extends TypedRoutes<infer R> ? R : T;
 /**
+* Search nested children for a route's search params schema.
+* Returns the schema output type if found, `never` if not found.
+*/
+type FindSearchParamsInChildren<
+	TPath extends string,
+	TMap extends Record<string, RouteConfigLike>,
+	_Prefix extends string = ""
+> = string extends keyof TMap ? never : { [K in keyof TMap & string] : JoinPaths<_Prefix, K> extends TPath ? TMap[K] extends {
+	searchParams: SearchParamSchema<infer S>;
+} ? S : never : TMap[K] extends {
+	children: infer C extends Record<string, RouteConfigLike>;
+} ? FindSearchParamsInChildren<TPath, C, JoinPaths<_Prefix, K>> : never }[keyof TMap & string];
+/**
 * Extract the search params type from a route definition map for a given path.
 *
+* Recursively searches nested `children` when the path is not a top-level key.
 * If the route at `TPath` has a `searchParams` schema, resolves to the schema's
 * output type `T`. Otherwise resolves to `Record<string, string>` (raw URL params).
 *
@@ -1436,7 +1469,7 @@ type ExtractSearchParams<
 	TMap extends Record<string, RouteConfigLike> = RouteDefinitionMap
 > = TPath extends keyof TMap ? TMap[TPath] extends {
 	searchParams: SearchParamSchema<infer T>;
-} ? T : Record<string, string> : Record<string, string>;
+} ? T : Record<string, string> : [FindSearchParamsInChildren<TPath, TMap>] extends [never] ? Record<string, string> : FindSearchParamsInChildren<TPath, TMap>;
 /** Internal compiled route. */
 interface CompiledRoute {
 	/** The original path pattern. */

package/dist/src/index.js

@@ -45,7 +45,7 @@ import {
 } from "../shared/chunk-mntc8w0g.js";
 import {
   createRouter
-} from "../shared/chunk-mm9ms792.js";
+} from "../shared/chunk-pkhyqntn.js";
 import {
   defineRoutes
 } from "../shared/chunk-ah86rm07.js";
@@ -66,7 +66,7 @@ import {
   query,
   registerRelationSchema,
   resetRelationSchemas_TEST_ONLY
-} from "../shared/chunk-rdz5k67m.js";
+} from "../shared/chunk-7dngshyk.js";
 import"../shared/chunk-jrtrk5z4.js";
 import {
   ThemeProvider,

package/dist/src/internals.js

@@ -20,7 +20,7 @@ import {
   MemoryCache,
   QueryEnvelopeStore,
   deriveKey
-} from "../shared/chunk-rdz5k67m.js";
+} from "../shared/chunk-7dngshyk.js";
 import"../shared/chunk-jrtrk5z4.js";
 import {
   ALIGNMENT_MAP,

package/dist/src/query/public.js

@@ -1,6 +1,6 @@
 import {
   query
-} from "../../shared/chunk-rdz5k67m.js";
+} from "../../shared/chunk-7dngshyk.js";
 import"../../shared/chunk-jrtrk5z4.js";
 import"../../shared/chunk-pv0apt9z.js";
 import"../../shared/chunk-sjypbv24.js";

package/dist/src/router/public.d.ts

@@ -34,8 +34,27 @@ type ExtractParams<T extends string> = [ExtractParamsFromSegments<WithoutWildcar
 * - Fallback: `string` → `string` (backward compat)
 */
 type PathWithParams<T extends string> = T extends `${infer Before}*` ? `${PathWithParams<Before>}${string}` : T extends `${infer Before}:${string}/${infer After}` ? `${Before}${string}/${PathWithParams<`${After}`>}` : T extends `${infer Before}:${string}` ? `${Before}${string}` : T;
-/** Union of route pattern keys from a route map. */
-type RoutePattern<TRouteMap extends Record<string, unknown>> = keyof TRouteMap & string;
+/**
+* Join parent and child route path segments.
+* - `JoinPaths<'/', '/brands'>` → `'/brands'`
+* - `JoinPaths<'/admin', '/settings'>` → `'/admin/settings'`
+* - `JoinPaths<'', '/brands'>` → `'/brands'`
+*/
+type JoinPaths<
+	Parent extends string,
+	Child extends string
+> = Parent extends "" | "/" ? Child : Child extends "/" ? Parent : `${Parent}${Child}`;
+/**
+* Union of all route pattern keys from a route map, including nested children.
+* Recursively walks `children` and concatenates parent + child paths.
+* Short-circuits to `string` for index signatures (backward compat).
+*/
+type RoutePattern<
+	TRouteMap extends Record<string, unknown>,
+	_Prefix extends string = ""
+> = string extends keyof TRouteMap ? string : { [K in keyof TRouteMap & string] : JoinPaths<_Prefix, K> | (TRouteMap[K] extends {
+	children: infer C extends Record<string, unknown>;
+} ? RoutePattern<C, JoinPaths<_Prefix, K>> : never) }[keyof TRouteMap & string];
 /**
 * Union of all valid URL shapes for a route map.
 * Maps each route pattern key through `PathWithParams` to produce the accepted URL shapes.
@@ -162,8 +181,22 @@ type TypedRoutes<T extends Record<string, RouteConfigLike> = RouteDefinitionMap>
 */
 type InferRouteMap<T> = T extends TypedRoutes<infer R> ? R : T;
 /**
+* Search nested children for a route's search params schema.
+* Returns the schema output type if found, `never` if not found.
+*/
+type FindSearchParamsInChildren<
+	TPath extends string,
+	TMap extends Record<string, RouteConfigLike>,
+	_Prefix extends string = ""
+> = string extends keyof TMap ? never : { [K in keyof TMap & string] : JoinPaths<_Prefix, K> extends TPath ? TMap[K] extends {
+	searchParams: SearchParamSchema<infer S>;
+} ? S : never : TMap[K] extends {
+	children: infer C extends Record<string, RouteConfigLike>;
+} ? FindSearchParamsInChildren<TPath, C, JoinPaths<_Prefix, K>> : never }[keyof TMap & string];
+/**
 * Extract the search params type from a route definition map for a given path.
 *
+* Recursively searches nested `children` when the path is not a top-level key.
 * If the route at `TPath` has a `searchParams` schema, resolves to the schema's
 * output type `T`. Otherwise resolves to `Record<string, string>` (raw URL params).
 *
@@ -174,7 +207,7 @@ type ExtractSearchParams<
 	TMap extends Record<string, RouteConfigLike> = RouteDefinitionMap
 > = TPath extends keyof TMap ? TMap[TPath] extends {
 	searchParams: SearchParamSchema<infer T>;
-} ? T : Record<string, string> : Record<string, string>;
+} ? T : Record<string, string> : [FindSearchParamsInChildren<TPath, TMap>] extends [never] ? Record<string, string> : FindSearchParamsInChildren<TPath, TMap>;
 /** Internal compiled route. */
 interface CompiledRoute {
 	/** The original path pattern. */

package/dist/src/router/public.js

@@ -10,7 +10,7 @@ import {
 import"../../shared/chunk-mntc8w0g.js";
 import {
   createRouter
-} from "../../shared/chunk-mm9ms792.js";
+} from "../../shared/chunk-pkhyqntn.js";
 import {
   defineRoutes
 } from "../../shared/chunk-ah86rm07.js";

package/dist/src/test/index.d.ts

@@ -138,8 +138,27 @@ type ExtractParams<T extends string> = [ExtractParamsFromSegments<WithoutWildcar
 } : Record<string, never> : HasWildcard<T> extends true ? { [K in ExtractParamsFromSegments<WithoutWildcard<T>>] : string } & {
 	"*": string;
 } : { [K in ExtractParamsFromSegments<WithoutWildcard<T>>] : string };
-/** Union of route pattern keys from a route map. */
-type RoutePattern<TRouteMap extends Record<string, unknown>> = keyof TRouteMap & string;
+/**
+* Join parent and child route path segments.
+* - `JoinPaths<'/', '/brands'>` → `'/brands'`
+* - `JoinPaths<'/admin', '/settings'>` → `'/admin/settings'`
+* - `JoinPaths<'', '/brands'>` → `'/brands'`
+*/
+type JoinPaths<
+	Parent extends string,
+	Child extends string
+> = Parent extends "" | "/" ? Child : Child extends "/" ? Parent : `${Parent}${Child}`;
+/**
+* Union of all route pattern keys from a route map, including nested children.
+* Recursively walks `children` and concatenates parent + child paths.
+* Short-circuits to `string` for index signatures (backward compat).
+*/
+type RoutePattern<
+	TRouteMap extends Record<string, unknown>,
+	_Prefix extends string = ""
+> = string extends keyof TRouteMap ? string : { [K in keyof TRouteMap & string] : JoinPaths<_Prefix, K> | (TRouteMap[K] extends {
+	children: infer C extends Record<string, unknown>;
+} ? RoutePattern<C, JoinPaths<_Prefix, K>> : never) }[keyof TRouteMap & string];
 /**
 * View Transitions API integration.
 *

package/dist/src/test/index.js

@@ -1,6 +1,6 @@
 import {
   createRouter
-} from "../../shared/chunk-mm9ms792.js";
+} from "../../shared/chunk-pkhyqntn.js";
 import {
   defineRoutes
 } from "../../shared/chunk-ah86rm07.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertz/ui",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "description": "Vertz UI framework — signals, components, JSX runtime",
   "license": "MIT",
   "repository": {
@@ -77,11 +77,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@vertz/fetch": "^0.2.31"
+    "@vertz/fetch": "^0.2.35"
   },
   "devDependencies": {
     "@happy-dom/global-registrator": "^20.7.0",
-    "@vertz/schema": "^0.2.31",
+    "@vertz/schema": "^0.2.35",
     "bunup": "^0.16.31",
     "happy-dom": "^20.7.0",
     "typescript": "^5.7.0"