lit-ui-router-ssr 0.6.0 → 0.8.0

package/README.md

@@ -24,14 +24,17 @@ imports the pre-1.0 renderer or re-derives the incantation.
   on the page carries `defer-hydration` and renders nothing until the client's walk reaches it.
 - **The hydration signature.** A page rendered from a template opens on a JSON data block,
   `<script type="application/json" data-lit-ui-router-ssr>`, naming this package's version, the
-  state the router stood on, and that state's url parameter values. A page `renderShell` returns
-  as a string is written as-is, without one.
+  state the router stood on, that state's url parameter values, and the resolved values
+  `dehydrate` or the `payload` hook draws. A page `renderShell` returns as a string is written as-is, without one.
 - **The lit render inside the emit loop.** The loop itself — verdict to file name, redirect to
   rules line, the `_redirects` file, delegating states skipped, tally, warnings for paths that
   matched nothing — is
   `prerender` from `ui-router-server/prerender`, which takes any render. This package's `prerender`
   supplies the lit one and takes the same options, plus `router`, `renderShell`, `document`,
-  `root` and `elementRenderers`. No SPA catch-all is ever written: one turns every 404 into a 200.
+  `root`, `elementRenderers`, `dehydrate`, `payload`, `responses` and `origin`. No SPA catch-all is ever written: one
+  turns every 404 into a 200.
+- **Response states after settle.** `responder` runs the handler bound to a response state's name
+  with the resolves its transition landed with.
 - **`<ui-view>` on both sides.** `UiViewRenderer` fills the element's light DOM on the server;
   `lit-ui-router-ssr/client` adopts what it drew.
 
@@ -48,7 +51,11 @@ npm install lit-ui-router-ssr
 `lit-ui-router`, `ui-router-server`, `@lit-labs/ssr`, `@lit-labs/ssr-client`, `lit`, and
 `@uirouter/core` are peer dependencies. `@lit-labs/ssr` is the server half and `@lit-labs/ssr-client`
 the client half, so a bundle takes one or the other, never both. `@lit-labs/ssr-client` is optional:
-install it when you import `lit-ui-router-ssr/client`.
+install it when you import `lit-ui-router-ssr/client`. `lit-ui-router-ssr/vite` wraps
+`ui-router-server/vite`, so it takes `vite` through that package's optional peer.
+
+The `lit-ui-router` peer is `^1.19.0`: the server renders a view through the helper `<ui-view>`
+renders through, and the client hands a served class element to the view it wakes.
 
 ## Quick Start
 
@@ -82,6 +89,14 @@ on. `dryRun: true` plans all of it and writes nothing.
 Files land through `node:fs`, imported lazily on first write; pass `write` to emit into memory or a
 virtual fs instead.
 
+## After `vite build`
+
+`lit-ui-router-ssr/vite` prerenders the built app after `vite build`. Its `serverRouterPlugin` is
+`ui-router-server/vite`'s, with the DOM shim and `lit-ui-router-ssr/register` loaded before the
+prerender script, and its `definePrerender` calls this package's `prerender` with the options the
+script returns; [Prerender with Vite](https://lit-ui-router.dev/guides/prerender-with-vite) shows
+both files in full.
+
 ## Static hosts add a trailing slash
 
 A shell page lands at `<subpath>/index.html`. Cloudflare Pages, Netlify, and S3-style hosts serve
@@ -125,6 +140,80 @@ A page fails to land in four ways, and each rejects rather than hangs:
 `settle()` never calls `router.start()`, which runs once per router: it drives `urlService`
 directly, so a page loop calls it once per path on the same router, started or not.
 
+## Response states
+
+A [response state](https://lit-ui-router.dev/packages/server#response-states) answers with a
+`Response` built from its resolves instead of a page. `responder(router, responses)` settles
+`router` on the verdict's subpath, query included, runs the handler bound to the landed state's
+name with that transition's resolves (inherited ones included) and the request, and returns the
+`Response` as built; a HEAD gets it without its body. A resolve that throws rejects before any
+handler runs. It fits the fetch adapter's `serveResponse`, and `prerender` takes the same handlers
+as `responses`, writing a 2xx body at the path its url spells or a 3xx as a rules line. See
+[response states](https://lit-ui-router.dev/packages/ssr#response-states).
+
+## Adopting the resolves on boot
+
+The `dehydrate` option draws each rendered page's resolve payload: `prerender` calls `dehydrate`
+from `ui-router-server/ssr` on the page's landed transition with the options given, so
+`shouldDehydrate` and `transport` act exactly as they do there. Pass `{}` to draw every resolve:
+
+```typescript
+import { prerender } from 'lit-ui-router-ssr';
+
+await prerender({
+  // mounts, router, paths, renderShell, …
+  dehydrate: {
+    shouldDehydrate: ({ token }) => token !== 'manifest',
+  },
+});
+```
+
+The payload's `resolves` go into the page's hydration signature, beside `version`, `state` and
+`params`, so the one block is the payload. `bootstrap()` seeds the boot transition from it before
+the router starts: each resolve the page was drawn with adopts its value in place of running its
+function. Every other resolve runs as it would without one: a value `dehydrate` left out, a
+`NOWAIT` resolve, every resolve of a boot that lands on another state or other parameters, and
+every resolve of a page whose block carries no `resolves`. Without `dehydrate` or a `payload` hook
+no page carries resolves. What `dehydrate` draws, and which values it leaves out, is in
+[its documentation](https://lit-ui-router.dev/packages/server#handing-resolves-to-the-client).
+
+A value plain JSON can't carry, such as a `Date`, travels through a transporter. Pass the same
+`transport` in `dehydrate` and to `bootstrap()`: the signature keeps the payload's `transported`
+marks, and `bootstrap()` hands `transport` to `seed`. See
+[values beyond plain JSON](https://lit-ui-router.dev/packages/server#values-beyond-plain-json).
+
+The `payload` option takes the drawing over by hand: a hook handed each page's landed transition
+returns the payload to write, or `undefined` to write none. Pass one or the other; passing both
+throws.
+
+```typescript
+import { dehydrate } from 'ui-router-server/ssr';
+
+await prerender({
+  // mounts, router, paths, renderShell, …
+  payload: (transition, { path }) =>
+    path.startsWith('/drafts/')
+      ? undefined
+      : dehydrate(transition, { transport }).payload,
+});
+```
+
+Each rendered page's entry in `result.pages` reports its payload as `payload`: `bytes`, what the
+payload adds to the page's signature as written, and, when `dehydrate` drew it, `unserializable`,
+the resolves left out to re-run on the client. A hook returns the payload alone, so behind one the
+report carries `bytes` only. A page with no payload has no `payload` field.
+
+```typescript
+const { pages } = await prerender({ /* … */ dehydrate: {} });
+
+for (const { path, payload } of pages) {
+  if (!payload) continue;
+  console.log(`${path}: ${payload.bytes} bytes of resolves`);
+  for (const { state, token } of payload.unserializable ?? [])
+    console.warn(`${path}: ${state}.${token} re-runs on the client`);
+}
+```
+
 ## The routed view, drawn on the server
 
 `elementRenderers` defaults to `[UiViewRenderer, LightElementRenderer]` — not `@lit-labs/ssr`'s
@@ -138,6 +227,20 @@ hydrates against. An address no state routes gets empty markers. That pair stays
 hydrating the view's surroundings reads it as the `uiViewSlot()` part and stops there; every marker
 between it carries a prefix, so the same walk reads past the view's interior.
 
+The template comes from `lit-ui-router`'s own render helper, the one `<ui-view>`'s `render()` calls,
+so the served markup and the client's first render share one source. A routed `LitElement` class,
+plain or `sticky`, prerenders too: `lit-ui-router` builds the element and assigns its props, and
+`LitElementRenderer` writes it, shadow root included, into the slot `<ui-view>` places a class in.
+At the wake the served view hands that element to `lit-ui-router`, which adopts it instead of
+building its own, so the element the server wrote is the element the client keeps. A class that
+renders into its own light DOM prerenders into it when it uses
+[`LightDomHydrating`](#light-dom-elements), and hydrates those nodes in place. Without it, the class
+is written as its bare element, with no shadow root to hide its render, and renders on the client. A
+class must be on the `customElements` registry to prerender.
+
+The served `<ui-view>` markup is internal to this package and `lit-ui-router` and changes with them.
+Post-processing of prerendered HTML keys on the [hydration signature](#the-client-half) block.
+
 The use site opts in with `uiViewSlot()`, which is what reaches the renderer's light-DOM render and
 commits nothing on the client:
 
@@ -295,23 +398,41 @@ await bootstrap(router, root, page(router));
 
 A `<ui-view>` another class already defined throws, naming both ways out.
 
-The build-time entry that calls `prerender()` imports `lit-ui-router-ssr/register` too, once the
-DOM shim has finished installing. The shim module awaits at its top level, so a static import beside
-it evaluates first: lit's Node build installs a registry of its own, the elements are defined there,
-and the shim then replaces `globalThis.customElements` with an empty one. Import the shim
-statically and everything that defines or reaches an element by dynamic import:
+The build-time entry that calls `prerender()` needs the DOM shim installed before anything defines
+an element. The shim module awaits at its top level, so a static import beside it evaluates first:
+lit's Node build installs a registry of its own, the elements are defined there, and the shim then
+replaces `globalThis.customElements` with an empty one. Load the shim and `lit-ui-router-ssr/register`
+before the entry starts. `serverRouterPlugin` from `lit-ui-router-ssr/vite` names both as preloads
+of its prerender worker, and its `definePrerender` calls `prerender()` with the options the entry
+returns:
 
 ```typescript
-import '@lit-labs/ssr/lib/install-global-dom-shim.js';
+// vite.config.ts
+import { createServerRouter } from 'ui-router-server';
+import { serverRouterPlugin } from 'lit-ui-router-ssr/vite';
+
+plugins: [
+  serverRouterPlugin(createServerRouter({ mounts }), {
+    prerender: './src/prerender.ts',
+  }),
+];
+
+// src/prerender.ts
+import { definePrerender } from 'lit-ui-router-ssr/vite';
 
-await import('lit-ui-router-ssr/register');
-const { UIRouterLit } = await import('lit-ui-router/pure');
-const { prerender, settle } = await import('lit-ui-router-ssr');
-const { page } = await import('./views.js');
+export default definePrerender((site) => ({
+  mounts,
+  router,
+  paths,
+  renderShell,
+  document,
+}));
 ```
 
-Preloading the shim with `node --import @lit-labs/ssr/lib/install-global-dom-shim.js` finishes it
-before the entry's graph starts, so static imports hold there too. `UiViewRenderer` draws the served
+The entry then uses plain static imports; see
+[Prerender with Vite](https://lit-ui-router.dev/guides/prerender-with-vite). An entry node runs
+directly gets the same order from `node --import @lit-labs/ssr/lib/install-global-dom-shim.js`.
+`UiViewRenderer` draws the served
 class, and a `<ui-view>` nothing defined on the server renders as an inert element with an empty
 part pair — no error, and every page's body missing. In development `prerender()` warns when the
 registry holds no `<ui-view>`.
@@ -362,15 +483,19 @@ const { outcome } = await bootstrap(router, root, page(router));
 - **The boot decides mismatches once.** A boot that lands where the document was drawn adopts every
   view, and a view that still mismatches warns in development: the two halves render that template
   differently. A boot that lands elsewhere — one static document served for a family of urls, or a
-  redirect — adopts the views that match and renders the rest cold without a warning each; once the
-  page is live, the development build warns once, naming both states and how many views rendered
-  cold.
-- **The boot transition takes a seed.** `options.payload` is handed to `seed()` from
+  redirect — adopts the views that match and renders the rest cold without a warning each. A view
+  whose state, or whose url parameters (its own and inherited), differ from the drawn ones renders
+  cold. Once the page is live, a boot into another state warns once in development, naming both
+  states and how many views rendered cold; a boot into other url parameters of the drawn state is
+  silent.
+- **The boot transition is seeded.** The payload the signature carries is handed to `seed()` from
   `ui-router-server/ssr/client` before the router starts, so the boot transition adopts the
-  resolved values a server render drew in place of running their resolve functions.
-- **`hydrateRoot()` is the step underneath.** An app that owns its own boot calls `router.start()`,
-  awaits the first successful transition, then `hydrateRoot(root, page(router))`, and renders
-  `page(router)` itself when that returns `false`.
+  resolved values the prerender drew in place of running their resolve functions.
+  `options.payload` takes its place when given.
+- **`hydrateRoot()` is the step underneath.** An app that owns its own boot calls
+  `seed(router, readResolvePayload(root))` and `router.start()`, awaits the first successful
+  transition, then `hydrateRoot(root, page(router))`, and renders `page(router)` itself when that
+  returns `false`.
 - **The signature decides first.** `hydrateRoot()` reads the container's hydration signature before
   it touches the document, and returns `false` over an emptied container when there is none — a
   cold client render, a dev server, a page from an earlier `prerender()`, a string `renderShell` —
@@ -500,6 +625,46 @@ the grid entirely.
 
 The [guide](https://lit-ui-router.dev/packages/ssr#how-this-compares) carries the longer discussion.
 
+## Measuring the round trip
+
+`lit-ui-router-ssr/testing` counts how many of the server's elements survive the boot. It imports
+nothing — no lit, no router — and runs anywhere there is a DOM. `stampServed(root)` takes every
+element under `root`, open shadow roots included, before the client boots; `countRetained(stamp)`
+returns `{ served, retained, removed, added }` after it. A hydrated page keeps `removed` at 0. A view
+the client rendered over counts its served elements as removed and its new ones as added; an element
+a component draws in `firstUpdated`, or the shadow `<slot>` each `<ui-router>` renders, counts only
+as added.
+
+```ts
+import { countRetained, stampServed } from 'lit-ui-router-ssr/testing';
+
+const stamp = stampServed(container); // after the prerender is parsed in, before bootstrap()
+await bootstrap(router, container, page(router));
+expect(countRetained(stamp)).toMatchObject({ removed: 0 });
+```
+
+In a browser the stamp and the count must run in the page. Each helper is self-contained, so its
+source text is valid page script. In Playwright, an init script stamps the body when parsing ends,
+before module scripts run:
+
+```ts
+import { countRetained, stampServed } from 'lit-ui-router-ssr/testing';
+
+await page.addInitScript(`
+  const stampServed = ${stampServed};
+  window.countRetained = ${countRetained};
+  document.addEventListener('readystatechange', () => {
+    if (document.readyState === 'interactive') window.servedStamp = stampServed(document.body);
+  });
+`);
+await page.goto('/sheet/7B/');
+await page.waitForFunction(() => !document.querySelector('[defer-hydration]'));
+
+expect(await page.evaluate('countRetained(servedStamp)')).toMatchObject({
+  removed: 0,
+});
+```
+
 ## Documentation
 
 - [Guide](https://lit-ui-router.dev/packages/ssr)

package/dist/client.d.ts

@@ -1,7 +1,7 @@
 import { renderLight } from "@lit-labs/ssr-client/directives/render-light.js";
 import type { RenderOptions } from "lit";
 import type { UIRouterLit } from "lit-ui-router/pure";
-import type { ResolvePayload } from "ui-router-server/ssr/client";
+import type { ResolvePayload, SeedOptions } from "ui-router-server/ssr/client";
 import type { HydrationSignature } from "./signature.js";
 export { adoptUiViewContext, type AdoptableView, type AdoptUiViewContext, type AdoptUiViewContextKey } from "./adopt-context.js";
 export { isServedViewClass, type ServedUiView, type ServedUiViewConstructor, servedViewBrand, withServedRender } from "./served-view.js";
@@ -12,7 +12,8 @@ export type { HydrationSignature } from "./signature.js";
 *
 * - `adopted`: the element hydrated its served nodes, and they are the live ones.
 * - `fell-back`: the served pair did not match the render the client booted
-*   into, or was lost; the view dropped the served interior and rendered cold.
+*   into, was drawn for another state or other url parameters, or was lost;
+*   the view dropped the served interior and rendered cold.
 * - `none`: nothing to adopt — an empty served pair, the address no state
 *   routed, or a view the document served no markers for.
 */
@@ -28,7 +29,7 @@ export declare const uiViewAdoptEventName: "ui-view:adopt";
 export interface UiViewAdoptDetail {
 	/** What the wake came to. */
 	readonly outcome: AdoptOutcome;
-	/** What `hydrate()` threw, or why the pair was lost; present only on `fell-back`. */
+	/** What `hydrate()` threw, or why the view did not adopt; present only on `fell-back`. */
 	readonly error?: unknown;
 }
 /**
@@ -135,6 +136,30 @@ export declare const lightSlot: typeof renderLight;
 */
 export declare function readHydrationSignature(container: ParentNode): HydrationSignature | null;
 /**
+* Reads the resolve payload `prerender()` wrote into the container's
+* {@link readHydrationSignature | hydration signature}: the state and url
+* parameters the document was drawn for, and the values its resolves settled
+* on, keyed by state name, then by resolve token.
+*
+* {@link bootstrap} reads it on its own. A boot that calls {@link hydrateRoot}
+* directly hands it to `seed` from `ui-router-server/ssr/client` before the
+* router starts.
+*
+* @example
+* ```ts
+* import { readResolvePayload } from 'lit-ui-router-ssr/client';
+* import { seed } from 'ui-router-server/ssr/client';
+*
+* seed(router, readResolvePayload(root));
+* router.start();
+* ```
+*
+* @param container - the element the server's markup was written into
+* @returns the payload, or `undefined` when the container holds no signature,
+* one from another release line of this package, or one without `resolves`
+*/
+export declare function readResolvePayload(container: ParentNode): ResolvePayload | undefined;
+/**
 * Adopts a server-rendered container, and the `<ui-view>`s that wake under it.
 *
 * The container's {@link readHydrationSignature | hydration signature} is read
@@ -181,11 +206,11 @@ export declare function readHydrationSignature(container: ParentNode): Hydration
 * way. The caller renders into it.
 *
 * {@link bootstrap} runs the whole boot around this call. Called directly, the
-* boot is the router first: `router.start()`, await its first successful
-* transition, then this call. The walk commits `.uiRouter` onto `<ui-router>`
-* and each woken `<ui-view>` re-seeks the router before its own first render,
-* so the views find the settled router rather than the placeholder they
-* registered against. Nothing constrains when `lit-ui-router-ssr/register` is
+* boot is the router first: `seed` the router with {@link readResolvePayload},
+* `router.start()`, await its first successful transition, then this call.
+* The walk commits `.uiRouter` onto `<ui-router>` and each woken `<ui-view>`
+* re-seeks the router before its own first render, so the views find the
+* settled router rather than the placeholder they registered against. Nothing constrains when `lit-ui-router-ssr/register` is
 * imported.
 *
 * @example
@@ -237,12 +262,16 @@ export interface BootstrapResult {
 	*/
 	readonly error?: unknown;
 }
-/** {@link bootstrap}'s options: {@link HydrateRootOptions}, plus the boot transition's seed. */
-export interface BootstrapOptions extends HydrateRootOptions {
+/**
+* {@link bootstrap}'s options: {@link HydrateRootOptions}, plus the boot
+* transition's seed and the `transport` handed to `seed` with it.
+*/
+export interface BootstrapOptions extends HydrateRootOptions, SeedOptions {
 	/**
 	* Resolved values the document was drawn with, handed to `seed` from
 	* `ui-router-server/ssr/client` before the router starts, so the boot
-	* transition adopts them in place of running their resolve functions.
+	* transition adopts them in place of running their resolve functions. It
+	* takes the place of the payload the container's signature carries.
 	*/
 	readonly payload?: ResolvePayload;
 }
@@ -250,9 +279,13 @@ export interface BootstrapOptions extends HydrateRootOptions {
 * Boots `router` into the page `container` holds, and resolves once that page
 * is live.
 *
-* It owns the whole client boot. `options.payload`, when given, seeds the boot
-* transition first. The container's {@link readHydrationSignature | signature}
-* is read before anything else touches the document; a container {@link
+* It owns the whole client boot. The boot transition is seeded first, with
+* `options.payload` when given, and otherwise with the resolves the
+* container's signature carries ({@link readResolvePayload}): each resolve the
+* document was drawn with adopts its value in place of running its function,
+* and every other resolve runs as it would without a payload. The
+* container's {@link readHydrationSignature | signature} is read before
+* anything else touches the document; a container {@link
 * hydrateRoot} would not adopt — no signature, another release line, stripped
 * markers — is emptied and `value` rendered into it at once, and the router
 * then starts. Otherwise the router starts, the call waits for the boot
@@ -266,9 +299,11 @@ export interface BootstrapOptions extends HydrateRootOptions {
 *   since that is a template the two halves render differently.
 * - The boot lands elsewhere — a static host serving one document for a
 *   family of urls, or a redirect: the views that match adopt, and the views
-*   that differ render cold without a warning of their own. Once the page is
-*   live, one development warning names both states and how many views
-*   rendered cold, when any did.
+*   that differ render cold without a warning of their own. A view whose
+*   state, or whose url parameters, its own and inherited, differ from the
+*   drawn ones renders cold. Once the page is live, a boot into another state
+*   warns once in development, naming both states and how many views rendered
+*   cold; a boot into other url parameters of the drawn state is silent.
 * - The boot fails, or the url starts no transition: the container is emptied
 *   and `value` rendered cold. The root `hydrate()` throwing, as over a
 *   mutated document, does the same. The call resolves rather than rejects.
@@ -288,7 +323,7 @@ export interface BootstrapOptions extends HydrateRootOptions {
 * @param router - the client router, its states registered and not yet started
 * @param container - the element the server's markup was written into, or an empty one
 * @param value - the same template the server rendered, with every `<ui-view>` hole empty
-* @param options - lit render options, `onAdopt`, and the boot transition's `payload`
+* @param options - lit render options, `onAdopt`, and the boot transition's `payload` and `transport`
 * @returns what the boot came to, once every awake view has updated
 * @throws what `router.start()` throws, as on a router already started
 * @throws the `TypeError` `seed` throws on a payload with no `resolves`, before the router starts

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","mappings":"AAQA,SAAS,mBAAmB;AAK5B,cAAyB,qBAAqB;AAM9C,cAAc,mBAAmB;AAEjC,cAAc,sBAAsB;AAOpC,cAAc,0BAA0B;AAExC,SACE,yBACK,oBACA,yBACA,6BACA;AAEP,SACE,wBACK,mBACA,yBACL,iBACA,wBACK;AAEP,SACE,wBACK,mCACA,+BACA,6BACA;AAEP,cAAc,0BAA0B;;;;;;;;;;AAcxC,YAAY,eAAe,YAAY,cAAc;;;;;AAMrD,OAAO,cAAM,sBAAuB;;;;AAKpC,iBAAiB,kBAAkB;;UAExB,SAAS;;UAET;AACX;;;;;AAMA,YAAY,mBAAmB,YAAY;;;;;;AAO3C,OAAO,cAAM,wBAAyB;;AAGtC,YAAY,qBAAqB,YAAY;;;;AAK7C,YAAY,iBACV,MAAM,SACN,SAAS,cAET;;;;;AAOF,iBAAiB,2BAA2B,cAAc;;;;;;CAMxD,UAAU;AACZ;eAEe;WACH,oBAAoB;;EAE5B,iBAAiB;;EAEjB,mBAAmB;CACrB;AACF;;;;;;;;;;;;;;;;;;;;;AAgEA,OAAO,cAAM,mBAAmB;;;;;;;;;;;;;;;AAgBhC,OAAO,cAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuY/B,OAAO,iBAAS,uBACd,WAAW,aACV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+IH,OAAO,iBAAS,YACd,WAAW,aAEX,gBACA,UAAS,qBACR;;AAsCH,YAAY,mBAAmB,YAAY;;;;;;;;;;;;;;;;AAiB3C,YAAY,qBAAqB,YAAY,cAAc;;AAG3D,iBAAiB,gBAAgB;;;;;;UAMtB,SAAS;;UAET,WAAW;;;;;UAKX;AACX;;AAGA,iBAAiB,yBAAyB,mBAAmB;;;;;;UAMlD,UAAU;AACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0JA,OAAO,iBAAe,UACpB,QAAQ,aACR,WAAW,aAEX,gBACA,UAAS,mBACR,QAAQ","names":[],"ignoreList":[],"sources":["../src/client.ts"]}
+{"version":3,"file":"client.d.ts","mappings":"AAQA,SAAS,mBAAmB;AAK5B,cAAyB,qBAAqB;AAM9C,cAAc,mBAAmB;AAEjC,cAAc,gBAAgB,mBAAmB;AAYjD,cAAc,0BAA0B;AAExC,SACE,yBACK,oBACA,yBACA,6BACA;AAEP,SACE,wBACK,mBACA,yBACL,iBACA,wBACK;AAEP,SACE,wBACK,mCACA,+BACA,6BACA;AAEP,cAAc,0BAA0B;;;;;;;;;;;AAexC,YAAY,eAAe,YAAY,cAAc;;;;;AAMrD,OAAO,cAAM,sBAAuB;;;;AAKpC,iBAAiB,kBAAkB;;UAExB,SAAS;;UAET;AACX;;;;;AAMA,YAAY,mBAAmB,YAAY;;;;;;AAO3C,OAAO,cAAM,wBAAyB;;AAGtC,YAAY,qBAAqB,YAAY;;;;AAK7C,YAAY,iBACV,MAAM,SACN,SAAS,cAET;;;;;AAOF,iBAAiB,2BAA2B,cAAc;;;;;;CAMxD,UAAU;AACZ;eAEe;WACH,oBAAoB;;EAE5B,iBAAiB;;EAEjB,mBAAmB;CACrB;AACF;;;;;;;;;;;;;;;;;;;;;AAgEA,OAAO,cAAM,mBAAmB;;;;;;;;;;;;;;;AAgBhC,OAAO,cAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgZ/B,OAAO,iBAAS,uBACd,WAAW,aACV;;;;;;;;;;;;;;;;;;;;;;;;AA6BH,OAAO,iBAAS,mBACd,WAAW,aACV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2JH,OAAO,iBAAS,YACd,WAAW,aAEX,gBACA,UAAS,qBACR;;AAsCH,YAAY,mBAAmB,YAAY;;;;;;;;;;;;;;;;AAiB3C,YAAY,qBAAqB,YAAY,cAAc;;AAG3D,iBAAiB,gBAAgB;;;;;;UAMtB,SAAS;;UAET,WAAW;;;;;UAKX;AACX;;;;;AAMA,iBAAiB,yBAAyB,oBAAoB,YAAY;;;;;;;UAO/D,UAAU;AACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6LA,OAAO,iBAAe,UACpB,QAAQ,aACR,WAAW,aAEX,gBACA,UAAS,mBACR,QAAQ","names":[],"ignoreList":[],"sources":["../src/client.ts"]}

package/dist/client.js

@@ -11,7 +11,7 @@ import "#dev-gate";
 import { adoptUiViewContext } from "./adopt-context.js";
 import { isLightDomElement } from "./light-dom-brand.js";
 import { servedMarkerPrefix } from "./served-markers.js";
-import { packageVersion, routeOf, signatureSelector } from "./signature.js";
+import { packageVersion, routeOf, signatureSelector, urlParamsOf } from "./signature.js";
 export { adoptUiViewContext } from "./adopt-context.js";
 export { isServedViewClass, servedViewBrand, withServedRender } from "./served-view.js";
 export { LightDomHydrating } from "./light-dom.js";
@@ -125,6 +125,10 @@ const adopt = (view, policy) => {
 		return report(view, reporter, "fell-back", error);
 	}
 	if (isPart(open.nextSibling, "/lit-part")) return report(view, reporter, "none");
+	if (policy.drawn && !policy.drawn(view)) {
+		clearInterior(open);
+		return report(view, reporter, "fell-back", notDrawn);
+	}
 	try {
 		revealServedMarkers(view);
 		walkWith(policy, () => hydrate(view.render(), view, view.renderOptions));
@@ -165,6 +169,13 @@ export function readHydrationSignature(container) {
 	const block = signatureBlockIn(container);
 	return block ? parseSignature(block.text) : null;
 }
+export function readResolvePayload(container) {
+	return payloadIn(readHydrationSignature(container));
+}
+const payloadIn = (signature) => {
+	if (signature?.resolves === void 0 || releaseLine(signature.version) !== releaseLine(packageVersion)) return void 0;
+	return signature;
+};
 const signatureBlockIn = (container) => [...container.children].find((child) => child.matches(signatureSelector));
 const precedesRender = (block) => {
 	let node = block.nextSibling;
@@ -237,6 +248,14 @@ const startBoot = (router) => new Promise((resolve) => {
 	}
 	if (!created) land({});
 });
+const notDrawn = "the view was drawn for another state or other url parameters";
+const drawnView = (signature, router) => (view) => {
+	if (!(view instanceof UiView) || !view.viewContext) return true;
+	const state = view.viewContext;
+	if (!router.stateRegistry.get(String(signature.state))?.$$state?.().path.includes(state)) return false;
+	const drawnParams = signature.params ?? {};
+	return Object.entries(urlParamsOf(state, router.globals.params)).every(([id, value]) => JSON.stringify(value) === JSON.stringify(drawnParams[id]));
+};
 const signatureMatches = (signature, router) => JSON.stringify([signature.state, signature.params]) === JSON.stringify(routeOf(router.globals));
 const settleViews = async (container) => {
 	const settled = new Set();
@@ -252,11 +271,11 @@ const renderCold = (container, value, renderOptions) => {
 	render(value, container, renderOptions);
 };
 export async function bootstrap(router, container, value, options = {}) {
-	const { onAdopt, payload, ...renderOptions } = options;
-	const disarm = seed(router, payload);
+	const { onAdopt, payload, transport, ...renderOptions } = options;
+	const served = readHydrationSignature(container);
+	const disarm = seed(router, payload ?? payloadIn(served), { transport });
 	const signature = readAdoptable(container);
 	if (!signature) {
-		const served = readHydrationSignature(container);
 		renderCold(container, value, renderOptions);
 		const landing = await startBoot(router);
 		disarm();
@@ -287,9 +306,13 @@ export async function bootstrap(router, container, value, options = {}) {
 	};
 	let release;
 	try {
-		release = adoptRoot(container, value, renderOptions, {
+		release = adoptRoot(container, value, renderOptions, drawn ? {
+			reporter,
+			quiet: false
+		} : {
 			reporter,
-			quiet: !drawn
+			quiet: true,
+			drawn: drawnView(signature, router)
 		});
 	} catch (error) {
 		render(value, container, renderOptions);
@@ -302,7 +325,7 @@ export async function bootstrap(router, container, value, options = {}) {
 	}
 	await settleViews(container);
 	release();
-	if (!drawn && fellBack > 0);
+	if (fellBack > 0 && signature.state !== router.globals.current.name);
 	return {
 		outcome: "adopted",
 		signature: compared

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","mappings":"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","names":[],"ignoreList":[],"sources":["../src/client.ts"]}
+{"version":3,"file":"client.js","mappings":"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","names":[],"ignoreList":[],"sources":["../src/client.ts"]}

package/dist/development/client.js

@@ -11,7 +11,7 @@ import { devGate } from "#dev-gate";
 import { adoptUiViewContext } from "./adopt-context.js";
 import { isLightDomElement } from "./light-dom-brand.js";
 import { servedMarkerPrefix } from "./served-markers.js";
-import { packageVersion, routeOf, signatureSelector } from "./signature.js";
+import { packageVersion, routeOf, signatureSelector, urlParamsOf } from "./signature.js";
 export { adoptUiViewContext } from "./adopt-context.js";
 export { isServedViewClass, servedViewBrand, withServedRender } from "./served-view.js";
 export { LightDomHydrating } from "./light-dom.js";
@@ -134,6 +134,10 @@ const adopt = (view, policy) => {
 		return report(view, reporter, "fell-back", error);
 	}
 	if (isPart(open.nextSibling, "/lit-part")) return report(view, reporter, "none");
+	if (policy.drawn && !policy.drawn(view)) {
+		clearInterior(open);
+		return report(view, reporter, "fell-back", notDrawn);
+	}
 	try {
 		revealServedMarkers(view);
 		walkWith(policy, () => hydrate(view.render(), view, view.renderOptions));
@@ -175,6 +179,13 @@ export function readHydrationSignature(container) {
 	const block = signatureBlockIn(container);
 	return block ? parseSignature(block.text) : null;
 }
+export function readResolvePayload(container) {
+	return payloadIn(readHydrationSignature(container));
+}
+const payloadIn = (signature) => {
+	if (signature?.resolves === void 0 || releaseLine(signature.version) !== releaseLine(packageVersion)) return void 0;
+	return signature;
+};
 const signatureBlockIn = (container) => [...container.children].find((child) => child.matches(signatureSelector));
 const precedesRender = (block) => {
 	let node = block.nextSibling;
@@ -256,6 +267,14 @@ const startBoot = (router) => new Promise((resolve) => {
 	}
 	if (!created) land({});
 });
+const notDrawn = "the view was drawn for another state or other url parameters";
+const drawnView = (signature, router) => (view) => {
+	if (!(view instanceof UiView) || !view.viewContext) return true;
+	const state = view.viewContext;
+	if (!router.stateRegistry.get(String(signature.state))?.$$state?.().path.includes(state)) return false;
+	const drawnParams = signature.params ?? {};
+	return Object.entries(urlParamsOf(state, router.globals.params)).every(([id, value]) => JSON.stringify(value) === JSON.stringify(drawnParams[id]));
+};
 const signatureMatches = (signature, router) => JSON.stringify([signature.state, signature.params]) === JSON.stringify(routeOf(router.globals));
 const warnBootElsewhere = (signature, router, fellBack) => {
 	if (!devGate()) return;
@@ -275,11 +294,11 @@ const renderCold = (container, value, renderOptions) => {
 	render(value, container, renderOptions);
 };
 export async function bootstrap(router, container, value, options = {}) {
-	const { onAdopt, payload, ...renderOptions } = options;
-	const disarm = seed(router, payload);
+	const { onAdopt, payload, transport, ...renderOptions } = options;
+	const served = readHydrationSignature(container);
+	const disarm = seed(router, payload ?? payloadIn(served), { transport });
 	const signature = readAdoptable(container);
 	if (!signature) {
-		const served = readHydrationSignature(container);
 		renderCold(container, value, renderOptions);
 		const landing = await startBoot(router);
 		disarm();
@@ -310,9 +329,13 @@ export async function bootstrap(router, container, value, options = {}) {
 	};
 	let release;
 	try {
-		release = adoptRoot(container, value, renderOptions, {
+		release = adoptRoot(container, value, renderOptions, drawn ? {
+			reporter,
+			quiet: false
+		} : {
 			reporter,
-			quiet: !drawn
+			quiet: true,
+			drawn: drawnView(signature, router)
 		});
 	} catch (error) {
 		render(value, container, renderOptions);
@@ -325,7 +348,7 @@ export async function bootstrap(router, container, value, options = {}) {
 	}
 	await settleViews(container);
 	release();
-	if (!drawn && fellBack > 0) warnBootElsewhere(signature, router, fellBack);
+	if (fellBack > 0 && signature.state !== router.globals.current.name) warnBootElsewhere(signature, router, fellBack);
 	return {
 		outcome: "adopted",
 		signature: compared