@kywi-software/core 0.10.0 → 0.12.0

package/dist/admin/layout-editor/use-component-fork.js

@@ -0,0 +1,346 @@
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
+import { collectComponentInstances, componentDetachSource, componentRefKey, refreshComponentCopies, } from '../../layout/component-refs.js';
+import { adminFetch } from '../../host-client/index.js';
+import { applyInstanceReplacements, buildUpdateAll, detachInstanceKeepingEdits, diffLinkedInstances, isBaselineStale, linkedInstanceContentEquals, } from './component-fork.js';
+import { ComponentForkDialog, EditorDialog, } from './editor-dialog.js';
+import { componentErrorMessage } from './use-component-connect.js';
+// ── The hook ─────────────────────────────────────────────────────────────────
+export function useComponentFork({ layout, originalLayout, dispatch, library, inlineEditActive = false, inert = false, }) {
+    const [session, setSession] = React.useState(null);
+    const [phase, setPhase] = React.useState({ kind: 'asking', index: 0 });
+    const [usage, setUsage] = React.useState({});
+    // ── Session baselines ──────────────────────────────────────────────────────
+    //
+    // A link created during this session has no stored self to be compared with,
+    // and connecting/placing already wrote the definition — so its baseline is what
+    // it looked like the moment the link appeared. Recorded here, first sight
+    // winning, because otherwise "save as component, then fix the typo you just
+    // spotted" would write the fix into a fallback copy the page never renders.
+    // Entries for placements that later reach the server are simply ignored (the
+    // stored document wins in `diffLinkedInstances`), so this never goes stale in a
+    // way that matters.
+    const sessionBaselines = React.useRef(new Map());
+    React.useEffect(() => {
+        const stored = new Set(collectComponentInstances(originalLayout).map(componentRefKey));
+        for (const instance of collectComponentInstances(layout)) {
+            const key = componentRefKey(instance);
+            if (stored.has(key) || sessionBaselines.current.has(key))
+                continue;
+            sessionBaselines.current.set(key, instance);
+        }
+    }, [layout, originalLayout]);
+    // ── Fallback-copy refresh (kywi-cms#147 T4 review, C1) ─────────────────────
+    //
+    // A linked section/container stores an inline copy of its definition and the
+    // editor edits THAT — so before anything can be edited, the copies are brought
+    // back in line with the definitions the library just loaded. Without it,
+    // update-all built the new definition out of a stale copy and reverted every
+    // newer edit of that component everywhere, silently, published pages included.
+    //
+    // Once per library SNAPSHOT: the components array is a fresh identity on load, on
+    // `add` (a component this session created) and on `update` (a definition this
+    // session wrote), and each of those genuinely changes what a copy should hold.
+    // The layout is a dependency because the effect reads it, not because a layout
+    // change should re-run this — the ref guard is what stops that, and it has to,
+    // since every edit changes the layout.
+    //
+    // The reducer refuses the dispatch on a document that is no longer pristine (see
+    // REFRESH_COMPONENT_COPIES), so an author already mid-edit when a slow library
+    // arrives keeps their work and is protected by `isBaselineStale` instead.
+    const refreshedForRef = React.useRef(null);
+    React.useEffect(() => {
+        // A definition canvas has no placements to refresh — see `inert`.
+        if (inert)
+            return;
+        // Deliberately does NOT update `refreshedForRef` on this branch, so the
+        // effect retries against the SAME library snapshot once the session ends
+        // (`inlineEditActive` flipping back to false is itself a dependency below,
+        // which re-runs this effect) — see `inlineEditActive`'s doc for why landing
+        // mid-session is unsafe rather than merely late.
+        if (inlineEditActive)
+            return;
+        if (refreshedForRef.current === library.components)
+            return;
+        refreshedForRef.current = library.components;
+        const refreshed = refreshComponentCopies(layout, library.lookup);
+        if (refreshed === layout)
+            return;
+        dispatch({ type: 'REFRESH_COMPONENT_COPIES', layout: refreshed });
+    }, [library, layout, dispatch, inlineEditActive, inert]);
+    const close = React.useCallback(() => {
+        setSession(null);
+        setPhase({ kind: 'asking', index: 0 });
+    }, []);
+    // ── Opening ────────────────────────────────────────────────────────────────
+    const guardSave = React.useCallback((perform, mode = 'save') => {
+        // A definition save is the propagation; there is nothing to ask (see `inert`).
+        if (inert) {
+            void perform(layout);
+            return;
+        }
+        // A save while the dialog is open would ask twice about the same edits.
+        if (session)
+            return;
+        const edits = diffLinkedInstances(originalLayout, layout, ref => sessionBaselines.current.get(componentRefKey(ref)));
+        if (edits.length === 0) {
+            void perform(layout);
+            return;
+        }
+        const groups = groupEdits(edits, library);
+        setSession({ layout, groups, decisions: {}, perform, mode });
+        setPhase({ kind: 'asking', index: 0 });
+        // Blast radius, best-effort and in parallel: one usage read per component,
+        // fired now so the numbers are there by the time the owner reads them.
+        setUsage(Object.fromEntries(groups.map(g => [g.componentId, { state: 'pending' }])));
+        for (const group of groups) {
+            void fetchUsage(group.componentId).then(radius => {
+                setUsage(prev => ({ ...prev, [group.componentId]: radius }));
+            });
+        }
+    }, [session, layout, originalLayout, library, inert]);
+    // ── Executing ──────────────────────────────────────────────────────────────
+    const execute = React.useCallback(async (current) => {
+        setPhase({ kind: 'saving' });
+        const replacements = new Map();
+        const updated = [];
+        // Definitions this save has written, so the OTHER placements of the same
+        // component — the ones nobody edited — can be refreshed to it before the page
+        // is stored (kywi-cms#147 T4 review, C1). Without this, editing placement A,
+        // updating everywhere, then editing placement B and updating again rebuilt the
+        // definition from B's now-stale copy and destroyed A's edit inside one session.
+        const written = new Map();
+        for (const group of current.groups) {
+            const decision = current.decisions[group.componentId] ?? 'this-page-only';
+            if (decision === 'this-page-only') {
+                for (const edit of group.edits) {
+                    replacements.set(componentRefKey(edit), detachInstanceKeepingEdits(edit, library.lookup(edit.componentId)));
+                }
+                continue;
+            }
+            // Every edit in the group agrees (that is what makes update-all
+            // available), so any of them defines the component; each placement still
+            // gets its own clean instance, since a clean module instance is built
+            // from the node it replaces.
+            const plans = group.edits.map(edit => buildUpdateAll(edit, {
+                source: library.lookup(edit.componentId),
+                resolveLink: library.lookup,
+            }));
+            const definition = plans[0]?.definition;
+            if (!definition || plans.some(plan => plan === null)) {
+                // Only reachable if the library changed under us between the question
+                // and the answer (`groupEdits` already withdrew update-all otherwise).
+                setPhase({
+                    kind: 'failed',
+                    message: `${alreadyUpdated(updated)}Could not work out what to save for ` +
+                        `“${group.name ?? 'this component'}”, so the page was not saved.`,
+                });
+                return;
+            }
+            let res;
+            try {
+                res = await adminFetch(`/api/v1/components/${group.componentId}`, {
+                    method: 'PUT',
+                    body: JSON.stringify({ definition }),
+                });
+            }
+            catch {
+                setPhase({
+                    kind: 'failed',
+                    message: `${alreadyUpdated(updated)}Could not reach the server, so “${group.name ?? 'this component'}” was not updated and the page was not saved.`,
+                });
+                return;
+            }
+            if (!res.ok) {
+                setPhase({
+                    kind: 'failed',
+                    message: `${alreadyUpdated(updated)}“${group.name ?? 'This component'}” was not updated: ${await componentErrorMessage(res)} The page was not saved.`,
+                });
+                return;
+            }
+            updated.push(group.name ?? 'the component');
+            group.edits.forEach((edit, index) => {
+                replacements.set(componentRefKey(edit), plans[index].cleanInstance);
+            });
+            // The library is the editor's copy of what the server now holds — every
+            // later read of it (the rail's values, the canvas preview, the next
+            // staleness check) must see the definition this save just wrote.
+            const row = library.byId(group.componentId);
+            if (row) {
+                written.set(group.componentId, componentDetachSource({ ...row, definition }));
+            }
+            library.update(group.componentId, definition);
+        }
+        // One document, one history entry, handed to the reducer BY REFERENCE so
+        // the shell's MARK_SAVED can recognise it (see the action's doc).
+        //
+        // Two passes, in this order: the answers first (each edited placement becomes
+        // a clean instance of the new definition), then the copy refresh for the
+        // placements nobody edited. The refresh is a no-op on the ones just replaced —
+        // `buildUpdateAll` builds `cleanInstance` by applying the new definition to the
+        // placement, which is precisely what refreshing would compute.
+        const answered = applyInstanceReplacements(current.layout, replacements);
+        const resolved = written.size > 0
+            ? refreshComponentCopies(answered, id => written.get(id) ?? null)
+            : answered;
+        dispatch({ type: 'APPLY_COMPONENT_FORK', layout: resolved });
+        let ok;
+        try {
+            ok = await Promise.resolve(current.perform(resolved));
+        }
+        catch {
+            ok = false;
+        }
+        if (ok === false) {
+            setPhase({
+                kind: 'failed',
+                message: `${alreadyUpdated(updated)}This page could not be saved, so it still has unsaved changes. ` +
+                    'Try again — updating a component twice changes nothing.',
+            });
+            return;
+        }
+        close();
+    }, [library, dispatch, close]);
+    const decide = React.useCallback((decision) => {
+        if (!session)
+            return;
+        if (phase.kind !== 'asking')
+            return;
+        const group = session.groups[phase.index];
+        if (!group)
+            return;
+        const next = {
+            ...session,
+            decisions: { ...session.decisions, [group.componentId]: decision },
+        };
+        setSession(next);
+        if (phase.index + 1 < next.groups.length) {
+            setPhase({ kind: 'asking', index: phase.index + 1 });
+            return;
+        }
+        void execute(next);
+    }, [session, phase, execute]);
+    const retry = React.useCallback(() => {
+        if (session)
+            void execute(session);
+    }, [session, execute]);
+    // ── The dialog ─────────────────────────────────────────────────────────────
+    const dialog = React.useMemo(() => {
+        if (!session)
+            return null;
+        // A failure replaces the question rather than decorating it: the answers have
+        // already been given, and re-offering "Save to this page only" here would
+        // re-run whatever was decided instead of what the label says. One honest
+        // action — try the same thing again — plus a way to walk away.
+        if (phase.kind === 'failed') {
+            return (_jsx(EditorDialog, { title: "Could not finish saving", error: phase.message, cancelLabel: "Close", actions: [{ label: 'Try again', action: 'fork-retry', onClick: retry }], onCancel: close }));
+        }
+        // While saving, the last question stays on screen with its actions disabled —
+        // the owner keeps the context of what they just decided.
+        const index = phase.kind === 'asking' ? phase.index : session.groups.length - 1;
+        const group = session.groups[Math.min(index, session.groups.length - 1)];
+        if (!group)
+            return null;
+        return (_jsx(ComponentForkDialog, { componentName: group.name, blastRadius: usage[group.componentId] ?? { state: 'pending' }, saveMode: session.mode, step: index + 1, stepCount: session.groups.length, updateAllUnavailable: group.updateAllUnavailable, busy: phase.kind === 'saving', onUpdateAll: () => decide('update-all'), onThisPageOnly: () => decide('this-page-only'), 
+            // Cancel/Escape aborts the WHOLE save: nothing is written, the document
+            // keeps every edit, and the page stays dirty. A half-applied fork would
+            // be worse than no save at all.
+            onCancel: close }));
+    }, [session, phase, usage, decide, retry, close]);
+    return React.useMemo(() => ({ dialog, guardSave }), [dialog, guardSave]);
+}
+// ── Helpers ──────────────────────────────────────────────────────────────────
+function alreadyUpdated(updated) {
+    if (updated.length === 0)
+        return '';
+    const names = updated.map(name => `“${name}”`).join(', ');
+    return `${names} ${updated.length === 1 ? 'was' : 'were'} already updated everywhere. `;
+}
+/**
+ * Group the edits by component — one question per component, not per node.
+ *
+ * MULTIPLE COMPONENTS IN ONE SAVE are asked about one after another ("Component 1
+ * of 2"), because the answers are genuinely independent: updating the shared
+ * footer everywhere and keeping a hero tweak local is a perfectly ordinary pair
+ * of intentions, and a single combined dialog would either force one answer for
+ * both or turn into a form.
+ *
+ * TWO PLACEMENTS OF ONE COMPONENT edited DIFFERENTLY on the same page cannot both
+ * become the definition. Rather than picking one silently, "update all" is
+ * withdrawn with the reason; "this page only" still works and detaches both.
+ * Identical edits to both placements are fine and stay offered.
+ *
+ * A STALE COPY withdraws it too (kywi-cms#147 T4 review, C1). If what this page
+ * stored as the component's content is not what the component now holds, the
+ * definition built from it would revert whatever changed in between — everywhere,
+ * published pages included. `isBaselineStale` decides; the copies are normally
+ * refreshed long before this point, so reaching it means the library never loaded
+ * or arrived too late to be applied safely.
+ */
+function groupEdits(edits, library) {
+    const groups = new Map();
+    for (const edit of edits) {
+        const existing = groups.get(edit.componentId);
+        if (existing) {
+            existing.edits.push(edit);
+            continue;
+        }
+        groups.set(edit.componentId, {
+            componentId: edit.componentId,
+            name: library.nameOf(edit.componentId),
+            edits: [edit],
+            updateAllUnavailable: null,
+        });
+    }
+    for (const group of groups.values()) {
+        const first = group.edits[0];
+        const divergent = group.edits.some(edit => !linkedInstanceContentEquals(first.instance, edit.instance));
+        if (divergent) {
+            group.updateAllUnavailable =
+                `${group.edits.length} instances of this component on this page were edited differently, ` +
+                    'so they cannot all become the component. Save them to this page only, or undo one of the edits.';
+            continue;
+        }
+        const source = library.lookup(group.componentId);
+        const buildable = group.edits.every(edit => buildUpdateAll(edit, { source, resolveLink: library.lookup }) !== null);
+        if (!buildable) {
+            group.updateAllUnavailable =
+                'This component’s current content could not be loaded, so the editor cannot tell which of ' +
+                    'its settings you changed. Save to this page only, or reload the page and try again.';
+            continue;
+        }
+        // The belt on C1: a definition built out of an out-of-date copy would revert
+        // whatever changed in between, everywhere.
+        if (group.edits.some(edit => isBaselineStale(edit, source))) {
+            group.updateAllUnavailable =
+                'This page’s copy of the component is out of date, so saving it to every instance would ' +
+                    'undo newer changes. Save to this page only, then re-edit the component from an ' +
+                    'up-to-date page.';
+        }
+    }
+    return [...groups.values()];
+}
+/** Where a component is placed — best-effort; a failure degrades the wording. */
+async function fetchUsage(componentId) {
+    try {
+        const res = await adminFetch(`/api/v1/components/${componentId}/usage`);
+        if (!res.ok)
+            return { state: 'unknown' };
+        const body = (await res.json());
+        const data = body.data;
+        if (!data || typeof data.instances !== 'number' || typeof data.pages !== 'number') {
+            return { state: 'unknown' };
+        }
+        return {
+            state: 'known',
+            instances: data.instances,
+            pages: data.pages,
+            trashedInstances: typeof data.trashedInstances === 'number' ? data.trashedInstances : 0,
+        };
+    }
+    catch {
+        return { state: 'unknown' };
+    }
+}
+//# sourceMappingURL=use-component-fork.js.map

package/dist/admin/layout-editor/use-component-fork.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-component-fork.js","sourceRoot":"","sources":["../../../src/admin/layout-editor/use-component-fork.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EACL,yBAAyB,EACzB,qBAAqB,EACrB,eAAe,EACf,sBAAsB,GAGvB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EACL,yBAAyB,EACzB,cAAc,EACd,0BAA0B,EAC1B,mBAAmB,EACnB,eAAe,EACf,2BAA2B,GAE5B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,mBAAmB,EACnB,YAAY,GAGb,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAiGlE,gFAAgF;AAEhF,MAAM,UAAU,gBAAgB,CAAC,EAC/B,MAAM,EACN,cAAc,EACd,QAAQ,EACR,OAAO,EACP,gBAAgB,GAAG,KAAK,EACxB,KAAK,GAAG,KAAK,GAuDd;IACC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAqB,IAAI,CAAC,CAAA;IACtE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;IAC7E,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAA2C,EAAE,CAAC,CAAA;IAEtF,8EAA8E;IAC9E,EAAE;IACF,6EAA6E;IAC7E,gFAAgF;IAChF,0EAA0E;IAC1E,4EAA4E;IAC5E,4EAA4E;IAC5E,6EAA6E;IAC7E,gFAAgF;IAChF,oBAAoB;IACpB,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,GAAG,EAA6B,CAAC,CAAA;IAC3E,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;QACtF,KAAK,MAAM,QAAQ,IAAI,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,MAAM,GAAG,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAA;YACrC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAQ;YAClE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAA;IAE5B,8EAA8E;IAC9E,EAAE;IACF,6EAA6E;IAC7E,+EAA+E;IAC/E,yEAAyE;IACzE,6EAA6E;IAC7E,+EAA+E;IAC/E,EAAE;IACF,kFAAkF;IAClF,8EAA8E;IAC9E,+EAA+E;IAC/E,+EAA+E;IAC/E,+EAA+E;IAC/E,uCAAuC;IACvC,EAAE;IACF,iFAAiF;IACjF,+EAA+E;IAC/E,0EAA0E;IAC1E,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAU,IAAI,CAAC,CAAA;IACnD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,kEAAkE;QAClE,IAAI,KAAK;YAAE,OAAM;QACjB,wEAAwE;QACxE,yEAAyE;QACzE,2EAA2E;QAC3E,4EAA4E;QAC5E,iDAAiD;QACjD,IAAI,gBAAgB;YAAE,OAAM;QAC5B,IAAI,eAAe,CAAC,OAAO,KAAK,OAAO,CAAC,UAAU;YAAE,OAAM;QAC1D,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAA;QAC5C,MAAM,SAAS,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QAChE,IAAI,SAAS,KAAK,MAAM;YAAE,OAAM;QAChC,QAAQ,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;IACnE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAA;IAExD,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACnC,UAAU,CAAC,IAAI,CAAC,CAAA;QAChB,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;IACxC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,8EAA8E;IAE9E,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CACjC,CAAC,OAAoB,EAAE,OAA8B,MAAM,EAAE,EAAE;QAC7D,+EAA+E;QAC/E,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;YACpB,OAAM;QACR,CAAC;QACD,wEAAwE;QACxE,IAAI,OAAO;YAAE,OAAM;QACnB,MAAM,KAAK,GAAG,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAC9D,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CACnD,CAAA;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;YACpB,OAAM;QACR,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACzC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC5D,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;QAEtC,2EAA2E;QAC3E,uEAAuE;QACvE,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,SAAS,EAAW,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7F,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,KAAK,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC/C,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;YAC9D,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,EACD,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,CAAC,CAClD,CAAA;IAED,8EAA8E;IAE9E,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAC/B,KAAK,EAAE,OAAoB,EAAE,EAAE;QAC7B,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC5B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAyD,CAAA;QACrF,MAAM,OAAO,GAAa,EAAE,CAAA;QAC5B,yEAAyE;QACzE,8EAA8E;QAC9E,6EAA6E;QAC7E,+EAA+E;QAC/E,gFAAgF;QAChF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAiC,CAAA;QAExD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,gBAAgB,CAAA;YACzE,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBAClC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;oBAC/B,YAAY,CAAC,GAAG,CACd,eAAe,CAAC,IAAI,CAAC,EACrB,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CACnE,CAAA;gBACH,CAAC;gBACD,SAAQ;YACV,CAAC;YAED,gEAAgE;YAChE,yEAAyE;YACzE,sEAAsE;YACtE,6BAA6B;YAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACnC,cAAc,CAAC,IAAI,EAAE;gBACnB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;gBACxC,WAAW,EAAE,OAAO,CAAC,MAAM;aAC5B,CAAC,CACH,CAAA;YACD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAA;YACvC,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBACrD,sEAAsE;gBACtE,uEAAuE;gBACvE,QAAQ,CAAC;oBACP,IAAI,EAAE,QAAQ;oBACd,OAAO,EACL,GAAG,cAAc,CAAC,OAAO,CAAC,sCAAsC;wBAChE,IAAI,KAAK,CAAC,IAAI,IAAI,gBAAgB,+BAA+B;iBACpE,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YAED,IAAI,GAAa,CAAA;YACjB,IAAI,CAAC;gBACH,GAAG,GAAG,MAAM,UAAU,CAAC,sBAAsB,KAAK,CAAC,WAAW,EAAE,EAAE;oBAChE,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,CAAC;iBACrC,CAAC,CAAA;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,QAAQ,CAAC;oBACP,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,mCAAmC,KAAK,CAAC,IAAI,IAAI,gBAAgB,+CAA+C;iBACpJ,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,QAAQ,CAAC;oBACP,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,gBAAgB,sBAAsB,MAAM,qBAAqB,CAAC,GAAG,CAAC,0BAA0B;iBACtJ,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,eAAe,CAAC,CAAA;YAC3C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBAClC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAE,CAAC,aAAa,CAAC,CAAA;YACtE,CAAC,CAAC,CAAA;YACF,wEAAwE;YACxE,oEAAoE;YACpE,iEAAiE;YACjE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YAC3C,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,qBAAqB,CAAC,EAAE,GAAG,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,CAAA;YAC/E,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAC/C,CAAC;QAED,yEAAyE;QACzE,kEAAkE;QAClE,EAAE;QACF,8EAA8E;QAC9E,yEAAyE;QACzE,+EAA+E;QAC/E,gFAAgF;QAChF,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,yBAAyB,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,GAAG,CAAC;YAC/B,CAAC,CAAC,sBAAsB,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACjE,CAAC,CAAC,QAAQ,CAAA;QACZ,QAAQ,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QAE5D,IAAI,EAAkB,CAAA;QACtB,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,EAAE,GAAG,KAAK,CAAA;QACZ,CAAC;QACD,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC;gBACP,IAAI,EAAE,QAAQ;gBACd,OAAO,EACL,GAAG,cAAc,CAAC,OAAO,CAAC,iEAAiE;oBAC3F,yDAAyD;aAC5D,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QACD,KAAK,EAAE,CAAA;IACT,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAC3B,CAAA;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAC9B,CAAC,QAAsB,EAAE,EAAE;QACzB,IAAI,CAAC,OAAO;YAAE,OAAM;QACpB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAM;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACzC,IAAI,CAAC,KAAK;YAAE,OAAM;QAClB,MAAM,IAAI,GAAgB;YACxB,GAAG,OAAO;YACV,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE;SACnE,CAAA;QACD,UAAU,CAAC,IAAI,CAAC,CAAA;QAChB,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACzC,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;YACpD,OAAM;QACR,CAAC;QACD,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACpB,CAAC,EACD,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAC1B,CAAA;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACnC,IAAI,OAAO;YAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IAEtB,8EAA8E;IAE9E,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAA;QAEzB,8EAA8E;QAC9E,0EAA0E;QAC1E,yEAAyE;QACzE,+DAA+D;QAC/D,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,yBAAyB,EAC/B,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,WAAW,EAAC,OAAO,EACnB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EACvE,QAAQ,EAAE,KAAK,GACf,CACH,CAAA;QACH,CAAC;QAED,8EAA8E;QAC9E,yDAAyD;QACzD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;QAC/E,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QACxE,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAA;QACvB,OAAO,CACL,KAAC,mBAAmB,IAClB,aAAa,EAAE,KAAK,CAAC,IAAI,EACzB,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,EAC7D,QAAQ,EAAE,OAAO,CAAC,IAAI,EACtB,IAAI,EAAE,KAAK,GAAG,CAAC,EACf,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAChC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB,EAChD,IAAI,EAAE,KAAK,CAAC,IAAI,KAAK,QAAQ,EAC7B,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EACvC,cAAc,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAC9C,wEAAwE;YACxE,wEAAwE;YACxE,gCAAgC;YAChC,QAAQ,EAAE,KAAK,GACf,CACH,CAAA;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;IAEjD,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;AAC1E,CAAC;AAED,gFAAgF;AAEhF,SAAS,cAAc,CAAC,OAAiB;IACvC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzD,OAAO,GAAG,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,+BAA+B,CAAA;AACzF,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAS,UAAU,CAAC,KAA2B,EAAE,OAAyB;IACxE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqB,CAAA;IAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC7C,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACzB,SAAQ;QACV,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE;YAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;YACtC,KAAK,EAAE,CAAC,IAAI,CAAC;YACb,oBAAoB,EAAE,IAAI;SAC3B,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAE,CAAA;QAC7B,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAChC,IAAI,CAAC,EAAE,CAAC,CAAC,2BAA2B,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CACpE,CAAA;QACD,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,CAAC,oBAAoB;gBACxB,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,qEAAqE;oBAC1F,iGAAiG,CAAA;YACnG,SAAQ;QACV,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QAChD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CACjC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAC/E,CAAA;QACD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,KAAK,CAAC,oBAAoB;gBACxB,2FAA2F;oBAC3F,qFAAqF,CAAA;YACvF,SAAQ;QACV,CAAC;QACD,6EAA6E;QAC7E,2CAA2C;QAC3C,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YAC5D,KAAK,CAAC,oBAAoB;gBACxB,yFAAyF;oBACzF,iFAAiF;oBACjF,kBAAkB,CAAA;QACtB,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;AAC7B,CAAC;AAED,iFAAiF;AACjF,KAAK,UAAU,UAAU,CAAC,WAAmB;IAC3C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,sBAAsB,WAAW,QAAQ,CAAC,CAAA;QACvE,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QACxC,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAE7B,CAAA;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACtB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAClF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;QACD,OAAO;YACL,KAAK,EAAE,OAAO;YACd,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,gBAAgB,EAAE,OAAO,IAAI,CAAC,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;SACxF,CAAA;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;IAC7B,CAAC;AACH,CAAC"}

package/dist/admin/layout-editor/use-component-library.d.ts

@@ -0,0 +1,94 @@
+import type { ComponentPlacementLookup } from '../../layout/component-refs.js';
+import type { ModuleNode } from '../../layout/types.js';
+import type { ComponentOption } from './component-picker-field.js';
+/**
+ * use-component-library.ts
+ * The saved components an editor shell has loaded, and the projections both
+ * shells need from them (kywi-cms#147).
+ *
+ * WHY ONE HOOK FOR BOTH SHELLS. The admin Layout tab fetched module components
+ * and section components in two separate effects and kept them in two states; the
+ * front-of-site overlay fetched neither, which is why "Save as component" and the
+ * linked badge existed only in the admin editor even though the overlay is the
+ * PRIMARY editing surface (kywi-cms#94). One hook, one request, three types.
+ *
+ * The request is deliberately unfiltered (`GET /components`, no `?type=`): a
+ * document can hold links of all three kinds at once, every one of them needs a
+ * name for its pill and a definition for detach, and one round trip is cheaper
+ * than three. Best-effort throughout — a failed load leaves the library empty,
+ * which degrades pills to the generic "Component" and leaves save-as-component
+ * fully working (it only ever POSTs).
+ */
+/** A saved component as `GET /api/v1/components` returns it. */
+export interface EditorComponent {
+    id: string;
+    name: string;
+    type: string;
+    moduleType: string | null;
+    definition: unknown;
+}
+export interface ComponentLibrary {
+    /** Every loaded component, all types. */
+    components: EditorComponent[];
+    byId: (componentId: string) => EditorComponent | null;
+    /** Display name for a linked instance's pill, or null when unknown. */
+    nameOf: (componentId: string) => string | null;
+    /** Picker options for one component type. */
+    optionsFor: (type: 'module' | 'section' | 'variantContainer') => ComponentOption[];
+    /**
+     * The canonical lookup materialisation reads (`componentDetachSource`), used by
+     * detach, by save-as-component's nested-link flattening, and by anything else
+     * that has to answer "what does this link render".
+     */
+    lookup: ComponentPlacementLookup;
+    /** Module-component projection for the canvas preview (kywi-cms#46). */
+    resolveModule: (componentId: string) => {
+        props: Record<string, unknown>;
+        style: Record<string, string>;
+        moduleType: string;
+    } | null;
+    /**
+     * What a module node RENDERS: its own props/style for an ordinary node, and for
+     * a linked instance the definition read through the canonical placement rule
+     * (`resolveModulePlacement` — definition alone for a clean instance, definition
+     * then node for a legacy override one).
+     *
+     * The props rail needs exactly this (kywi-cms#147 T4): a clean instance carries
+     * no props of its own, so fields fed from `node.props` would show an empty form
+     * for a module full of content, and the first keystroke would look like it
+     * cleared everything. Same projection as the canvas preview and the public
+     * renderer, so what the rail shows is what the visitor sees.
+     */
+    renderedModule: (node: Pick<ModuleNode, 'props' | 'style' | 'componentId'>) => {
+        props: Record<string, unknown>;
+        style: Record<string, string>;
+    };
+    /**
+     * Which module type's registry entry describes a node's editable FIELDS, or null
+     * when nothing honest can be shown (kywi-cms#147 T4 review, I2).
+     *
+     * For an ordinary node that is its own `type`. For a linked instance it is the
+     * COMPONENT's `moduleType`, because that is what the placement renders as
+     * (`materializeModuleNode` retypes the node) — and because a component placed
+     * from the palette picker is a `component` placeholder node, whose registry entry
+     * declares "Component Slug" and "Component ID" props. Those are link plumbing,
+     * not content: seeded from the resolved definition they read empty, and typing
+     * into "Component ID" writes a prop the fork deliberately strips.
+     *
+     * Null for a linked placeholder whose component does not resolve — there is no
+     * module type, so there are no fields, and inventing the placeholder's own two is
+     * how the rail came to show a form nobody could use.
+     */
+    fieldModuleType: (node: Pick<ModuleNode, 'type' | 'componentId'>) => string | null;
+    /** Adopt a component the shell just created, so its name is available at once. */
+    add: (component: EditorComponent) => void;
+    /**
+     * Adopt a definition the shell just wrote (the save fork's `PUT`), so everything
+     * reading the library — the rail's field values, the canvas preview, the copy
+     * refresh, and the next fork's staleness check — sees the new content rather than
+     * the one the page loaded with (kywi-cms#147 T4 review, C1).
+     */
+    update: (componentId: string, definition: unknown) => void;
+}
+export declare function useComponentLibrary(): ComponentLibrary;
+//# sourceMappingURL=use-component-library.d.ts.map

package/dist/admin/layout-editor/use-component-library.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-component-library.d.ts","sourceRoot":"","sources":["../../../src/admin/layout-editor/use-component-library.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAElE;;;;;;;;;;;;;;;;;GAiBG;AAEH,gEAAgE;AAChE,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,UAAU,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,yCAAyC;IACzC,UAAU,EAAE,eAAe,EAAE,CAAA;IAC7B,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,eAAe,GAAG,IAAI,CAAA;IACrD,uEAAuE;IACvE,MAAM,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;IAC9C,6CAA6C;IAC7C,UAAU,EAAE,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,kBAAkB,KAAK,eAAe,EAAE,CAAA;IAClF;;;;OAIG;IACH,MAAM,EAAE,wBAAwB,CAAA;IAChC,wEAAwE;IACxE,aAAa,EAAE,CACb,WAAW,EAAE,MAAM,KAChB;QAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IACjG;;;;;;;;;;;OAWG;IACH,cAAc,EAAE,CACd,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,GAAG,aAAa,CAAC,KACtD;QAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;IACtE;;;;;;;;;;;;;;;OAeG;IACH,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC,KAAK,MAAM,GAAG,IAAI,CAAA;IAClF,kFAAkF;IAClF,GAAG,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAA;IACzC;;;;;OAKG;IACH,MAAM,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,KAAK,IAAI,CAAA;CAC3D;AAED,wBAAgB,mBAAmB,IAAI,gBAAgB,CAkFtD"}

package/dist/admin/layout-editor/use-component-library.js

@@ -0,0 +1,55 @@
+'use client';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { componentDetachSource, resolveModulePlacement } from '../../layout/component-refs.js';
+import { adminFetch } from '../../host-client/index.js';
+import { resolveComponentDefinition } from './component-actions.js';
+export function useComponentLibrary() {
+    const [components, setComponents] = useState([]);
+    useEffect(() => {
+        let cancelled = false;
+        adminFetch('/api/v1/components')
+            .then(r => (r.ok ? r.json() : Promise.reject(new Error(String(r.status)))))
+            .then((body) => {
+            if (!cancelled)
+                setComponents(body.data ?? []);
+        })
+            .catch(() => { });
+        return () => { cancelled = true; };
+    }, []);
+    const byId = useCallback((componentId) => components.find(c => c.id === componentId) ?? null, [components]);
+    const nameOf = useCallback((componentId) => byId(componentId)?.name ?? null, [byId]);
+    const optionsFor = useCallback((type) => components
+        .filter(c => c.type === type)
+        .map(c => ({ id: c.id, name: c.name, moduleType: c.moduleType })), [components]);
+    const lookup = useCallback((componentId) => componentDetachSource(byId(componentId)), [byId]);
+    const resolveModule = useCallback((componentId) => resolveComponentDefinition(byId(componentId)), [byId]);
+    const renderedModule = useCallback((node) => {
+        const resolved = node.componentId ? resolveComponentDefinition(byId(node.componentId)) : null;
+        if (!resolved)
+            return { props: node.props ?? {}, style: node.style ?? {} };
+        return resolveModulePlacement(node, resolved);
+    }, [byId]);
+    const fieldModuleType = useCallback((node) => {
+        if (!node.componentId)
+            return node.type;
+        const resolved = resolveComponentDefinition(byId(node.componentId));
+        if (resolved)
+            return resolved.moduleType;
+        // An unresolvable link on a placeholder node has no fields to offer.
+        return node.type === 'component' ? null : node.type;
+    }, [byId]);
+    const add = useCallback((component) => {
+        setComponents(prev => (prev.some(c => c.id === component.id) ? prev : [...prev, component]));
+    }, []);
+    const update = useCallback((componentId, definition) => {
+        setComponents(prev => prev.map(c => (c.id === componentId ? { ...c, definition } : c)));
+    }, []);
+    return useMemo(() => ({
+        components, byId, nameOf, optionsFor, lookup, resolveModule, renderedModule,
+        fieldModuleType, add, update,
+    }), [
+        components, byId, nameOf, optionsFor, lookup, resolveModule, renderedModule,
+        fieldModuleType, add, update,
+    ]);
+}
+//# sourceMappingURL=use-component-library.js.map

package/dist/admin/layout-editor/use-component-library.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-component-library.js","sourceRoot":"","sources":["../../../src/admin/layout-editor/use-component-library.ts"],"names":[],"mappings":"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"}

package/dist/admin/registry.d.ts

@@ -12,9 +12,18 @@ import type { KywiRole } from '../auth/roles.js';
 /**
  * Feature-area taxonomy — the granularity at which config (`admin.features`) and
  * runtime flags (`admin.features` site-settings key, T16) enable/disable admin.
- * 23 areas.
+ * 24 areas.
  */
-export type AdminArea = 'dashboard' | 'contentTree' | 'menus' | 'content' | 'approvals' | 'changesets' | 'search' | 'media' | 'users' | 'forms' | 'taxonomy' | 'trash' | 'comments' | 'translations' | 'feeds' | 'audiences' | 'experiments' | 'layouts' | 'extensions' | 'plugins' | 'webServices' | 'settings' | 'contentTypes';
+export type AdminArea = 'dashboard' | 'contentTree' | 'menus' | 'content' | 'approvals' | 'changesets' | 'search' | 'media' | 'users' | 'forms' | 'taxonomy' | 'trash' | 'comments' | 'translations' | 'feeds' | 'audiences' | 'experiments' | 'layouts'
+/**
+ * The reusable-components library (kywi-cms#147). Its own area, not a slice of
+ * `layouts`: a saved component is a live source that pages LINK to (editing one
+ * changes every page it is placed on), whereas a layout is a blueprint that is
+ * copied on use. A site that wants one and not the other — components without
+ * the standalone layout builder, say — can now say so, and disabling `layouts`
+ * no longer takes the components library with it.
+ */
+ | 'components' | 'extensions' | 'plugins' | 'webServices' | 'settings' | 'contentTypes';
 /** Runtime-checkable list of every area, in declaration order. */
 export declare const ADMIN_AREAS: readonly AdminArea[];
 /**

package/dist/admin/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/admin/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAEhD;;;;;;;;GAQG;AAIH;;;;GAIG;AACH,MAAM,MAAM,SAAS,GACjB,WAAW,GACX,aAAa,GACb,OAAO,GACP,SAAS,GACT,WAAW,GACX,YAAY,GACZ,QAAQ,GACR,OAAO,GACP,OAAO,GACP,OAAO,GACP,UAAU,GACV,OAAO,GACP,UAAU,GACV,cAAc,GACd,OAAO,GACP,WAAW,GACX,aAAa,GACb,SAAS,GACT,YAAY,GACZ,SAAS,GACT,aAAa,GACb,UAAU,GACV,cAAc,CAAA;AAElB,kEAAkE;AAClE,eAAO,MAAM,WAAW,EAAE,SAAS,SAAS,EAwBlC,CAAA;AAIV;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AAED,oEAAoE;AACpE,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAA;IACb,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,+CAA+C;IAC/C,EAAE,EAAE,MAAM,CAAA;IACV,oDAAoD;IACpD,IAAI,EAAE,SAAS,CAAA;IACf;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAA;IACb,+FAA+F;IAC/F,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,gFAAgF;IAChF,OAAO,EAAE,QAAQ,CAAA;IACjB;;;;;;;;OAQG;IACH,IAAI,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAA;KAAE,CAAC,CAAA;CAC9D;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,8DAA8D;IAC9D,EAAE,EAAE,MAAM,CAAA;IACV,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,gFAAgF;IAChF,KAAK,EAAE,MAAM,CAAA;CACd;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IAC9C,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B;AAED;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAIvD,eAAO,MAAM,gBAAgB,EAAE,SAAS,aAAa,EAQ3C,CAAA;AAQV,eAAO,MAAM,cAAc,EAAE,SAAS,YAAY,EA8cxC,CAAA;AAEV;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,oBAAoB,CAAA"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/admin/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAEhD;;;;;;;;GAQG;AAIH;;;;GAIG;AACH,MAAM,MAAM,SAAS,GACjB,WAAW,GACX,aAAa,GACb,OAAO,GACP,SAAS,GACT,WAAW,GACX,YAAY,GACZ,QAAQ,GACR,OAAO,GACP,OAAO,GACP,OAAO,GACP,UAAU,GACV,OAAO,GACP,UAAU,GACV,cAAc,GACd,OAAO,GACP,WAAW,GACX,aAAa,GACb,SAAS;AACX;;;;;;;GAOG;GACD,YAAY,GACZ,YAAY,GACZ,SAAS,GACT,aAAa,GACb,UAAU,GACV,cAAc,CAAA;AAElB,kEAAkE;AAClE,eAAO,MAAM,WAAW,EAAE,SAAS,SAAS,EAyBlC,CAAA;AAIV;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AAED,oEAAoE;AACpE,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAA;IACb,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,+CAA+C;IAC/C,EAAE,EAAE,MAAM,CAAA;IACV,oDAAoD;IACpD,IAAI,EAAE,SAAS,CAAA;IACf;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAA;IACb,+FAA+F;IAC/F,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,gFAAgF;IAChF,OAAO,EAAE,QAAQ,CAAA;IACjB;;;;;;;;OAQG;IACH,IAAI,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAA;KAAE,CAAC,CAAA;CAC9D;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,8DAA8D;IAC9D,EAAE,EAAE,MAAM,CAAA;IACV,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,gFAAgF;IAChF,KAAK,EAAE,MAAM,CAAA;CACd;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IAC9C,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B;AAED;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAIvD,eAAO,MAAM,gBAAgB,EAAE,SAAS,aAAa,EAQ3C,CAAA;AAQV,eAAO,MAAM,cAAc,EAAE,SAAS,YAAY,EAkfxC,CAAA;AAEV;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,oBAAoB,CAAA"}

package/dist/admin/registry.js

@@ -18,6 +18,7 @@ export const ADMIN_AREAS = [
     'audiences',
     'experiments',
     'layouts',
+    'components',
     'extensions',
     'plugins',
     'webServices',
@@ -30,9 +31,9 @@ export const ADMIN_NAV_GROUPS = [
     { id: 'users', label: 'Users', href: '/admin/users', icon: 'users', order: 8 },
     { id: 'forms', label: 'Forms', href: '/admin/forms', icon: 'clipboard', order: 9 },
     { id: 'audiences', label: 'Audiences', href: '/admin/audiences', icon: 'target', order: 16 },
-    { id: 'extensions', label: 'Extensions', href: '/admin/extensions', icon: 'blocks', order: 19 },
-    { id: 'webServices', label: 'Web Services', href: '/admin/web-services', icon: 'globe', order: 21 },
-    { id: 'settings', label: 'Settings', href: '/admin/settings', icon: 'settings', order: 22 },
+    { id: 'extensions', label: 'Extensions', href: '/admin/extensions', icon: 'blocks', order: 20 },
+    { id: 'webServices', label: 'Web Services', href: '/admin/web-services', icon: 'globe', order: 22 },
+    { id: 'settings', label: 'Settings', href: '/admin/settings', icon: 'settings', order: 23 },
 ];
 // ─── Surfaces ───────────────────────────────────────────────────────────────────
 // Sourced by cross-referencing packages/core/src/admin/nav.ts (nav-visible set)
@@ -321,6 +322,41 @@ export const ADMIN_SURFACES = [
     },
     { id: 'layouts.new', area: 'layouts', pattern: 'layouts/new', label: 'New Layout', minRole: 'editor', load: () => import('./surfaces/layouts/layouts-new.js') },
     { id: 'layouts.detail', area: 'layouts', pattern: 'layouts/:id', label: 'Layout', minRole: 'editor', load: () => import('./surfaces/layouts/layouts-detail.js') },
+    // components (kywi-cms#147) — the reusable-components library, promoted out of
+    // the read-only sub-panel it used to occupy on the Layouts page. Sits directly
+    // after Layouts: both are "reusable building blocks", and inserting here shifted
+    // every later top-level `order` by one (the #112 precedent).
+    //
+    // ON minRole. `component-routes.ts` gates reading and writing the library at
+    // `write` (⇒ author) and DELETE at `delete` (⇒ siteAdmin). Only the second of
+    // those is reproduced in the UI (the list withholds the Delete action below
+    // siteAdmin) — the read floor here is `editor`, matching every other nav
+    // surface, because `editor` is not the admin's convention by accident: no
+    // surface in this registry is reachable below it, so an author-floored
+    // Components page would be a one-item admin (no Dashboard, no Site Tree, no
+    // content lists) rather than an unlocked capability. `editor` satisfies the
+    // route's `write` gate, so nobody who reaches this page gets a 403 from it. If
+    // the admin ever grows an author floor, this is the line to revisit.
+    {
+        id: 'components.list',
+        area: 'components',
+        pattern: 'components',
+        label: 'Components',
+        minRole: 'editor',
+        nav: { section: 'primary', icon: 'boxes', order: 19 },
+        load: () => import('./surfaces/components/components-list.js'),
+    },
+    {
+        // The definition-editing canvas. Its own surface (not a panel on the list) so
+        // the `LayoutEditor` it mounts for section/container components stays in its
+        // own chunk and the list page loads none of it — the same split Layouts uses.
+        id: 'components.edit',
+        area: 'components',
+        pattern: 'components/:id',
+        label: 'Component',
+        minRole: 'editor',
+        load: () => import('./surfaces/components/component-edit.js'),
+    },
     // extensions (group) — the extensions ADMIN surface manages subtypes/sets/
     // attributes and import/export, all siteAdmin-gated (extension-routes.ts). The
     // editor-gated `/extensions/for-content|/data` endpoints belong to the content
@@ -350,7 +386,7 @@ export const ADMIN_SURFACES = [
         pattern: 'plugins',
         label: 'Plugins',
         minRole: 'siteAdmin',
-        nav: { section: 'primary', icon: 'puzzle', order: 20 },
+        nav: { section: 'primary', icon: 'puzzle', order: 21 },
         load: () => import('./surfaces/plugins/plugins-index.js'),
     },
     // webServices (group)