@contentful/experience-design-system-cli 2.37.1-dev-build-444a2d6a.0 → 2.37.1-dev-build-5fe4d4be.0

package/dist/app.js

@@ -7846,7 +7846,6 @@ function GroupedSidebar(props) {
     showFlatTier,
     viewMode,
     selectionStateByKey,
-    excludedSlotEdges,
     aiFlaggedByKey,
     dimPredicate,
     visibleRows: providedRows,
@@ -7877,8 +7876,7 @@ function GroupedSidebar(props) {
       const badge = itemName ? previewBadge(previewAnnotationByKey?.get(itemName)) : null;
       const showInheritance = rs !== void 0 && row.kind !== "cycle" && row.kind !== "empty" && row.kind !== "group-root";
       const supportsSelectionGlyph = selectionStateByKey !== void 0 && itemName !== void 0 && (row.kind === "standalone" || row.kind === "group-root" || row.kind === "group-child" || row.kind === "flat" || row.kind === "empty" || row.kind === "cycle");
-      const edgeExcluded = row.kind === "group-child" && row.parentName !== void 0 && itemName !== void 0 && excludedSlotEdges?.some((edge) => edge.parent === row.parentName && edge.child === itemName) === true;
-      const selState = supportsSelectionGlyph ? edgeExcluded ? "undecided" : selectionStateByKey.get(itemName) ?? "undecided" : void 0;
+      const selState = supportsSelectionGlyph ? selectionStateByKey.get(itemName) ?? "undecided" : void 0;
       const isCycleRow = row.kind === "cycle";
       const selStyle = selectionGlyphStyleFor(selState, isCycleRow);
       const selGlyph = selStyle.glyph;
@@ -8551,6 +8549,7 @@ function resolveKey(mode, key, ctx) {
 function resolveMain(key, ctx) {
   const { input } = key;
   const inMain = ctx.focusedColumn === "main";
+  if (key.ctrl && input === "z") return { type: "undo" };
   if (input === "q" || key.escape) {
     if (key.escape && ctx.jumpFilterActive) return { type: "clear-jump-filter" };
     if (key.escape && ctx.searchActive) return { type: "clear-search" };
@@ -8809,11 +8808,21 @@ function rejectNeedsConfirmation(graph, name, state) {
   const ancestors = toReject.filter((n) => n !== name);
   return ancestors.length + toDeselect.length >= 2;
 }
-function withEdgeExcluded(edges, edge, excluded) {
-  const others = edges.filter((e) => e.parent !== edge.parent || e.child !== edge.child);
-  return excluded ? [...others, edge] : others;
+function removeSlotChild(components, edge) {
+  return components.map(
+    (component) => component.name === edge.parent ? {
+      ...component,
+      slots: component.slots?.map((slot) => ({
+        ...slot,
+        allowedComponents: slot.allowedComponents.filter((name) => name !== edge.child)
+      }))
+    } : component
+  );
+}
+function withoutSlotChildren(components, removedEdges) {
+  return removedEdges.reduce(removeSlotChild, components);
 }
-function partitionDecisions(components, state, excludedEdges) {
+function partitionDecisions(components, state, removedEdges) {
   const accepted = [];
   const rejected = [];
   for (const c2 of components) {
@@ -8821,16 +8830,20 @@ function partitionDecisions(components, state, excludedEdges) {
     else rejected.push(c2.name);
   }
   const rejectedNames = new Set(rejected);
-  const excludedSlotEdges = excludedEdges.filter((e) => !rejectedNames.has(e.parent) && !rejectedNames.has(e.child));
+  const excludedSlotEdges = removedEdges.filter((e) => !rejectedNames.has(e.parent) && !rejectedNames.has(e.child));
   return { accepted, rejected, excludedSlotEdges };
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/use-scope-gate.ts
-function useScopeGate({ components, onConfirm, onQuit }) {
+function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
   const { columns: totalWidth, rows: terminalRows } = useTerminalSize();
   const columnPlan = useMemo2(() => computeColumnWidths(totalWidth), [totalWidth]);
   const [decisions, setDecisions] = useState12(/* @__PURE__ */ new Map());
-  const [excludedEdges, setExcludedEdges] = useState12([]);
+  const [removedEdges, setRemovedEdges] = useState12([]);
+  const components = useMemo2(
+    () => withoutSlotChildren(loadedComponents, removedEdges),
+    [loadedComponents, removedEdges]
+  );
   const [nav, setNav] = useState12({ cursor: 0, scrollOffset: 0 });
   const [focusedColumn, setFocusedColumn] = useState12("main");
   const [addedComponentsCursor, setAddedComponentsCursor] = useState12(0);
@@ -9008,7 +9021,8 @@ function useScopeGate({ components, onConfirm, onQuit }) {
     const child = groupedItems[row.itemIdx]?.key;
     return child ? { parent: row.parentName, child } : void 0;
   };
-  const setEdgeExcluded = (edge, excluded) => setExcludedEdges((prev) => withEdgeExcluded(prev, edge, excluded));
+  const removeFromParentSlot = (edge) => setRemovedEdges((edges) => [...edges, edge]);
+  const undoSlotRemoval = () => setRemovedEdges((edges) => edges.slice(0, -1));
   const jumpCursorTo = (name) => {
     let idx = -1;
     for (let i = 0; i < visibleRows.length; i++) {
@@ -9108,7 +9122,7 @@ function useScopeGate({ components, onConfirm, onQuit }) {
         onQuit();
         return;
       case "confirm":
-        onConfirm(partitionDecisions(components, decisions, excludedEdges));
+        onConfirm(partitionDecisions(components, decisions, removedEdges));
         return;
       case "close-help":
         setShowHelp(false);
@@ -9156,8 +9170,6 @@ function useScopeGate({ components, onConfirm, onQuit }) {
         }
         return;
       case "accept": {
-        const edge = focusedNestedEdge();
-        if (edge) setEdgeExcluded(edge, false);
         const key = focusedRowKey();
         if (key) decide({ type: "accept", name: key });
         return;
@@ -9165,7 +9177,7 @@ function useScopeGate({ components, onConfirm, onQuit }) {
       case "reject": {
         const edge = focusedColumn === "main" ? focusedNestedEdge() : void 0;
         if (edge) {
-          setEdgeExcluded(edge, true);
+          removeFromParentSlot(edge);
           return;
         }
         const key = focusedColumn === "added-components" ? addedComponents[safeAddedComponentsCursor]?.name : focusedRowKey();
@@ -9175,6 +9187,9 @@ function useScopeGate({ components, onConfirm, onQuit }) {
       case "toggle-all":
         decide({ type: "toggle-all" });
         return;
+      case "undo":
+        undoSlotRemoval();
+        return;
       case "accept-unflagged":
         decide({ type: "accept-unflagged" });
         return;
@@ -9269,7 +9284,6 @@ function useScopeGate({ components, onConfirm, onQuit }) {
     visibleCount,
     panelMaxRows,
     // sidebar
-    excludedEdges,
     groupedItems,
     graph,
     hasGroupRoots,
@@ -9395,7 +9409,6 @@ function ScopeGateView({ components, onConfirm, onQuit }) {
           visibleCount: gate.visibleCount,
           showFlatTier: false,
           selectionStateByKey: gate.selectionStateByKey,
-          excludedSlotEdges: gate.excludedEdges,
           aiFlaggedByKey: gate.aiFlaggedByKey,
           dimPredicate: gate.dimPredicate,
           visibleRows: gate.visibleRows,

package/dist/index.js

@@ -10596,7 +10596,6 @@ function GroupedSidebar(props) {
     showFlatTier,
     viewMode,
     selectionStateByKey,
-    excludedSlotEdges,
     aiFlaggedByKey,
     dimPredicate,
     visibleRows: providedRows,
@@ -10627,8 +10626,7 @@ function GroupedSidebar(props) {
       const badge = itemName ? previewBadge(previewAnnotationByKey?.get(itemName)) : null;
       const showInheritance = rs !== void 0 && row.kind !== "cycle" && row.kind !== "empty" && row.kind !== "group-root";
       const supportsSelectionGlyph = selectionStateByKey !== void 0 && itemName !== void 0 && (row.kind === "standalone" || row.kind === "group-root" || row.kind === "group-child" || row.kind === "flat" || row.kind === "empty" || row.kind === "cycle");
-      const edgeExcluded = row.kind === "group-child" && row.parentName !== void 0 && itemName !== void 0 && excludedSlotEdges?.some((edge) => edge.parent === row.parentName && edge.child === itemName) === true;
-      const selState = supportsSelectionGlyph ? edgeExcluded ? "undecided" : selectionStateByKey.get(itemName) ?? "undecided" : void 0;
+      const selState = supportsSelectionGlyph ? selectionStateByKey.get(itemName) ?? "undecided" : void 0;
       const isCycleRow = row.kind === "cycle";
       const selStyle = selectionGlyphStyleFor(selState, isCycleRow);
       const selGlyph = selStyle.glyph;
@@ -11393,6 +11391,7 @@ function resolveKey(mode, key, ctx) {
 function resolveMain(key, ctx) {
   const { input } = key;
   const inMain = ctx.focusedColumn === "main";
+  if (key.ctrl && input === "z") return { type: "undo" };
   if (input === "q" || key.escape) {
     if (key.escape && ctx.jumpFilterActive) return { type: "clear-jump-filter" };
     if (key.escape && ctx.searchActive) return { type: "clear-search" };
@@ -11691,11 +11690,21 @@ function rejectNeedsConfirmation(graph, name, state) {
   const ancestors = toReject.filter((n) => n !== name);
   return ancestors.length + toDeselect.length >= 2;
 }
-function withEdgeExcluded(edges, edge, excluded) {
-  const others = edges.filter((e) => e.parent !== edge.parent || e.child !== edge.child);
-  return excluded ? [...others, edge] : others;
+function removeSlotChild(components, edge) {
+  return components.map(
+    (component) => component.name === edge.parent ? {
+      ...component,
+      slots: component.slots?.map((slot) => ({
+        ...slot,
+        allowedComponents: slot.allowedComponents.filter((name) => name !== edge.child)
+      }))
+    } : component
+  );
+}
+function withoutSlotChildren(components, removedEdges) {
+  return removedEdges.reduce(removeSlotChild, components);
 }
-function partitionDecisions(components, state, excludedEdges) {
+function partitionDecisions(components, state, removedEdges) {
   const accepted = [];
   const rejected = [];
   for (const c2 of components) {
@@ -11703,7 +11712,7 @@ function partitionDecisions(components, state, excludedEdges) {
     else rejected.push(c2.name);
   }
   const rejectedNames = new Set(rejected);
-  const excludedSlotEdges = excludedEdges.filter((e) => !rejectedNames.has(e.parent) && !rejectedNames.has(e.child));
+  const excludedSlotEdges = removedEdges.filter((e) => !rejectedNames.has(e.parent) && !rejectedNames.has(e.child));
   return { accepted, rejected, excludedSlotEdges };
 }
 var init_state = __esm({
@@ -11716,11 +11725,15 @@ var init_state = __esm({
 
 // packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/use-scope-gate.ts
 import { useEffect as useEffect7, useMemo as useMemo2, useRef as useRef4, useState as useState12 } from "react";
-function useScopeGate({ components, onConfirm, onQuit }) {
+function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
   const { columns: totalWidth, rows: terminalRows } = useTerminalSize();
   const columnPlan = useMemo2(() => computeColumnWidths(totalWidth), [totalWidth]);
   const [decisions, setDecisions] = useState12(/* @__PURE__ */ new Map());
-  const [excludedEdges, setExcludedEdges] = useState12([]);
+  const [removedEdges, setRemovedEdges] = useState12([]);
+  const components = useMemo2(
+    () => withoutSlotChildren(loadedComponents, removedEdges),
+    [loadedComponents, removedEdges]
+  );
   const [nav, setNav] = useState12({ cursor: 0, scrollOffset: 0 });
   const [focusedColumn, setFocusedColumn] = useState12("main");
   const [addedComponentsCursor, setAddedComponentsCursor] = useState12(0);
@@ -11898,7 +11911,8 @@ function useScopeGate({ components, onConfirm, onQuit }) {
     const child = groupedItems[row.itemIdx]?.key;
     return child ? { parent: row.parentName, child } : void 0;
   };
-  const setEdgeExcluded = (edge, excluded) => setExcludedEdges((prev) => withEdgeExcluded(prev, edge, excluded));
+  const removeFromParentSlot = (edge) => setRemovedEdges((edges) => [...edges, edge]);
+  const undoSlotRemoval = () => setRemovedEdges((edges) => edges.slice(0, -1));
   const jumpCursorTo = (name) => {
     let idx = -1;
     for (let i = 0; i < visibleRows.length; i++) {
@@ -11998,7 +12012,7 @@ function useScopeGate({ components, onConfirm, onQuit }) {
         onQuit();
         return;
       case "confirm":
-        onConfirm(partitionDecisions(components, decisions, excludedEdges));
+        onConfirm(partitionDecisions(components, decisions, removedEdges));
         return;
       case "close-help":
         setShowHelp(false);
@@ -12046,8 +12060,6 @@ function useScopeGate({ components, onConfirm, onQuit }) {
         }
         return;
       case "accept": {
-        const edge = focusedNestedEdge();
-        if (edge) setEdgeExcluded(edge, false);
         const key = focusedRowKey();
         if (key) decide({ type: "accept", name: key });
         return;
@@ -12055,7 +12067,7 @@ function useScopeGate({ components, onConfirm, onQuit }) {
       case "reject": {
         const edge = focusedColumn === "main" ? focusedNestedEdge() : void 0;
         if (edge) {
-          setEdgeExcluded(edge, true);
+          removeFromParentSlot(edge);
           return;
         }
         const key = focusedColumn === "added-components" ? addedComponents[safeAddedComponentsCursor]?.name : focusedRowKey();
@@ -12065,6 +12077,9 @@ function useScopeGate({ components, onConfirm, onQuit }) {
       case "toggle-all":
         decide({ type: "toggle-all" });
         return;
+      case "undo":
+        undoSlotRemoval();
+        return;
       case "accept-unflagged":
         decide({ type: "accept-unflagged" });
         return;
@@ -12159,7 +12174,6 @@ function useScopeGate({ components, onConfirm, onQuit }) {
     visibleCount,
     panelMaxRows,
     // sidebar
-    excludedEdges,
     groupedItems,
     graph,
     hasGroupRoots,
@@ -12272,7 +12286,6 @@ function ScopeGateView({ components, onConfirm, onQuit }) {
           visibleCount: gate.visibleCount,
           showFlatTier: false,
           selectionStateByKey: gate.selectionStateByKey,
-          excludedSlotEdges: gate.excludedEdges,
           aiFlaggedByKey: gate.aiFlaggedByKey,
           dimPredicate: gate.dimPredicate,
           visibleRows: gate.visibleRows,

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-444a2d6a.0",
+  "version": "2.37.1-dev-build-5fe4d4be.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/tui/import/steps/07-scope-gate/keymap.d.ts

@@ -80,5 +80,7 @@ export type GateAction = {
     type: 'toggle-jump-filter';
 } | {
     type: 'toggle-view';
+} | {
+    type: 'undo';
 };
 export declare function resolveKey(mode: GateMode, key: KeyPress, ctx: GateContext): GateAction;

package/dist/src/tui/import/steps/07-scope-gate/sidebar/components/GroupedSidebar.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
 import type { CDFComponentEntry } from '@contentful/experience-design-system-types';
 import { type ComponentGraphNode, type NodeStatus } from '../../graph/composite-closure.js';
-import type { ParentChildEdge } from '../../types.js';
 import type { PreviewAnnotation, RenderStatus } from '../types.js';
 export interface GroupedSidebarItem {
     key: string;
@@ -28,8 +27,6 @@ export interface GroupedSidebarProps {
     alwaysExpanded?: boolean;
     showFlatTier?: boolean;
     selectionStateByKey?: Map<string, 'accepted' | 'rejected' | 'undecided'>;
-    /** Slot edges the user removed; their nested rows render unchecked. */
-    excludedSlotEdges?: ParentChildEdge[];
     aiFlaggedByKey?: Map<string, boolean>;
     dimPredicate?: (componentKey: string) => boolean;
     viewMode?: 'grouped' | 'flat';

package/dist/src/tui/import/steps/07-scope-gate/state.d.ts

@@ -15,6 +15,6 @@ export type DecisionAction = {
 export declare function reduceDecisions(state: DecisionState, action: DecisionAction, components: ScopeComponent[], graph: ScopeGraph): DecisionState;
 /** Whether rejecting `name` touches 2 or more other components, so the screen has to ask first. */
 export declare function rejectNeedsConfirmation(graph: ScopeGraph, name: string, state: DecisionState): boolean;
-export declare function withEdgeExcluded(edges: ParentChildEdge[], edge: ParentChildEdge, excluded: boolean): ParentChildEdge[];
+export declare function withoutSlotChildren(components: ScopeComponent[], removedEdges: ParentChildEdge[]): ScopeComponent[];
 /** Everything not accepted counts as rejected, as legacy's `partition` did. */
-export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState, excludedEdges: ParentChildEdge[]): ScopeDecisions;
+export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState, removedEdges: ParentChildEdge[]): ScopeDecisions;

package/dist/src/tui/import/steps/07-scope-gate/use-scope-gate.d.ts

@@ -1,4 +1,4 @@
-import type { ParentChildEdge, ScopeComponent, ScopeDecisions } from './types.js';
+import type { ScopeComponent, ScopeDecisions } from './types.js';
 interface UseScopeGateOptions {
     components: ScopeComponent[];
     onConfirm: (decisions: ScopeDecisions) => void;
@@ -10,7 +10,7 @@ export interface PendingRejectCascade {
     ancestors: string[];
     descendants: string[];
 }
-export declare function useScopeGate({ components, onConfirm, onQuit }: UseScopeGateOptions): {
+export declare function useScopeGate({ components: loadedComponents, onConfirm, onQuit }: UseScopeGateOptions): {
     totalWidth: number;
     columnPlan: {
         layout: "single" | "two-column";
@@ -20,7 +20,6 @@ export declare function useScopeGate({ components, onConfirm, onQuit }: UseScope
     panelLayout: import("./columns.js").ScopeGatePanelLayout;
     visibleCount: number;
     panelMaxRows: number;
-    excludedEdges: ParentChildEdge[];
     groupedItems: import("./graph/index.js").SidebarItem[];
     graph: import("./graph/index.js").ScopeGraph;
     hasGroupRoots: boolean;

package/legacy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-444a2d6a.0",
+  "version": "2.37.1-dev-build-5fe4d4be.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-444a2d6a.0",
+  "version": "2.37.1-dev-build-5fe4d4be.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,9 +45,9 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-generation": "2.37.1-dev-build-444a2d6a.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-444a2d6a.0",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-444a2d6a.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-5fe4d4be.0",
+    "@contentful/experience-design-system-generation": "2.37.1-dev-build-5fe4d4be.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-5fe4d4be.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",