@phis/ui 0.1.0 → 0.2.1

package/cms/plugins.d.ts

@@ -1,10 +1,9 @@
 export type { PhiCmsSiteBridge } from "../types/cms-plugins";
-export { PHI_FIRST_PARTY_RUNTIME_MODULE_CATALOG } from "../plugins/runtime-modules/catalog";
 export { assertPhiCmsPresetTreeContract, buildPhiCmsPresetIdentityKey, compilePhiCmsActiveRouteTable, compilePhiCmsDescriptorCatalog, instantiatePhiCmsAreaShellPreset, instantiatePhiCmsRoutePreset, instantiatePhiCmsThemePreset, instantiatePhiCmsThemePresets, normalizePhiCmsRoutePath, resolvePhiCmsAreaShellPresetBinding, resolvePhiCmsDescriptorCatalog, resolvePhiCmsRoutePreset, resolvePhiCmsRoutePresetByPageId, resolvePhiCmsRoutePresetByIdentity, resolvePhiCmsThemePresetBinding, } from "../plugins/runtime-modules/descriptor-compiler";
 export { buildPhiRuntimeModulePackageRoutePrefix, readPhiRuntimeModulePackageRouteParts, } from "../helpers/runtime-module-route-path";
 export { assertPhiRuntimeModuleCatalog, createPhiRuntimeModuleCatalog, buildPhiRuntimeModuleControllerDescriptor, buildPhiRuntimeModuleDataProviderDescriptor, extendPhiRuntimeModuleCatalog, } from "../plugins/runtime-modules/contracts";
 export type { PhiAuthoringRenderPolicy, PhiPreviewRenderPolicy, PhiRuntimeModule, PhiRuntimeModuleCatalog, PhiRuntimeModuleCatalogEntry, PhiRuntimeModuleControllerMountPolicy, PhiRuntimeModuleControllerClientProps, PhiRuntimeModuleAuthoringClientProps, PhiRuntimeModuleControllerDescriptor, PhiRuntimeModuleDefinition, PhiRuntimeModuleId, PhiRuntimeModuleLoader, PhiRuntimeModuleDataProviderClientDefinition, PhiRuntimeModuleDataProviderDescriptor, PhiRuntimeModuleDataProviderClientProps, PhiRuntimeModuleLayoutDefinition, PhiRuntimeModuleRenderPolicies, PhiRuntimeModuleWidgetDefinition, PhiRuntimeModuleUiProvider, PhiRuntimeRenderPolicy, } from "../plugins/runtime-modules/contracts";
 export type { PhiCmsBuilderWidgetPlugin, PhiCmsLayoutPlugin, PhiCmsServerWidgetPlugin, } from "../types/cms-plugins";
 export { PHI_CMS_PLUGIN_CATEGORIES, isPhiCmsPluginCategory, type PhiCmsPluginCategory, } from "../constants/cms-plugin-categories";
-export type { PhiCmsActiveRouteTable, PhiCmsAreaDefinition, PhiCmsAreaShellPresetBinding, PhiCmsAreaShellPresetDescriptor, PhiCmsCompiledDescriptorCatalog, PhiCmsRoutePresetBinding, PhiCmsRoutePresetDescriptor, PhiCmsRouteMountKey, PhiCmsAreaRouteMountDescriptor, PhiCmsRouteMountReference, PhiCmsThemePresetBinding, PhiCmsThemePresetDescriptor, } from "../types/cms-module-descriptors";
+export type { PhiCmsActiveRouteTable, PhiCmsAreaDefinition, PhiCmsAreaShellPresetBinding, PhiCmsAreaShellPresetDescriptor, PhiCmsCompiledDescriptorCatalog, PhiCmsDescriptorBuildContext, PhiCmsRoutePresetBinding, PhiCmsRoutePresetDescriptor, PhiCmsRouteMountKey, PhiCmsAreaRouteMountDescriptor, PhiCmsRouteMountReference, PhiCmsThemePresetBinding, PhiCmsThemePresetDescriptor, } from "../types/cms-module-descriptors";
 export { createPhiCmsBuilderWidgetPlugin } from "../plugins/factories/widget-builder-plugin";

package/cms/plugins.js

@@ -1,4 +1,3 @@
-export { PHI_FIRST_PARTY_RUNTIME_MODULE_CATALOG } from "../plugins/runtime-modules/catalog";
 export { assertPhiCmsPresetTreeContract, buildPhiCmsPresetIdentityKey, compilePhiCmsActiveRouteTable, compilePhiCmsDescriptorCatalog, instantiatePhiCmsAreaShellPreset, instantiatePhiCmsRoutePreset, instantiatePhiCmsThemePreset, instantiatePhiCmsThemePresets, normalizePhiCmsRoutePath, resolvePhiCmsAreaShellPresetBinding, resolvePhiCmsDescriptorCatalog, resolvePhiCmsRoutePreset, resolvePhiCmsRoutePresetByPageId, resolvePhiCmsRoutePresetByIdentity, resolvePhiCmsThemePresetBinding, } from "../plugins/runtime-modules/descriptor-compiler";
 export { buildPhiRuntimeModulePackageRoutePrefix, readPhiRuntimeModulePackageRouteParts, } from "../helpers/runtime-module-route-path";
 export { assertPhiRuntimeModuleCatalog, createPhiRuntimeModuleCatalog, buildPhiRuntimeModuleControllerDescriptor, buildPhiRuntimeModuleDataProviderDescriptor, extendPhiRuntimeModuleCatalog, } from "../plugins/runtime-modules/contracts";

package/cms.d.ts

@@ -11,6 +11,6 @@ export type { PhiCmsErrorPageProps } from "./components/cms/phi-cms-error-page";
 export { PhiCmsRootSlotPage } from "./components/cms/phi-cms-root-slot-page";
 export type { PhiCmsRootSlotPageProps } from "./components/cms/phi-cms-root-slot-page";
 export type { PhiCmsResolvedRequestLoaderArgs, PhiResolvedCmsRequest, } from "./types/cms-plugins";
-export * from "./cms/plugins";
-export { parsePhiCmsErrorCode, resolvePhiCmsErrorPagePath, type PhiCmsErrorCode, } from "./components/regions/presets/phi-default-pub-error-page-tree";
+export { assertPhiCmsPresetTreeContract, assertPhiRuntimeModuleCatalog, buildPhiCmsPresetIdentityKey, buildPhiRuntimeModuleControllerDescriptor, buildPhiRuntimeModuleDataProviderDescriptor, buildPhiRuntimeModulePackageRoutePrefix, createPhiCmsBuilderWidgetPlugin, createPhiRuntimeModuleCatalog, extendPhiRuntimeModuleCatalog, instantiatePhiCmsAreaShellPreset, instantiatePhiCmsRoutePreset, instantiatePhiCmsThemePreset, instantiatePhiCmsThemePresets, isPhiCmsPluginCategory, normalizePhiCmsRoutePath, PHI_CMS_PLUGIN_CATEGORIES, type PhiAuthoringRenderPolicy, type PhiCmsAreaDefinition, type PhiCmsAreaRouteMountDescriptor, type PhiCmsAreaShellPresetBinding, type PhiCmsAreaShellPresetDescriptor, type PhiCmsBuilderWidgetPlugin, type PhiCmsLayoutPlugin, type PhiCmsPluginCategory, type PhiCmsRouteMountKey, type PhiCmsRouteMountReference, type PhiCmsRoutePresetBinding, type PhiCmsRoutePresetDescriptor, type PhiCmsServerWidgetPlugin, type PhiCmsSiteBridge, type PhiCmsThemePresetBinding, type PhiCmsThemePresetDescriptor, type PhiPreviewRenderPolicy, type PhiRuntimeModule, type PhiRuntimeModuleAuthoringClientProps, type PhiRuntimeModuleCatalog, type PhiRuntimeModuleCatalogEntry, type PhiRuntimeModuleControllerClientProps, type PhiRuntimeModuleControllerDescriptor, type PhiRuntimeModuleControllerMountPolicy, type PhiRuntimeModuleDataProviderClientDefinition, type PhiRuntimeModuleDataProviderClientProps, type PhiRuntimeModuleDataProviderDescriptor, type PhiRuntimeModuleDefinition, type PhiRuntimeModuleId, type PhiRuntimeModuleLayoutDefinition, type PhiRuntimeModuleLoader, type PhiRuntimeModuleRenderPolicies, type PhiRuntimeModuleUiProvider, type PhiRuntimeModuleWidgetDefinition, type PhiRuntimeRenderPolicy, readPhiRuntimeModulePackageRouteParts, resolvePhiCmsAreaShellPresetBinding, resolvePhiCmsRoutePreset, resolvePhiCmsRoutePresetByIdentity, resolvePhiCmsRoutePresetByPageId, resolvePhiCmsThemePresetBinding, } from "./cms/plugins";
+export { PHI_CMS_ERROR_CODES, isPhiCmsErrorPagePath, parsePhiCmsErrorCode, resolvePhiCmsErrorPagePath, type PhiCmsErrorCode, } from "./constants/cms-error-pages";
 export { PhiCmsRegionType } from "./constants/phi-cms";

package/cms.js

@@ -4,6 +4,6 @@ export { PhiCmsRootLayout } from "./components/cms/phi-cms-root-layout";
 export { PhiCmsRootPage } from "./components/cms/phi-cms-root-page";
 export { PhiCmsErrorPage, isPhiCmsErrorCode } from "./components/cms/phi-cms-error-page";
 export { PhiCmsRootSlotPage } from "./components/cms/phi-cms-root-slot-page";
-export * from "./cms/plugins";
-export { parsePhiCmsErrorCode, resolvePhiCmsErrorPagePath, } from "./components/regions/presets/phi-default-pub-error-page-tree";
+export { assertPhiCmsPresetTreeContract, assertPhiRuntimeModuleCatalog, buildPhiCmsPresetIdentityKey, buildPhiRuntimeModuleControllerDescriptor, buildPhiRuntimeModuleDataProviderDescriptor, buildPhiRuntimeModulePackageRoutePrefix, createPhiCmsBuilderWidgetPlugin, createPhiRuntimeModuleCatalog, extendPhiRuntimeModuleCatalog, instantiatePhiCmsAreaShellPreset, instantiatePhiCmsRoutePreset, instantiatePhiCmsThemePreset, instantiatePhiCmsThemePresets, isPhiCmsPluginCategory, normalizePhiCmsRoutePath, PHI_CMS_PLUGIN_CATEGORIES, readPhiRuntimeModulePackageRouteParts, resolvePhiCmsAreaShellPresetBinding, resolvePhiCmsRoutePreset, resolvePhiCmsRoutePresetByIdentity, resolvePhiCmsRoutePresetByPageId, resolvePhiCmsThemePresetBinding, } from "./cms/plugins";
+export { PHI_CMS_ERROR_CODES, isPhiCmsErrorPagePath, parsePhiCmsErrorCode, resolvePhiCmsErrorPagePath, } from "./constants/cms-error-pages";
 export { PhiCmsRegionType } from "./constants/phi-cms";

package/components/account/avatar-client.js

@@ -1,4 +1,5 @@
 "use client";
+import { readPhiJsonError, requestPhiJson } from "../../helpers/client-json-request";
 const AVATAR_URL = "/api/site/account/avatar";
 function readAvatar(payload) {
     if (!payload || typeof payload !== "object")
@@ -10,28 +11,22 @@ function readAvatar(payload) {
     return typeof id === "number" ? avatar : null;
 }
 export async function fetchPhiViewerAvatar(signal) {
-    const response = await fetch(AVATAR_URL, { credentials: "include", signal });
-    if (!response.ok) {
-        throw new Error(`avatar_read_failed:${response.status}`);
+    const { ok, status, payload } = await requestPhiJson(AVATAR_URL, { signal });
+    if (!ok) {
+        throw new Error(`avatar_read_failed:${status}`);
     }
-    return readAvatar(await response.json().catch(() => null));
+    return readAvatar(payload);
 }
 export async function setPhiViewerAvatar(assetId) {
-    const response = await fetch(AVATAR_URL, {
-        method: "PUT",
-        credentials: "include",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({ assetId }),
-    });
-    if (!response.ok) {
-        const body = await response.json().catch(() => null);
-        throw new Error(body?.error ?? `avatar_write_failed:${response.status}`);
+    const { ok, status, payload } = await requestPhiJson(AVATAR_URL, { method: "PUT", body: { assetId } });
+    if (!ok) {
+        throw new Error(readPhiJsonError(payload, `avatar_write_failed:${status}`));
     }
-    return readAvatar(await response.json().catch(() => null));
+    return readAvatar(payload);
 }
 export async function clearPhiViewerAvatar() {
-    const response = await fetch(AVATAR_URL, { method: "DELETE", credentials: "include" });
-    if (!response.ok) {
-        throw new Error(`avatar_clear_failed:${response.status}`);
+    const { ok, status } = await requestPhiJson(AVATAR_URL, { method: "DELETE" });
+    if (!ok) {
+        throw new Error(`avatar_clear_failed:${status}`);
     }
 }

package/components/calendar/gregory-calendar-adapter-client.js

@@ -1,11 +1,14 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Badge, Calendar, DatePicker, Flex, Typography } from "antd";
+import { Badge, Calendar, DatePicker } from "antd";
 import dayjs, {} from "dayjs";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import timezone from "dayjs/plugin/timezone";
 import utc from "dayjs/plugin/utc";
-import { PHI_GREGORY_CALENDAR_ADAPTER_KEY, } from "../../types/calendar";
+import { phiCalendarEventFallsOnDate, resolvePhiCalendarMonthPanelDays, } from "../../types/calendar";
+import { PHI_GREGORY_CALENDAR_ADAPTER_KEY } from "../../types/calendar-keys";
+import { PhiFlexControl } from "../controls/phi-flex-control";
+import { PhiTypographyControl } from "../controls/phi-typography-control";
 dayjs.extend(quarterOfYear);
 dayjs.extend(utc);
 dayjs.extend(timezone);
@@ -137,20 +140,15 @@ function renderDatePicker(props) {
                 });
         } }));
 }
-function eventFallsOnDate(event, value, timeZone) {
-    if (event.allDay) {
-        return !value.isBefore(event.startDate.isoDate, "day") &&
-            value.isBefore(event.endDateExclusive.isoDate, "day");
-    }
-    return dayjs(event.start.instant).tz(timeZone).isSame(value, "day");
-}
 function renderCalendar(props) {
     const calendarValue = props.value ? dayjs(props.value.isoDate) : undefined;
     const cellRender = (value, info) => {
         if (info.type !== "date")
             return info.originNode;
-        const events = props.events.filter((event) => eventFallsOnDate(event, value, props.timeZone));
-        return (_jsx(Flex, { vertical: true, gap: 2, children: events.map((event) => (_jsx(Typography.Link, { onClick: (mouseEvent) => {
+        // The cell's own calendar date, compared as a date in the calendar's zone (`types/calendar.ts`).
+        const isoDate = value.format("YYYY-MM-DD");
+        const events = props.events.filter((event) => phiCalendarEventFallsOnDate(event, isoDate, props.timeZone));
+        return (_jsx(PhiFlexControl, { vertical: true, gap: 2, children: events.map((event) => (_jsx(PhiTypographyControl, { presentation: "link", onClick: (mouseEvent) => {
                     mouseEvent.stopPropagation();
                     props.onEventActivate?.(event);
                 }, children: _jsx(Badge, { color: event.color, status: event.color ? undefined : "default", text: event.title }) }, `${event.id}:${event.occurrenceId ?? "single"}`))) }));
@@ -160,8 +158,12 @@ function renderCalendar(props) {
             props.onViewportChange?.({
                 view: mode,
                 calendar: "gregory",
-                isoStart: start.format("YYYY-MM-DD"),
-                isoEndExclusive: start.add(1, mode).format("YYYY-MM-DD"),
+                ...(mode === "month"
+                    ? resolvePhiCalendarMonthPanelDays(start.format("YYYY-MM-DD"), start.startOf("week").day())
+                    : {
+                        isoStart: start.format("YYYY-MM-DD"),
+                        isoEndExclusive: start.add(1, mode).format("YYYY-MM-DD"),
+                    }),
             });
         } }));
 }

package/components/cms/clients/phi-cms-node-visibility-gate.d.ts

@@ -1,8 +1,27 @@
 import { type ReactNode } from "react";
 import { type PhiRuntimeConditionExpression, type PhiRuntimeFeatureState, type PhiRuntimePageConditionState } from "../../../types/runtime-condition";
 import { type PhiSignalAddress } from "../../../types/signals";
+import type { PhiSlotChildSizing } from "../../../plugins/runtime/slot-size-policy";
 export type PhiCmsNodeVisibilityGateProps = {
     visibleWhen: PhiRuntimeConditionExpression;
+    /**
+     * How the node inside sizes, carried through and never read here.
+     *
+     * `display: contents` takes this wrapper out of the Layout so a slot behaves as if the node sat in it
+     * directly -- but only for CSS. The slot reads its child's sizing off the React element it holds, and
+     * that element is this gate, whose own props say nothing about the node behind it. So the sizing rides
+     * along: `resolvePhiSlotChildSizing` looks for exactly this prop first.
+     *
+     * It has to be handed down rather than worked out here. A slot cannot see through a Client Component
+     * to what it will render, and it cannot ask the component either -- across a client boundary the
+     * element's type is a reference, not the function. The renderer that builds both the frame and this
+     * gate is the one place that knows both.
+     *
+     * Left out while it did not matter: an unanchored Layout stretches its slots, so a child wrongly read
+     * as "does not fill" was stretched anyway. The moment a Layout centred its slots instead, the node had
+     * nothing to measure its own `width: 100%` against and collapsed to nothing.
+     */
+    slotChildSizing?: PhiSlotChildSizing | null;
     /**
      * The address the wrapped node answers at, which the gate answers at while the node is away.
      *

package/components/cms/clients/phi-cms-node-visibility-gate.js

@@ -47,6 +47,7 @@ function usePhiRuntimeConditionReportedStates(expression, receiver) {
  * holds, what has been typed.
  */
 export function PhiCmsNodeVisibilityGate({ visibleWhen, receiver = null, page, features, children, }) {
+    // `slotChildSizing` is deliberately not destructured: it is read off this element, never in it.
     const reported = usePhiRuntimeConditionReportedStates(visibleWhen, receiver);
     const visible = evaluatePhiRuntimeConditionExpression(visibleWhen, {
         page,

package/components/cms/phi-cms-area-access-guard.d.ts

@@ -0,0 +1,21 @@
+import "server-only";
+import type { PhiCmsSiteBridge } from "../../types/cms-plugins";
+import type { PhiCapabilitySnapshot } from "../../types/server-capabilities";
+import type { PhiBlockRuntimeViewer } from "../../types/widget-runtime";
+import type { PhiResolvedRootRoute } from "../../server-helpers/cms-route";
+/**
+ * Refuses an Area root the viewer may not enter, and returns only when they may.
+ *
+ * Asked by the Layout for a document request and by the Page for a client navigation that stayed inside
+ * the same branch and never re-ran the Layout. A signed-out visitor is sent to the Public login; anyone
+ * else back to the root of the Area they resolve to -- where they may enter it. Where they may not, or
+ * it is this very Area, the answer is 403: a forward there would be refused and forwarded again.
+ */
+export declare function guardPhiCmsAreaAccess({ cmsBridge, resolvedRoute, viewer, pathname, serverCapabilities, isRevisionPreview, }: {
+    cmsBridge: PhiCmsSiteBridge;
+    resolvedRoute: Pick<PhiResolvedRootRoute, "rootKind" | "area" | "locale">;
+    viewer: PhiBlockRuntimeViewer;
+    pathname: string | null | undefined;
+    serverCapabilities: PhiCapabilitySnapshot | null;
+    isRevisionPreview: boolean;
+}): Promise<void>;

package/components/cms/phi-cms-area-access-guard.js

@@ -0,0 +1,48 @@
+import "server-only";
+import { forbidden, redirect, unauthorized } from "next/navigation";
+import { canPhiViewerAccess } from "../../types/access";
+import { resolvePhiCmsDescriptorCatalog } from "../../plugins/runtime-modules/descriptor-compiler";
+import { resolvePhiPublicLoginHref } from "../../server-helpers/public-login-route";
+import { localizeAreaPath } from "../../helpers/locale";
+/**
+ * Refuses an Area root the viewer may not enter, and returns only when they may.
+ *
+ * Asked by the Layout for a document request and by the Page for a client navigation that stayed inside
+ * the same branch and never re-ran the Layout. A signed-out visitor is sent to the Public login; anyone
+ * else back to the root of the Area they resolve to -- where they may enter it. Where they may not, or
+ * it is this very Area, the answer is 403: a forward there would be refused and forwarded again.
+ */
+export async function guardPhiCmsAreaAccess({ cmsBridge, resolvedRoute, viewer, pathname, serverCapabilities, isRevisionPreview, }) {
+    const areaDefinitions = resolvePhiCmsDescriptorCatalog(cmsBridge.runtimeModuleCatalog).areaDefinitions;
+    const areaDefinition = areaDefinitions.get(resolvedRoute.area);
+    if (!isRevisionPreview &&
+        resolvedRoute.rootKind === "area" &&
+        areaDefinition &&
+        !canPhiViewerAccess(viewer, areaDefinition.accessPolicy) &&
+        viewer.resolvedArea) {
+        if (viewer.access === "public" && resolvedRoute.area !== "public") {
+            // Section 6 of AUTHENTICATION.md: where no active Public Auth Module owns the route, protected
+            // access fails closed. Assuming it would send the visitor to a 404 that reports a missing page
+            // instead of a refused one, and the Layout still runs before the shell flushes, so 401 can
+            // still be the status rather than only the body.
+            const login = await resolvePhiPublicLoginHref(cmsBridge, resolvedRoute.locale, serverCapabilities);
+            if (!login) {
+                unauthorized();
+            }
+            const next = pathname?.trim() || `/${resolvedRoute.area}`;
+            redirect(`${login}?${new URLSearchParams({ next }).toString()}`);
+        }
+        /*
+         * Server and UI decide who may enter from the same claims, so the home Area admits its viewer --
+         * until they disagree: a claim this side cannot read, an Area switched off. Then the home Area is
+         * as closed as this one, and forwarding there is a loop rather than a way out.
+         */
+        const homeDefinition = areaDefinitions.get(viewer.resolvedArea);
+        if (viewer.resolvedArea === resolvedRoute.area ||
+            !homeDefinition ||
+            !canPhiViewerAccess(viewer, homeDefinition.accessPolicy)) {
+            forbidden();
+        }
+        redirect(localizeAreaPath(resolvedRoute.locale, viewer.resolvedArea, "/"));
+    }
+}

package/components/cms/phi-cms-area-render-scope.d.ts

@@ -1,64 +1,5 @@
 import "server-only";
 import type { PhiCmsSiteBridge } from "../../types/cms-plugins";
-declare const loadPhiCmsAreaRenderScopeCached: (root: string, pathKey: string, cmsBridge: PhiCmsSiteBridge) => Promise<{
-    rootScope: {
-        resolvedRoute: import("../../server-helpers/cms-route").PhiResolvedRootRoute;
-        request: {
-            pathname?: string;
-            searchParams?: {
-                [x: string]: string | undefined;
-            };
-        };
-        runtime: {
-            authUiProvider: {
-                moduleId: `${string}/${string}`;
-                providerKey: `${string}/${string}`;
-                controllerAddress: import("@phis/contracts/signals").PhiControllerSignalAddress;
-                capabilities: readonly string[];
-                accountSecurityPath?: `/${string}`;
-            } | null | undefined;
-            site: import("../../types").PhiBlockRuntimeSite;
-            locale: import("../../types").PhiBlockRuntimeLocale;
-            area: import("../../types").PhiBlockRuntimeArea;
-            viewer: import("../../types").PhiBlockRuntimeViewer;
-            page?: import("../../types").PhiBlockRuntimePage;
-            request?: {
-                searchParams?: Record<string, string | undefined>;
-            };
-        };
-        requestContext: import("../../server-helpers/runtime").PhiSiteRequestContext;
-        resolvedAreaPreset: import("../../types").PhiResolvedCmsAreaPresetTree | null;
-        resolvedRequest: import("../../types").PhiResolvedCmsRequest | null;
-    };
-    runtime: {
-        authUiProvider: {
-            moduleId: `${string}/${string}`;
-            providerKey: `${string}/${string}`;
-            controllerAddress: import("@phis/contracts/signals").PhiControllerSignalAddress;
-            capabilities: readonly string[];
-            accountSecurityPath?: `/${string}`;
-        } | null | undefined;
-        site: import("../../types").PhiBlockRuntimeSite;
-        locale: import("../../types").PhiBlockRuntimeLocale;
-        area: import("../../types").PhiBlockRuntimeArea;
-        viewer: import("../../types").PhiBlockRuntimeViewer;
-        page?: import("../../types").PhiBlockRuntimePage;
-        request?: {
-            searchParams?: Record<string, string | undefined>;
-        };
-    };
-    runtimeModuleScope: {
-        catalog: import("../../types").PhiRuntimeModuleCatalog;
-        moduleSet: import("../../types").PhiResolvedRuntimeModuleSet;
-        serverCapabilities: import("@phis/contracts/server-capabilities").PhiCapabilitySnapshot | null;
-        widgetDefinitionsByType: Map<string, import("../../types").PhiCmsWidgetPluginDefinition<unknown>>;
-    };
-    filteredLayoutTree: import("../../types").PhiResolvedCmsAreaPresetTree | null;
-    runtimeRegistry: import("../../types").PhiCmsRuntimeRenderRegistry;
-    registeredControllerSettings: import("../../types").PhiRuntimeControllerSetting[] | null;
-    controllerDefinitionsByType: Map<any, any>;
-}>;
-export type PhiCmsAreaRenderScope = Awaited<ReturnType<typeof loadPhiCmsAreaRenderScopeCached>>;
 export declare function loadPhiCmsAreaRenderScope({ root, path, cmsBridge, }: {
     root: string;
     path?: string[];
@@ -71,6 +12,7 @@ export declare function loadPhiCmsAreaRenderScope({ root, path, cmsBridge, }: {
             searchParams?: {
                 [x: string]: string | undefined;
             };
+            clientNavigation?: boolean;
         };
         runtime: {
             authUiProvider: {
@@ -78,7 +20,7 @@ export declare function loadPhiCmsAreaRenderScope({ root, path, cmsBridge, }: {
                 providerKey: `${string}/${string}`;
                 controllerAddress: import("@phis/contracts/signals").PhiControllerSignalAddress;
                 capabilities: readonly string[];
-                accountSecurityPath?: `/${string}`;
+                loginOverlayAddress: import("@phis/contracts/signals").PhiSignalAddress | null;
             } | null | undefined;
             site: import("../../types").PhiBlockRuntimeSite;
             locale: import("../../types").PhiBlockRuntimeLocale;
@@ -89,7 +31,7 @@ export declare function loadPhiCmsAreaRenderScope({ root, path, cmsBridge, }: {
                 searchParams?: Record<string, string | undefined>;
             };
         };
-        requestContext: import("../../server-helpers/runtime").PhiSiteRequestContext;
+        requestContext: import("../../types/site-request-context").PhiSiteRequestContext;
         resolvedAreaPreset: import("../../types").PhiResolvedCmsAreaPresetTree | null;
         resolvedRequest: import("../../types").PhiResolvedCmsRequest | null;
     };
@@ -99,7 +41,7 @@ export declare function loadPhiCmsAreaRenderScope({ root, path, cmsBridge, }: {
             providerKey: `${string}/${string}`;
             controllerAddress: import("@phis/contracts/signals").PhiControllerSignalAddress;
             capabilities: readonly string[];
-            accountSecurityPath?: `/${string}`;
+            loginOverlayAddress: import("@phis/contracts/signals").PhiSignalAddress | null;
         } | null | undefined;
         site: import("../../types").PhiBlockRuntimeSite;
         locale: import("../../types").PhiBlockRuntimeLocale;
@@ -112,13 +54,12 @@ export declare function loadPhiCmsAreaRenderScope({ root, path, cmsBridge, }: {
     };
     runtimeModuleScope: {
         catalog: import("../../types").PhiRuntimeModuleCatalog;
-        moduleSet: import("../../types").PhiResolvedRuntimeModuleSet;
+        moduleSet: import("../../types/cms-plugins").PhiResolvedRuntimeModuleSet;
         serverCapabilities: import("@phis/contracts/server-capabilities").PhiCapabilitySnapshot | null;
         widgetDefinitionsByType: Map<string, import("../../types").PhiCmsWidgetPluginDefinition<unknown>>;
     };
     filteredLayoutTree: import("../../types").PhiResolvedCmsAreaPresetTree | null;
-    runtimeRegistry: import("../../types").PhiCmsRuntimeRenderRegistry;
+    runtimeRegistry: import("../../types/cms-plugins").PhiCmsRuntimeRenderRegistry;
     registeredControllerSettings: import("../../types").PhiRuntimeControllerSetting[] | null;
     controllerDefinitionsByType: Map<any, any>;
 }>;
-export {};

package/components/cms/phi-cms-area-render-scope.js

@@ -1,13 +1,11 @@
 import "server-only";
 import { cache } from "react";
-import { resolvePhiCmsRuntimeModuleScope, resolvePhiCmsTreeRuntimeRegistry, } from "./phi-cms-runtime-registry";
+import { resolvePhiCmsAreaRuntimeModuleScope, resolvePhiCmsTreeRuntimeRegistry, } from "./phi-cms-runtime-registry";
 import { loadPhiCmsRootRequest } from "../../server-helpers/cms-root";
-import { resolvePhiRuntimeModuleIdsForArea, } from "../../plugins/runtime-modules/settings";
 import { materializePhiRuntimeControllerSettings } from "../runtime/runtime-controller-materialization";
+import { isPhiCmsOverlayDeferredWhenClosed } from "../../types/cms-overlay";
 import { resolvePhiRuntimeControllerDefinitions } from "../../plugins/runtime-modules/resolver";
-import { canPhiViewerAccess } from "../../types/access";
 import { buildPhiRuntimeModuleAccessRegistry, filterPhiCmsRenderableTreeForViewer, } from "../../helpers/cms-access-policy";
-import { readPhiAreaPresetRuntimeModuleIds } from "../../helpers/cms-area-config";
 /**
  * Everything an Area's own render needs, resolved once per request.
  *
@@ -29,11 +27,10 @@ const loadPhiCmsAreaRenderScopeCached = cache(async function loadPhiCmsAreaRende
     const rootScope = await loadPhiCmsRootRequest({ root, path, cmsBridge });
     const { resolvedAreaPreset, runtime } = rootScope;
     const layoutTree = resolvedAreaPreset ?? null;
-    const runtimeModuleIds = resolvePhiRuntimeModuleIdsForArea(runtime.area, readPhiAreaPresetRuntimeModuleIds(layoutTree, runtime.area), [...cmsBridge.runtimeModuleCatalog.values()].map((entry) => entry.definition)).filter((moduleId) => canPhiViewerAccess(runtime.viewer, cmsBridge.runtimeModuleCatalog.get(moduleId)?.definition.accessPolicy));
-    const runtimeModuleScope = await resolvePhiCmsRuntimeModuleScope({
+    const runtimeModuleScope = await resolvePhiCmsAreaRuntimeModuleScope({
         cmsBridge,
-        moduleIds: runtimeModuleIds,
         area: runtime.area,
+        areaPreset: layoutTree,
         serverCapabilities: rootScope.requestContext.serverCapabilities,
     });
     const filteredLayoutTree = layoutTree
@@ -54,6 +51,10 @@ const loadPhiCmsAreaRenderScopeCached = cache(async function loadPhiCmsAreaRende
             widgetPluginsByType: runtimeModuleScope.widgetDefinitionsByType,
             baseSettings: runtimeModuleScope.moduleSet.areaControllerSettings,
             activeControllerTypes: [...runtimeModuleScope.moduleSet.controllerDescriptorsByType.keys()],
+            // The Area's Overlays render deferred (`PhiCmsOverlayRenderer`), so their Controllers do too.
+            excludedOverlayIds: new Set(filteredLayoutTree.overlays
+                .filter(isPhiCmsOverlayDeferredWhenClosed)
+                .map((overlay) => overlay.id)),
         })
         : null;
     const controllerDefinitionsByType = registeredControllerSettings

package/components/cms/phi-cms-error-page.d.ts

@@ -1,7 +1,7 @@
 import "server-only";
 import type { PhiCmsSiteBridge } from "../../types/cms-plugins";
 import type { PhiCmsAreaKey } from "../../constants/cms-areas";
-import { type PhiCmsErrorCode } from "../regions/presets/phi-default-pub-error-page-tree";
+import { type PhiCmsErrorCode } from "../../constants/cms-error-pages";
 export type PhiCmsErrorPageProps = {
     code: PhiCmsErrorCode;
     cmsBridge: PhiCmsSiteBridge;

package/components/cms/phi-cms-error-page.js

@@ -4,11 +4,9 @@ import { cookies } from "next/headers";
 import { resolvePhiRequestLocale } from "../../server-helpers/request-locale";
 import { loadPhiResolvedCmsRequest } from "../../server-helpers/cms-request";
 import { PhiCmsPageRenderer } from "./phi-cms-page-renderer";
-import { parsePhiCmsErrorCode, resolvePhiCmsErrorPagePath, } from "../regions/presets/phi-default-pub-error-page-tree";
-import { resolvePhiRuntimeModuleIdsForArea, } from "../../plugins/runtime-modules/settings";
-import { resolvePhiCmsRuntimeModuleScope, resolvePhiCmsTreeRuntimeRegistry, } from "./phi-cms-runtime-registry";
+import { parsePhiCmsErrorCode, resolvePhiCmsErrorPagePath, } from "../../constants/cms-error-pages";
+import { resolvePhiCmsAreaRuntimeModuleScope, resolvePhiCmsTreeRuntimeRegistry, } from "./phi-cms-runtime-registry";
 import { PhiRuntimeModuleDataProviderHost } from "../runtime/runtime-module-data-provider-host";
-import { readPhiAreaPresetRuntimeModuleIds } from "../../helpers/cms-area-config";
 import { isPhiStaticCmsSiteBridge } from "../../server-helpers/static-render";
 const ERROR_COPY = {
     401: {
@@ -23,10 +21,6 @@ const ERROR_COPY = {
         title: "Not found",
         text: "This page could not be found.",
     },
-    500: {
-        title: "Something went wrong",
-        text: "The page could not be rendered.",
-    },
 };
 function PhiCmsHardFallbackErrorPage({ code }) {
     const copy = ERROR_COPY[code];
@@ -62,7 +56,16 @@ export async function PhiCmsErrorPage({ code, cmsBridge, area, locale: staticLoc
             internalToken: bridgeRuntime?.internalToken,
             siteKey,
         });
-        resolvedRequest = await loadPhiResolvedCmsRequest(siteKey, locale, area, resolvePhiCmsErrorPagePath(code), cookieHeader, bridgeRuntime?.apiBaseUrl, bridgeRuntime?.internalToken, undefined, undefined, cmsBridge.runtimeModuleCatalog);
+        resolvedRequest = await loadPhiResolvedCmsRequest(siteKey, locale, area, resolvePhiCmsErrorPagePath(code), cookieHeader, bridgeRuntime?.apiBaseUrl, bridgeRuntime?.internalToken, undefined, undefined, cmsBridge.runtimeModuleCatalog, 
+        /*
+         * A refusal, not the address that was asked for.
+         *
+         * Next renders this tree beside the Page of every matched route whether it is shown or not, and
+         * `/error/404` names no Area preset -- so a resolution that claimed the request would hand the
+         * Shell the default Module selection and drop every Module the Site switched on. It claims only
+         * where nothing else did, which is the root refusal route with no Area layout above it.
+         */
+        "refusal");
     }
     catch {
         return _jsx(PhiCmsHardFallbackErrorPage, { code: code });
@@ -70,11 +73,10 @@ export async function PhiCmsErrorPage({ code, cmsBridge, area, locale: staticLoc
     if (!resolvedRequest) {
         return _jsx(PhiCmsHardFallbackErrorPage, { code: code });
     }
-    const runtimeModuleIds = resolvePhiRuntimeModuleIdsForArea(resolvedRequest.runtime.area, readPhiAreaPresetRuntimeModuleIds(resolvedRequest.areaPreset, resolvedRequest.runtime.area), [...cmsBridge.runtimeModuleCatalog.values()].map((entry) => entry.definition));
-    const runtimeModuleScope = await resolvePhiCmsRuntimeModuleScope({
+    const runtimeModuleScope = await resolvePhiCmsAreaRuntimeModuleScope({
         cmsBridge,
-        moduleIds: runtimeModuleIds,
         area: resolvedRequest.runtime.area,
+        areaPreset: resolvedRequest.areaPreset,
         serverCapabilities: resolvedRequest.serverCapabilities,
     });
     const runtimeRegistry = await resolvePhiCmsTreeRuntimeRegistry({

package/components/cms/phi-cms-layout-renderer.d.ts

@@ -1,9 +1,15 @@
-import type { PhiResolvedCmsRenderableTree } from "../../types/cms";
+import type { PhiCmsContentWidgetNode, PhiCmsLayoutRenderNode, PhiCmsOverlayNode, PhiResolvedCmsRenderableTree } from "../../types/cms";
 import { type PhiCmsInstanceId } from "../../types/cms-instance-id";
 import type { PhiBlockRuntime, PhiSignalScope } from "../../types";
+import type { PhiRenderableBlockBase, PhiRenderableBlockRuntime } from "../../types/renderable-block";
 import type { PhiCmsRenderIssue } from "../../types/cms-plugins";
 import { type PhiSlotChildKind } from "../../plugins/runtime/slot-size-policy";
 import type { PhiResolvedRuntimeRenderRegistry } from "../../plugins/runtime-modules/contracts";
+import type { PhiResolvedLinkTargets } from "../../types/references";
+import type { PhiCmsOverlayZones, PhiCmsOverlayZonesRequest } from "../../types/cms-overlay-zones";
+declare function resolvePhiCmsTreeFeatures(...args: Parameters<typeof import("../../server-helpers/cms-node-features")["resolvePhiCmsTreeFeatures"]>): Promise<Readonly<Record<string, unknown>> | null>;
+/** Lazily imported for the reason above: the pass is `server-only`, the helpers beside it are not. */
+declare function resolvePhiCmsTreeLinkTargets(...args: Parameters<typeof import("../../server-helpers/cms-link-targets")["resolvePhiCmsTreeLinkTargets"]>): Promise<PhiResolvedLinkTargets | null>;
 export type PhiCmsLayoutRendererProps = {
     tree: PhiResolvedCmsRenderableTree;
     runtime: PhiBlockRuntime;
@@ -12,11 +18,56 @@ export type PhiCmsLayoutRendererProps = {
     stackGap?: number | string;
     registry: PhiResolvedRuntimeRenderRegistry;
 };
-export declare function PhiCmsOverlayRenderer({ tree, runtime, registry, signalScope, }: {
+/**
+ * A Widget node, carrying what its Widget declares about the block where the node says nothing.
+ *
+ * Applied once, here, so there is one config and not two: the slot frame draws the block from the
+ * node's config, the Widget renders from the same config parsed, and until this existed the two could
+ * disagree -- a Form Widget declaring the reading measure as its cap rendered uncapped wherever a
+ * Preset placed it, because the Preset writes its nodes by hand and the frame never saw the Widget's
+ * answer. The Builder already merges the same defaults when it creates a node and when it edits one.
+ *
+ * Shallow, per key, and only the block base: see `widgetBlockDefaultsByType`.
+ */
+export declare function applyPhiWidgetBlockDefaults(widget: PhiCmsContentWidgetNode, blockDefaultsByType: ReadonlyMap<string, Partial<PhiRenderableBlockBase>>): PhiCmsContentWidgetNode;
+declare function buildLayoutNodeResolver(tree: PhiResolvedCmsRenderableTree, blockDefaultsByType: ReadonlyMap<string, Partial<PhiRenderableBlockBase>>): (layoutId: PhiCmsInstanceId) => PhiCmsLayoutRenderNode | null;
+/** Everything one Overlay's zones are rendered from, computed once per tree. */
+export type PhiCmsOverlayRenderContext = {
     tree: PhiResolvedCmsRenderableTree;
     runtime: PhiBlockRuntime;
     registry: PhiResolvedRuntimeRenderRegistry;
     signalScope: Extract<PhiSignalScope, "area" | "page">;
+    createNode: ReturnType<typeof buildLayoutNodeResolver>;
+    signalParticipants: Set<string>;
+    signalRuntime: PhiRenderableBlockRuntime;
+    features: Awaited<ReturnType<typeof resolvePhiCmsTreeFeatures>>;
+    links: Awaited<ReturnType<typeof resolvePhiCmsTreeLinkTargets>>;
+};
+export declare function preparePhiCmsOverlayRenderContext({ tree, runtime, registry, signalScope, }: {
+    tree: PhiResolvedCmsRenderableTree;
+    runtime: PhiBlockRuntime;
+    registry: PhiResolvedRuntimeRenderRegistry;
+    signalScope: Extract<PhiSignalScope, "area" | "page">;
+}): Promise<PhiCmsOverlayRenderContext>;
+/** One Overlay's header, body and footer, or null where its body cannot be drawn. */
+export declare function renderPhiCmsOverlayZones(context: PhiCmsOverlayRenderContext, overlay: PhiCmsOverlayNode): PhiCmsOverlayZones | null;
+/**
+ * The tree's Overlays, each with its zones -- or, closed, with what it needs to ask for them.
+ *
+ * Given `deferredOrigin`, an Overlay that is not `eager` ships no zones: its Client container asks the
+ * Site's Server Action for them the first time it opens (`types/cms-overlay-zones.ts`). An `eager` one
+ * still renders here, because its policy is that the content is mounted before anyone opens it. Without
+ * `deferredOrigin` -- a page-level Overlay, for now -- the zones render with the page as before.
+ *
+ * A deferred Overlay is kept when its zones' root nodes exist; whether the body then draws anything is
+ * answered when it is asked for, which is the one difference from rendering it here.
+ */
+export declare function PhiCmsOverlayRenderer({ tree, runtime, registry, signalScope, deferredOrigin, }: {
+    tree: PhiResolvedCmsRenderableTree;
+    runtime: PhiBlockRuntime;
+    registry: PhiResolvedRuntimeRenderRegistry;
+    signalScope: Extract<PhiSignalScope, "area" | "page">;
+    deferredOrigin?: Omit<PhiCmsOverlayZonesRequest, "overlayId">;
 }): Promise<(import("react").JSX.Element | null)[]>;
 /** What a Widget that threw while rendering on the server reports in its place. */
 export declare function buildPhiRenderFailureIssue(error: unknown, options: {
@@ -26,3 +77,4 @@ export declare function buildPhiRenderFailureIssue(error: unknown, options: {
     moduleId?: PhiCmsRenderIssue["moduleId"];
 }): PhiCmsRenderIssue;
 export declare function PhiCmsLayoutRenderer({ tree, runtime, regionClassName, regionTypes, stackGap, registry, }: PhiCmsLayoutRendererProps): Promise<import("react").JSX.Element | null>;
+export {};