@phis/ui 0.4.2 → 0.4.4

package/plugins/runtime-modules/builder/persistence.js

@@ -13,8 +13,10 @@ import { resolvePhiCmsRegionType } from "../../../helpers/cms-region-keys";
 import { resolvePhiAuthUiProviderModuleId, resolvePhiDeclaredMediaSpaces, resolvePhiDeclaredSeeds, resolvePhiDeclaredThreadKinds, resolvePhiRuntimeModuleIdsForArea, } from "../../../plugins/runtime-modules/settings";
 import { isPhiRuntimeAreaBaseModuleId } from "../../../plugins/runtime-modules/area-definitions";
 import { createPhiBuilderDraftAllocationKey } from "./draft-allocation-key";
-import { builderWorkspaceStore, commitPhiDeveloperBuilderAreaConfig, readPhiBuilderEffectiveAreaRootRoute, readPhiBuilderEffectiveAreaMeta, } from "./developer-workspace-store";
+import { clearPhiBuilderDraftAllocation, storePhiBuilderDraftAllocation, commitPhiDeveloperBuilderAreaConfig, readPhiBuilderEffectiveAreaRootRoute, readPhiBuilderEffectiveAreaMeta, } from "./developer-workspace-store";
 import { resolvePhiBuilderActivePageCatalog, resolvePhiBuilderPageDefaultFlags, resolvePhiBuilderPagePresetSource, } from "../../../helpers/cms-page-catalog";
+import { isPhiRuntimeModuleId } from "../../../constants/module-identity";
+import { createPhiResponseReader, requirePhiField } from "../../../components/widgets/config/strict-config-reader";
 import { PHI_AREA_CONFIG_MODULES_NAMESPACE, PHI_AREA_CONFIG_SHELL_NAMESPACE, PHI_AREA_PUBLIC_ROUTE_PATHS_KEY, PHI_AREA_ROOT_ROUTE_KEY, PHI_AREA_META_KEY, normalizePhiAreaPublicRoutePaths, } from "../../../helpers/cms-area-config";
 /**
  * A save that was refused because there is nothing to patch yet -- an Area with no stored revision at
@@ -194,22 +196,33 @@ async function postCmsDraft(path, payload) {
         const addressRefused = body?.error === "path_collision" || body?.error === "path_nested";
         throw response.status === 409 && !addressRefused ? new CmsDraftConflictError(message) : new Error(message);
     }
-    if (!Number.isSafeInteger(body?.revisionId) ||
-        body?.revisionId < 1 ||
-        !Number.isSafeInteger(body?.version) ||
-        body?.version < 1 ||
-        !Number.isSafeInteger(body?.nextNodeSequence) ||
-        body?.nextNodeSequence < 1) {
-        throw new Error("CMS draft save returned invalid Draft allocation metadata.");
-    }
-    if (!Object.prototype.hasOwnProperty.call(body, "sourcePreset")) {
-        throw new Error("CMS draft save returned no preset source metadata.");
-    }
+    return readPhiDraftAllocation(body, "The CMS draft save");
+}
+/**
+ * What a Draft save or read answers about the Draft it now stands on: its revision, version and node
+ * sequence, all positive, and the preset it came from -- stated as `null` when it came from none, never
+ * left out. Read field by field; each was checked before and then cast, and the preset source was not
+ * checked at all.
+ */
+function readPhiDraftAllocation(body, source) {
+    const reader = createPhiResponseReader(body, source);
+    const positive = (key) => {
+        const value = requirePhiField(reader, key, "a positive whole number", reader.integer);
+        return value >= 1 ? value : reader.fail(key, "a positive whole number");
+    };
+    if (!Object.prototype.hasOwnProperty.call(reader.record, "sourcePreset")) {
+        reader.fail("sourcePreset", "a preset source or null");
+    }
+    const sourcePreset = reader.object("sourcePreset", (preset) => ({
+        ownerModuleId: requirePhiField(preset, "ownerModuleId", "a Module id", (key) => preset.value(key, "a Module id", (value) => (isPhiRuntimeModuleId(value) ? value : undefined))),
+        presetKey: requirePhiField(preset, "presetKey", "a text", preset.string),
+        sourcePresetVersion: requirePhiField(preset, "sourcePresetVersion", "a whole number", preset.integer),
+    })) ?? null;
     return {
-        revisionId: body.revisionId,
-        version: body.version,
-        nextNodeSequence: body.nextNodeSequence,
-        sourcePreset: body.sourcePreset ?? null,
+        revisionId: positive("revisionId"),
+        version: positive("version"),
+        nextNodeSequence: positive("nextNodeSequence"),
+        sourcePreset,
     };
 }
 async function postCmsAction(path, payload) {
@@ -247,23 +260,7 @@ async function getCmsDraft(path, payload) {
         const detail = body?.details?.length ? ` ${body.details.join(" ")}` : "";
         throw new Error(`${body?.error ?? "CMS draft read failed."}${detail}`);
     }
-    if (!Number.isSafeInteger(body?.revisionId) ||
-        body?.revisionId < 1 ||
-        !Number.isSafeInteger(body?.version) ||
-        body?.version < 1 ||
-        !Number.isSafeInteger(body?.nextNodeSequence) ||
-        body?.nextNodeSequence < 1) {
-        throw new Error("CMS draft read returned invalid Draft allocation metadata.");
-    }
-    if (!Object.prototype.hasOwnProperty.call(body, "sourcePreset")) {
-        throw new Error("CMS draft read returned no preset source metadata.");
-    }
-    return {
-        revisionId: body.revisionId,
-        version: body.version,
-        nextNodeSequence: body.nextNodeSequence,
-        sourcePreset: body.sourcePreset ?? null,
-    };
+    return readPhiDraftAllocation(body, "The CMS draft read");
 }
 /**
  * The href a preview opens, with no locale in it.
@@ -294,37 +291,11 @@ export function buildPhiBuilderLiveHref(area, pageKey, pages, workspaceKind) {
     return `${url.pathname}${url.search}${url.hash}`;
 }
 function storePhiDeveloperBuilderDraftAllocation(allocationKey, saved) {
-    builderWorkspaceStore.patch("public", (current) => {
-        const currentAllocation = current.draftAllocations[allocationKey];
-        const nextNodeSequence = currentAllocation?.revisionId === saved.revisionId
-            ? Math.max(currentAllocation.nextNodeSequence, saved.nextNodeSequence)
-            : saved.nextNodeSequence;
-        return {
-            ...current,
-            draftAllocations: {
-                ...current.draftAllocations,
-                [allocationKey]: {
-                    revisionId: saved.revisionId,
-                    version: currentAllocation?.revisionId === saved.revisionId
-                        ? Math.max(currentAllocation.version, saved.version)
-                        : saved.version,
-                    nextNodeSequence,
-                    sourcePreset: saved.sourcePreset,
-                },
-            },
-        };
-    });
+    storePhiBuilderDraftAllocation(allocationKey, saved);
 }
 export function clearPhiDeveloperBuilderDraftAllocation(input) {
     const allocationKey = createPhiBuilderDraftAllocationKey(input.area, input.pageKey, input.workspaceKind === "pages" ? "page" : "area");
-    builderWorkspaceStore.patch("public", (current) => {
-        if (!current.draftAllocations[allocationKey]) {
-            return current;
-        }
-        const draftAllocations = { ...current.draftAllocations };
-        delete draftAllocations[allocationKey];
-        return { ...current, draftAllocations };
-    });
+    clearPhiBuilderDraftAllocation(allocationKey);
 }
 export async function getPhiDeveloperBuilderDraftAllocation(input) {
     const cmsArea = resolvePhiBuilderAreaAsCmsArea(input.area);
@@ -368,14 +339,7 @@ export async function getPhiDeveloperBuilderModulesDraftAllocation(input) {
 }
 function clearPhiDeveloperBuilderModulesDraftAllocation(area) {
     const allocationKey = createPhiBuilderDraftAllocationKey(area, area, "modules");
-    builderWorkspaceStore.patch("public", (current) => {
-        if (!current.draftAllocations[allocationKey]) {
-            return current;
-        }
-        const draftAllocations = { ...current.draftAllocations };
-        delete draftAllocations[allocationKey];
-        return { ...current, draftAllocations };
-    });
+    clearPhiBuilderDraftAllocation(allocationKey);
 }
 /**
  * What a tree tells its Controllers, as it arrived with the workspace. The Builder edits none of it but

package/plugins/runtime-modules/builder/public-route-collisions.d.ts

@@ -1,5 +1,5 @@
 import type { PhiRuntimeModuleId } from "../../../types";
-import type { PhiBuilderPublicRouteCollisionAnswer, PhiBuilderPublicRouteCollisionRequest, PhiDeveloperBuilderArea, PhiDeveloperBuilderWorkspaceState } from "./developer-workspace-types";
+import type { PhiBuilderPublicRouteCollisionAnswer, PhiBuilderPublicRouteCollisionRequest, PhiDeveloperBuilderWorkspaceState } from "./developer-workspace-types";
 /**
  * The question to put to the Builder before a Module may be enabled for Public.
  *
@@ -22,4 +22,4 @@ export declare function findPhiBuilderPublicRouteAnswerProblem(state: Pick<PhiDe
  * alone, including those of Modules that are switched off -- an assignment outlives its Module being
  * disabled, which is why nobody is asked the same question twice.
  */
-export declare function applyPhiBuilderPublicRouteAssignments(scopeKey: PhiDeveloperBuilderArea, request: Pick<PhiBuilderPublicRouteCollisionRequest, "moduleId" | "answers">): void;
+export declare function applyPhiBuilderPublicRouteAssignments(request: Pick<PhiBuilderPublicRouteCollisionRequest, "moduleId" | "answers">): void;

package/plugins/runtime-modules/builder/public-route-collisions.js

@@ -1,8 +1,8 @@
 import { buildPhiRuntimeModulePackageRoutePrefix } from "../../../helpers/runtime-module-route-path";
 import { buildPhiPublicRouteAddressMap, findPhiPublicRoutePathCollisions, } from "../../../helpers/public-route-claims";
-import { isPhiAssignablePublicRoutePath, normalizePhiAreaPublicRoutePaths, } from "../../../helpers/cms-area-config";
-import { phiWorkspaceCatalogStore } from "../../../components/workspace/catalog-store";
-import { markPhiBuilderModuleAreasDirty } from "./runtime-module-selection";
+import { isPhiAssignablePublicRoutePath, } from "../../../helpers/cms-area-config";
+import { assignPhiWorkspacePublicRoutePaths } from "./workspace-catalog-actions";
+import { markPhiBuilderModuleAreasDirty } from "./developer-workspace-store";
 /**
  * Which Public addresses a Site Page already occupies.
  *
@@ -121,21 +121,8 @@ export function findPhiBuilderPublicRouteAnswerProblem(state, request) {
  * alone, including those of Modules that are switched off -- an assignment outlives its Module being
  * disabled, which is why nobody is asked the same question twice.
  */
-export function applyPhiBuilderPublicRouteAssignments(scopeKey, request) {
+export function applyPhiBuilderPublicRouteAssignments(request) {
     const answered = new Map(request.answers.map((answer) => [answer.presetKey, answer.path.trim()]));
-    phiWorkspaceCatalogStore.patch(scopeKey, (catalog) => {
-        const kept = (catalog.publicRoutePaths ?? []).filter((assignment) => assignment.ownerModuleId !== request.moduleId || !answered.has(assignment.presetKey));
-        return {
-            ...catalog,
-            publicRoutePaths: normalizePhiAreaPublicRoutePaths([
-                ...kept,
-                ...[...answered.entries()].map(([presetKey, path]) => ({
-                    ownerModuleId: request.moduleId,
-                    presetKey,
-                    path,
-                })),
-            ]),
-        };
-    });
-    markPhiBuilderModuleAreasDirty(["public"], scopeKey);
+    assignPhiWorkspacePublicRoutePaths(request.moduleId, answered);
+    markPhiBuilderModuleAreasDirty(["public"]);
 }

package/plugins/runtime-modules/builder/render-root-node-preview.server.js

@@ -46,12 +46,29 @@ function mergePreviewTreeNodes(tree, extraPreviewNodes) {
 function resolveRootNodeFromPreviewDraft(draft) {
     return draft?.rootNode ? readPhiBuilderRootNodeDraft(draft.rootNode) : null;
 }
+/*
+ * The nodes of every Region in one preview snapshot, built once per snapshot.
+ *
+ * Each of the ten Region previews needs all of them -- a signal route may name a node in another Region
+ * -- and each used to build every Region's tree again: about a hundred tree builds for one preview
+ * request. A snapshot is one parsed object per request and nothing here writes the result, so it is kept
+ * by that object and dropped with it.
+ */
+const previewSnapshotNodes = new WeakMap();
 function buildPreviewSnapshotNodes(snapshot) {
-    const layoutNodes = [];
-    const contentWidgets = [];
     if (!snapshot) {
-        return { layoutNodes, contentWidgets };
+        return { layoutNodes: [], contentWidgets: [] };
+    }
+    let nodes = previewSnapshotNodes.get(snapshot);
+    if (!nodes) {
+        nodes = collectPreviewSnapshotNodes(snapshot);
+        previewSnapshotNodes.set(snapshot, nodes);
     }
+    return nodes;
+}
+function collectPreviewSnapshotNodes(snapshot) {
+    const layoutNodes = [];
+    const contentWidgets = [];
     for (const [draftKey, draft] of Object.entries(snapshot.regionDrafts)) {
         const regionKey = draftKey.split(":").at(-1);
         const rootNode = resolveRootNodeFromPreviewDraft(draft);

package/plugins/runtime-modules/builder/render-root-node-scaffold.js

@@ -1,7 +1,8 @@
 "use client";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { cloneElement, isValidElement, Suspense, useCallback, useEffect, useRef, useState } from "react";
-import { usePhiConfig } from "../../../components/root/phi-config-provider";
+import { usePhiPageModeToken } from "../../../components/root/phi-config-provider";
+import { usePhiPageModeTone } from "../../../components/surface/phi-surface-tone";
 import { PhiEditScaffoldDrawer } from "./edit-scaffold-drawer";
 import { comparePhiCmsInstanceIds } from "../../../types/cms-instance-id";
 import { PhiSlotChildFrame } from "../../../plugins/runtime/phi-slot-child-frame";
@@ -10,7 +11,7 @@ import { PhiPlusButtonWidget, } from "./clients/layout-scaffold-buttons";
 import { usePhiStructureDroppable, } from "./structure-dnd";
 import { PhiInlineTextEditor } from "../../../components/controls/phi-inline-text-editor";
 import { PhiButtonControl } from "../../../components/controls/phi-button-control";
-import { usePhiAuthoringLayoutDefinition, usePhiRuntimeModuleAuthoringRegistration, } from "../../../plugins/runtime-modules/client-authoring-module";
+import { usePhiAuthoringLayoutDefinitionResolver, usePhiRuntimeModuleAuthoringRegistration, } from "../../../plugins/runtime-modules/client-authoring-module";
 import { usePhiRuntimeModuleState } from "../../../components/runtime/runtime-module-context";
 import { PhiCmsRenderDiagnostic } from "../../../components/cms/phi-cms-render-diagnostic";
 import { PhiCmsRenderErrorBoundary } from "../../../components/cms/phi-cms-render-error-boundary";
@@ -116,7 +117,8 @@ function PhiAuthoringWidgetLoader({ widget, config, slotSizePolicy, demandContro
 function PhiAuthoringLayoutLoader({ type, kind, blockId, children, }) {
     const activeModules = usePhiRuntimeModuleState();
     const layoutType = resolvePhiAuthoringLayoutType(type);
-    const definition = usePhiAuthoringLayoutDefinition(layoutType);
+    const resolveLayoutDefinition = usePhiAuthoringLayoutDefinitionResolver();
+    const definition = resolveLayoutDefinition(layoutType);
     if (!definition) {
         return _jsx(PhiCmsRenderDiagnostic, { issue: {
                 code: "missing-renderer",
@@ -138,7 +140,7 @@ function PhiAuthoringLayoutLoader({ type, kind, blockId, children, }) {
             } });
     }
     const LazyAuthoringLayout = definition.component;
-    return (_jsx(PhiCmsRenderErrorBoundary, { kind: kind, blockId: blockId, typeKey: type, moduleId: definition.ownerModuleId, children: _jsx(Suspense, { fallback: null, children: _jsx(LazyAuthoringLayout, { children: (plugin) => children(plugin, definition, activeModules.widgetDefinitionsByType) }) }) }));
+    return (_jsx(PhiCmsRenderErrorBoundary, { kind: kind, blockId: blockId, typeKey: type, moduleId: definition.ownerModuleId, children: _jsx(Suspense, { fallback: null, children: _jsx(LazyAuthoringLayout, { children: (plugin) => children(plugin, definition, activeModules.widgetDefinitionsByType, resolveLayoutDefinition) }) }) }));
 }
 function resolveRootNodeEditSlotAnchor(rootNode) {
     return rootNode.editSlotAnchor ?? undefined;
@@ -206,10 +208,12 @@ function resolveEffectsPreviewDurationMs(config) {
 }
 function PhiEffectsPreviewButton({ config, blockKind, onRun, }) {
     const previewLabel = formatEffectsPreviewLabel(config, blockKind);
+    // In the editor's mode, not a tone's: the button is the Builder's, whatever mode the Widget is drawn in.
+    const pageModeTone = usePhiPageModeTone();
     return (_jsx("span", { style: { display: "contents" }, onMouseDown: (event) => {
             event.preventDefault();
             event.stopPropagation();
-        }, onClick: (event) => event.stopPropagation(), children: _jsx(PhiButtonControl, { className: "phi-layout-affordance phi-layout-affordance--effects-preview", ariaLabel: previewLabel, tooltip: previewLabel, icon: _jsx(PhiIcon, { name: "node-index", size: "inherit" }), type: "text", size: "small", onClick: onRun, style: {
+        }, onClick: (event) => event.stopPropagation(), children: pageModeTone.wrap(_jsx(PhiButtonControl, { className: "phi-layout-affordance phi-layout-affordance--effects-preview", ariaLabel: previewLabel, tooltip: previewLabel, icon: _jsx(PhiIcon, { name: "node-index", size: "inherit" }), type: "text", size: "small", onClick: onRun, style: {
                 position: "absolute",
                 top: "50%",
                 left: "50%",
@@ -219,7 +223,7 @@ function PhiEffectsPreviewButton({ config, blockKind, onRun, }) {
                 // whose children `styles/layout.css` stretches, and a stylesheet answer did not hold there.
                 width: "var(--ant-control-height)",
                 "--phi-layout-affordance-size": "var(--ant-control-height)",
-            } }) }));
+            } })) }));
 }
 function PhiSignalWiringToolButton({ onOpen }) {
     return (_jsx("span", { style: { display: "contents" }, onPointerDown: (event) => {
@@ -264,8 +268,9 @@ function findPhiWidgetAuthoringTextTarget(container, clientX, clientY) {
     }) ?? null;
 }
 function PhiWidgetEffectsPreviewFrame({ kind, slotSizePolicy, surfacePolicy, blockId, regionKey, config: committedConfig, title, scaffoldLabel, editorInteraction = "inert", onSelect, dropTarget, tools, style, children, }) {
-    const { token } = usePhiConfig();
-    const selected = usePhiDeveloperBuilderStateValue("public", (state) => blockId != null &&
+    // The editor's colours, not a tone's: a Widget inside a toned Surface is marked in the page's mode.
+    const token = usePhiPageModeToken();
+    const selected = usePhiDeveloperBuilderStateValue((state) => blockId != null &&
         regionKey != null &&
         state.selectedRootRegionKey === regionKey &&
         state.nodeKind === "widget" &&
@@ -278,7 +283,7 @@ function PhiWidgetEffectsPreviewFrame({ kind, slotSizePolicy, surfacePolicy, blo
      * still under the finger; the draft learns it when Save is pressed. Overlaying the whole `effects`
      * rather than one property keeps this the editor's picture and not a second opinion about it.
      */
-    const effectsPreview = usePhiDeveloperBuilderStateValue("public", (state) => readPhiDeveloperBuilderEffectsPreview(state, "widget", blockId ?? null));
+    const effectsPreview = usePhiDeveloperBuilderStateValue((state) => readPhiDeveloperBuilderEffectsPreview(state, "widget", blockId ?? null));
     const config = effectsPreview
         ? { ...committedConfig, effects: effectsPreview }
         : committedConfig;
@@ -493,7 +498,7 @@ function PhiWidgetEffectsPreviewFrame({ kind, slotSizePolicy, surfacePolicy, blo
 }
 function PhiLayoutEffectsPreviewFrame({ kind, slotSizePolicy, blockId, config: committedConfig, explicitInlineSize, explicitBlockSize, children, }) {
     // The same live picture the Widget frame draws, for the Layout whose own toolbar opened the editor.
-    const effectsPreview = usePhiDeveloperBuilderStateValue("public", (state) => readPhiDeveloperBuilderEffectsPreview(state, "layout", blockId ?? null));
+    const effectsPreview = usePhiDeveloperBuilderStateValue((state) => readPhiDeveloperBuilderEffectsPreview(state, "layout", blockId ?? null));
     const config = effectsPreview
         ? { ...committedConfig, effects: effectsPreview }
         : committedConfig;
@@ -525,10 +530,6 @@ function PhiLayoutEffectsPreviewFrame({ kind, slotSizePolicy, blockId, config: c
                     });
                 } })) : null] }, hasPreviewEffects ? `layout-effects-preview-${blockId ?? "root"}-${previewRunId}` : undefined));
 }
-function PhiAuthoringLayoutEffectsPreviewFrame({ type, ...props }) {
-    const definition = usePhiAuthoringLayoutDefinition(resolvePhiAuthoringLayoutType(type));
-    return (_jsx(PhiLayoutEffectsPreviewFrame, { ...props, slotSizePolicy: definition?.slotSizePolicy }));
-}
 /**
  * The band under a scaffold: what this node is called, and then what it is.
  *
@@ -821,11 +822,20 @@ export function renderPhiRootNodeScaffold(rootNode, onOpenInsert, onOpenInspecto
                 nodeKind: normalizedRootNode.kind,
             })
             : undefined, chrome: renderRootScaffoldToolbar(), children: wrapRootScaffoldChild(child) }));
-    const renderChildLayoutNode = (node) => {
+    /*
+     * A nested Layout's frame states its policy on the element the parent Layout sizes its slot by.
+     *
+     * It was looked up inside that element, which is too late: the parent reads the element's props
+     * before it renders, found a Layout with no policy, took the Layout default -- fill both ways -- and
+     * let the slot grow and shrink in its column. A Grid of cards in a Flex was squeezed below its
+     * content on the canvas and the cards ran out of their scaffold, while the page laid it out at its
+     * content height, as its `fill-inline` says.
+     */
+    const renderChildLayoutNodeWith = (resolveLayoutDefinition) => function renderChildLayoutNode(node) {
         const nodeKind = "layout";
         const rootProps = resolveLayoutNodeRootProps(node);
         const rootPropsGeometry = resolvePhiRenderableBlockGeometry(normalizePhiBuilderRootNodeDraft(rootProps).rootNodeGeometry);
-        return (_jsx(PhiAuthoringLayoutEffectsPreviewFrame, { type: node.widgetType, kind: nodeKind, blockId: node.id, config: node.config, explicitInlineSize: rootPropsGeometry.explicitInline, explicitBlockSize: rootPropsGeometry.explicitBlock, children: renderPhiRootNodeScaffold({ ...rootProps, regionKey }, (options) => onOpenInsert?.({
+        return (_jsx(PhiLayoutEffectsPreviewFrame, { kind: nodeKind, slotSizePolicy: resolveLayoutDefinition(resolvePhiAuthoringLayoutType(node.widgetType))?.slotSizePolicy, blockId: node.id, config: node.config, explicitInlineSize: rootPropsGeometry.explicitInline, explicitBlockSize: rootPropsGeometry.explicitBlock, children: renderPhiRootNodeScaffold({ ...rootProps, regionKey }, (options) => onOpenInsert?.({
                 ...options,
                 slotIndex: options?.slotIndex ?? 0,
                 targetNodeId: node.id,
@@ -861,8 +871,8 @@ export function renderPhiRootNodeScaffold(rootNode, onOpenInsert, onOpenInspecto
                 renderInsertPicker: options?.renderInsertPicker,
             }) }));
     };
-    const scaffold = (_jsx(PhiAuthoringLayoutLoader, { type: normalizedRootNode.typeKey, kind: "layout", blockId: normalizedRootNode.id ?? -1, children: (plugin, definition, widgetDefinitionsByType) => {
-            const rendered = resolvePhiRootNodeRenderedBody(normalizedRootNode, "editor", plugin, definition, widgetDefinitionsByType, regionKey, renderChildLayoutNode, onDeleteRootNode
+    const scaffold = (_jsx(PhiAuthoringLayoutLoader, { type: normalizedRootNode.typeKey, kind: "layout", blockId: normalizedRootNode.id ?? -1, children: (plugin, definition, widgetDefinitionsByType, resolveLayoutDefinition) => {
+            const rendered = resolvePhiRootNodeRenderedBody(normalizedRootNode, "editor", plugin, definition, widgetDefinitionsByType, regionKey, renderChildLayoutNodeWith(resolveLayoutDefinition), onDeleteRootNode
                 ? (widget) => onDeleteRootNode({
                     nodeId: widget.id,
                     nodeKey: widget.widgetType,

package/plugins/runtime-modules/builder/runtime-module-selection.d.ts

@@ -1,6 +1,4 @@
-import type { PhiRuntimeModuleId } from "../../../types";
 import type { PhiDeveloperBuilderArea } from "./developer-workspace-types";
-export declare function areRuntimeModuleIdsEqual(left: readonly PhiRuntimeModuleId[] | null | undefined, right: readonly PhiRuntimeModuleId[] | null | undefined): boolean;
 /**
  * Applies a new Module selection to one or more Areas: validates each Area's list, patches the
  * catalog, and records the whole gesture as ONE history entry -- the one place all of this happens,
@@ -15,13 +13,5 @@ export declare function areRuntimeModuleIdsEqual(left: readonly PhiRuntimeModule
 export declare function applyPhiBuilderRuntimeModuleSelectionChanges(changes: ReadonlyArray<{
     area: PhiDeveloperBuilderArea;
     selectedIds: readonly string[];
-}>, defaultArea: PhiDeveloperBuilderArea): void;
-export declare function applyPhiBuilderRuntimeModuleSelectionChange(area: PhiDeveloperBuilderArea, selectedIds: readonly string[], defaultArea: PhiDeveloperBuilderArea): `${string}/${string}`[];
-/**
- * The Areas whose Module selection has unsaved edits, kept as Builder tool state so the Modules
- * workspace commands know which Areas a site-wide save or publish has to reach. Undo does not clear
- * an Area from here -- a save of an unchanged selection is a no-op draft, while a missed Area would
- * silently publish stale state.
- */
-export declare function markPhiBuilderModuleAreasDirty(areas: readonly PhiDeveloperBuilderArea[], defaultArea: PhiDeveloperBuilderArea): void;
-export declare function clearPhiBuilderModuleAreasDirty(defaultArea: PhiDeveloperBuilderArea): void;
+}>): void;
+export declare function applyPhiBuilderRuntimeModuleSelectionChange(area: PhiDeveloperBuilderArea, selectedIds: readonly string[]): `${string}/${string}`[];

package/plugins/runtime-modules/builder/runtime-module-selection.js

@@ -1,13 +1,13 @@
 import { resolvePhiBuilderAreaAsCmsArea } from "../../../constants/cms-areas";
 import { isPhiRuntimeAreaBaseModuleId, resolvePhiRuntimeAreaDefinition, } from "../area-definitions";
 import { assertPhiRuntimeModuleIdsAllowedForArea } from "../settings";
-import { phiWorkspaceCatalogStore } from "../../../components/workspace/catalog-store";
-import { builderWorkspaceStore, getPhiDeveloperBuilderStateSnapshot } from "./developer-workspace-store";
+import { getPhiDeveloperBuilderStateSnapshot, markPhiBuilderModuleAreasDirty } from "./developer-workspace-store";
+import { setPhiWorkspaceModuleSelection } from "./workspace-catalog-actions";
 import { capturePhiBuilderModulesHistoryState, createPhiBuilderHistoryContext, phiBuilderHistory, } from "./history";
 function serializeRuntimeModuleIds(moduleIds) {
     return JSON.stringify(moduleIds ?? []);
 }
-export function areRuntimeModuleIdsEqual(left, right) {
+function areRuntimeModuleIdsEqual(left, right) {
     return serializeRuntimeModuleIds(left) === serializeRuntimeModuleIds(right);
 }
 /**
@@ -52,8 +52,8 @@ function normalizeRuntimeModuleSelection(selectedIds, area, definitions) {
  * switched on in one Area and off in another is named once; the step's sentence says that the
  * selection of these changed, not which way.
  */
-function describeModuleSelectionChange(effective, before, defaultArea) {
-    const definitions = getPhiDeveloperBuilderStateSnapshot(defaultArea).runtimeModuleDefinitions;
+function describeModuleSelectionChange(effective, before) {
+    const definitions = getPhiDeveloperBuilderStateSnapshot().runtimeModuleDefinitions;
     const titleById = new Map(definitions.map((definition) => [definition.moduleId, definition.title]));
     const changed = new Set();
     for (const { area, moduleIds } of effective) {
@@ -79,8 +79,8 @@ function describeModuleSelectionChange(effective, before, defaultArea) {
  * the switch exists to avoid. Areas whose normalized list already matches what is live are dropped;
  * if nothing remains, nothing is recorded.
  */
-export function applyPhiBuilderRuntimeModuleSelectionChanges(changes, defaultArea) {
-    const current = getPhiDeveloperBuilderStateSnapshot(defaultArea);
+export function applyPhiBuilderRuntimeModuleSelectionChanges(changes) {
+    const current = getPhiDeveloperBuilderStateSnapshot();
     const effective = [];
     for (const change of changes) {
         const currentModuleIds = current.runtimeModuleIdsByArea?.[change.area] ?? [];
@@ -93,42 +93,16 @@ export function applyPhiBuilderRuntimeModuleSelectionChanges(changes, defaultAre
         return;
     }
     const changedAreas = effective.map(({ area }) => area);
-    const historyBefore = capturePhiBuilderModulesHistoryState(getPhiDeveloperBuilderStateSnapshot(defaultArea), changedAreas);
-    phiWorkspaceCatalogStore.patch(defaultArea, (catalog) => ({
-        ...catalog,
-        runtimeModuleIdsByArea: {
-            ...(catalog.runtimeModuleIdsByArea ?? {}),
-            ...Object.fromEntries(effective.map(({ area, moduleIds }) => [area, moduleIds])),
-        },
-    }));
-    markPhiBuilderModuleAreasDirty(changedAreas, defaultArea);
-    phiBuilderHistory.record(createPhiBuilderHistoryContext({ workspace: "modules", area: defaultArea }), {
-        action: { key: "changeModules", subject: describeModuleSelectionChange(effective, historyBefore, defaultArea) },
+    const historyBefore = capturePhiBuilderModulesHistoryState(getPhiDeveloperBuilderStateSnapshot(), changedAreas);
+    setPhiWorkspaceModuleSelection(Object.fromEntries(effective.map(({ area, moduleIds }) => [area, moduleIds])));
+    markPhiBuilderModuleAreasDirty(changedAreas);
+    phiBuilderHistory.record(createPhiBuilderHistoryContext({ workspace: "modules" }), {
+        action: { key: "changeModules", subject: describeModuleSelectionChange(effective, historyBefore) },
         before: historyBefore,
-        after: capturePhiBuilderModulesHistoryState(getPhiDeveloperBuilderStateSnapshot(defaultArea), changedAreas),
+        after: capturePhiBuilderModulesHistoryState(getPhiDeveloperBuilderStateSnapshot(), changedAreas),
     });
 }
-export function applyPhiBuilderRuntimeModuleSelectionChange(area, selectedIds, defaultArea) {
-    applyPhiBuilderRuntimeModuleSelectionChanges([{ area, selectedIds }], defaultArea);
-    return getPhiDeveloperBuilderStateSnapshot(defaultArea).runtimeModuleIdsByArea?.[area] ?? [];
-}
-/**
- * The Areas whose Module selection has unsaved edits, kept as Builder tool state so the Modules
- * workspace commands know which Areas a site-wide save or publish has to reach. Undo does not clear
- * an Area from here -- a save of an unchanged selection is a no-op draft, while a missed Area would
- * silently publish stale state.
- */
-export function markPhiBuilderModuleAreasDirty(areas, defaultArea) {
-    builderWorkspaceStore.patch(defaultArea, (tool) => {
-        const next = new Set(tool.modulesDirtyAreas ?? []);
-        for (const area of areas) {
-            next.add(area);
-        }
-        return next.size === (tool.modulesDirtyAreas ?? []).length
-            ? tool
-            : { ...tool, modulesDirtyAreas: [...next] };
-    });
-}
-export function clearPhiBuilderModuleAreasDirty(defaultArea) {
-    builderWorkspaceStore.patch(defaultArea, (tool) => (tool.modulesDirtyAreas?.length ?? 0) === 0 ? tool : { ...tool, modulesDirtyAreas: [] });
+export function applyPhiBuilderRuntimeModuleSelectionChange(area, selectedIds) {
+    applyPhiBuilderRuntimeModuleSelectionChanges([{ area, selectedIds }]);
+    return getPhiDeveloperBuilderStateSnapshot().runtimeModuleIdsByArea?.[area] ?? [];
 }

package/plugins/runtime-modules/builder/services/navigation-table.js

@@ -23,7 +23,7 @@ import { PHI_BUILDER_RUNTIME_DATA_PROVIDER_DESCRIPTORS } from "../../../../plugi
 import { isPhiExternalHref } from "../../../../helpers/external-href";
 import { createPhiPageUri, readPhiInternalReference } from "../../../../types/references";
 import { buildPhiBuilderNavigationContainerFromCatalogFolder, findPhiBuilderCatalogNode, } from "../navigation-folder-drop";
-import { phiWorkspaceCatalogStore } from "../../../../components/workspace/catalog-store";
+import { addPhiWorkspaceNavigationSurface } from "../workspace-catalog-actions";
 /**
  * The "404" choice of the Path cell. On a container it is how a folder address is cleared, and what a
  * choice that is no longer a direct child reads as; on a page link it is what a deleted target reads as,
@@ -196,11 +196,11 @@ export function PhiBuilderNavigationTableProviderClient({ children }) {
      * Inspector and every slider step -- each one a reload of the navigation. The functions below read the
      * state snapshot when they run; these subscriptions only say when a change is worth a new registration.
      */
-    const area = usePhiDeveloperBuilderStateValue("public", (state) => state.area);
-    const customPages = usePhiDeveloperBuilderStateValue("public", (state) => state.customPages);
-    const modulePresetPagesByArea = usePhiDeveloperBuilderStateValue("public", (state) => state.modulePresetPagesByArea);
-    const persistedPageCatalogByArea = usePhiDeveloperBuilderStateValue("public", (state) => state.persistedPageCatalogByArea);
-    const navigationSurfacesByArea = usePhiDeveloperBuilderStateValue("public", (state) => state.navigationSurfacesByArea);
+    const area = usePhiDeveloperBuilderStateValue((state) => state.area);
+    const customPages = usePhiDeveloperBuilderStateValue((state) => state.customPages);
+    const modulePresetPagesByArea = usePhiDeveloperBuilderStateValue((state) => state.modulePresetPagesByArea);
+    const persistedPageCatalogByArea = usePhiDeveloperBuilderStateValue((state) => state.persistedPageCatalogByArea);
+    const navigationSurfacesByArea = usePhiDeveloperBuilderStateValue((state) => state.navigationSurfacesByArea);
     const activeNavigationKey = resolvePhiBuilderNavigationWidgetNavKey(undefined, navigationSearchValue, area);
     const activeNavigationDraft = usePhiBuilderNavigationDraft(activeNavigationKey);
     const loaded = useRef(new Map());
@@ -209,7 +209,7 @@ export function PhiBuilderNavigationTableProviderClient({ children }) {
     const initializedHistoryScopes = useRef(new Set());
     const registration = useMemo(() => {
         const resolveScope = (params) => {
-            const state = getPhiDeveloperBuilderStateSnapshot("public");
+            const state = getPhiDeveloperBuilderStateSnapshot();
             const requestedNavKey = typeof params?.navKey === "string" ? params.navKey : navigationSearchValue;
             const navKey = resolvePhiBuilderNavigationWidgetNavKey(undefined, requestedNavKey ?? null, state.area);
             const surfaces = state.navigationSurfacesByArea[state.area];
@@ -345,7 +345,7 @@ export function PhiBuilderNavigationTableProviderClient({ children }) {
                 if (!localKey) {
                     return { status: "rejected", invalidation: "none", errorCode: "invalid-navigation-key", message: "Navigation key is invalid." };
                 }
-                const state = getPhiDeveloperBuilderStateSnapshot("public");
+                const state = getPhiDeveloperBuilderStateSnapshot();
                 const cmsArea = resolvePhiBuilderAreaAsCmsArea(state.area);
                 const navKey = formatPhiBuilderNavigationScopeKey(cmsArea, localKey);
                 const surfaces = state.navigationSurfacesByArea[state.area] ?? [];
@@ -353,13 +353,7 @@ export function PhiBuilderNavigationTableProviderClient({ children }) {
                     return { status: "rejected", invalidation: "none", errorCode: "navigation-exists", message: "Navigation already exists." };
                 }
                 const surface = createPhiBuilderCustomNavigationSurface(navKey, localKey);
-                phiWorkspaceCatalogStore.patch("public", (current) => ({
-                    ...current,
-                    navigationSurfacesByArea: {
-                        ...current.navigationSurfacesByArea,
-                        [state.area]: [...(current.navigationSurfacesByArea[state.area] ?? []), surface],
-                    },
-                }));
+                addPhiWorkspaceNavigationSurface(state.area, surface);
                 const navigation = (await loadPhiBuilderNavigationScope(navKey, surface)).navigation;
                 const saved = await savePhiBuilderNavigationDraft(navigation);
                 setPhiBuilderNavigationDraft(navKey, {

package/plugins/runtime-modules/builder/services/page-source-tree.js

@@ -47,13 +47,13 @@ export function PhiBuilderPageSourceTreeProviderClient({ children }) {
      * The slices the offered catalog is built from; the query reads the state when it runs. Subscribed
      * to the whole state, every selection renewed the registration and reloaded the tree.
      */
-    const area = usePhiDeveloperBuilderStateValue("public", (state) => state.area);
-    const customPages = usePhiDeveloperBuilderStateValue("public", (state) => state.customPages);
-    const modulePresetPagesByArea = usePhiDeveloperBuilderStateValue("public", (state) => state.modulePresetPagesByArea);
-    const navigationSurfacesByArea = usePhiDeveloperBuilderStateValue("public", (state) => state.navigationSurfacesByArea);
-    const persistedPageCatalogByArea = usePhiDeveloperBuilderStateValue("public", (state) => state.persistedPageCatalogByArea);
-    const runtimeModuleIdsByArea = usePhiDeveloperBuilderStateValue("public", (state) => state.runtimeModuleIdsByArea);
-    const areaRootRoutes = usePhiDeveloperBuilderStateValue("public", (state) => state.areaRootRoutes);
+    const area = usePhiDeveloperBuilderStateValue((state) => state.area);
+    const customPages = usePhiDeveloperBuilderStateValue((state) => state.customPages);
+    const modulePresetPagesByArea = usePhiDeveloperBuilderStateValue((state) => state.modulePresetPagesByArea);
+    const navigationSurfacesByArea = usePhiDeveloperBuilderStateValue((state) => state.navigationSurfacesByArea);
+    const persistedPageCatalogByArea = usePhiDeveloperBuilderStateValue((state) => state.persistedPageCatalogByArea);
+    const runtimeModuleIdsByArea = usePhiDeveloperBuilderStateValue((state) => state.runtimeModuleIdsByArea);
+    const areaRootRoutes = usePhiDeveloperBuilderStateValue((state) => state.areaRootRoutes);
     const registration = useMemo(() => {
         const descriptor = PHI_BUILDER_RUNTIME_DATA_PROVIDER_DESCRIPTORS.find((candidate) => candidate.key === PHI_BUILDER_RUNTIME_DATA_PROVIDER_KEYS.pageSourceTree);
         return {
@@ -65,7 +65,7 @@ export function PhiBuilderPageSourceTreeProviderClient({ children }) {
                     : field),
             })) : [],
             query: async (request) => {
-                const state = getPhiDeveloperBuilderStateSnapshot("public");
+                const state = getPhiDeveloperBuilderStateSnapshot();
                 const requestedArea = isBuilderArea(request.params?.area) ? request.params.area : state.area;
                 /*
                  * What the Area answers with, not what is installed in it. The active catalog mirrors the route