@ultimat3/cli 29.0.0 → 29.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ultimat3/cli",
-  "version": "29.0.0",
+  "version": "29.1.0",
   "description": "The `x` binary: new, dev, build, verify, generate, db, mcp, doctor, deploy",
   "license": "MIT",
   "type": "module",
@@ -39,33 +39,33 @@
   },
   "dependencies": {
     "@babel/core": "^8.0.7",
-    "@ultimat3/action": "29.0.0",
-    "@ultimat3/admin": "29.0.0",
-    "@ultimat3/ai": "29.0.0",
-    "@ultimat3/auth": "29.0.0",
-    "@ultimat3/cache": "29.0.0",
-    "@ultimat3/core": "29.0.0",
-    "@ultimat3/db": "29.0.0",
-    "@ultimat3/entity": "29.0.0",
-    "@ultimat3/flags": "29.0.0",
-    "@ultimat3/http": "29.0.0",
-    "@ultimat3/i18n": "29.0.0",
-    "@ultimat3/jobs": "29.0.0",
-    "@ultimat3/mail": "29.0.0",
-    "@ultimat3/manifest": "29.0.0",
-    "@ultimat3/mcp": "29.0.0",
-    "@ultimat3/money": "29.0.0",
-    "@ultimat3/notify": "29.0.0",
-    "@ultimat3/policy": "29.0.0",
-    "@ultimat3/pwa": "29.0.0",
-    "@ultimat3/query": "29.0.0",
-    "@ultimat3/realtime": "29.0.0",
-    "@ultimat3/render": "29.0.0",
-    "@ultimat3/schema": "29.0.0",
-    "@ultimat3/seo": "29.0.0",
-    "@ultimat3/storage": "29.0.0",
-    "@ultimat3/testing": "29.0.0",
-    "@ultimat3/time": "29.0.0",
+    "@ultimat3/action": "29.1.0",
+    "@ultimat3/admin": "29.1.0",
+    "@ultimat3/ai": "29.1.0",
+    "@ultimat3/auth": "29.1.0",
+    "@ultimat3/cache": "29.1.0",
+    "@ultimat3/core": "29.1.0",
+    "@ultimat3/db": "29.1.0",
+    "@ultimat3/entity": "29.1.0",
+    "@ultimat3/flags": "29.1.0",
+    "@ultimat3/http": "29.1.0",
+    "@ultimat3/i18n": "29.1.0",
+    "@ultimat3/jobs": "29.1.0",
+    "@ultimat3/mail": "29.1.0",
+    "@ultimat3/manifest": "29.1.0",
+    "@ultimat3/mcp": "29.1.0",
+    "@ultimat3/money": "29.1.0",
+    "@ultimat3/notify": "29.1.0",
+    "@ultimat3/policy": "29.1.0",
+    "@ultimat3/pwa": "29.1.0",
+    "@ultimat3/query": "29.1.0",
+    "@ultimat3/realtime": "29.1.0",
+    "@ultimat3/render": "29.1.0",
+    "@ultimat3/schema": "29.1.0",
+    "@ultimat3/seo": "29.1.0",
+    "@ultimat3/storage": "29.1.0",
+    "@ultimat3/testing": "29.1.0",
+    "@ultimat3/time": "29.1.0",
     "babel-preset-solid": "^1.9.16"
   }
 }

package/src/page-navigation.ts

@@ -11,10 +11,14 @@ import type { Ctx, NavigationSurface } from '@ultimat3/core';
 import { CLIENT_NAVIGATION_SCOPE_HEADER } from '@ultimat3/core';
 import type { Route, RouteNavigation, UltimateRequest } from '@ultimat3/http';
 import { locationFor, navigationPurpose, relocate } from '@ultimat3/http';
+import type { Translator } from '@ultimat3/i18n';
 import type { ClientNavigationHead, HeadTag, RouteEntry } from '@ultimat3/render';
 import {
   clientNavigationTags,
   documentCarriesScope,
+  modalRouteList,
+  navigationModeOf,
+  navigationPrefetches,
   RouteNavigationInvalidError,
   routeEntries,
 } from '@ultimat3/render';
@@ -36,6 +40,11 @@ export interface NavigationDocumentHead {
   readonly buildId: string;
   /** `app.config.ts`'s `name`: two apps on one origin (web and admin) are two routers. */
   readonly app: string;
+  /**
+   * Per opted-in surface, its modal routes as `modalRouteList` orders them — what lets a click
+   * open the dialog before the answer. Absent or empty: the documents name none.
+   */
+  readonly modalRoutes?: ReadonlyMap<string, readonly string[]>;
 }
 
 export interface PageNavigation {
@@ -71,7 +80,7 @@ export function assertRouteNavigation(
   entries: readonly RouteEntry[] = routeEntries(),
 ): void {
   for (const entry of entries) {
-    const mode = entry.config.navigation;
+    const mode = navigationModeOf(entry.config.navigation);
     if (mode === undefined || surfaces.some((surface) => surface === entry.surface)) continue;
     throw new RouteNavigationInvalidError(
       `${entry.file} declares navigation: '${mode}', and its surface (${entry.surface}) is not in app.config.ts navigation.client`,
@@ -79,6 +88,28 @@ export function assertRouteNavigation(
   }
 }
 
+/**
+ * Each opted-in surface's modal routes, from the whole table: a page of ANY surface may outrank a
+ * modal pattern on the shared URL space, and the router must not open a frame the server will
+ * answer with that page.
+ */
+export function modalRoutesOf(
+  surfaces: readonly NavigationSurface[],
+  entries: readonly RouteEntry[] = routeEntries(),
+): ReadonlyMap<string, readonly string[]> {
+  return new Map(
+    surfaces.map((surface) => [
+      surface,
+      modalRouteList(
+        entries.map((entry) => ({
+          path: entry.path,
+          modal: entry.surface === surface && navigationModeOf(entry.config.navigation) === 'modal',
+        })),
+      ),
+    ]),
+  );
+}
+
 /**
  * Built at boot, never on the watcher tick — the router is framework code, and a tab that loaded
  * it keeps it across every soft navigation, so a URL that changed per save would be one no tab
@@ -109,6 +140,7 @@ export async function pageNavigation(
       scriptUrl: script.url,
       buildId,
       app: declared.app,
+      modalRoutes: modalRoutesOf(declared.surfaces),
     },
   };
 }
@@ -117,13 +149,25 @@ export async function pageNavigation(
 export const surfaceKey = (head: NavigationDocumentHead, surface: string): string =>
   `${head.app}:${surface}`;
 
-/** The head for one document, or `undefined` when its surface did not opt in. */
+/**
+ * The head for one document, or `undefined` when its surface did not opt in. With `t`, and modal
+ * routes on the surface, it names them and the frame's two words in the document's own locale
+ * (the framework catalog's `ui.close` and `ui.loading`, which an app may override).
+ */
 export function navigationHeadFor(
   head: NavigationDocumentHead | undefined,
   surface: string,
+  t?: Translator,
 ): ClientNavigationHead | undefined {
   if (head === undefined || !head.surfaces.has(surface)) return undefined;
-  return { surface: surfaceKey(head, surface), buildId: head.buildId, scriptUrl: head.scriptUrl };
+  const base = {
+    surface: surfaceKey(head, surface),
+    buildId: head.buildId,
+    scriptUrl: head.scriptUrl,
+  };
+  const routes = head.modalRoutes?.get(surface) ?? [];
+  if (t === undefined || routes.length === 0) return base;
+  return { ...base, modals: { routes, close: t('ui.close'), loading: t('ui.loading') } };
 }
 
 /**
@@ -137,15 +181,15 @@ export function navigationHeadFor(
 export function navigationTagsOf(
   head: NavigationDocumentHead | undefined,
   entry: Pick<RouteEntry, 'surface' | 'config'>,
+  t?: Translator,
 ): readonly HeadTag[] {
-  if (entry.config.navigation === 'document') return [];
-  const tags = navigationHeadFor(head, entry.surface);
+  const mode = navigationModeOf(entry.config.navigation);
+  if (mode === 'document') return [];
+  const tags = navigationHeadFor(head, entry.surface, t);
   if (tags === undefined) return [];
   // A modal says so in its own document: the router shows it over the page beneath, never decided
   // from a link — a redirect's target and a pasted `#/…` address are answered alike.
-  return clientNavigationTags(
-    entry.config.navigation === 'modal' ? { ...tags, modal: true } : tags,
-  );
+  return clientNavigationTags(mode === 'modal' ? { ...tags, modal: true } : tags);
 }
 
 /** `{ navigation }` for `metaOf`'s spread, or nothing. */
@@ -167,10 +211,10 @@ export function routeNavigationOf(
   head: NavigationDocumentHead | undefined,
 ): RouteNavigation | undefined {
   if (head === undefined || !head.surfaces.has(entry.surface)) return undefined;
-  if (entry.config.navigation === 'document') return undefined;
+  if (navigationModeOf(entry.config.navigation) === 'document') return undefined;
   return {
     surface: surfaceKey(head, entry.surface),
-    prefetch: entry.config.navigation === 'prefetch',
+    prefetch: navigationPrefetches(entry.config.navigation),
   };
 }
 

package/src/page-speculation.ts

@@ -12,6 +12,8 @@ import type { AppLocaleSet } from '@ultimat3/i18n/app-catalogs';
 import type { RouteDescriptor, RouteEntry } from '@ultimat3/render';
 import {
   describePages,
+  navigationModeOf,
+  navigationPrefetches,
   renderHead,
   routeEntries,
   speculationPattern,
@@ -37,8 +39,9 @@ export async function loadSpeculation(root: string): Promise<SpeculationConfig>
  *   no policy, no `no-store`. Such a page ran its `load` at build time, for nobody. An `ssr` page
  *   there has no way to declare that its GET records something (`navigation` is refused on a
  *   surface that did not opt in), so it is never a candidate.
- * - On a client-routed surface: only a page that declared `navigation: 'prefetch'` — the app's own
- *   statement that its GET is a pure read, the same one the router's prefetch obeys.
+ * - On a client-routed surface: only a page that declared `navigation: 'prefetch'` (or a modal
+ *   that declared `prefetch: 'intent'`) — the app's own statement that its GET is a pure read,
+ *   the same one the router's prefetch obeys.
  * - Never an `api/` route, a `navigation: 'document'` page, or an `offline: 'network-only'` one.
  */
 export function speculationCandidate(
@@ -47,8 +50,9 @@ export function speculationCandidate(
   client: ReadonlySet<string>,
 ): boolean {
   if (entry.surface !== 'site' && entry.surface !== 'app') return false;
-  if (entry.config.navigation === 'document' || described.offline === 'network-only') return false;
-  if (client.has(entry.surface)) return entry.config.navigation === 'prefetch';
+  const mode = navigationModeOf(entry.config.navigation);
+  if (mode === 'document' || described.offline === 'network-only') return false;
+  if (client.has(entry.surface)) return navigationPrefetches(entry.config.navigation);
   return (described.mode === 'static' || described.mode === 'isr') && !described.personal;
 }
 

package/src/runtime-render.ts

@@ -120,7 +120,7 @@ const headFor = async (
 ): Promise<string> => {
   const meta = metaContextFor(ctx, data);
   const url = new URL(ctx.url);
-  const router = navigationTagsOf(options.navigation, entry);
+  const router = navigationTagsOf(options.navigation, entry, meta.t);
   return (
     renderHead(
       headFromMeta(