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

package/dist/app.js

@@ -7429,9 +7429,6 @@ function PreviewBadge({
 
 // packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/GroupedSidebar.tsx
 import { jsx as jsx21, jsxs as jsxs18 } from "react/jsx-runtime";
-function slotEdgeKey(parent, child) {
-  return `${parent}\u2192${child}`;
-}
 var GLYPH_EXPAND_COLLAPSED = "\u25B8";
 var GLYPH_EXPAND_EXPANDED = "\u25BE";
 var GLYPH_TREE_MID = "\u251C\u2500";
@@ -7880,7 +7877,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?.has(slotEdgeKey(row.parentName, itemName)) === true;
+      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 isCycleRow = row.kind === "cycle";
       const selStyle = selectionGlyphStyleFor(selState, isCycleRow);
@@ -8812,14 +8809,20 @@ function rejectNeedsConfirmation(graph, name, state) {
   const ancestors = toReject.filter((n) => n !== name);
   return ancestors.length + toDeselect.length >= 2;
 }
-function partitionDecisions(components, state) {
+function withEdgeExcluded(edges, edge, excluded) {
+  const others = edges.filter((e) => e.parent !== edge.parent || e.child !== edge.child);
+  return excluded ? [...others, edge] : others;
+}
+function partitionDecisions(components, state, excludedEdges) {
   const accepted = [];
   const rejected = [];
   for (const c2 of components) {
     if (state.get(c2.name) === "accepted") accepted.push(c2.name);
     else rejected.push(c2.name);
   }
-  return { accepted, rejected, excludedSlotEdges: [] };
+  const rejectedNames = new Set(rejected);
+  const excludedSlotEdges = excludedEdges.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
@@ -8827,7 +8830,7 @@ function useScopeGate({ components, 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(/* @__PURE__ */ new Set());
+  const [excludedEdges, setExcludedEdges] = useState12([]);
   const [nav, setNav] = useState12({ cursor: 0, scrollOffset: 0 });
   const [focusedColumn, setFocusedColumn] = useState12("main");
   const [addedComponentsCursor, setAddedComponentsCursor] = useState12(0);
@@ -9005,22 +9008,7 @@ 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) => {
-      const next = new Set(prev);
-      const key = slotEdgeKey(edge.parent, edge.child);
-      if (excluded) next.add(key);
-      else next.delete(key);
-      return next;
-    });
-  };
-  const confirmedEdges = (rejected) => {
-    const rejectedSet = new Set(rejected);
-    return [...excludedEdges].map((key) => {
-      const [parent, child] = key.split("\u2192");
-      return { parent, child };
-    }).filter((edge) => !rejectedSet.has(edge.parent) && !rejectedSet.has(edge.child));
-  };
+  const setEdgeExcluded = (edge, excluded) => setExcludedEdges((prev) => withEdgeExcluded(prev, edge, excluded));
   const jumpCursorTo = (name) => {
     let idx = -1;
     for (let i = 0; i < visibleRows.length; i++) {
@@ -9120,10 +9108,7 @@ function useScopeGate({ components, onConfirm, onQuit }) {
         onQuit();
         return;
       case "confirm":
-        {
-          const partition = partitionDecisions(components, decisions);
-          onConfirm({ ...partition, excludedSlotEdges: confirmedEdges(partition.rejected) });
-        }
+        onConfirm(partitionDecisions(components, decisions, excludedEdges));
         return;
       case "close-help":
         setShowHelp(false);

package/dist/index.js

@@ -10185,9 +10185,6 @@ var init_badge = __esm({
 import figures4 from "figures";
 import { Box as Box17, Text as Text19 } from "ink";
 import { jsx as jsx21, jsxs as jsxs18 } from "react/jsx-runtime";
-function slotEdgeKey(parent, child) {
-  return `${parent}\u2192${child}`;
-}
 function isEmpty(entry) {
   return Object.keys(entry.$properties ?? {}).length === 0 && Object.keys(entry.$slots ?? {}).length === 0;
 }
@@ -10630,7 +10627,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?.has(slotEdgeKey(row.parentName, itemName)) === true;
+      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 isCycleRow = row.kind === "cycle";
       const selStyle = selectionGlyphStyleFor(selState, isCycleRow);
@@ -11694,14 +11691,20 @@ function rejectNeedsConfirmation(graph, name, state) {
   const ancestors = toReject.filter((n) => n !== name);
   return ancestors.length + toDeselect.length >= 2;
 }
-function partitionDecisions(components, state) {
+function withEdgeExcluded(edges, edge, excluded) {
+  const others = edges.filter((e) => e.parent !== edge.parent || e.child !== edge.child);
+  return excluded ? [...others, edge] : others;
+}
+function partitionDecisions(components, state, excludedEdges) {
   const accepted = [];
   const rejected = [];
   for (const c2 of components) {
     if (state.get(c2.name) === "accepted") accepted.push(c2.name);
     else rejected.push(c2.name);
   }
-  return { accepted, rejected, excludedSlotEdges: [] };
+  const rejectedNames = new Set(rejected);
+  const excludedSlotEdges = excludedEdges.filter((e) => !rejectedNames.has(e.parent) && !rejectedNames.has(e.child));
+  return { accepted, rejected, excludedSlotEdges };
 }
 var init_state = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/state.ts"() {
@@ -11717,7 +11720,7 @@ function useScopeGate({ components, 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(/* @__PURE__ */ new Set());
+  const [excludedEdges, setExcludedEdges] = useState12([]);
   const [nav, setNav] = useState12({ cursor: 0, scrollOffset: 0 });
   const [focusedColumn, setFocusedColumn] = useState12("main");
   const [addedComponentsCursor, setAddedComponentsCursor] = useState12(0);
@@ -11895,22 +11898,7 @@ 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) => {
-      const next = new Set(prev);
-      const key = slotEdgeKey(edge.parent, edge.child);
-      if (excluded) next.add(key);
-      else next.delete(key);
-      return next;
-    });
-  };
-  const confirmedEdges = (rejected) => {
-    const rejectedSet = new Set(rejected);
-    return [...excludedEdges].map((key) => {
-      const [parent, child] = key.split("\u2192");
-      return { parent, child };
-    }).filter((edge) => !rejectedSet.has(edge.parent) && !rejectedSet.has(edge.child));
-  };
+  const setEdgeExcluded = (edge, excluded) => setExcludedEdges((prev) => withEdgeExcluded(prev, edge, excluded));
   const jumpCursorTo = (name) => {
     let idx = -1;
     for (let i = 0; i < visibleRows.length; i++) {
@@ -12010,10 +11998,7 @@ function useScopeGate({ components, onConfirm, onQuit }) {
         onQuit();
         return;
       case "confirm":
-        {
-          const partition = partitionDecisions(components, decisions);
-          onConfirm({ ...partition, excludedSlotEdges: confirmedEdges(partition.rejected) });
-        }
+        onConfirm(partitionDecisions(components, decisions, excludedEdges));
         return;
       case "close-help":
         setShowHelp(false);

package/dist/package.json

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

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

@@ -1,6 +1,7 @@
 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;
@@ -27,8 +28,8 @@ export interface GroupedSidebarProps {
     alwaysExpanded?: boolean;
     showFlatTier?: boolean;
     selectionStateByKey?: Map<string, 'accepted' | 'rejected' | 'undecided'>;
-    /** `parent→child` slot edges the user removed; their nested rows render unchecked. */
-    excludedSlotEdges?: Set<string>;
+    /** Slot edges the user removed; their nested rows render unchecked. */
+    excludedSlotEdges?: ParentChildEdge[];
     aiFlaggedByKey?: Map<string, boolean>;
     dimPredicate?: (componentKey: string) => boolean;
     viewMode?: 'grouped' | 'flat';
@@ -36,7 +37,6 @@ export interface GroupedSidebarProps {
     graph: ComponentGraphNode[];
     filterVisibleKeys?: Set<string>;
 }
-export declare function slotEdgeKey(parent: string, child: string): string;
 type RowKind = 'cycle' | 'empty' | 'group-root' | 'group-child' | 'standalone' | 'flat' | 'flat-header';
 export interface VisibleRow {
     kind: RowKind;
@@ -48,7 +48,7 @@ export interface VisibleRow {
     cycleChild?: boolean;
     itemIdx: number;
     rootName?: string;
-    /** Direct parent of a nested row; identifies the slot edge the row stands for. */
+    /** The parent whose slot the nested row sits in. */
     parentName?: string;
 }
 export declare function buildVisibleRows(props: {

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

@@ -1,5 +1,5 @@
 import { type ScopeGraph } from './graph/index.js';
-import type { Decision, ScopeComponent, ScopeDecisions } from './types.js';
+import type { Decision, ParentChildEdge, ScopeComponent, ScopeDecisions } from './types.js';
 export type DecisionState = Map<string, Decision>;
 export type DecisionAction = {
     type: 'accept';
@@ -15,5 +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[];
 /** Everything not accepted counts as rejected, as legacy's `partition` did. */
-export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState): ScopeDecisions;
+export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState, excludedEdges: ParentChildEdge[]): ScopeDecisions;

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

@@ -1,4 +1,4 @@
-import type { ScopeComponent, ScopeDecisions } from './types.js';
+import type { ParentChildEdge, ScopeComponent, ScopeDecisions } from './types.js';
 interface UseScopeGateOptions {
     components: ScopeComponent[];
     onConfirm: (decisions: ScopeDecisions) => void;
@@ -20,7 +20,7 @@ export declare function useScopeGate({ components, onConfirm, onQuit }: UseScope
     panelLayout: import("./columns.js").ScopeGatePanelLayout;
     visibleCount: number;
     panelMaxRows: number;
-    excludedEdges: Set<string>;
+    excludedEdges: ParentChildEdge[];
     groupedItems: import("./graph/index.js").SidebarItem[];
     graph: import("./graph/index.js").ScopeGraph;
     hasGroupRoots: boolean;

package/legacy/dist/src/analyze/select/tui/components/GroupedSidebar.d.ts

@@ -28,7 +28,6 @@ export interface GroupedSidebarProps {
     alwaysExpanded?: boolean;
     showFlatTier?: boolean;
     selectionStateByKey?: Map<string, 'accepted' | 'rejected' | 'undecided'>;
-    excludedSlotEdges?: Set<string>;
     aiFlaggedByKey?: Map<string, boolean>;
     dimPredicate?: (componentKey: string) => boolean;
     viewMode?: 'grouped' | 'flat';
@@ -36,7 +35,6 @@ export interface GroupedSidebarProps {
     graph: ComponentGraphNode[];
     filterVisibleKeys?: Set<string>;
 }
-export declare function slotEdgeKey(parent: string, child: string): string;
 type RowKind = 'cycle' | 'empty' | 'group-root' | 'group-child' | 'standalone' | 'flat' | 'flat-header';
 export interface VisibleRow {
     kind: RowKind;
@@ -48,7 +46,7 @@ export interface VisibleRow {
     cycleChild?: boolean;
     itemIdx: number;
     rootName?: string;
-    /** Direct parent of a nested row; identifies the slot edge the row stands for. */
+    /** The parent whose slot the nested row sits in. */
     parentName?: string;
 }
 export declare function buildVisibleRows(props: {

package/legacy/dist/src/import/tui/handoff.d.ts

@@ -1,4 +1,5 @@
 import { type ImportHandoff } from '@contentful/experience-design-system-types/handoff';
+import type { ParentChildEdge } from '../../session/db.js';
 /** The wizard state the early stages produce. Every field is one the stage used to write. */
 export interface HandoffState {
     credentialsSkipped: boolean;
@@ -18,10 +19,7 @@ export interface HandoffScope {
     decisions: {
         accepted: string[];
         rejected: string[];
-        excludedSlotEdges: Array<{
-            parent: string;
-            child: string;
-        }>;
+        excludedSlotEdges: ParentChildEdge[];
     };
     /** Components the cache check (finished and restored before the wizard started) found already generated. */
     cachedNames: string[];

package/legacy/dist/src/index.js

@@ -19418,9 +19418,6 @@ var init_Sidebar = __esm({
 import figures from "figures";
 import { Box as Box18, Text as Text19 } from "ink";
 import { jsx as jsx23, jsxs as jsxs18 } from "react/jsx-runtime";
-function slotEdgeKey(parent, child) {
-  return `${parent}\u2192${child}`;
-}
 function isEmpty(entry) {
   return Object.keys(entry.$properties ?? {}).length === 0 && Object.keys(entry.$slots ?? {}).length === 0;
 }
@@ -19832,7 +19829,6 @@ function GroupedSidebar(props) {
     showFlatTier,
     viewMode,
     selectionStateByKey,
-    excludedSlotEdges,
     aiFlaggedByKey,
     dimPredicate,
     visibleRows: providedRows,
@@ -19863,8 +19859,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?.has(slotEdgeKey(row.parentName, 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;
@@ -25279,55 +25274,50 @@ function GenerateReviewStepView({
     const cycle = cycleRows[cyclesCursor];
     return cycle ? enumerateCycleBreaks(cycle, components) : [];
   }, [cycleRows, cyclesCursor, components]);
-  const handleBreakEdge = (edge) => {
-    const target = components.find((component) => component.key === edge.fromComponent);
-    const slot = target?.entry.$slots?.[edge.slotName];
-    if (!target || !slot || !Array.isArray(slot.$allowedComponents)) return;
-    const nextEntry = {
-      ...target.entry,
-      $slots: {
-        ...target.entry.$slots,
-        [edge.slotName]: {
-          ...slot,
-          $allowedComponents: slot.$allowedComponents.filter((value) => value !== edge.toComponent)
-        }
-      }
-    };
+  const saveSlotChange = (parentKey, nextEntry, historyLabel) => {
     const next = components.map(
-      (component) => component.key === target.key ? { ...component, entry: nextEntry } : component
+      (component) => component.key === parentKey ? { ...component, entry: nextEntry } : component
     );
     setComponents(next);
     const db = openPipelineDb();
     try {
-      storeCDFComponents(db, extractSessionId, [{ key: target.key, entry: nextEntry }]);
+      storeCDFComponents(db, extractSessionId, [{ key: parentKey, entry: nextEntry }]);
     } finally {
       db.close();
     }
     recomputeCycles(next);
     livePreviewHook.trigger();
-    pushHistorySnapshot(next, "break-cycle-edge");
+    pushHistorySnapshot(next, historyLabel);
+  };
+  const handleBreakEdge = (edge) => {
+    const target = components.find((component) => component.key === edge.fromComponent);
+    const slot = target?.entry.$slots?.[edge.slotName];
+    if (!target || !slot || !Array.isArray(slot.$allowedComponents)) return;
+    saveSlotChange(
+      target.key,
+      {
+        ...target.entry,
+        $slots: {
+          ...target.entry.$slots,
+          [edge.slotName]: {
+            ...slot,
+            $allowedComponents: slot.$allowedComponents.filter((value) => value !== edge.toComponent)
+          }
+        }
+      },
+      "break-cycle-edge"
+    );
   };
   const handleRemoveSlotChild = (parentKey, childKey) => {
     const parent = components.find((component) => component.key === parentKey);
     if (!parent?.entry.$slots) return;
-    const slots = {};
-    for (const [slotName, slot] of Object.entries(parent.entry.$slots)) {
-      slots[slotName] = Array.isArray(slot.$allowedComponents) ? { ...slot, $allowedComponents: slot.$allowedComponents.filter((value) => value !== childKey) } : slot;
-    }
-    const nextEntry = { ...parent.entry, $slots: slots };
-    const next = components.map(
-      (component) => component.key === parentKey ? { ...component, entry: nextEntry } : component
+    const slots = Object.fromEntries(
+      Object.entries(parent.entry.$slots).map(([slotName, slot]) => [
+        slotName,
+        Array.isArray(slot.$allowedComponents) ? { ...slot, $allowedComponents: slot.$allowedComponents.filter((value) => value !== childKey) } : slot
+      ])
     );
-    setComponents(next);
-    const db = openPipelineDb();
-    try {
-      storeCDFComponents(db, extractSessionId, [{ key: parentKey, entry: nextEntry }]);
-    } finally {
-      db.close();
-    }
-    recomputeCycles(next);
-    livePreviewHook.trigger();
-    pushHistorySnapshot(next, "remove-slot-child");
+    saveSlotChange(parentKey, { ...parent.entry, $slots: slots }, "remove-slot-child");
   };
   const handleRejectComponent = (key) => {
     const rejectCascade = computeRejectCascade(key, componentGraph);

package/legacy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-7a46c9e6.0",
+  "version": "2.37.1-dev-build-444a2d6a.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-7a46c9e6.0",
+  "version": "2.37.1-dev-build-444a2d6a.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-backend-pipeline": "2.37.1-dev-build-7a46c9e6.0",
-    "@contentful/experience-design-system-generation": "2.37.1-dev-build-7a46c9e6.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-7a46c9e6.0"
+    "@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"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",