@phis/ui 0.4.1 → 0.4.3

package/plugins/runtime-modules/builder/controller/page-controller.js

@@ -13,16 +13,16 @@ import { collectPhiDeveloperBuilderPageKeys, collectPhiDeveloperBuilderPageStora
 import { createPhiDeveloperBuilderInitialPageDrafts, createPhiDeveloperBuilderPageDraft, PhiBuilderPageExistsError, } from "../persistence";
 import { describePhiBuilderPageAddressConflict, findPhiBuilderSitePageAddressConflict, } from "../page-address-rule";
 import { PHI_BUILDER_AREA_SEARCH_PARAM, PHI_BUILDER_PAGE_SEARCH_PARAM, } from "../../../../helpers/cms-scope-search-params";
-import { builderWorkspaceStore, mergePhiDeveloperRegionDrafts, resetPhiBuilderSelectionToPage, getPhiDeveloperBuilderStateSnapshot, } from "../developer-workspace-store";
+import { mergePhiDeveloperRegionDrafts, openPhiBuilderPage, setPhiBuilderPageMetaDraft, startPhiBuilderNewPageDrafts, getPhiDeveloperBuilderStateSnapshot, } from "../developer-workspace-store";
 import { getPhiBuilderRegionDraftKey } from "../region-keys";
 import { capturePhiBuilderWorkspaceHistoryState, createPhiBuilderHistoryContext, phiBuilderHistory, } from "../history";
 import { createPhiBuilderControllerAddress } from "../controller/address";
 import { PHI_SIGNAL_VALUE_SCHEMAS } from "../../../../types/signals";
 import { readPhiRuntimeFormValuesSignalValue } from "../../../../components/forms/runtime-form-state";
 import { emitPhiPageTitleInputSignal } from "../page-title-signal";
-import { phiWorkspaceCatalogStore } from "../../../../components/workspace/catalog-store";
+import { addPhiWorkspaceCustomPage, storePhiWorkspacePersistedPages, } from "../workspace-catalog-actions";
 import { usePhiPathname } from "../../../../components/runtime/use-phi-pathname";
-export function usePhiBuilderPageController({ emitCapability, defaultArea, effectiveArea, effectivePageKey, pageMetaLabels, state, }) {
+export function usePhiBuilderPageController({ emitCapability, effectiveArea, effectivePageKey, pageMetaLabels, state, }) {
     const { showMessage } = usePhiApplicationFeedback();
     const router = useRouter();
     const pathname = usePhiPathname();
@@ -59,25 +59,10 @@ export function usePhiBuilderPageController({ emitCapability, defaultArea, effec
     }, [effectiveArea, emitSignal, resolvePageTitleForInput]);
     async function reloadPersistedPageCatalog(area) {
         const pages = await loadPhiBuilderPersistedPageCatalog(area, { refresh: true });
-        phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-            ...current,
-            persistedPageCatalogByArea: {
-                ...current.persistedPageCatalogByArea,
-                [area]: pages,
-            },
-            pageCatalogHydratedByArea: {
-                ...current.pageCatalogHydratedByArea,
-                [area]: true,
-            },
-        }));
+        storePhiWorkspacePersistedPages(area, pages);
     }
     function navigateToBuilderPage(pageKey) {
-        phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-            ...current,
-            area: effectiveArea,
-            pageKey,
-        }));
-        builderWorkspaceStore.patch(defaultArea, (current) => resetPhiBuilderSelectionToPage(current, pageKey, { closePages: true }));
+        openPhiBuilderPage(effectiveArea, pageKey, { closePages: true });
         if (typeof pathname === "string") {
             const nextSearchParams = new URLSearchParams(searchParams.toString());
             nextSearchParams.set(PHI_BUILDER_AREA_SEARCH_PARAM, effectiveArea);
@@ -180,22 +165,8 @@ export function usePhiBuilderPageController({ emitCapability, defaultArea, effec
                     })
                     : null;
                 const pageMetaDraftKey = getPhiBuilderRegionDraftKey(effectiveArea, "page_meta", effectivePageKey);
-                const historyBefore = capturePhiBuilderWorkspaceHistoryState(getPhiDeveloperBuilderStateSnapshot(defaultArea));
-                // replace writes the whole tool state, so it must read the tool state -- not the merged view.
-                const current = builderWorkspaceStore.getSnapshot(defaultArea);
-                const next = {
-                    ...current,
-                    pageMetaDrafts: {
-                        ...current.pageMetaDrafts,
-                        [pageMetaDraftKey]: {
-                            ...(current.pageMetaDrafts[pageMetaDraftKey] ?? {}),
-                            title: editedTitle,
-                            description,
-                            ...indexPatch,
-                        },
-                    },
-                };
-                builderWorkspaceStore.replace(defaultArea, next);
+                const historyBefore = capturePhiBuilderWorkspaceHistoryState(getPhiDeveloperBuilderStateSnapshot());
+                setPhiBuilderPageMetaDraft(pageMetaDraftKey, { title: editedTitle, description, ...indexPatch });
                 phiBuilderHistory.record(createPhiBuilderHistoryContext({
                     workspace: "pages",
                     area: effectiveArea,
@@ -208,13 +179,13 @@ export function usePhiBuilderPageController({ emitCapability, defaultArea, effec
                     },
                     after: {
                         kind: "workspace",
-                        state: capturePhiBuilderWorkspaceHistoryState(getPhiDeveloperBuilderStateSnapshot(defaultArea)),
+                        state: capturePhiBuilderWorkspaceHistoryState(getPhiDeveloperBuilderStateSnapshot()),
                     },
                 });
                 emitPageTitleInputValue(effectivePageKey, editedTitle);
                 if (pathResult) {
                     await reloadPersistedPageCatalog(effectiveArea);
-                    const refreshed = getPhiDeveloperBuilderStateSnapshot(defaultArea);
+                    const refreshed = getPhiDeveloperBuilderStateSnapshot();
                     const refreshedPages = resolvePhiBuilderActivePageCatalog(effectiveArea, refreshed.modulePresetPagesByArea, refreshed.customPages, refreshed.persistedPageCatalogByArea);
                     const nextPageKey = resolvePhiBuilderPageKeyFromCatalogPath(effectiveArea, pathResult.path, refreshedPages);
                     if (nextPageKey)
@@ -275,36 +246,13 @@ export function usePhiBuilderPageController({ emitCapability, defaultArea, effec
                 pathname,
             });
             mergePhiDeveloperRegionDrafts(nextDrafts);
-            phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-                ...current,
-                customPages: {
-                    ...current.customPages,
-                    [effectiveArea]: [
-                        ...(current.customPages[effectiveArea] ?? []),
-                        {
-                            key: requestedKey,
-                            title,
-                            storagePath: requestedStoragePath,
-                        },
-                    ],
-                },
-            }));
+            addPhiWorkspaceCustomPage(effectiveArea, { key: requestedKey, title, storagePath: requestedStoragePath });
             // The page's meta and delete drafts are edits in progress, so they stay with the Builder.
-            builderWorkspaceStore.patch(defaultArea, (current) => ({
-                ...current,
-                pageMetaDrafts: {
-                    ...current.pageMetaDrafts,
-                    [getPhiBuilderRegionDraftKey(effectiveArea, "page_meta", requestedKey)]: {
-                        title,
-                        description,
-                        ...indexPatch,
-                    },
-                },
-                deletedPageDrafts: {
-                    ...current.deletedPageDrafts,
-                    [getPhiBuilderRegionDraftKey(effectiveArea, "page_delete", requestedKey)]: false,
-                },
-            }));
+            startPhiBuilderNewPageDrafts({
+                metaDraftKey: getPhiBuilderRegionDraftKey(effectiveArea, "page_meta", requestedKey),
+                meta: { title, description, ...indexPatch },
+                deleteDraftKey: getPhiBuilderRegionDraftKey(effectiveArea, "page_delete", requestedKey),
+            });
             await reloadPersistedPageCatalog(effectiveArea);
             navigateToBuilderPage(requestedKey);
             emitPageTitleInputValue(requestedKey, title);
@@ -315,7 +263,7 @@ export function usePhiBuilderPageController({ emitCapability, defaultArea, effec
             if (error instanceof PhiBuilderPageExistsError && !error.tombstoned) {
                 // Somebody created it meanwhile: open that Page rather than failing on the path it holds.
                 await reloadPersistedPageCatalog(effectiveArea);
-                const refreshed = getPhiDeveloperBuilderStateSnapshot(defaultArea);
+                const refreshed = getPhiDeveloperBuilderStateSnapshot();
                 const refreshedPages = resolvePhiBuilderActivePageCatalog(effectiveArea, refreshed.modulePresetPagesByArea, refreshed.customPages, refreshed.persistedPageCatalogByArea);
                 const existingKey = resolvePhiBuilderPageKeyFromCatalogPath(effectiveArea, error.path, refreshedPages);
                 if (existingKey)

package/plugins/runtime-modules/builder/controller/server-definition.d.ts

@@ -33,20 +33,10 @@ export declare const PHI_BUILDER_RUNTIME_CONTROLLER_SERVER_DEFINITION: {
     allowedMountScopes: "area"[];
     runtimeSignals: {
         emits: ({
-            id: string;
-            action: "start";
-            valueType: "json";
-            valueSchema: `${string}/signals/${string}`;
-        } | {
             id: string;
             action: "change";
             valueType: "json";
             valueSchema: `${string}/signals/${string}`;
-        } | {
-            id: string;
-            action: "stop";
-            valueType: "json";
-            valueSchema: `${string}/signals/${string}`;
         } | {
             id: string;
             action: "activate";
@@ -70,11 +60,6 @@ export declare const PHI_BUILDER_RUNTIME_CONTROLLER_SERVER_DEFINITION: {
             action: "change";
             valueType: "boolean";
             valueSchema?: undefined;
-        } | {
-            id: string;
-            action: "drop";
-            valueType: "json";
-            valueSchema: `${string}/signals/${string}`;
         })[];
         listens: ({
             id: string;

package/plugins/runtime-modules/builder/controller/signal-wiring-controller.d.ts

@@ -1,7 +1,4 @@
 import { type PhiSignalRouteSet } from "../../../../types/signals";
-import type { PhiDeveloperBuilderArea } from "../developer-workspace-types";
-export declare function patchPhiBuilderSignalWiringSession(defaultArea: PhiDeveloperBuilderArea, values: Record<string, unknown>): void;
-export declare function resetPhiBuilderSignalWiringSession(defaultArea: PhiDeveloperBuilderArea): void;
 export type PhiBuilderSignalWiringResult = {
     kind: "applied";
     routes: PhiSignalRouteSet;
@@ -19,7 +16,7 @@ export type PhiBuilderSignalWiringResult = {
  * selection change, and a route whose value the receiver cannot read is worse than no route at all --
  * nothing reports it at runtime.
  */
-export declare function resolvePhiBuilderSignalWiringRoutes(defaultArea: PhiDeveloperBuilderArea): PhiBuilderSignalWiringResult;
+export declare function resolvePhiBuilderSignalWiringRoutes(): PhiBuilderSignalWiringResult;
 /**
  * Removes one route from the selected block by its key.
  *
@@ -27,4 +24,4 @@ export declare function resolvePhiBuilderSignalWiringRoutes(defaultArea: PhiDeve
  * so its rows come straight from the draft config rather than from a staged copy. Removing therefore
  * writes to the same place Apply does, and the Table is reloaded afterwards.
  */
-export declare function resolvePhiBuilderSignalWiringRoutesWithout(defaultArea: PhiDeveloperBuilderArea, routeKey: string): PhiSignalRouteSet | null;
+export declare function resolvePhiBuilderSignalWiringRoutesWithout(routeKey: string): PhiSignalRouteSet | null;

package/plugins/runtime-modules/builder/controller/signal-wiring-controller.js

@@ -1,52 +1,8 @@
 "use client";
 import { createPhiSignalRouteKey, readPhiSignalRouteSet, PHI_SIGNAL_VALUE_SCHEMAS, } from "../../../../types/signals";
-import { builderWorkspaceStore, getPhiDeveloperBuilderStateSnapshot } from "../developer-workspace-store";
+import { getPhiDeveloperBuilderStateSnapshot } from "../developer-workspace-store";
 import { getPhiDeveloperSelectedSignalRoutes } from "../signal-route-selection";
 import { phiSignalCapabilitiesMatch, resolvePhiBuilderReceiverSignalEndpoints, resolvePhiBuilderSelectedSignalEndpoints, } from "../signal-wiring-options";
-const EMPTY_SESSION = {
-    senderAddress: null,
-    senderCapabilityId: null,
-    receiverAddress: null,
-    receiverCapabilityId: null,
-    fieldKey: null,
-};
-function readOptionalString(value) {
-    return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
-}
-export function patchPhiBuilderSignalWiringSession(defaultArea, values) {
-    builderWorkspaceStore.patch(defaultArea, (current) => {
-        const senderAddress = readOptionalString(values.senderAddress) ?? current.signalWiring.senderAddress;
-        // A cascade only holds if the values below the one that moved are dropped: keeping a capability that
-        // belongs to the previous endpoint would build a route the runtime silently ignores.
-        const senderChanged = senderAddress !== current.signalWiring.senderAddress;
-        const senderCapabilityId = senderChanged
-            ? null
-            : readOptionalString(values.senderCapabilityId) ?? current.signalWiring.senderCapabilityId;
-        const capabilityChanged = senderCapabilityId !== current.signalWiring.senderCapabilityId;
-        const receiverAddress = senderChanged || capabilityChanged
-            ? null
-            : readOptionalString(values.receiverAddress) ?? current.signalWiring.receiverAddress;
-        const receiverChanged = receiverAddress !== current.signalWiring.receiverAddress;
-        return {
-            ...current,
-            signalWiring: {
-                senderAddress,
-                senderCapabilityId,
-                receiverAddress,
-                receiverCapabilityId: senderChanged || capabilityChanged || receiverChanged
-                    ? null
-                    : readOptionalString(values.receiverCapabilityId) ?? current.signalWiring.receiverCapabilityId,
-                // The field belongs to the receiver's input, so it falls with everything above it.
-                fieldKey: senderChanged || capabilityChanged || receiverChanged
-                    ? null
-                    : readOptionalString(values.fieldKey) ?? current.signalWiring.fieldKey,
-            },
-        };
-    });
-}
-export function resetPhiBuilderSignalWiringSession(defaultArea) {
-    builderWorkspaceStore.patch(defaultArea, (current) => ({ ...current, signalWiring: { ...EMPTY_SESSION } }));
-}
 function routesAreEquivalent(left, right) {
     return left.capabilityId === right.capabilityId && left.scope === right.scope &&
         left.channel === right.channel && left.action === right.action && left.valueType === right.valueType &&
@@ -61,8 +17,8 @@ function routesAreEquivalent(left, right) {
  * selection change, and a route whose value the receiver cannot read is worse than no route at all --
  * nothing reports it at runtime.
  */
-export function resolvePhiBuilderSignalWiringRoutes(defaultArea) {
-    const state = getPhiDeveloperBuilderStateSnapshot(defaultArea);
+export function resolvePhiBuilderSignalWiringRoutes() {
+    const state = getPhiDeveloperBuilderStateSnapshot();
     const session = state.signalWiring;
     if (!session.senderAddress || !session.senderCapabilityId || !session.receiverAddress || !session.receiverCapabilityId) {
         return { kind: "incomplete" };
@@ -95,7 +51,7 @@ export function resolvePhiBuilderSignalWiringRoutes(defaultArea) {
         receiver: receiver.address,
         ...(wantsFieldKey && session.fieldKey ? { fieldKey: session.fieldKey } : {}),
     };
-    const current = getPhiDeveloperSelectedSignalRoutes(defaultArea) ?? {};
+    const current = getPhiDeveloperSelectedSignalRoutes() ?? {};
     if ([...(current.emits ?? []), ...(current.listens ?? [])].some((candidate) => routesAreEquivalent(candidate, route))) {
         return { kind: "duplicate" };
     }
@@ -112,8 +68,8 @@ export function resolvePhiBuilderSignalWiringRoutes(defaultArea) {
  * so its rows come straight from the draft config rather than from a staged copy. Removing therefore
  * writes to the same place Apply does, and the Table is reloaded afterwards.
  */
-export function resolvePhiBuilderSignalWiringRoutesWithout(defaultArea, routeKey) {
-    const current = getPhiDeveloperSelectedSignalRoutes(defaultArea) ?? {};
+export function resolvePhiBuilderSignalWiringRoutesWithout(routeKey) {
+    const current = getPhiDeveloperSelectedSignalRoutes() ?? {};
     const emits = (current.emits ?? []).filter((route) => route.routeKey !== routeKey);
     const listens = (current.listens ?? []).filter((route) => route.routeKey !== routeKey);
     if (emits.length === (current.emits ?? []).length && listens.length === (current.listens ?? []).length) {

package/plugins/runtime-modules/builder/controller/workspace-controller.d.ts

@@ -1,6 +1,6 @@
 import { type PhiSignalRouteSet } from "../../../../types/signals";
 import type { PhiRuntimeModuleDefinition, PhiRuntimeModuleId } from "../../../../types/cms-plugins";
-import type { PhiDeveloperBuilderArea, PhiDeveloperBuilderRegionDraft } from "../developer-workspace-types";
+import type { PhiDeveloperBuilderRegionDraft } from "../developer-workspace-types";
 import type { PhiAreaRootRoute, PhiAreaMeta } from "../../../../helpers/cms-area-config";
 import type { PhiWorkspaceCatalogState } from "../../../../components/workspace/catalog-state";
 import { type PhiBuilderPageMetaPresentationLabels } from "../controller/definition";
@@ -8,7 +8,6 @@ import type { PhiCmsTreeControllerSettings } from "../../../../types/cms";
 import { type PhiHistoryLabels } from "../../../../components/widgets/label-types/history";
 export type { PhiBuilderPageRegionKey, PhiBuilderRegionKey, PhiBuilderShellRegionKey, } from "../region-keys";
 export type PhiDeveloperBuilderWorkspaceControllerProps = {
-    defaultArea?: PhiDeveloperBuilderArea;
     shellPresetDraftsByArea?: Record<string, Record<string, PhiDeveloperBuilderRegionDraft>>;
     runtimeModuleDefinitions?: readonly PhiRuntimeModuleDefinition[];
     runtimeModuleIdsByArea?: Record<string, PhiRuntimeModuleId[]>;
@@ -27,4 +26,4 @@ export type PhiDeveloperBuilderWorkspaceControllerProps = {
     historyLabels: PhiHistoryLabels;
     signalRoutes?: PhiSignalRouteSet | null;
 };
-export declare function PhiDeveloperBuilderWorkspaceController({ defaultArea, shellPresetDraftsByArea, runtimeModuleDefinitions, runtimeModuleIdsByArea, modulePresetPagesByArea, areaPresetSourcesByArea, navigationSurfacesByArea, unresolvedModuleIdsByArea, serverUnavailableModules, publicRouteClaims, publicRoutePaths, areaRootRoutesByArea, areaMetaByArea, areaControllerSettingsByArea, pageMetaLabels, historyLabels, signalRoutes, }: PhiDeveloperBuilderWorkspaceControllerProps): import("react").JSX.Element;
+export declare function PhiDeveloperBuilderWorkspaceController({ shellPresetDraftsByArea, runtimeModuleDefinitions, runtimeModuleIdsByArea, modulePresetPagesByArea, areaPresetSourcesByArea, navigationSurfacesByArea, unresolvedModuleIdsByArea, serverUnavailableModules, publicRouteClaims, publicRoutePaths, areaRootRoutesByArea, areaMetaByArea, areaControllerSettingsByArea, pageMetaLabels, historyLabels, signalRoutes, }: PhiDeveloperBuilderWorkspaceControllerProps): import("react").JSX.Element;