@nifrajs/web-solid 5.8.0 → 5.10.0

package/CHANGELOG.md

@@ -1,5 +1,109 @@
 # @nifrajs/web-solid
 
+## 5.10.0
+
+### Minor Changes
+
+- 611a3be: Expose mutation and infinite-query bindings across the framework adapters, with request-scoped query-client providers and SSR cache hydration. Mutation functions and callbacks receive a cooperative abort signal, and identity changes cancel pending work across tabs. `dehydrate` can filter regular and infinite query values before they are serialized to the browser.
+- d2066e0: Add opt-in local `?image` metadata imports and content-hashed build-time responsive variants using the existing injectable image backends. Emit images with client, SSR and static builds, and infer imported dimensions in all five UI adapters. String image URLs retain their existing dimension requirements.
+  
+  Add explicit static translated-path mappings to i18n routing, with reciprocal URL/SEO helpers, availability-aware redirects and static-path enumeration. These mappings do not implicitly create filesystem route aliases.
+  
+  Add `vercelRuntime: "node"` for ordinary SSR Vercel builds through both bundlers, using a shared streaming Node request bridge. Vercel Edge remains the default.
+- 824a75e: Partial prerendering is no longer experimental. `createWebApp` takes it as `ppr`, where it was `experimental.ppr`, and the `experimental` option is gone: passing it throws a `TypeError` that names `ppr`, and the startup errors name `ppr.origin`, `ppr.deployment` and `ppr.store`. `nifra upgrade` moves `experimental: { ppr }` to `ppr` in a `createWebApp` options literal and lists any other `experimental` shape it finds there by line (options spread in, or built in another file, are yours to check). `nifra scaffold` is stable.
+- 1faf86c: `href({ to, params, search, hash })` builds an in-app URL from a route pattern and returns an `Href`; `rawHref(path)` returns one for a same-origin path built elsewhere (a CMS link, `/llms.txt`). `to` is a key of the generated `RouteTable`, so a misspelt route, a missing, misspelt or extra param, and a `search` that breaks the route's schema are compile errors. A route without a `searchSchema` takes any `search`. Each param is encoded as one path segment, so a value such as `a/b` or `//evil.com` cannot change where the URL goes; a param that is missing, empty, `.`, `..` or an unpaired surrogate throws a `TypeError` naming it and the pattern. `rawHref` throws a `TypeError` unless `isSameOriginPath` accepts the path. Both are exported by `@nifrajs/web` and by the `/router` entry of every adapter.
+  
+  `navigate` takes an `Href` or a history delta. A string, a template literal and the `{ to, search }` object form are compile errors, and a value forged past the types is still held to the same-origin check the browser navigate makes. `<Navigate to>` and the `useSearchParams` setter in `@nifrajs/web-react` pass their path through `rawHref`, so an off-origin `to` throws instead of doing nothing. `isSameOriginPath` is exported from `@nifrajs/core/pattern` as well as `@nifrajs/core/server`.
+  
+  Upgrade: `navigate("/users/7")` becomes `navigate(href({ to: "/users/:id", params: { id: "7" } }))`, `navigate({ to, search, replace: true })` becomes `navigate(href({ to, search }), { replace: true })`, and a path built elsewhere is `navigate(rawHref(path))`. `resolveNavigate`, `NavigateTargetInput` and `NavigateSearchOf` are removed from `@nifrajs/web`.
+
+### Patch Changes
+
+- 2c361be: Opening a modal route on a Solid page no longer rebuilds the page. A layout was handed the `boundaries` value rather than a getter over it, so an intercept boundary taking its target re-ran the whole chain: a typed input lost its text and every component remounted. The page now stays mounted underneath, as the other adapters keep it.
+- Updated dependencies [535c4e5]
+- Updated dependencies [87e7fd9]
+- Updated dependencies [611a3be]
+- Updated dependencies [7f32bb2]
+- Updated dependencies [0aa10d0]
+- Updated dependencies [ab69ee6]
+- Updated dependencies [548bade]
+- Updated dependencies [d2066e0]
+- Updated dependencies [7e292dd]
+- Updated dependencies [a6af4c9]
+- Updated dependencies [e465ed5]
+- Updated dependencies [683c3d6]
+- Updated dependencies [824a75e]
+- Updated dependencies [d2066e0]
+- Updated dependencies [5845e1c]
+- Updated dependencies [5d1be78]
+- Updated dependencies [1faf86c]
+- Updated dependencies [950996b]
+  - @nifrajs/web@5.10.0
+  - @nifrajs/core@5.10.0
+
+## 5.9.0
+
+### Patch Changes
+
+- 2ffa7c1: The React, Preact, Solid, Svelte and Vue `useServerFn` bindings take their function through one shared helper in `@nifrajs/web/internal/client-server-fn`.
+  
+  The React, Svelte and Vue client and keep-alive mounts read a hydration verification runner's hooks through one reader in `@nifrajs/web/internal/hydration-assurance`. Recoverable errors and warnings reach the runner as before.
+- 71dea89: Every binding's `useNavigate` returns one navigate from `@nifrajs/web/internal/navigate-runtime`, the same function on every call. The React, Preact, Solid and Vue `Hole` components read their boundary state through the `HoleState` type in `@nifrajs/web/internal/hole-runtime`.
+- a0fe5bf: The keep-alive mounts of the React, Preact, Svelte, Solid and Vue adapters take their framework-free half from `@nifrajs/web/internal/keep-alive-mount`. This covers the slot tree of each router state, the parking each committed tree goes to, render props made once per state, and the slots under each layout. Each adapter still renders the slots its own way. Kept pages behave as before.
+- Updated dependencies [2ffa7c1]
+- Updated dependencies [100a0aa]
+- Updated dependencies [71dea89]
+- Updated dependencies [9c20e05]
+- Updated dependencies [9942748]
+- Updated dependencies [8cdb138]
+- Updated dependencies [be1c677]
+- Updated dependencies [f399e06]
+- Updated dependencies [93e7078]
+- Updated dependencies [2c2f58b]
+- Updated dependencies [123409c]
+- Updated dependencies [7ee17d0]
+- Updated dependencies [68d9f31]
+- Updated dependencies [fa7d102]
+- Updated dependencies [ddeb735]
+- Updated dependencies [a3fb195]
+- Updated dependencies [47a864f]
+- Updated dependencies [9942748]
+- Updated dependencies [ffcf41a]
+- Updated dependencies [7a15327]
+- Updated dependencies [866c8ec]
+- Updated dependencies [bc42fd2]
+- Updated dependencies [a29d1cc]
+- Updated dependencies [9942748]
+- Updated dependencies [77b98ea]
+- Updated dependencies [a3caf9b]
+- Updated dependencies [a0fe5bf]
+- Updated dependencies [7ba5c9b]
+- Updated dependencies [0445564]
+- Updated dependencies [180bf9d]
+- Updated dependencies [ff9bc11]
+- Updated dependencies [8094874]
+- Updated dependencies [a7b89ee]
+- Updated dependencies [34b780e]
+- Updated dependencies [111c3be]
+- Updated dependencies [5bd225e]
+- Updated dependencies [d6e6617]
+- Updated dependencies [5bc60b7]
+- Updated dependencies [159ae97]
+- Updated dependencies [6ba9740]
+- Updated dependencies [5f4416a]
+- Updated dependencies [bc05ec5]
+- Updated dependencies [d3c050e]
+- Updated dependencies [c4ed3e9]
+- Updated dependencies [9942748]
+- Updated dependencies [5bc60b7]
+- Updated dependencies [3299474]
+- Updated dependencies [543d00a]
+- Updated dependencies [020eb7b]
+- Updated dependencies [9942748]
+- Updated dependencies [9785cd4]
+  - @nifrajs/web@5.9.0
+  - @nifrajs/core@5.9.0
+
 ## 5.8.0
 
 ### Patch Changes

package/dist/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAmC,KAAK,GAAG,EAAE,MAAM,UAAU,CAAA;AAMpE;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,MAAM,GAAG,CAAC,OAAO,CAmCxF"}
+{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAmC,KAAK,GAAG,EAAE,MAAM,UAAU,CAAA;AAMpE;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,MAAM,GAAG,CAAC,OAAO,CAqCxF"}

package/dist/compose.js

@@ -25,7 +25,9 @@ export function compose(chain, props) {
             get data() {
                 return props.layoutData?.[i] ?? null;
             },
-            ...(props.boundaries !== undefined ? { boundaries: props.boundaries } : {}),
+            get boundaries() {
+                return props.boundaries;
+            },
             children: child(),
         });
     }

package/dist/compose.js.map

@@ -1 +1 @@
-{"version":3,"file":"compose.js","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,eAAe,EAAY,MAAM,UAAU,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE/D,sFAAsF;AACtF,MAAM,YAAY,GAAsC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAEzE;;;;;;;GAOG;AACH,MAAM,UAAU,OAAO,CAAC,KAAyB,EAAE,KAAkB;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;IAC7B,IAAI,IAAI,GAAsB,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAA2B,EAAE,KAAK,CAAC,CAAA;IACjG,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAyC,CAAA;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAA;QAClB,6FAA6F;QAC7F,mGAAmG;QACnG,kEAAkE;QAClE,0FAA0F;QAC1F,6EAA6E;QAC7E,IAAI,GAAG,GAAG,EAAE,CACV,eAAe,CAAC,MAAM,EAAE;YACtB,IAAI,IAAI;gBACN,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;YACtC,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3E,QAAQ,EAAE,KAAK,EAAE;SAClB,CAAC,CAAA;IACN,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAA;IAClB,qGAAqG;IACrG,sFAAsF;IACtF,OAAO,GAAG,EAAE,CACV,eAAe,CAAC,aAAa,CAAC,QAAQ,EAAE;QACtC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,YAAY,CAA4B;QACtE,IAAI,QAAQ;YACV,OAAO,eAAe,CAAC,kBAAkB,CAAC,QAAQ,EAAE;gBAClD,KAAK,EAAE,KAAK;gBACZ,IAAI,QAAQ;oBACV,OAAO,KAAK,EAAE,CAAA;gBAChB,CAAC;aACF,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACN,CAAC"}
+{"version":3,"file":"compose.js","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,eAAe,EAAY,MAAM,UAAU,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE/D,sFAAsF;AACtF,MAAM,YAAY,GAAsC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAEzE;;;;;;;GAOG;AACH,MAAM,UAAU,OAAO,CAAC,KAAyB,EAAE,KAAkB;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;IAC7B,IAAI,IAAI,GAAsB,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAA2B,EAAE,KAAK,CAAC,CAAA;IACjG,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAyC,CAAA;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAA;QAClB,6FAA6F;QAC7F,mGAAmG;QACnG,kEAAkE;QAClE,0FAA0F;QAC1F,6EAA6E;QAC7E,IAAI,GAAG,GAAG,EAAE,CACV,eAAe,CAAC,MAAM,EAAE;YACtB,IAAI,IAAI;gBACN,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;YACtC,CAAC;YACD,IAAI,UAAU;gBACZ,OAAO,KAAK,CAAC,UAAU,CAAA;YACzB,CAAC;YACD,QAAQ,EAAE,KAAK,EAAE;SAClB,CAAC,CAAA;IACN,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAA;IAClB,qGAAqG;IACrG,sFAAsF;IACtF,OAAO,GAAG,EAAE,CACV,eAAe,CAAC,aAAa,CAAC,QAAQ,EAAE;QACtC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,YAAY,CAA4B;QACtE,IAAI,QAAQ;YACV,OAAO,eAAe,CAAC,kBAAkB,CAAC,QAAQ,EAAE;gBAClD,KAAK,EAAE,KAAK;gBACZ,IAAI,QAAQ;oBACV,OAAO,KAAK,EAAE,CAAA;gBAChB,CAAC;aACF,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACN,CAAC"}

package/dist/fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../src/fn.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAkB,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC/E,OAAO,EAAE,KAAK,QAAQ,EAA2B,MAAM,UAAU,CAAA;AAEjE,+DAA+D;AAC/D,MAAM,WAAW,cAAc,CAAC,KAAK,EAAE,MAAM;IAC3C,8DAA8D;IAC9D,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/C,mGAAmG;IACnG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAChD,oBAAoB;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAA;CAC3B;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EACvC,EAAE,EAAE,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,GACnC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAS/B"}
+{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../src/fn.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAE/E,OAAO,EAAE,KAAK,QAAQ,EAA2B,MAAM,UAAU,CAAA;AAEjE,+DAA+D;AAC/D,MAAM,WAAW,cAAc,CAAC,KAAK,EAAE,MAAM;IAC3C,8DAA8D;IAC9D,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/C,mGAAmG;IACnG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAChD,oBAAoB;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAA;CAC3B;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EACvC,EAAE,EAAE,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,GACnC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAS/B"}

package/dist/fn.js

@@ -8,6 +8,7 @@
  * "is it pending" has one answer rather than five that drift. This file contributes only a signal fed by the store.
  */
 import { createServerFnStore } from "@nifrajs/web/fn-state";
+import { clientServerFn } from "@nifrajs/web/internal/client-server-fn";
 import { createSignal, onCleanup } from "solid-js";
 /**
  * Track one server function's call state.
@@ -16,7 +17,7 @@ import { createSignal, onCleanup } from "solid-js";
  *     <button disabled={addTodo.state().pending} onClick={() => addTodo.call({ text }).catch(() => {})}>
  */
 export function useServerFn(fn) {
-    const store = createServerFnStore(fn);
+    const store = createServerFnStore(clientServerFn(fn));
     // Seeded from the store, not from the idle constant. They are the same value here - the store is
     // created one line up and cannot have moved - so this is correctness that does not depend on that
     // staying true. Svelte had exactly this line reading the constant, and when its subscription turned

package/dist/fn.js.map

@@ -1 +1 @@
-{"version":3,"file":"fn.js","sourceRoot":"","sources":["../src/fn.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,mBAAmB,EAAsB,MAAM,uBAAuB,CAAA;AAC/E,OAAO,EAAiB,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAYjE;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CACzB,EAAoC;IAEpC,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAmC,CAAC,CAAA;IACtE,iGAAiG;IACjG,kGAAkG;IAClG,oGAAoG;IACpG,oFAAoF;IACpF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAwB,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC/E,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;IAClE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAA;AACxD,CAAC"}
+{"version":3,"file":"fn.js","sourceRoot":"","sources":["../src/fn.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,mBAAmB,EAAsB,MAAM,uBAAuB,CAAA;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AACvE,OAAO,EAAiB,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAYjE;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CACzB,EAAoC;IAEpC,MAAM,KAAK,GAAG,mBAAmB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAA;IACrD,iGAAiG;IACjG,kGAAkG;IAClG,oGAAoG;IACpG,oFAAoF;IACpF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAwB,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC/E,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;IAClE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAA;AACxD,CAAC"}

package/dist/image.d.ts

@@ -6,7 +6,7 @@
  * reactively (`splitProps`/`mergeProps`). Resizing is delegated to the `loader`; nifra bundles no codec.
  * No JSX (`createComponent`/`Dynamic`), so the package builds with plain `tsc`.
  */
-import { type ImageLoader, type ImageProps } from "@nifrajs/image";
+import { type ImageLoader, type ImageProps, type StaticImageProps } from "@nifrajs/image";
 import { type JSX } from "solid-js";
 /** Attributes `resolveImage` computes - callers can't override them via DOM passthrough. */
 type ComputedAttrs = "src" | "srcset" | "sizes" | "width" | "height" | "alt" | "loading" | "decoding" | "fetchpriority";
@@ -14,10 +14,11 @@ export interface ImageComponentProps extends ImageProps, Omit<JSX.ImgHTMLAttribu
     /** CDN URL builder. Defaults to the identity loader (no transform - still CLS-safe + lazy). */
     readonly loader?: ImageLoader;
 }
+export type StaticImageComponentProps = StaticImageProps & Omit<ImageComponentProps, "src" | "width" | "height">;
 /**
- * Render a responsive, CLS-safe `<img>`. `width`+`height` are required (reserve layout space);
+ * Render a responsive, CLS-safe `<img>`. String URLs require dimensions; asset imports infer them;
  * `priority` marks the LCP image (`eager` + `fetchpriority="high"`). Extra DOM props pass through.
  */
-export declare function Image(props: ImageComponentProps): JSX.Element;
+export declare function Image(props: ImageComponentProps | StaticImageComponentProps): JSX.Element;
 export {};
 //# sourceMappingURL=image.d.ts.map

package/dist/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAA6B,MAAM,gBAAgB,CAAA;AAC7F,OAAO,EAAmB,KAAK,GAAG,EAA0B,MAAM,UAAU,CAAA;AAG5E,4FAA4F;AAC5F,KAAK,aAAa,GACd,KAAK,GACL,QAAQ,GACR,OAAO,GACP,OAAO,GACP,QAAQ,GACR,KAAK,GACL,SAAS,GACT,UAAU,GACV,eAAe,CAAA;AAEnB,MAAM,WAAW,mBACf,SAAQ,UAAU,EAChB,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,aAAa,GAAG,MAAM,UAAU,CAAC;IACjF,+FAA+F;IAC/F,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAC9B;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,mBAAmB,GAAG,GAAG,CAAC,OAAO,CAgC7D"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,UAAU,EAEf,KAAK,gBAAgB,EAEtB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAmB,KAAK,GAAG,EAA0B,MAAM,UAAU,CAAA;AAG5E,4FAA4F;AAC5F,KAAK,aAAa,GACd,KAAK,GACL,QAAQ,GACR,OAAO,GACP,OAAO,GACP,QAAQ,GACR,KAAK,GACL,SAAS,GACT,UAAU,GACV,eAAe,CAAA;AAEnB,MAAM,WAAW,mBACf,SAAQ,UAAU,EAChB,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,aAAa,GAAG,MAAM,UAAU,CAAC;IACjF,+FAA+F;IAC/F,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAC9B;AAED,MAAM,MAAM,yBAAyB,GAAG,gBAAgB,GACtD,IAAI,CAAC,mBAAmB,EAAE,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC,CAAA;AAEvD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,mBAAmB,GAAG,yBAAyB,GAAG,GAAG,CAAC,OAAO,CA2CzF"}

package/dist/image.js

@@ -6,11 +6,11 @@
  * reactively (`splitProps`/`mergeProps`). Resizing is delegated to the `loader`; nifra bundles no codec.
  * No JSX (`createComponent`/`Dynamic`), so the package builds with plain `tsc`.
  */
-import { resolveImage, toHtmlAttrs } from "@nifrajs/image";
+import { resolveImage, toHtmlAttrs, } from "@nifrajs/image";
 import { createComponent, mergeProps, splitProps } from "solid-js";
 import { Dynamic } from "solid-js/web";
 /**
- * Render a responsive, CLS-safe `<img>`. `width`+`height` are required (reserve layout space);
+ * Render a responsive, CLS-safe `<img>`. String URLs require dimensions; asset imports infer them;
  * `priority` marks the LCP image (`eager` + `fetchpriority="high"`). Extra DOM props pass through.
  */
 export function Image(props) {
@@ -31,10 +31,7 @@ export function Image(props) {
     const attrs = () => {
         // Build ImageProps via conditional spreads (exactOptionalPropertyTypes: an unset optional is
         // absent, not `undefined`). resolveImage validates width/height > 0 (CLS contract).
-        const input = {
-            src: props.src,
-            width: props.width,
-            height: props.height,
+        const common = {
             alt: props.alt,
             ...(props.sizes !== undefined ? { sizes: props.sizes } : {}),
             ...(props.widths !== undefined ? { widths: props.widths } : {}),
@@ -42,6 +39,19 @@ export function Image(props) {
             ...(props.loading !== undefined ? { loading: props.loading } : {}),
             ...(props.priority !== undefined ? { priority: props.priority } : {}),
         };
+        const input = typeof props.src === "string"
+            ? {
+                ...common,
+                src: props.src,
+                width: props.width ?? Number.NaN,
+                height: props.height ?? Number.NaN,
+            }
+            : {
+                ...common,
+                src: props.src,
+                ...(props.width !== undefined ? { width: props.width } : {}),
+                ...(props.height !== undefined ? { height: props.height } : {}),
+            };
         return toHtmlAttrs(resolveImage(input, props.loader));
     };
     return createComponent(Dynamic, mergeProps(rest, attrs, { component: "img" }));

package/dist/image.js.map

@@ -1 +1 @@
-{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAqC,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC7F,OAAO,EAAE,eAAe,EAAY,UAAU,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAqBtC;;;GAGG;AACH,MAAM,UAAU,KAAK,CAAC,KAA0B;IAC9C,sGAAsG;IACtG,iGAAiG;IACjG,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE;QACjC,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,UAAU;QACV,KAAK;QACL,OAAO;QACP,QAAQ;QACR,KAAK;QACL,OAAO;QACP,SAAS;KACV,CAAC,CAAA;IACF,MAAM,KAAK,GAAG,GAAmC,EAAE;QACjD,6FAA6F;QAC7F,oFAAoF;QACpF,MAAM,KAAK,GAAe;YACxB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE,CAAA;QACD,OAAO,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IACvD,CAAC,CAAA;IACD,OAAO,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AAChF,CAAC"}
+{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAIL,YAAY,EAEZ,WAAW,GACZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,eAAe,EAAY,UAAU,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAwBtC;;;GAGG;AACH,MAAM,UAAU,KAAK,CAAC,KAAsD;IAC1E,sGAAsG;IACtG,iGAAiG;IACjG,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE;QACjC,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,UAAU;QACV,KAAK;QACL,OAAO;QACP,QAAQ;QACR,KAAK;QACL,OAAO;QACP,SAAS;KACV,CAAC,CAAA;IACF,MAAM,KAAK,GAAG,GAAmC,EAAE;QACjD,6FAA6F;QAC7F,oFAAoF;QACpF,MAAM,MAAM,GAAG;YACb,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE,CAAA;QACD,MAAM,KAAK,GACT,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ;YAC3B,CAAC,CAAC;gBACE,GAAG,MAAM;gBACT,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,GAAG;gBAChC,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG;aACnC;YACH,CAAC,CAAC;gBACE,GAAG,MAAM;gBACT,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5D,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChE,CAAA;QACP,OAAO,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IACvD,CAAC,CAAA;IACD,OAAO,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AAChF,CAAC"}

package/dist/keep-alive.d.ts

@@ -9,7 +9,7 @@
  * in place, synchronously, so the DOM half runs right after each publish.
  */
 import type { MountRouterOptions } from "@nifrajs/web";
-import { type KeepAliveRouter, type KeepAliveTable } from "@nifrajs/web/keep-alive";
+import type { KeepAliveRouter, KeepAliveTable } from "@nifrajs/web/keep-alive";
 export * from "./client.js";
 export { onPageHide, onPageShow, usePageVisibility } from "./page-visibility.js";
 /** `mountRouter`'s options in a keep-alive app: the generated entry adds where the wrappers go. */

package/dist/keep-alive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keep-alive.d.ts","sourceRoot":"","sources":["../src/keep-alive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAe,MAAM,cAAc,CAAA;AACnE,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,yBAAyB,CAAA;AAOhC,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAEhF,mGAAmG;AACnG,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAA;IAChC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAA;CACnC;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAsChE"}
+{"version":3,"file":"keep-alive.d.ts","sourceRoot":"","sources":["../src/keep-alive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAe,MAAM,cAAc,CAAA;AAEnE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAY,MAAM,yBAAyB,CAAA;AAOxF,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAEhF,mGAAmG;AACnG,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAA;IAChC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAA;CACnC;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CA8BhE"}

package/dist/keep-alive.js

@@ -1,4 +1,4 @@
-import { createSlotParking, slotTree, } from "@nifrajs/web/keep-alive";
+import { keptMount } from "@nifrajs/web/internal/keep-alive-mount";
 import { createMemo, createSignal } from "solid-js";
 import { hydrate as solidHydrate } from "solid-js/web";
 import { setMountedRouter } from "./fetcher.js";
@@ -11,37 +11,29 @@ export { onPageHide, onPageShow, usePageVisibility } from "./page-visibility.js"
  * wrappers the server rendered), so hydration claims the document as it is.
  */
 export function mountRouter(options) {
-    const { router, routes, searchSchemas, container, keepAlive: table } = options;
+    const { router, searchSchemas, container } = options;
     const matchChains = options.matchChains ?? {};
     setMountedRouter(router);
-    const parking = createSlotParking();
-    let committed;
-    router.beforePublish((next) => parking.before(slotTree(next, matchChains, table, committed)));
+    const kept = keptMount(options);
     let current = [];
     let publish;
-    // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: the generated entry passes the element the server rendered the app into
     solidHydrate(() => {
         const [state, setState] = createSignal(router.snapshot());
         publish = (next) => setState(() => next);
         const tree = createMemo(() => {
-            current = slotTree(state(), matchChains, table, current);
+            current = kept.tree(state(), current);
             return current;
         });
         const mount = {
+            ...kept,
             propsOf: (of) => routeProps(of, searchSchemas, matchChains, (read) => createMemo(read)),
-            chainOf: (of) => routes[of.routeId] ?? [],
-            entry: parking.entry,
-            page: parking.page,
         };
         return KeepAliveView({ tree, shown: mount.propsOf(state), mount });
         // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: the generated entry passes the element the server rendered the app into
     }, container);
     // Solid has updated the document by the time a publish returns: park what it hid, restore what it
     // showed again.
-    const after = () => {
-        committed = current;
-        parking.after(current);
-    };
+    const after = () => kept.after(current);
     after();
     router.subscribe(() => {
         publish?.(router.snapshot());

package/dist/keep-alive.js.map

@@ -1 +1 @@
-{"version":3,"file":"keep-alive.js","sourceRoot":"","sources":["../src/keep-alive.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,iBAAiB,EAIjB,QAAQ,GACT,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,aAAa,EAA2B,MAAM,sBAAsB,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAQhF;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,OAA8B;IACxD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9E,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAA;IAC7C,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACxB,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAA;IACnC,IAAI,SAA0C,CAAA;IAC9C,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IAE7F,IAAI,OAAO,GAAwB,EAAE,CAAA;IACrC,IAAI,OAAmD,CAAA;IACvD,yIAAyI;IACzI,YAAY,CAAC,GAAG,EAAE;QAChB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QACzD,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;QACxC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE;YAC3B,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;YACxD,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,MAAM,KAAK,GAAuB;YAChC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACvF,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE;YACzC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAA;QACD,OAAO,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;QAClE,yIAAyI;IAC3I,CAAC,EAAE,SAAoB,CAAC,CAAA;IACxB,kGAAkG;IAClG,gBAAgB;IAChB,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,SAAS,GAAG,OAAO,CAAA;QACnB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC,CAAA;IACD,KAAK,EAAE,CAAA;IACP,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5B,KAAK,EAAE,CAAA;IACT,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"keep-alive.js","sourceRoot":"","sources":["../src/keep-alive.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,aAAa,EAA2B,MAAM,sBAAsB,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAQhF;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,OAA8B;IACxD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IACpD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAA;IAC7C,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACxB,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;IAE/B,IAAI,OAAO,GAAwB,EAAE,CAAA;IACrC,IAAI,OAAmD,CAAA;IACvD,YAAY,CAAC,GAAG,EAAE;QAChB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QACzD,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;QACxC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE;YAC3B,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAA;YACrC,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,MAAM,KAAK,GAAuB;YAChC,GAAG,IAAI;YACP,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACxF,CAAA;QACD,OAAO,aAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;QAClE,yIAAyI;IAC3I,CAAC,EAAE,SAAoB,CAAC,CAAA;IACxB,kGAAkG;IAClG,gBAAgB;IAChB,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC7C,KAAK,EAAE,CAAA;IACP,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5B,KAAK,EAAE,CAAA;IACT,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/dist/ppr.d.ts

@@ -1,3 +1,4 @@
+import { type HoleState } from "@nifrajs/web/internal/hole-runtime";
 import { type JSX } from "solid-js";
 /**
  * The fields of a route's boundary declaration a hole renders from. `fallback` is a function: JSX
@@ -9,14 +10,6 @@ export interface HoleDefinition<Data> {
     readonly fallback?: () => JSX.Element;
     readonly interactive?: boolean;
 }
-/** The slice of a boundary state a hole reads: `ppr` marks a hole the shared shell left open, and
- * `fill` that host's refill when the page reloads. */
-interface HoleState {
-    readonly status: "unresolved" | "pending" | "ready" | "error";
-    readonly data?: unknown;
-    readonly ppr?: true;
-    readonly fill?: unknown;
-}
 export interface HoleProps<Data> {
     readonly of: HoleDefinition<Data>;
     readonly state: HoleState | undefined;
@@ -24,7 +17,7 @@ export interface HoleProps<Data> {
     readonly error?: JSX.Element;
 }
 /**
- * Experimental: one `dynamic` or `shared` boundary of a partially prerendered page.
+ * One `dynamic` or `shared` boundary of a partially prerendered page.
  *
  * In a shared shell the hole is an empty host Solid never fills: the PPR runtime puts the server's
  * HTML into it, and an interactive hole then hydrates as its own root from the frame's props. When the
@@ -33,5 +26,4 @@ export interface HoleProps<Data> {
  * navigation the hole renders like any streamed boundary.
  */
 export declare function Hole<Data>(props: HoleProps<Data>): JSX.Element;
-export {};
 //# sourceMappingURL=ppr.d.ts.map

package/dist/ppr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ppr.d.ts","sourceRoot":"","sources":["../src/ppr.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,KAAK,GAAG,EAAW,MAAM,UAAU,CAAA;AAKzE;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,IAAI;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,OAAO,CAAA;IAC5C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED;sDACsD;AACtD,UAAU,SAAS;IACjB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;IAC7D,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAA;IACnB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CACxB;AAED,MAAM,WAAW,SAAS,CAAC,IAAI;IAC7B,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;IACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAAA;IACrC,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;CAC7B;AAiBD;;;;;;;;GAQG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CA4B9D"}
+{"version":3,"file":"ppr.d.ts","sourceRoot":"","sources":["../src/ppr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,oCAAoC,CAAA;AAChF,OAAO,EAA+B,KAAK,GAAG,EAAW,MAAM,UAAU,CAAA;AAKzE;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,IAAI;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,OAAO,CAAA;IAC5C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,MAAM,WAAW,SAAS,CAAC,IAAI;IAC7B,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;IACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAAA;IACrC,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;CAC7B;AAiBD;;;;;;;;GAQG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CA4B9D"}

package/dist/ppr.js

@@ -18,7 +18,7 @@ function openHost(hole, fill) {
     return clientHost(hole.name, hole.render, hole.interactive === true, attributes, fill);
 }
 /**
- * Experimental: one `dynamic` or `shared` boundary of a partially prerendered page.
+ * One `dynamic` or `shared` boundary of a partially prerendered page.
  *
  * In a shared shell the hole is an empty host Solid never fills: the PPR runtime puts the server's
  * HTML into it, and an interactive hole then hydrates as its own root from the frame's props. When the

package/dist/ppr.js.map

@@ -1 +1 @@
-{"version":3,"file":"ppr.js","sourceRoot":"","sources":["../src/ppr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ppr.js","sourceRoot":"","sources":["../src/ppr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAChF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAY,OAAO,EAAE,MAAM,UAAU,CAAA;AACzE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAoB5C;+DAC+D;AAC/D,SAAS,QAAQ,CAAO,IAA0B,EAAE,IAAmB;IACrE,MAAM,UAAU,GAAG,EAAE,iBAAiB,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAA;IACxE,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QACnC,OAAO,eAAe,CAAC,OAAO,EAAE;YAC9B,SAAS,EAAE,KAAK;YAChB,GAAG,UAAU;YACb,GAAG,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;SAClD,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;AACxF,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,IAAI,CAAO,KAAsB;IAC/C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,CAAA;IACxD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;IACvE,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE;QAC3B,wDAAwD;QACxD,IAAI,IAAI,EAAE;YAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAA;QAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAA;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;QACzB,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAChE,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO,KAAK,CAAC,KAAK,CAAA;QAChD,gJAAgJ;QAChJ,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAY,CAAC,CAAC,CAAA;QACnF,2FAA2F;QAC3F,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrE,OAAO,OAAO,CAAC,GAAG,EAAE,CAClB,eAAe,CAAC,CAAA,KAAW,CAAA,EAAE;YAC3B,0IAA0I;YAC1I,OAAO,EAAE,KAAK,CAAC,IAAY;YAC3B,IAAI,QAAQ;gBACV,OAAO,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAA;YAC1B,CAAC;YACD,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK;YAChC,QAAQ,EAAE,IAAI,CAAC,MAAM;SACtB,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;IACF,mNAAmN;IACnN,OAAO,IAA8B,CAAA;AACvC,CAAC"}

package/dist/query.d.ts

@@ -1,15 +1,22 @@
-import type { QueryClient, QueryOptions, QueryState } from "@nifrajs/web";
+import type { DehydratedState, InfiniteData, InfiniteQueryOptions, MutationCallbacks, MutationContext, MutationState, QueryClient, QueryOptions, QueryState } from "@nifrajs/web";
 /**
  * `@nifrajs/web-solid/query` - Solid bindings for the keyed query-cache. `createQuery(key, fn)` bridges a
  * query's `subscribe`/`snapshot` store into a Solid signal and fetches on mount; `useQueryClient`
  * exposes `invalidateQueries` for after a mutation. Imports only `solid-js` + `@nifrajs/web` (never
  * `solid-js/web`), so route components use it on the server *and* client. No JSX.
  *
- * The query client is created lazily **client-side only** (`typeof window`) - on the server the
- * accessor returns the idle/pending state (queries are client-first; loaders are the SSR data source).
+ * Without a provider, the query client is created lazily **client-side only** (`typeof window`) - on
+ * the server the accessor returns idle state and route loaders remain the data source. A
+ * `QueryClientProvider` can supply a request-scoped hydrated client.
  * The `key` is captured once (Solid setup runs once); a reactive key is a documented future enhancement.
  */
-import { type Accessor } from "solid-js";
+import { type Accessor, type JSX } from "solid-js";
+/** Provide a request-scoped client and optionally seed it before descendants run. */
+export declare function QueryClientProvider(props: {
+    readonly client: QueryClient;
+    readonly state?: DehydratedState;
+    readonly children?: JSX.Element;
+}): JSX.Element;
 /** Access the query client to imperatively `invalidateQueries(keyOrPrefix)` (e.g. after a mutation). */
 export declare function useQueryClient(): Pick<QueryClient, "invalidateQueries">;
 /** A query's reactive state accessor plus `refetch`. */
@@ -26,4 +33,36 @@ export interface CreateQueryResult<T> {
  * the live keys that refetch it.
  */
 export declare function createQuery<T>(key: unknown, fn: () => Promise<T>, options?: QueryOptions): CreateQueryResult<T>;
+/** A mutation result expressed as Solid accessors and imperative controls. */
+export interface CreateMutationResult<TData, TVariables> {
+    readonly state: Accessor<MutationState<TData, TVariables>>;
+    readonly isIdle: Accessor<boolean>;
+    readonly isPending: Accessor<boolean>;
+    readonly isError: Accessor<boolean>;
+    readonly isSuccess: Accessor<boolean>;
+    readonly mutate: (variables: TVariables) => void;
+    readonly mutateAsync: (variables: TVariables) => Promise<TData>;
+    readonly reset: () => void;
+    readonly cancel: () => void;
+}
+/** Bind a mutation to a Solid owner. Identity changes discard late results and callbacks. */
+export declare function createMutation<TData, TVariables = void>(fn: (variables: TVariables, context: MutationContext) => Promise<TData>, callbacks?: MutationCallbacks<TData, TVariables>): CreateMutationResult<TData, TVariables>;
+/** Options for a Solid infinite query. */
+export interface CreateInfiniteQueryOptions<T, P> extends InfiniteQueryOptions<T, P> {
+    readonly enabled?: boolean;
+}
+/** Infinite-query state and page controls expressed as Solid accessors. */
+export interface CreateInfiniteQueryResult<T, P> {
+    readonly state: Accessor<QueryState<InfiniteData<T, P>>>;
+    readonly isPending: Accessor<boolean>;
+    readonly isError: Accessor<boolean>;
+    readonly isSuccess: Accessor<boolean>;
+    readonly hasNextPage: Accessor<boolean>;
+    readonly hasPreviousPage: Accessor<boolean>;
+    readonly fetchNextPage: () => Promise<InfiniteData<T, P>>;
+    readonly fetchPreviousPage: () => Promise<InfiniteData<T, P>>;
+    readonly refetch: () => Promise<InfiniteData<T, P>>;
+}
+/** Bind a paged query to a Solid owner and fetch its first page on mount. */
+export declare function createInfiniteQuery<T, P>(key: unknown, fn: (pageParam: P) => Promise<T>, options: CreateInfiniteQueryOptions<T, P>): CreateInfiniteQueryResult<T, P>;
 //# sourceMappingURL=query.d.ts.map

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAQzE;;;;;;;;;GASG;AACH,OAAO,EAAE,KAAK,QAAQ,EAAoC,MAAM,UAAU,CAAA;AAE1E,wGAAwG;AACxG,wBAAgB,cAAc,IAAI,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAEvE;AAED,wDAAwD;AACxD,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,uGAAuG;IACvG,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IACvC,6CAA6C;IAC7C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;CACnC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAC3B,GAAG,EAAE,OAAO,EACZ,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,CAAC,EAAE,YAAY,GACrB,iBAAiB,CAAC,CAAC,CAAC,CActB"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}

package/dist/query.js

@@ -1,3 +1,4 @@
+import { createMutation as createMutationHandle } from "@nifrajs/web/client";
 import { createNoClientRefetch, fetchOnMount, getQueryClientSingleton, IDLE_QUERY_STATE, noop, } from "@nifrajs/web/internal/query-runtime";
 /**
  * `@nifrajs/web-solid/query` - Solid bindings for the keyed query-cache. `createQuery(key, fn)` bridges a
@@ -5,14 +6,30 @@ import { createNoClientRefetch, fetchOnMount, getQueryClientSingleton, IDLE_QUER
  * exposes `invalidateQueries` for after a mutation. Imports only `solid-js` + `@nifrajs/web` (never
  * `solid-js/web`), so route components use it on the server *and* client. No JSX.
  *
- * The query client is created lazily **client-side only** (`typeof window`) - on the server the
- * accessor returns the idle/pending state (queries are client-first; loaders are the SSR data source).
+ * Without a provider, the query client is created lazily **client-side only** (`typeof window`) - on
+ * the server the accessor returns idle state and route loaders remain the data source. A
+ * `QueryClientProvider` can supply a request-scoped hydrated client.
  * The `key` is captured once (Solid setup runs once); a reactive key is a documented future enhancement.
  */
-import { createSignal, onCleanup, onMount } from "solid-js";
+import { createComponent, createContext, createSignal, onCleanup, onMount, useContext, } from "solid-js";
+const QueryClientContext = createContext();
+function queryClientForCurrentTree() {
+    return useContext(QueryClientContext) ?? getQueryClientSingleton();
+}
+/** Provide a request-scoped client and optionally seed it before descendants run. */
+export function QueryClientProvider(props) {
+    if (props.state !== undefined)
+        props.client.hydrate(props.state);
+    return createComponent(QueryClientContext.Provider, {
+        value: props.client,
+        get children() {
+            return props.children;
+        },
+    });
+}
 /** Access the query client to imperatively `invalidateQueries(keyOrPrefix)` (e.g. after a mutation). */
 export function useQueryClient() {
-    return getQueryClientSingleton() ?? { invalidateQueries: noop };
+    return queryClientForCurrentTree() ?? { invalidateQueries: noop };
 }
 /**
  * Bind the keyed query for `key`, fetched via `fn`. Returns a reactive `state()` accessor + `refetch`.
@@ -21,7 +38,7 @@ export function useQueryClient() {
  * the live keys that refetch it.
  */
 export function createQuery(key, fn, options) {
-    const handle = getQueryClientSingleton()?.query(key, fn, options);
+    const handle = queryClientForCurrentTree()?.query(key, fn, options);
     const [state, setState] = createSignal(handle ? handle.snapshot() : IDLE_QUERY_STATE);
     if (handle !== undefined) {
         onCleanup(handle.subscribe(() => setState(() => handle.snapshot())));
@@ -33,4 +50,55 @@ export function createQuery(key, fn, options) {
         refetch: createNoClientRefetch("[nifra/web-solid]", "createQuery.refetch"),
     };
 }
+/** Bind a mutation to a Solid owner. Identity changes discard late results and callbacks. */
+export function createMutation(fn, callbacks = {}) {
+    const handle = createMutationHandle(fn, callbacks);
+    const [state, setState] = createSignal(handle.snapshot());
+    onCleanup(handle.subscribe(() => setState(() => handle.snapshot())));
+    return {
+        state,
+        isIdle: () => state().status === "idle",
+        isPending: () => state().status === "pending",
+        isError: () => state().status === "error",
+        isSuccess: () => state().status === "success",
+        mutate: (variables) => {
+            handle.mutate(variables).catch(noop);
+        },
+        mutateAsync: handle.mutate,
+        reset: handle.reset,
+        cancel: handle.cancel,
+    };
+}
+/** Bind a paged query to a Solid owner and fetch its first page on mount. */
+export function createInfiniteQuery(key, fn, options) {
+    const client = queryClientForCurrentTree();
+    const enabled = options.enabled !== false;
+    const handle = client?.infiniteQuery(key, fn, options);
+    const [state, setState] = createSignal(handle
+        ? handle.snapshot()
+        : // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: An idle query has no generic page data; the provider supplies the typed state before use.
+            IDLE_QUERY_STATE);
+    if (handle) {
+        onCleanup(handle.subscribe(() => setState(() => handle.snapshot())));
+        onMount(fetchOnMount(enabled ? handle : undefined));
+    }
+    const noClientAction = createNoClientRefetch("[nifra/web-solid]", "infinite query action");
+    return {
+        state,
+        isPending: () => state().status === "pending",
+        isError: () => state().status === "error",
+        isSuccess: () => state().status === "success",
+        hasNextPage: () => {
+            state();
+            return handle?.hasNextPage() ?? false;
+        },
+        hasPreviousPage: () => {
+            state();
+            return handle?.hasPreviousPage() ?? false;
+        },
+        fetchNextPage: handle?.fetchNextPage ?? noClientAction,
+        fetchPreviousPage: handle?.fetchPreviousPage ?? noClientAction,
+        refetch: handle?.refetch ?? noClientAction,
+    };
+}
 //# sourceMappingURL=query.js.map

package/dist/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,uBAAuB,EACvB,gBAAgB,EAChB,IAAI,GACL,MAAM,qCAAqC,CAAA;AAC5C;;;;;;;;;GASG;AACH,OAAO,EAAiB,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAE1E,wGAAwG;AACxG,MAAM,UAAU,cAAc;IAC5B,OAAO,uBAAuB,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAA;AACjE,CAAC;AAUD;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CACzB,GAAY,EACZ,EAAoB,EACpB,OAAsB;IAEtB,MAAM,MAAM,GAAG,uBAAuB,EAAE,EAAE,KAAK,CAAI,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;IACpE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,YAAY,CACpC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAC9C,CAAA;IACD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;QACpE,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAA;IAC3C,CAAC;IACD,OAAO;QACL,KAAK;QACL,OAAO,EAAE,qBAAqB,CAAI,mBAAmB,EAAE,qBAAqB,CAAC;KAC9E,CAAA;AACH,CAAC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}

package/dist/router.d.ts

@@ -8,6 +8,7 @@ import type { Blocker, BlockerFunction, BlockerState, NavigateFunction, RenderPr
  * reads the accessor `compose` provides on SSR + client mount alike. Imports only `solid-js`. No JSX.
  */
 import { type Accessor, type Context } from "solid-js";
+export { href, rawHref } from "@nifrajs/web/client";
 export { onPageHide, onPageShow, usePageVisibility } from "./page-visibility.js";
 export type { Blocker, BlockerFunction, BlockerState, NavigateFunction, UIMatch };
 export declare const SearchContext: Context<Accessor<Record<string, unknown>> | undefined>;
@@ -38,7 +39,7 @@ export declare function useMatches(): Accessor<readonly UIMatch[]>;
  * ```
  */
 export declare function useSearch<Schema extends StandardSchemaV1 | undefined = undefined>(): Accessor<Schema extends StandardSchemaV1 ? InferOutput<Schema> : Record<string, unknown>>;
-/** Get the {@link NavigateFunction} (a string path, a history delta, or a typed `{ to, search }` object).
+/** Get the {@link NavigateFunction} (an `Href` from `href()` or `rawHref()`, or a history delta).
  * Resolves the browser navigate at call time, so it works as soon as `installHistory` has run and no-ops
  * before then / on the server. */
 export declare function useNavigate(): NavigateFunction;

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAIzE,OAAO,KAAK,EACV,OAAO,EACP,eAAe,EACf,YAAY,EACZ,gBAAgB,EAGhB,WAAW,EACX,OAAO,EACR,MAAM,cAAc,CAAA;AAWrB;;;;;;GAMG;AACH,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,OAAO,EAMb,MAAM,UAAU,CAAA;AAGjB,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAChF,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAA;AAiBjF,eAAO,MAAM,aAAa,wDACoE,CAAA;AAO9F,eAAO,MAAM,kBAAkB,kCACuC,CAAA;AAKtE;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,SAAS,OAAO,EAAE,CAAC,CAIzD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,MAAM,SAAS,gBAAgB,GAAG,SAAS,GAAG,SAAS,KAAK,QAAQ,CAC5F,MAAM,SAAS,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAChF,CAIA;AAED;;kCAEkC;AAClC,wBAAgB,WAAW,IAAI,gBAAgB,CAO9C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,OAAO,GAAG,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,CAYpF"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAIzE,OAAO,KAAK,EACV,OAAO,EACP,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,OAAO,EACR,MAAM,cAAc,CAAA;AAOrB;;;;;;GAMG;AACH,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,OAAO,EAMb,MAAM,UAAU,CAAA;AAGjB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAChF,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAA;AAiBjF,eAAO,MAAM,aAAa,wDACoE,CAAA;AAO9F,eAAO,MAAM,kBAAkB,kCACuC,CAAA;AAKtE;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,SAAS,OAAO,EAAE,CAAC,CAIzD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,MAAM,SAAS,gBAAgB,GAAG,SAAS,GAAG,SAAS,KAAK,QAAQ,CAC5F,MAAM,SAAS,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAChF,CAIA;AAED;;kCAEkC;AAClC,wBAAgB,WAAW,IAAI,gBAAgB,CAE9C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,OAAO,GAAG,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,CAYpF"}

package/dist/router.js

@@ -1,8 +1,9 @@
 // `/client`, not the root - these are DOM values, and the root's graph carries the
 // server, which Vite's dev server evaluates rather than tree-shakes.
-import { getBrowserNavigate, IDLE_BLOCKER, registerBlocker, resolveNavigate, } from "@nifrajs/web/client";
+import { IDLE_BLOCKER, registerBlocker } from "@nifrajs/web/client";
 // Its own subpath, so an app that never calls `useMatches` never bundles it.
 import { chainMatches } from "@nifrajs/web/internal/matches-runtime";
+import { navigateNow } from "@nifrajs/web/internal/navigate-runtime";
 /**
  * `@nifrajs/web-solid/router` - Solid routing bindings over the agnostic `@nifrajs/web` history layer:
  * `useNavigate` (programmatic navigation), `useBlocker` (the unsaved-changes guard), and `useSearch`
@@ -12,6 +13,7 @@ import { chainMatches } from "@nifrajs/web/internal/matches-runtime";
  */
 import { createContext, createMemo, createSignal, onCleanup, useContext, } from "solid-js";
 import { PageContext } from "./page-visibility.js";
+export { href, rawHref } from "@nifrajs/web/client";
 export { onPageHide, onPageShow, usePageVisibility } from "./page-visibility.js";
 // Frozen empty search + a stable accessor for a `useSearch` used outside a nifra route tree.
 const EMPTY_SEARCH = Object.freeze({});
@@ -67,17 +69,11 @@ export function useMatches() {
 export function useSearch() {
     return (useContext(SearchContext) ?? EMPTY_SEARCH_ACCESSOR);
 }
-/** Get the {@link NavigateFunction} (a string path, a history delta, or a typed `{ to, search }` object).
+/** Get the {@link NavigateFunction} (an `Href` from `href()` or `rawHref()`, or a history delta).
  * Resolves the browser navigate at call time, so it works as soon as `installHistory` has run and no-ops
  * before then / on the server. */
 export function useNavigate() {
-    return ((to, options) => {
-        const navigate = getBrowserNavigate();
-        if (navigate === undefined)
-            return;
-        const resolved = resolveNavigate(to, options);
-        navigate(resolved.to, resolved.options);
-    });
+    return navigateNow;
 }
 /**
  * Guard navigation away from a page with unsaved work, confirming with your OWN async UI. Mirrors

package/dist/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAcA,mFAAmF;AACnF,qEAAqE;AACrE,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,MAAM,qBAAqB,CAAA;AAC5B,6EAA6E;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AACpE;;;;;;GAMG;AACH,OAAO,EAGL,aAAa,EACb,UAAU,EACV,YAAY,EACZ,SAAS,EACT,UAAU,GACX,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGhF,6FAA6F;AAC7F,MAAM,YAAY,GAAsC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AACzE,MAAM,qBAAqB,GAAsC,GAAG,EAAE,CAAC,YAAY,CAAA;AAEnF;;;;;;2BAM2B;AAC3B,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;AACxE,MAAM,iBAAiB,GAAG,UAEzB,CAAA;AACD,MAAM,CAAC,MAAM,aAAa,GACxB,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,aAAa,EAAqC,CAAA;AAC9F,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,aAAa,CAAA;AAEtD;sGACsG;AACtG,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;AACtE,MAAM,gBAAgB,GAAG,UAAyE,CAAA;AAClG,MAAM,CAAC,MAAM,kBAAkB,GAC7B,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,aAAa,EAAe,CAAA;AACtE,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAAA;AAEzD,MAAM,UAAU,GAAuB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAExD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,UAAU;IACxB,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAA;IAC5C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,GAAG,EAAE,CAAC,UAAU,CAAA;IAChD,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAA;AAC9C,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,SAAS;IAGvB,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,qBAAqB,CAEzD,CAAA;AACH,CAAC;AAED;;kCAEkC;AAClC,MAAM,UAAU,WAAW;IACzB,OAAO,CAAC,CAAC,EAAyC,EAAE,OAAyB,EAAE,EAAE;QAC/E,MAAM,QAAQ,GAAG,kBAAkB,EAAE,CAAA;QACrC,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAM;QAClC,MAAM,QAAQ,GAAG,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;QAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC,CAAqB,CAAA;AACxB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,UAAU,CAAC,WAAsC;IAC/D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,YAAY,CAAU,YAAY,CAAC,CAAA;IACjE,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACpC,SAAS,CACP,eAAe,CACb,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI;QACvB,CAAC,OAAO,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,EACvE,UAAU,CACX,CACF,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAYA,mFAAmF;AACnF,qEAAqE;AACrE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACnE,6EAA6E;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE;;;;;;GAMG;AACH,OAAO,EAGL,aAAa,EACb,UAAU,EACV,YAAY,EACZ,SAAS,EACT,UAAU,GACX,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGhF,6FAA6F;AAC7F,MAAM,YAAY,GAAsC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AACzE,MAAM,qBAAqB,GAAsC,GAAG,EAAE,CAAC,YAAY,CAAA;AAEnF;;;;;;2BAM2B;AAC3B,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;AACxE,MAAM,iBAAiB,GAAG,UAEzB,CAAA;AACD,MAAM,CAAC,MAAM,aAAa,GACxB,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,aAAa,EAAqC,CAAA;AAC9F,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,aAAa,CAAA;AAEtD;sGACsG;AACtG,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;AACtE,MAAM,gBAAgB,GAAG,UAAyE,CAAA;AAClG,MAAM,CAAC,MAAM,kBAAkB,GAC7B,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,aAAa,EAAe,CAAA;AACtE,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAAA;AAEzD,MAAM,UAAU,GAAuB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAExD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,UAAU;IACxB,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAA;IAC5C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,GAAG,EAAE,CAAC,UAAU,CAAA;IAChD,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAA;AAC9C,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,SAAS;IAGvB,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,qBAAqB,CAEzD,CAAA;AACH,CAAC;AAED;;kCAEkC;AAClC,MAAM,UAAU,WAAW;IACzB,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,UAAU,CAAC,WAAsC;IAC/D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,YAAY,CAAU,YAAY,CAAC,CAAA;IACjE,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACpC,SAAS,CACP,eAAe,CACb,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI;QACvB,CAAC,OAAO,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,EACvE,UAAU,CACX,CACF,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nifrajs/web-solid",
-  "version": "5.8.0",
+  "version": "5.10.0",
   "description": "Solid render adapter for @nifrajs/web - SSR + hydration, with the Solid Babel build plugin (@nifrajs/web-solid/plugin).",
   "keywords": [
     "bun",
@@ -132,16 +132,16 @@
   "dependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
-    "@nifrajs/core": "5.8.0",
-    "@nifrajs/web": "5.8.0",
+    "@nifrajs/core": "5.10.0",
+    "@nifrajs/web": "5.10.0",
     "babel-preset-solid": "^1.9.3",
     "solid-refresh": "^0.7.8"
   },
   "peerDependencies": {
     "@mdx-js/mdx": "^3",
     "solid-js": "^1.9.0",
-    "@nifrajs/i18n": "^5.8.0",
-    "@nifrajs/image": "^5.8.0"
+    "@nifrajs/i18n": "^5.10.0",
+    "@nifrajs/image": "^5.10.0"
   },
   "peerDependenciesMeta": {
     "@mdx-js/mdx": {

package/src/compose.ts

@@ -29,7 +29,9 @@ export function compose(chain: readonly unknown[], props: RenderProps): () => JS
         get data() {
           return props.layoutData?.[i] ?? null
         },
-        ...(props.boundaries !== undefined ? { boundaries: props.boundaries } : {}),
+        get boundaries() {
+          return props.boundaries
+        },
         children: child(),
       })
   }

package/src/fn.ts

@@ -8,8 +8,9 @@
  * "is it pending" has one answer rather than five that drift. This file contributes only a signal fed by the store.
  */
 
-import type { ClientServerFn, ServerFnReference } from "@nifrajs/web/fn"
+import type { ServerFnReference } from "@nifrajs/web/fn"
 import { createServerFnStore, type ServerFnState } from "@nifrajs/web/fn-state"
+import { clientServerFn } from "@nifrajs/web/internal/client-server-fn"
 import { type Accessor, createSignal, onCleanup } from "solid-js"
 
 /** A server function's state accessor plus the call itself. */
@@ -31,7 +32,7 @@ export interface ServerFnHandle<Input, Output> {
 export function useServerFn<Input, Output>(
   fn: ServerFnReference<Input, Output>,
 ): ServerFnHandle<Input, Output> {
-  const store = createServerFnStore(fn as ClientServerFn<Input, Output>)
+  const store = createServerFnStore(clientServerFn(fn))
   // Seeded from the store, not from the idle constant. They are the same value here - the store is
   // created one line up and cannot have moved - so this is correctness that does not depend on that
   // staying true. Svelte had exactly this line reading the constant, and when its subscription turned

package/src/image.ts

@@ -6,7 +6,14 @@
  * reactively (`splitProps`/`mergeProps`). Resizing is delegated to the `loader`; nifra bundles no codec.
  * No JSX (`createComponent`/`Dynamic`), so the package builds with plain `tsc`.
  */
-import { type ImageLoader, type ImageProps, resolveImage, toHtmlAttrs } from "@nifrajs/image"
+import {
+  type ImageInputProps,
+  type ImageLoader,
+  type ImageProps,
+  resolveImage,
+  type StaticImageProps,
+  toHtmlAttrs,
+} from "@nifrajs/image"
 import { createComponent, type JSX, mergeProps, splitProps } from "solid-js"
 import { Dynamic } from "solid-js/web"
 
@@ -29,11 +36,14 @@ export interface ImageComponentProps
   readonly loader?: ImageLoader
 }
 
+export type StaticImageComponentProps = StaticImageProps &
+  Omit<ImageComponentProps, "src" | "width" | "height">
+
 /**
- * Render a responsive, CLS-safe `<img>`. `width`+`height` are required (reserve layout space);
+ * Render a responsive, CLS-safe `<img>`. String URLs require dimensions; asset imports infer them;
  * `priority` marks the LCP image (`eager` + `fetchpriority="high"`). Extra DOM props pass through.
  */
-export function Image(props: ImageComponentProps): JSX.Element {
+export function Image(props: ImageComponentProps | StaticImageComponentProps): JSX.Element {
   // Separate the nifra-only props (not valid DOM attributes) from the DOM passthrough (`rest`), keeping
   // both reactive. `rest` carries class/style/id/handlers; the computed attrs are layered over it.
   const [, rest] = splitProps(props, [
@@ -51,10 +61,7 @@ export function Image(props: ImageComponentProps): JSX.Element {
   const attrs = (): ReturnType<typeof toHtmlAttrs> => {
     // Build ImageProps via conditional spreads (exactOptionalPropertyTypes: an unset optional is
     // absent, not `undefined`). resolveImage validates width/height > 0 (CLS contract).
-    const input: ImageProps = {
-      src: props.src,
-      width: props.width,
-      height: props.height,
+    const common = {
       alt: props.alt,
       ...(props.sizes !== undefined ? { sizes: props.sizes } : {}),
       ...(props.widths !== undefined ? { widths: props.widths } : {}),
@@ -62,6 +69,20 @@ export function Image(props: ImageComponentProps): JSX.Element {
       ...(props.loading !== undefined ? { loading: props.loading } : {}),
       ...(props.priority !== undefined ? { priority: props.priority } : {}),
     }
+    const input: ImageInputProps =
+      typeof props.src === "string"
+        ? {
+            ...common,
+            src: props.src,
+            width: props.width ?? Number.NaN,
+            height: props.height ?? Number.NaN,
+          }
+        : {
+            ...common,
+            src: props.src,
+            ...(props.width !== undefined ? { width: props.width } : {}),
+            ...(props.height !== undefined ? { height: props.height } : {}),
+          }
     return toHtmlAttrs(resolveImage(input, props.loader))
   }
   return createComponent(Dynamic, mergeProps(rest, attrs, { component: "img" }))

package/src/keep-alive.ts

@@ -9,13 +9,8 @@
  * in place, synchronously, so the DOM half runs right after each publish.
  */
 import type { MountRouterOptions, RouterState } from "@nifrajs/web"
-import {
-  createSlotParking,
-  type KeepAliveRouter,
-  type KeepAliveTable,
-  type SlotNode,
-  slotTree,
-} from "@nifrajs/web/keep-alive"
+import { keptMount } from "@nifrajs/web/internal/keep-alive-mount"
+import type { KeepAliveRouter, KeepAliveTable, SlotNode } from "@nifrajs/web/keep-alive"
 import { createMemo, createSignal } from "solid-js"
 import { hydrate as solidHydrate } from "solid-js/web"
 import { setMountedRouter } from "./fetcher.ts"
@@ -36,38 +31,30 @@ export interface KeepAliveMountOptions extends MountRouterOptions {
  * wrappers the server rendered), so hydration claims the document as it is.
  */
 export function mountRouter(options: KeepAliveMountOptions): void {
-  const { router, routes, searchSchemas, container, keepAlive: table } = options
+  const { router, searchSchemas, container } = options
   const matchChains = options.matchChains ?? {}
   setMountedRouter(router)
-  const parking = createSlotParking()
-  let committed: readonly SlotNode[] | undefined
-  router.beforePublish((next) => parking.before(slotTree(next, matchChains, table, committed)))
+  const kept = keptMount(options)
 
   let current: readonly SlotNode[] = []
   let publish: ((state: RouterState) => void) | undefined
-  // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: the generated entry passes the element the server rendered the app into
   solidHydrate(() => {
     const [state, setState] = createSignal(router.snapshot())
     publish = (next) => setState(() => next)
     const tree = createMemo(() => {
-      current = slotTree(state(), matchChains, table, current)
+      current = kept.tree(state(), current)
       return current
     })
     const mount: KeepAliveViewMount = {
+      ...kept,
       propsOf: (of) => routeProps(of, searchSchemas, matchChains, (read) => createMemo(read)),
-      chainOf: (of) => routes[of.routeId] ?? [],
-      entry: parking.entry,
-      page: parking.page,
     }
     return KeepAliveView({ tree, shown: mount.propsOf(state), mount })
     // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: the generated entry passes the element the server rendered the app into
   }, container as Element)
   // Solid has updated the document by the time a publish returns: park what it hid, restore what it
   // showed again.
-  const after = (): void => {
-    committed = current
-    parking.after(current)
-  }
+  const after = (): void => kept.after(current)
   after()
   router.subscribe(() => {
     publish?.(router.snapshot())

package/src/ppr.ts

@@ -1,4 +1,4 @@
-import { initialHtml } from "@nifrajs/web/internal/hole-runtime"
+import { type HoleState, initialHtml } from "@nifrajs/web/internal/hole-runtime"
 import { createComponent, createMemo, type JSX, untrack } from "solid-js"
 import { Dynamic, isServer } from "solid-js/web"
 import { Await } from "./await.ts"
@@ -15,15 +15,6 @@ export interface HoleDefinition<Data> {
   readonly interactive?: boolean
 }
 
-/** The slice of a boundary state a hole reads: `ppr` marks a hole the shared shell left open, and
- * `fill` that host's refill when the page reloads. */
-interface HoleState {
-  readonly status: "unresolved" | "pending" | "ready" | "error"
-  readonly data?: unknown
-  readonly ppr?: true
-  readonly fill?: unknown
-}
-
 export interface HoleProps<Data> {
   readonly of: HoleDefinition<Data>
   readonly state: HoleState | undefined
@@ -47,7 +38,7 @@ function openHost<Data>(hole: HoleDefinition<Data>, fill: () => unknown): JSX.El
 }
 
 /**
- * Experimental: one `dynamic` or `shared` boundary of a partially prerendered page.
+ * One `dynamic` or `shared` boundary of a partially prerendered page.
  *
  * In a shared shell the hole is an empty host Solid never fills: the PPR runtime puts the server's
  * HTML into it, and an interactive hole then hydrates as its own root from the frame's props. When the

package/src/query.ts

@@ -1,4 +1,16 @@
-import type { QueryClient, QueryOptions, QueryState } from "@nifrajs/web"
+import type {
+  DehydratedState,
+  InfiniteData,
+  InfiniteQueryOptions,
+  MutationCallbacks,
+  MutationContext,
+  MutationHandle,
+  MutationState,
+  QueryClient,
+  QueryOptions,
+  QueryState,
+} from "@nifrajs/web"
+import { createMutation as createMutationHandle } from "@nifrajs/web/client"
 import {
   createNoClientRefetch,
   fetchOnMount,
@@ -12,15 +24,46 @@ import {
  * exposes `invalidateQueries` for after a mutation. Imports only `solid-js` + `@nifrajs/web` (never
  * `solid-js/web`), so route components use it on the server *and* client. No JSX.
  *
- * The query client is created lazily **client-side only** (`typeof window`) - on the server the
- * accessor returns the idle/pending state (queries are client-first; loaders are the SSR data source).
+ * Without a provider, the query client is created lazily **client-side only** (`typeof window`) - on
+ * the server the accessor returns idle state and route loaders remain the data source. A
+ * `QueryClientProvider` can supply a request-scoped hydrated client.
  * The `key` is captured once (Solid setup runs once); a reactive key is a documented future enhancement.
  */
-import { type Accessor, createSignal, onCleanup, onMount } from "solid-js"
+import {
+  type Accessor,
+  createComponent,
+  createContext,
+  createSignal,
+  type JSX,
+  onCleanup,
+  onMount,
+  useContext,
+} from "solid-js"
+
+const QueryClientContext = createContext<QueryClient>()
+
+function queryClientForCurrentTree(): QueryClient | undefined {
+  return useContext(QueryClientContext) ?? getQueryClientSingleton()
+}
+
+/** Provide a request-scoped client and optionally seed it before descendants run. */
+export function QueryClientProvider(props: {
+  readonly client: QueryClient
+  readonly state?: DehydratedState
+  readonly children?: JSX.Element
+}): JSX.Element {
+  if (props.state !== undefined) props.client.hydrate(props.state)
+  return createComponent(QueryClientContext.Provider, {
+    value: props.client,
+    get children() {
+      return props.children
+    },
+  })
+}
 
 /** Access the query client to imperatively `invalidateQueries(keyOrPrefix)` (e.g. after a mutation). */
 export function useQueryClient(): Pick<QueryClient, "invalidateQueries"> {
-  return getQueryClientSingleton() ?? { invalidateQueries: noop }
+  return queryClientForCurrentTree() ?? { invalidateQueries: noop }
 }
 
 /** A query's reactive state accessor plus `refetch`. */
@@ -42,7 +85,7 @@ export function createQuery<T>(
   fn: () => Promise<T>,
   options?: QueryOptions,
 ): CreateQueryResult<T> {
-  const handle = getQueryClientSingleton()?.query<T>(key, fn, options)
+  const handle = queryClientForCurrentTree()?.query<T>(key, fn, options)
   const [state, setState] = createSignal<QueryState<T>>(
     handle ? handle.snapshot() : IDLE_QUERY_STATE,
   )
@@ -56,3 +99,99 @@ export function createQuery<T>(
     refetch: createNoClientRefetch<T>("[nifra/web-solid]", "createQuery.refetch"),
   }
 }
+
+/** A mutation result expressed as Solid accessors and imperative controls. */
+export interface CreateMutationResult<TData, TVariables> {
+  readonly state: Accessor<MutationState<TData, TVariables>>
+  readonly isIdle: Accessor<boolean>
+  readonly isPending: Accessor<boolean>
+  readonly isError: Accessor<boolean>
+  readonly isSuccess: Accessor<boolean>
+  readonly mutate: (variables: TVariables) => void
+  readonly mutateAsync: (variables: TVariables) => Promise<TData>
+  readonly reset: () => void
+  readonly cancel: () => void
+}
+
+/** Bind a mutation to a Solid owner. Identity changes discard late results and callbacks. */
+export function createMutation<TData, TVariables = void>(
+  fn: (variables: TVariables, context: MutationContext) => Promise<TData>,
+  callbacks: MutationCallbacks<TData, TVariables> = {},
+): CreateMutationResult<TData, TVariables> {
+  const handle: MutationHandle<TData, TVariables> = createMutationHandle(fn, callbacks)
+  const [state, setState] = createSignal(handle.snapshot())
+  onCleanup(handle.subscribe(() => setState(() => handle.snapshot())))
+  return {
+    state,
+    isIdle: () => state().status === "idle",
+    isPending: () => state().status === "pending",
+    isError: () => state().status === "error",
+    isSuccess: () => state().status === "success",
+    mutate: (variables) => {
+      handle.mutate(variables).catch(noop)
+    },
+    mutateAsync: handle.mutate,
+    reset: handle.reset,
+    cancel: handle.cancel,
+  }
+}
+
+/** Options for a Solid infinite query. */
+export interface CreateInfiniteQueryOptions<T, P> extends InfiniteQueryOptions<T, P> {
+  readonly enabled?: boolean
+}
+
+/** Infinite-query state and page controls expressed as Solid accessors. */
+export interface CreateInfiniteQueryResult<T, P> {
+  readonly state: Accessor<QueryState<InfiniteData<T, P>>>
+  readonly isPending: Accessor<boolean>
+  readonly isError: Accessor<boolean>
+  readonly isSuccess: Accessor<boolean>
+  readonly hasNextPage: Accessor<boolean>
+  readonly hasPreviousPage: Accessor<boolean>
+  readonly fetchNextPage: () => Promise<InfiniteData<T, P>>
+  readonly fetchPreviousPage: () => Promise<InfiniteData<T, P>>
+  readonly refetch: () => Promise<InfiniteData<T, P>>
+}
+
+/** Bind a paged query to a Solid owner and fetch its first page on mount. */
+export function createInfiniteQuery<T, P>(
+  key: unknown,
+  fn: (pageParam: P) => Promise<T>,
+  options: CreateInfiniteQueryOptions<T, P>,
+): CreateInfiniteQueryResult<T, P> {
+  const client = queryClientForCurrentTree()
+  const enabled = options.enabled !== false
+  const handle = client?.infiniteQuery<T, P>(key, fn, options)
+  const [state, setState] = createSignal<QueryState<InfiniteData<T, P>>>(
+    handle
+      ? handle.snapshot()
+      : // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: An idle query has no generic page data; the provider supplies the typed state before use.
+        (IDLE_QUERY_STATE as QueryState<InfiniteData<T, P>>),
+  )
+  if (handle) {
+    onCleanup(handle.subscribe(() => setState(() => handle.snapshot())))
+    onMount(fetchOnMount(enabled ? handle : undefined))
+  }
+  const noClientAction = createNoClientRefetch<InfiniteData<T, P>>(
+    "[nifra/web-solid]",
+    "infinite query action",
+  )
+  return {
+    state,
+    isPending: () => state().status === "pending",
+    isError: () => state().status === "error",
+    isSuccess: () => state().status === "success",
+    hasNextPage: () => {
+      state()
+      return handle?.hasNextPage() ?? false
+    },
+    hasPreviousPage: () => {
+      state()
+      return handle?.hasPreviousPage() ?? false
+    },
+    fetchNextPage: handle?.fetchNextPage ?? noClientAction,
+    fetchPreviousPage: handle?.fetchPreviousPage ?? noClientAction,
+    refetch: handle?.refetch ?? noClientAction,
+  }
+}

package/src/router.ts

@@ -1,27 +1,21 @@
 import type { InferOutput, StandardSchemaV1 } from "@nifrajs/core/server"
 // `import type` + a local re-export, NOT `export type { … } from "@nifrajs/web"`: that form leaves a
 // bare `import "@nifrajs/web"` in the output, which pulls the server graph into the browser under
-// Vite's dev server. Sourced from the ROOT so the generated `RouteSearch` augmentation applies.
+// Vite's dev server. Sourced from the ROOT so the generated `RouteTable` augmentation applies.
 import type {
   Blocker,
   BlockerFunction,
   BlockerState,
   NavigateFunction,
-  NavigateOptions,
-  NavigateTargetInput,
   RenderProps,
   UIMatch,
 } from "@nifrajs/web"
 // `/client`, not the root - these are DOM values, and the root's graph carries the
 // server, which Vite's dev server evaluates rather than tree-shakes.
-import {
-  getBrowserNavigate,
-  IDLE_BLOCKER,
-  registerBlocker,
-  resolveNavigate,
-} from "@nifrajs/web/client"
+import { IDLE_BLOCKER, registerBlocker } from "@nifrajs/web/client"
 // Its own subpath, so an app that never calls `useMatches` never bundles it.
 import { chainMatches } from "@nifrajs/web/internal/matches-runtime"
+import { navigateNow } from "@nifrajs/web/internal/navigate-runtime"
 /**
  * `@nifrajs/web-solid/router` - Solid routing bindings over the agnostic `@nifrajs/web` history layer:
  * `useNavigate` (programmatic navigation), `useBlocker` (the unsaved-changes guard), and `useSearch`
@@ -40,6 +34,7 @@ import {
 } from "solid-js"
 import { PageContext } from "./page-visibility.ts"
 
+export { href, rawHref } from "@nifrajs/web/client"
 export { onPageHide, onPageShow, usePageVisibility } from "./page-visibility.ts"
 export type { Blocker, BlockerFunction, BlockerState, NavigateFunction, UIMatch }
 
@@ -110,16 +105,11 @@ export function useSearch<Schema extends StandardSchemaV1 | undefined = undefine
   >
 }
 
-/** Get the {@link NavigateFunction} (a string path, a history delta, or a typed `{ to, search }` object).
+/** Get the {@link NavigateFunction} (an `Href` from `href()` or `rawHref()`, or a history delta).
  * Resolves the browser navigate at call time, so it works as soon as `installHistory` has run and no-ops
  * before then / on the server. */
 export function useNavigate(): NavigateFunction {
-  return ((to: string | number | NavigateTargetInput, options?: NavigateOptions) => {
-    const navigate = getBrowserNavigate()
-    if (navigate === undefined) return
-    const resolved = resolveNavigate(to, options)
-    navigate(resolved.to, resolved.options)
-  }) as NavigateFunction
+  return navigateNow
 }
 
 /**