@phis/ui 0.4.2 → 0.4.4

package/plugins/runtime-modules/phi-default-site-area-preset-tree.js

@@ -17,8 +17,6 @@ import { PHI_DEFAULT_PUB_AREA_LAYOUT_NODE_KEYS, PHI_DEFAULT_PUB_AREA_WIDGET_NODE
 const SYNTHETIC_REGION_IDS = {
     regionHeaderTop: -1,
     regionHeaderMain: -2,
-    regionHeaderBottom: -3,
-    regionSiderRight: -24,
     regionFooterTop: -27,
     regionFooterMain: -28,
     regionFooterBottom: -33,
@@ -34,11 +32,8 @@ export async function buildPhiDefaultSiteAreaPresetTree({ page, runtime, presetK
         ownerModuleId,
         presetKey,
     }, PHI_DEFAULT_PUB_AREA_WIDGET_NODE_KEYS);
-    const navigationArea = runtimeModuleArea === "public" ? "public" : runtimeModuleArea;
     const headerMainRegion = PHI_DEFAULT_PUB_AREA_PRESET.regions.find((region) => region.key === "header_main");
     const headerTopRegion = PHI_DEFAULT_PUB_AREA_PRESET.regions.find((region) => region.key === "header_top");
-    const headerBottomRegion = PHI_DEFAULT_PUB_AREA_PRESET.regions.find((region) => region.key === "header_bottom");
-    const siderRightRegion = PHI_DEFAULT_PUB_AREA_PRESET.regions.find((region) => region.key === "sider_right");
     const footerMainRegion = PHI_DEFAULT_PUB_AREA_PRESET.regions.find((region) => region.key === "footer_main");
     const footerTopRegion = PHI_DEFAULT_PUB_AREA_PRESET.regions.find((region) => region.key === "footer_top");
     const footerBottomRegion = PHI_DEFAULT_PUB_AREA_PRESET.regions.find((region) => region.key === "footer_bottom");
@@ -68,19 +63,6 @@ export async function buildPhiDefaultSiteAreaPresetTree({ page, runtime, presetK
         family: "header",
         region: "main",
     });
-    const shellHeaderBottomHeight = resolvePhiShellHeaderHeight(runtime.site.theme?.shell, "bottom");
-    const shellHeaderBottomOffsetTop = resolvePhiShellMetric(runtime.site.theme?.shell, "offsetTop", {
-        family: "header",
-        region: "bottom",
-    });
-    const shellSiderRightWidth = resolvePhiShellMetric(runtime.site.theme?.shell, "width", {
-        family: "sider",
-        region: "right",
-    });
-    const shellSiderRightOffsetTop = resolvePhiShellMetric(runtime.site.theme?.shell, "offsetTop", {
-        family: "sider",
-        region: "right",
-    });
     const shellFooterMainHeight = resolvePhiShellMetric(runtime.site.theme?.shell, "height", {
         family: "footer",
         region: "main",
@@ -135,44 +117,6 @@ export async function buildPhiDefaultSiteAreaPresetTree({ page, runtime, presetK
                     }),
                 ]
                 : []),
-            ...(headerBottomRegion
-                ? [
-                    nodes.region({
-                        id: SYNTHETIC_REGION_IDS.regionHeaderBottom,
-                        regionType: PhiCmsRegionType.HeaderBottom,
-                        rootLayoutNodeId: PHI_DEFAULT_PUB_AREA_LAYOUT_IDS.layoutHeaderBottom,
-                        status: headerBottomRegion.status,
-                        flags: headerBottomRegion.flags,
-                        visibilityMask: headerBottomRegion.visibilityMask,
-                        sortOrder: headerBottomRegion.sortOrder,
-                        config: {
-                            ...headerBottomRegion.config,
-                            size: { ...(headerBottomRegion.config.size ?? {}), height: `${shellHeaderBottomHeight}px` },
-                            ...(typeof shellHeaderBottomOffsetTop === "number" ? { offsetTop: shellHeaderBottomOffsetTop } : {}),
-                        },
-                    }),
-                ]
-                : []),
-            ...(siderRightRegion
-                ? [
-                    nodes.region({
-                        id: SYNTHETIC_REGION_IDS.regionSiderRight,
-                        regionType: PhiCmsRegionType.SiderRight,
-                        rootLayoutNodeId: PHI_DEFAULT_PUB_AREA_LAYOUT_IDS.layoutSiderRight,
-                        status: siderRightRegion.status,
-                        flags: siderRightRegion.flags,
-                        visibilityMask: siderRightRegion.visibilityMask,
-                        sortOrder: siderRightRegion.sortOrder,
-                        config: {
-                            ...siderRightRegion.config,
-                            ...(typeof shellSiderRightWidth === "number"
-                                ? { size: { ...(siderRightRegion.config.size ?? {}), width: `${shellSiderRightWidth}px` } }
-                                : {}),
-                            ...(typeof shellSiderRightOffsetTop === "number" ? { offsetTop: shellSiderRightOffsetTop } : {}),
-                        },
-                    }),
-                ]
-                : []),
             ...(footerTopRegion
                 ? [
                     nodes.region({
@@ -295,53 +239,6 @@ export async function buildPhiDefaultSiteAreaPresetTree({ page, runtime, presetK
                     paddingRight: 0,
                 },
             },
-            ...(headerBottomRegion
-                ? [
-                    {
-                        id: PHI_DEFAULT_PUB_AREA_LAYOUT_IDS.layoutHeaderBottom,
-                        siteId: page.siteId,
-                        parentLayoutNodeId: null,
-                        widgetType: buildPhiCmsLayoutNamespacedTypeKey(resolvePhiCmsLayoutPluginKey("flex"), "flex"),
-                        slotIndex: PHI_CMS_DEFAULT_SLOT_INDEX,
-                        sortOrder: 10,
-                        status: 1,
-                        flags: 0,
-                        visibilityMask: page.visibilityMask,
-                        label: "pub header bottom flex",
-                        config: {
-                            anchor: {
-                                horizontal: "left",
-                                vertical: "middle",
-                            },
-                            gap: 0,
-                            wrap: false,
-                        },
-                    },
-                ]
-                : []),
-            ...(siderRightRegion
-                ? [
-                    {
-                        id: PHI_DEFAULT_PUB_AREA_LAYOUT_IDS.layoutSiderRight,
-                        siteId: page.siteId,
-                        parentLayoutNodeId: null,
-                        widgetType: buildPhiCmsLayoutNamespacedTypeKey(resolvePhiCmsLayoutPluginKey("flex-vertical"), "flex-vertical"),
-                        slotIndex: PHI_CMS_DEFAULT_SLOT_INDEX,
-                        sortOrder: 16,
-                        status: 1,
-                        flags: 0,
-                        visibilityMask: page.visibilityMask,
-                        label: "pub sider right vertical",
-                        config: {
-                            anchor: {
-                                horizontal: "center",
-                                vertical: "top",
-                            },
-                            gap: 0,
-                        },
-                    },
-                ]
-                : []),
             ...(footerTopRegion
                 ? [
                     {
@@ -516,7 +413,7 @@ export async function buildPhiDefaultSiteAreaPresetTree({ page, runtime, presetK
                 visibilityMask: page.visibilityMask,
                 label: "pub header main navigation",
                 config: {
-                    navKey: `${navigationArea}:header`,
+                    navKey: `${runtimeModuleArea}:header`,
                 },
                 contentVersionId: null,
             },
@@ -588,7 +485,7 @@ export async function buildPhiDefaultSiteAreaPresetTree({ page, runtime, presetK
                         config: {
                             title: "Quick Links",
                             textSource: PHI_TEXT_SOURCE_PRESET,
-                            navKey: `${navigationArea}:footer`,
+                            navKey: `${runtimeModuleArea}:footer`,
                             columns: 2,
                             separator: true,
                         },

package/plugins/runtime-modules/public/presets.d.ts

@@ -0,0 +1,115 @@
+import type { PhiCmsDescriptorBuildContext } from "../../../types/cms-module-descriptors";
+export declare const PHI_PUBLIC_RUNTIME_MODULE_AREA_SHELLS: {
+    ownerModuleId: "@phis/ui/modules/public";
+    presetKey: string;
+    shellPresetVersion: number;
+    area: "public";
+    exportedNodeKeys: readonly ["widgetBrand", "widgetNav", "widgetLocale"];
+    loadTree: ({ page, runtime }: PhiCmsDescriptorBuildContext) => Promise<import("../../../types").PhiResolvedCmsPageTree>;
+}[];
+export declare const PHI_PUBLIC_RUNTIME_MODULE_ROUTES: ({
+    ownerModuleId: "@phis/ui/modules/public";
+    presetKey: string;
+    presetVersion: number;
+    area: "public";
+    title: string;
+    path: string;
+    defaultPageFlags: number;
+    loadTree: ({ page }: PhiCmsDescriptorBuildContext) => Promise<import("../../../types").PhiResolvedCmsPageTree>;
+} | {
+    ownerModuleId: "@phis/ui/modules/public";
+    presetKey: "public-welcome-page";
+    presetVersion: number;
+    area: "public";
+    title: string;
+    path: string;
+    loadTree: ({ page, runtime }: PhiCmsDescriptorBuildContext) => Promise<import("../../../types").PhiResolvedCmsPageTree>;
+    navigation?: undefined;
+} | {
+    ownerModuleId: "@phis/ui/modules/public";
+    presetKey: "public-home-page";
+    presetVersion: number;
+    area: "public";
+    title: string;
+    path: string;
+    navigation: {
+        navKey: "public:header";
+        parentItemKey: null;
+        before: string;
+        item: {
+            itemKey: string;
+            label: {
+                defaultMessage: string;
+            };
+            icon: string;
+            routePresetKey: string;
+        };
+    }[];
+    loadTree: ({ page }: PhiCmsDescriptorBuildContext) => Promise<import("../../../types").PhiResolvedCmsPageTree>;
+} | {
+    ownerModuleId: "@phis/ui/modules/public";
+    presetKey: "public-terms-page";
+    presetVersion: number;
+    area: "public";
+    title: string;
+    path: string;
+    loadTree: ({ page }: PhiCmsDescriptorBuildContext & {
+        activeModuleIds: ReadonlySet<import("../contracts").PhiRuntimeModuleId>;
+        params: Readonly<Record<string, string>>;
+    }) => Promise<import("../../../types").PhiResolvedCmsPageTree>;
+    navigation?: undefined;
+})[];
+/**
+ * The Public form pages, in their own list because they appear only where Forms are allowed. The
+ * contact page is Core's like the terms: every Site starts with a way to be reached, and neither is
+ * a landing -- the front door is the Site package's business.
+ */
+export declare const PHI_PUBLIC_FORM_RUNTIME_MODULE_ROUTES: ({
+    ownerModuleId: "@phis/ui/modules/public";
+    presetKey: "public-contact-page";
+    presetVersion: number;
+    area: "public";
+    title: string;
+    path: string;
+    navigation: ({
+        navKey: "public:header";
+        parentItemKey: null;
+        after: string;
+        item: {
+            itemKey: string;
+            label: {
+                defaultMessage: string;
+            };
+            icon: string;
+            routePresetKey: string;
+        };
+    } | {
+        navKey: "public:footer";
+        parentItemKey: null;
+        after: string;
+        item: {
+            itemKey: string;
+            label: {
+                defaultMessage: string;
+            };
+            routePresetKey: string;
+            icon?: undefined;
+        };
+    })[];
+    loadTree: ({ page }: PhiCmsDescriptorBuildContext & {
+        activeModuleIds: ReadonlySet<import("../contracts").PhiRuntimeModuleId>;
+        params: Readonly<Record<string, string>>;
+    }) => Promise<import("../../../types").PhiResolvedCmsPageTree>;
+} | {
+    ownerModuleId: "@phis/ui/modules/public";
+    presetKey: "public-unsubscribe-page";
+    presetVersion: number;
+    area: "public";
+    title: string;
+    path: string;
+    navigation: never[];
+    loadTree: ({ page }: PhiCmsDescriptorBuildContext & {
+        activeModuleIds: ReadonlySet<import("../contracts").PhiRuntimeModuleId>;
+        params: Readonly<Record<string, string>>;
+    }) => Promise<import("../../../types").PhiResolvedCmsPageTree>;
+})[];

package/plugins/runtime-modules/{area-base-presets.js → public/presets.js}

@@ -1,22 +1,21 @@
-import { PHI_DEFAULT_PUB_AREA_COMPOSITION_NODE_KEYS, PHI_DEFAULT_PUB_AREA_PRESET_KEY, } from "./preset-contracts/pub-area";
-import { PhiCmsFlags } from "../../constants/phi-cms";
-import { PHI_CMS_ERROR_CODES, resolvePhiCmsErrorPagePath, } from "../../constants/cms-error-pages";
-import { PHI_CORE_RUNTIME_MODULE_ID } from "./core/ids";
-import { PHI_ACCOUNTING_RUNTIME_MODULE_ID } from "./accounting/ids";
-import { PHI_APP_RUNTIME_MODULE_ID } from "./app/ids";
-import { PHI_PUBLIC_RUNTIME_MODULE_ID } from "./public/ids";
-import { PHI_CORE_THEME_PRESET_PLUGINS } from "../../theme/phi-theme-presets";
-import { buildPhiAreaRootRoutePresetDescriptor } from "./area-root-route";
-import { PHI_BASE_PAGE_LAYOUT_VERSION } from "../../components/regions/presets/phi-base-page-layout";
-import { PHI_PUBLIC_BASE_PAGE_PRESET_KEYS } from "./public-base-page-references";
-export const PHI_AREA_BASE_RUNTIME_MODULE_AREA_SHELLS = [
+import { PhiCmsFlags } from "../../../constants/phi-cms";
+import { PHI_CMS_ERROR_CODES, resolvePhiCmsErrorPagePath } from "../../../constants/cms-error-pages";
+import { PHI_DEFAULT_PUB_AREA_COMPOSITION_NODE_KEYS, PHI_DEFAULT_PUB_AREA_PRESET_KEY, } from "../preset-contracts/pub-area";
+import { PHI_PUBLIC_BASE_PAGE_PRESET_KEYS } from "../public-base-page-references";
+import { PHI_PUBLIC_RUNTIME_MODULE_ID } from "./ids";
+/*
+ * What the Public base Module brings: the Site shell and the Pages no Site can do without. They live in
+ * the Module that owns them, so the Module reaches no other Module to state them (MODULES.md, "The
+ * dependency rule").
+ */
+export const PHI_PUBLIC_RUNTIME_MODULE_AREA_SHELLS = [
     {
         ownerModuleId: PHI_PUBLIC_RUNTIME_MODULE_ID,
         presetKey: PHI_DEFAULT_PUB_AREA_PRESET_KEY,
         shellPresetVersion: 1,
         area: "public",
         exportedNodeKeys: PHI_DEFAULT_PUB_AREA_COMPOSITION_NODE_KEYS,
-        loadTree: ({ page, runtime }) => import("./phi-default-site-area-preset-tree")
+        loadTree: ({ page, runtime }) => import("../phi-default-site-area-preset-tree")
             .then((module) => module.buildPhiDefaultSiteAreaPresetTree({
             page,
             runtime,
@@ -25,56 +24,8 @@ export const PHI_AREA_BASE_RUNTIME_MODULE_AREA_SHELLS = [
             runtimeModuleArea: "public",
         })),
     },
-    {
-        ownerModuleId: PHI_APP_RUNTIME_MODULE_ID,
-        presetKey: "app-area-preset",
-        shellPresetVersion: 1,
-        area: "app",
-        /*
-         * The Site shell with a left sider added, rather than a shell of its own.
-         *
-         * App's header and footer are Public's -- one Brand, one account trigger, one description of both.
-         * What App has that Public does not is somewhere for the Modules a signed-in person works with,
-         * and that is the whole of the overlay. Nothing is omitted from the base, so the two trees cannot
-         * disagree about a Region: composition refuses a Region type stated twice.
-         */
-        loadTree: async ({ page, runtime }) => {
-            const [{ buildPhiDefaultSiteAreaPresetTree }, { buildPhiDefaultAppAreaPresetTree }, { mergePhiCmsShellTrees },] = await Promise.all([
-                import("./phi-default-site-area-preset-tree"),
-                import("./app/trees/phi-default-app-area-preset-tree"),
-                import("./shell-tree-composition"),
-            ]);
-            const [base, overlay] = await Promise.all([
-                buildPhiDefaultSiteAreaPresetTree({
-                    page,
-                    runtime,
-                    presetKey: "app-area-preset",
-                    ownerModuleId: PHI_APP_RUNTIME_MODULE_ID,
-                    runtimeModuleArea: "app",
-                }),
-                buildPhiDefaultAppAreaPresetTree({ page, runtime }),
-            ]);
-            return mergePhiCmsShellTrees(base, overlay);
-        },
-    },
-    ...[
-        ["accounting", PHI_ACCOUNTING_RUNTIME_MODULE_ID],
-    ].map(([area, ownerModuleId]) => ({
-        ownerModuleId,
-        presetKey: `${area}-area-preset`,
-        shellPresetVersion: 1,
-        area,
-        loadTree: ({ page, runtime }) => import("./phi-default-site-area-preset-tree")
-            .then((module) => module.buildPhiDefaultSiteAreaPresetTree({
-            page,
-            runtime,
-            presetKey: `${area}-area-preset`,
-            ownerModuleId,
-            runtimeModuleArea: area,
-        })),
-    })),
 ];
-export const PHI_AREA_BASE_RUNTIME_MODULE_ROUTES = [
+export const PHI_PUBLIC_RUNTIME_MODULE_ROUTES = [
     {
         ownerModuleId: PHI_PUBLIC_RUNTIME_MODULE_ID,
         presetKey: PHI_PUBLIC_BASE_PAGE_PRESET_KEYS.welcome,
@@ -90,7 +41,7 @@ export const PHI_AREA_BASE_RUNTIME_MODULE_ROUTES = [
          * the table for every Site, so a Site package offering a landing would arrive as the second and
          * would no longer cover this one on activation.
          */
-        loadTree: ({ page, runtime }) => import("./public/trees/phi-default-pub-welcome-page-tree")
+        loadTree: ({ page, runtime }) => import("./trees/phi-default-pub-welcome-page-tree")
             .then((module) => module.buildPhiDefaultPubWelcomePageTree({ page, runtime })),
     },
     {
@@ -121,36 +72,9 @@ export const PHI_AREA_BASE_RUNTIME_MODULE_ROUTES = [
                 },
             },
         ],
-        loadTree: ({ page }) => import("./public/trees/phi-default-pub-home-page-tree")
+        loadTree: ({ page }) => import("./trees/phi-default-pub-home-page-tree")
             .then((module) => module.buildPhiDefaultPubHomePageTree({ page })),
     },
-    buildPhiAreaRootRoutePresetDescriptor({
-        ownerModuleId: PHI_APP_RUNTIME_MODULE_ID,
-        area: "app",
-        title: "App",
-    }),
-    /*
-     * What a person has settled about their own account: their name, the language they read in.
-     *
-     * It sat with the Auth Module, which owned the route while Core owned every Widget on it. Nothing
-     * about a name or a language depends on how somebody signs in -- a Site that switches to a
-     * directory, or switches Auth off while sessions keep working, would have lost the Page that says
-     * what they are called. AUTHENTICATION.md section 5 already said so: profile administration does
-     * not become Auth's merely by appearing in its menu.
-     *
-     * The Area's own Settings child, so it is declared here rather than injected -- SETTINGS.md section
-     * 5, the same standing Admin and Builder give their General page.
-     */
-    {
-        ownerModuleId: PHI_APP_RUNTIME_MODULE_ID,
-        presetKey: "app-profile-page",
-        presetVersion: 1 + PHI_BASE_PAGE_LAYOUT_VERSION,
-        area: "app",
-        title: "Profile",
-        path: "/settings/profile",
-        loadTree: ({ page, runtime }) => import("./app/trees/phi-default-app-profile-page-tree")
-            .then((module) => module.buildPhiDefaultAppProfilePageTree({ page, runtime })),
-    },
     ...PHI_CMS_ERROR_CODES.map((code) => ({
         ownerModuleId: PHI_PUBLIC_RUNTIME_MODULE_ID,
         presetKey: `public-error-${code}-page`,
@@ -164,7 +88,7 @@ export const PHI_AREA_BASE_RUNTIME_MODULE_ROUTES = [
          * Pages, and the Site can still decide otherwise.
          */
         defaultPageFlags: PhiCmsFlags.NoIndex,
-        loadTree: ({ page }) => import("./public/trees/phi-default-pub-error-page-tree")
+        loadTree: ({ page }) => import("./trees/phi-default-pub-error-page-tree")
             .then((module) => module.buildPhiDefaultPubErrorPageTree({ code, page })),
     })),
     {
@@ -174,34 +98,10 @@ export const PHI_AREA_BASE_RUNTIME_MODULE_ROUTES = [
         area: "public",
         title: "Terms and Conditions",
         path: "/terms-and-conditions",
-        loadTree: ({ page }) => import("./public/trees/phi-default-pub-terms-page-tree")
+        loadTree: ({ page }) => import("./trees/phi-default-pub-terms-page-tree")
             .then((module) => module.buildPhiDefaultPubTermsPageTree({ page })),
     },
-    buildPhiAreaRootRoutePresetDescriptor({
-        ownerModuleId: PHI_ACCOUNTING_RUNTIME_MODULE_ID,
-        area: "accounting",
-        title: "Accounting",
-    }),
-    {
-        ownerModuleId: PHI_ACCOUNTING_RUNTIME_MODULE_ID,
-        presetKey: "accounting-overview-page",
-        presetVersion: 1 + PHI_BASE_PAGE_LAYOUT_VERSION,
-        area: "accounting",
-        title: "Overview",
-        path: "/overview",
-        loadTree: ({ page, runtime }) => import("./accounting/trees/phi-default-accounting-page-tree")
-            .then((module) => module.buildPhiDefaultAccountingPageTree({ page, runtime })),
-    },
 ];
-export const PHI_CORE_RUNTIME_MODULE_THEMES = PHI_CORE_THEME_PRESET_PLUGINS.map((preset) => ({
-    ownerModuleId: PHI_CORE_RUNTIME_MODULE_ID,
-    presetKey: `${preset.key}-theme-preset`,
-    presetVersion: 1,
-    themeKey: preset.key,
-    title: preset.title,
-    ...(preset.description ? { description: preset.description } : {}),
-    loadPreset: () => preset,
-}));
 /**
  * The Public form pages, in their own list because they appear only where Forms are allowed. The
  * contact page is Core's like the terms: every Site starts with a way to be reached, and neither is
@@ -238,7 +138,7 @@ export const PHI_PUBLIC_FORM_RUNTIME_MODULE_ROUTES = [
                 },
             },
         ],
-        loadTree: ({ page }) => import("./public/trees/phi-default-pub-contact-page-tree")
+        loadTree: ({ page }) => import("./trees/phi-default-pub-contact-page-tree")
             .then((module) => module.buildPhiDefaultPubContactPageTree({ page })),
     },
     /*
@@ -257,7 +157,7 @@ export const PHI_PUBLIC_FORM_RUNTIME_MODULE_ROUTES = [
         title: "Unsubscribe",
         path: "/unsubscribe",
         navigation: [],
-        loadTree: ({ page }) => import("./public/trees/phi-default-pub-unsubscribe-page-tree")
+        loadTree: ({ page }) => import("./trees/phi-default-pub-unsubscribe-page-tree")
             .then((module) => module.buildPhiDefaultPubUnsubscribePageTree({
             page,
             presetKey: PHI_PUBLIC_BASE_PAGE_PRESET_KEYS.unsubscribe,

package/plugins/runtime-modules/public/server.d.ts

@@ -1,5 +1,2 @@
-/**
- * The unselectable base module of its Area. Shells and routes come from the shared Area-base preset
- * list and are filtered by owner, so each base module states its own half of it.
- */
+/** The unselectable base module of its Area. Its shell and Pages are its own (`./presets`). */
 export declare const PHI_PUBLIC_RUNTIME_MODULE_SERVER_AREA_CONTRIBUTION: import("../area-contributions").PhiRuntimeModuleServerAreaContribution;

package/plugins/runtime-modules/public/server.js

@@ -1,11 +1,8 @@
-import { PHI_AREA_BASE_RUNTIME_MODULE_AREA_SHELLS, PHI_AREA_BASE_RUNTIME_MODULE_ROUTES, PHI_PUBLIC_FORM_RUNTIME_MODULE_ROUTES, } from "../area-base-presets";
+import { PHI_PUBLIC_RUNTIME_MODULE_AREA_SHELLS, PHI_PUBLIC_RUNTIME_MODULE_ROUTES, PHI_PUBLIC_FORM_RUNTIME_MODULE_ROUTES, } from "./presets";
 import { definePhiRuntimeModuleServerAreaContribution } from "../area-contributions";
 import { PHI_PUBLIC_RUNTIME_MODULE_DEFINITION } from "../public/definition";
 import { PHI_PUBLIC_RUNTIME_MODULE_FORMS } from "./forms";
-/**
- * The unselectable base module of its Area. Shells and routes come from the shared Area-base preset
- * list and are filtered by owner, so each base module states its own half of it.
- */
+/** The unselectable base module of its Area. Its shell and Pages are its own (`./presets`). */
 export const PHI_PUBLIC_RUNTIME_MODULE_SERVER_AREA_CONTRIBUTION = definePhiRuntimeModuleServerAreaContribution({
     moduleId: PHI_PUBLIC_RUNTIME_MODULE_DEFINITION.moduleId,
     catalogEntry: {
@@ -13,13 +10,13 @@ export const PHI_PUBLIC_RUNTIME_MODULE_SERVER_AREA_CONTRIBUTION = definePhiRunti
         widgets: [],
         layouts: [],
         forms: PHI_PUBLIC_RUNTIME_MODULE_FORMS,
-        areaShells: PHI_AREA_BASE_RUNTIME_MODULE_AREA_SHELLS.filter((descriptor) => descriptor.ownerModuleId === PHI_PUBLIC_RUNTIME_MODULE_DEFINITION.moduleId),
+        areaShells: PHI_PUBLIC_RUNTIME_MODULE_AREA_SHELLS,
         /*
          * The landing, the error Pages, the terms, and the contact page: what no Site can do without. Each
          * is a floor a package Module may cover (MODULES.md, "Who owns an address") -- the landing through
          * the root slot, the others through their path.
          */
-        routes: PHI_AREA_BASE_RUNTIME_MODULE_ROUTES.filter((descriptor) => descriptor.ownerModuleId === PHI_PUBLIC_RUNTIME_MODULE_DEFINITION.moduleId).concat(PHI_PUBLIC_FORM_RUNTIME_MODULE_ROUTES),
+        routes: [...PHI_PUBLIC_RUNTIME_MODULE_ROUTES, ...PHI_PUBLIC_FORM_RUNTIME_MODULE_ROUTES],
         load: () => import("./module").then((module) => module.PHI_PUBLIC_RUNTIME_MODULE),
     },
 });

package/plugins/runtime-modules/public/trees/phi-default-pub-error-page-tree.js

@@ -1,4 +1,5 @@
 import { createPhiPresetCmsInstanceId } from "../../../../types/cms-instance-id";
+import { PHI_TEXT_SOURCE_PRESET } from "../../../../helpers/text-source";
 import { PHI_PUBLIC_RUNTIME_MODULE_ID } from "../ids";
 import { PHI_CMS_DEFAULT_SLOT_INDEX } from "../../../../constants/cms-layout-types";
 import { PhiCmsPageType } from "../../../../constants/phi-cms";
@@ -12,14 +13,11 @@ const ERROR_STATUS = {
 /**
  * The source text, and the source text only.
  *
- * It goes into the widget config untranslated, because the `result` widget translates through the Site
- * translator -- which is the point: a Site defines its own error strings, and it can only do that if
- * what reaches the translator is the source rather than an already translated string. Pre-translating
- * here would register the German text as a Site source, ask for a de->de translation, and show the
- * translation in the builder inspector where every other widget shows the original.
- *
- * The admin presets are the deliberate other case: their labels are system copy shared across Sites, so
- * they are translated globally in the preset and set the node's `NoTranslate` flag.
+ * It goes into the widget config untranslated and marked `textSource: "preset"`: these are the
+ * platform's words, the same on every Site, so the `result` widget translates them through the global
+ * store (`helpers/text-source.ts`). Pre-translating here would freeze one locale into every Site that
+ * adopts the page. An author who rewrites a text in the Builder drops the marker, and from then on the
+ * words are the Site's and its own store translates them.
  */
 const ERROR_SOURCE_COPY = {
     401: {
@@ -92,6 +90,7 @@ export async function buildPhiDefaultPubErrorPageTree({ code, page, }) {
                 sortOrder: 0,
                 label: `pub error ${code} result widget`,
                 config: {
+                    textSource: PHI_TEXT_SOURCE_PRESET,
                     status: ERROR_STATUS[code],
                     code: String(code),
                     title: copy.title,

package/plugins/runtime-modules/public-base-page-references.d.ts

@@ -4,7 +4,7 @@ import { createPhiPageReference } from "../../types/references";
  *
  * A Module that points at one of them has to say which, and a string typed at the call site is the same
  * fragility as a path: nothing checks it, and a preset key that is renamed leaves a reference resolving
- * to nothing. The base descriptors in `area-base-presets.ts` read their keys from here, so the two
+ * to nothing. The base descriptors in `public/presets.ts` read their keys from here, so the two
  * cannot drift.
  *
  * Kept apart from those descriptors on purpose. They import every base Page tree, and

package/plugins/runtime-modules/public-base-page-references.js

@@ -6,7 +6,7 @@ import { createPhiRuntimeModuleId } from "../../constants/module-identity";
  *
  * A Module that points at one of them has to say which, and a string typed at the call site is the same
  * fragility as a path: nothing checks it, and a preset key that is renamed leaves a reference resolving
- * to nothing. The base descriptors in `area-base-presets.ts` read their keys from here, so the two
+ * to nothing. The base descriptors in `public/presets.ts` read their keys from here, so the two
  * cannot drift.
  *
  * Kept apart from those descriptors on purpose. They import every base Page tree, and

package/plugins/runtime-modules/revisions/controller/client.js

@@ -8,7 +8,7 @@ import { createPhiRuntimeControllerClient } from "../../../../components/runtime
 import { usePhiSignalDispatcher, usePhiSignalListener } from "../../../../components/runtime/runtime-signal-bus";
 import { dispatchPhiSignalCapability } from "../../../../components/runtime/runtime-signal-identity";
 import { usePhiApplicationFeedback } from "../../../../components/runtime/use-phi-application-feedback";
-import { getPhiWorkspaceCatalogSnapshot, usePhiWorkspaceCatalogValue, PHI_WORKSPACE_CATALOG_SCOPE, } from "../../../../components/workspace/catalog-store";
+import { getPhiWorkspaceCatalogSnapshot, usePhiWorkspaceCatalogValue, } from "../../../../components/workspace/catalog-store";
 import { PHI_BUILDER_NAVIGATION_KEY_SEARCH_PARAM, PHI_BUILDER_PAGE_SEARCH_PARAM, PHI_BUILDER_REVISIONS_KIND_SEARCH_PARAM, PHI_BUILDER_REVISIONS_SCOPE_SEARCH_PARAM, PHI_BUILDER_THEME_KEY_SEARCH_PARAM, normalizePhiBuilderAreaSearchParam, normalizePhiBuilderPageSearchParam, normalizePhiBuilderRevisionsKindSearchParam, } from "../../../../helpers/cms-scope-search-params";
 import { resolvePhiBuilderRevisionPagePath, } from "../types";
 import { resolvePhiBuilderActivePageCatalog, resolvePhiBuilderActivePageKey, resolvePhiBuilderPageKeyFromCatalogPath, } from "../../../../helpers/cms-page-catalog";
@@ -31,13 +31,13 @@ function PhiRevisionsControllerMount({ address, config, }) {
     const { showMessage } = usePhiApplicationFeedback();
     const pathname = usePhiPathname();
     const router = useRouter();
-    const builderArea = usePhiWorkspaceCatalogValue(PHI_WORKSPACE_CATALOG_SCOPE, (state) => state.area);
-    const builderPageKey = usePhiWorkspaceCatalogValue(PHI_WORKSPACE_CATALOG_SCOPE, (state) => state.pageKey);
-    const modulePresetPagesByArea = usePhiWorkspaceCatalogValue(PHI_WORKSPACE_CATALOG_SCOPE, (state) => state.modulePresetPagesByArea);
-    const customPages = usePhiWorkspaceCatalogValue(PHI_WORKSPACE_CATALOG_SCOPE, (state) => state.customPages);
-    const persistedPageCatalogByArea = usePhiWorkspaceCatalogValue(PHI_WORKSPACE_CATALOG_SCOPE, (state) => state.persistedPageCatalogByArea);
+    const builderArea = usePhiWorkspaceCatalogValue((state) => state.area);
+    const builderPageKey = usePhiWorkspaceCatalogValue((state) => state.pageKey);
+    const modulePresetPagesByArea = usePhiWorkspaceCatalogValue((state) => state.modulePresetPagesByArea);
+    const customPages = usePhiWorkspaceCatalogValue((state) => state.customPages);
+    const persistedPageCatalogByArea = usePhiWorkspaceCatalogValue((state) => state.persistedPageCatalogByArea);
     useEffect(() => {
-        const state = getPhiWorkspaceCatalogSnapshot(PHI_WORKSPACE_CATALOG_SCOPE);
+        const state = getPhiWorkspaceCatalogSnapshot();
         const pages = resolvePhiBuilderActivePageCatalog(state.area, state.modulePresetPagesByArea, state.customPages, state.persistedPageCatalogByArea);
         const search = new URLSearchParams(window.location.search);
         const pageKey = resolvePhiBuilderActivePageKey(normalizePhiBuilderPageSearchParam(search.get(PHI_BUILDER_PAGE_SEARCH_PARAM)) ?? state.pageKey, pages);
@@ -72,7 +72,7 @@ function PhiRevisionsControllerMount({ address, config, }) {
      * not the root route, not the SEO answers. Every one of them is now a value only the server knows.
      */
     const deleteAreaShell = useCallback(async (area, correlationId) => {
-        const source = getPhiWorkspaceCatalogSnapshot(PHI_WORKSPACE_CATALOG_SCOPE)
+        const source = getPhiWorkspaceCatalogSnapshot()
             .areaPresetSourcesByArea?.[area] ?? null;
         try {
             await deleteCmsDraft("/api/site/cms/area/override", {
@@ -114,7 +114,7 @@ function PhiRevisionsControllerMount({ address, config, }) {
              * from the signal -- the button names a command, and what it acts on is whatever the Builder is
              * pointed at when it is pressed.
              */
-            const area = getPhiWorkspaceCatalogSnapshot(PHI_WORKSPACE_CATALOG_SCOPE).area;
+            const area = getPhiWorkspaceCatalogSnapshot().area;
             emitCapability("deleteAreaWarning", `Everything this Site stored for ${area} is cleared -- its Shell and its Module selection, drafts and published alike. What is live changes at once, the Module preset takes the Area back, and no revision is left to restore it from. It cannot be undone.`, signal.correlationId);
             emitCapability("deleteAreaOpen", null, signal.correlationId);
             return;
@@ -123,7 +123,7 @@ function PhiRevisionsControllerMount({ address, config, }) {
             const payload = isPhiRecord(signal.value) ? signal.value : null;
             const values = isPhiRecord(payload?.values) ? payload.values : null;
             const typed = typeof values?.areaKey === "string" ? values.areaKey.trim() : "";
-            const area = getPhiWorkspaceCatalogSnapshot(PHI_WORKSPACE_CATALOG_SCOPE).area;
+            const area = getPhiWorkspaceCatalogSnapshot().area;
             if (typed !== area) {
                 // The Overlay stays open: what is wrong is the answer, not the question.
                 showMessage({ level: "error", content: "That is not the Area key." }, { correlationId: signal.correlationId });
@@ -169,7 +169,7 @@ function PhiRevisionsControllerMount({ address, config, }) {
             const key = typeof action?.key === "string" ? action.key : "";
             if (key === "restore") {
                 showMessage({ level: "success", content: `Restored revision #${String(action?.revisionId ?? "")}.` }, { correlationId: signal.correlationId });
-                const state = getPhiWorkspaceCatalogSnapshot(PHI_WORKSPACE_CATALOG_SCOPE);
+                const state = getPhiWorkspaceCatalogSnapshot();
                 const search = new URLSearchParams(window.location.search);
                 const kind = normalizePhiBuilderRevisionsKindSearchParam(search.get(PHI_BUILDER_REVISIONS_KIND_SEARCH_PARAM)) ?? "area";
                 const revisionScope = search.get(PHI_BUILDER_REVISIONS_SCOPE_SEARCH_PARAM)?.trim() ?? "";