@contentful/experience-design-system-cli 2.32.1-dev-build-26a2030.0 → 2.33.1-dev-build-9dba4a6.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-26a2030.0",
+  "version": "2.33.1-dev-build-9dba4a6.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/index.js

@@ -9211,6 +9211,419 @@ var init_replace_raw_prop_token_paths = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/session/repositories/components/raw/read.ts
+function mapRawComponentRow(row) {
+  return {
+    component_id: String(row.component_id),
+    name: String(row.name),
+    source: String(row.source),
+    framework: String(row.framework),
+    extraction_confidence: row.extraction_confidence === null ? null : Number(row.extraction_confidence),
+    review_reasons: String(row.review_reasons ?? "[]"),
+    needs_review: Number(row.needs_review ?? 0),
+    source_path: row.source_path === null ? null : String(row.source_path)
+  };
+}
+function mapRawPropRow(row) {
+  return {
+    component_id: String(row.component_id),
+    name: String(row.name),
+    type: String(row.type),
+    required: Number(row.required),
+    category: row.category === null ? null : String(row.category),
+    default_value: row.default_value === null ? null : String(row.default_value),
+    description: row.description === null ? null : String(row.description),
+    token_reference: row.token_reference === null ? null : String(row.token_reference),
+    position: Number(row.position),
+    rationale: row.rationale === null ? null : String(row.rationale),
+    source_start_line: row.source_start_line === null ? null : Number(row.source_start_line),
+    source_end_line: row.source_end_line === null ? null : Number(row.source_end_line)
+  };
+}
+function mapAllowedValueSnapshotRow(row) {
+  return {
+    component_id: String(row.component_id),
+    prop_name: String(row.prop_name),
+    position: Number(row.position),
+    value: String(row.value)
+  };
+}
+function mapRawSlotRow(row) {
+  return {
+    component_id: String(row.component_id),
+    name: String(row.name),
+    is_default: Number(row.is_default),
+    description: row.description === null ? null : String(row.description),
+    position: Number(row.position)
+  };
+}
+function mapRawSlotAllowedComponentRow(row) {
+  return {
+    component_id: String(row.component_id),
+    slot_name: String(row.slot_name),
+    position: Number(row.position),
+    allowed_component: String(row.allowed_component)
+  };
+}
+function parseReviewReasons(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed.filter((v) => typeof v === "string") : [];
+  } catch {
+    return [];
+  }
+}
+function getRawComponents(db, sessionId2, allowedNames) {
+  const all = db.prepare(
+    "SELECT component_id, name, source, framework, extraction_confidence, review_reasons, needs_review, source_path FROM raw_components WHERE session_id = ? ORDER BY rowid"
+  ).all(sessionId2).map(mapRawComponentRow);
+  const components = allowedNames ? all.filter((c2) => allowedNames.has(c2.name)) : all;
+  if (components.length === 0) return [];
+  const props = db.prepare(
+    `SELECT component_id, name, type, required, category, default_value, description, token_reference, position,
+              rationale, source_start_line, source_end_line
+       FROM raw_props WHERE session_id = ? ORDER BY component_id, position`
+  ).all(sessionId2).map(mapRawPropRow);
+  const allowedValues = db.prepare(
+    `SELECT component_id, prop_name, position, value
+       FROM raw_prop_allowed_values WHERE session_id = ? ORDER BY component_id, prop_name, position`
+  ).all(sessionId2).map(mapAllowedValueSnapshotRow);
+  const slots = db.prepare(
+    `SELECT component_id, name, is_default, description, position
+       FROM raw_slots WHERE session_id = ? ORDER BY component_id, position`
+  ).all(sessionId2).map(mapRawSlotRow);
+  const allowedComponents = db.prepare(
+    `SELECT component_id, slot_name, position, allowed_component
+       FROM raw_slot_allowed_components WHERE session_id = ? ORDER BY component_id, slot_name, position`
+  ).all(sessionId2).map(mapRawSlotAllowedComponentRow);
+  const propsByComponent = indexRowsByKey(props, (p) => p.component_id);
+  const allowedValuesByProp = indexRowsByKey(allowedValues, (av) => `${av.component_id}::${av.prop_name}`);
+  const slotsByComponent = indexRowsByKey(slots, (s) => s.component_id);
+  const allowedComponentsBySlot = indexRowsByKey(allowedComponents, (ac) => `${ac.component_id}::${ac.slot_name}`);
+  return components.map(
+    (c2) => ({
+      component_id: c2.component_id,
+      name: c2.name,
+      source: c2.source,
+      framework: c2.framework,
+      extractionConfidence: c2.extraction_confidence ?? null,
+      reviewReasons: parseReviewReasons(c2.review_reasons),
+      needsReview: Boolean(c2.needs_review),
+      sourcePath: c2.source_path ?? void 0,
+      props: (propsByComponent.get(c2.component_id) ?? []).map((p) => {
+        const av = allowedValuesByProp.get(`${c2.component_id}::${p.name}`);
+        const prop = {
+          name: p.name,
+          type: p.type,
+          required: Boolean(p.required)
+        };
+        if (p.category !== null) prop.category = p.category;
+        if (p.default_value !== null) prop.defaultValue = p.default_value;
+        if (p.description !== null) prop.description = p.description;
+        if (p.token_reference !== null) prop.tokenReference = p.token_reference;
+        if (av && av.length > 0) prop.allowedValues = av.map((v) => v.value);
+        if (p.source_start_line !== null) prop.sourceStartLine = p.source_start_line;
+        if (p.source_end_line !== null) prop.sourceEndLine = p.source_end_line;
+        return prop;
+      }),
+      slots: (slotsByComponent.get(c2.component_id) ?? []).map((s) => {
+        const ac = allowedComponentsBySlot.get(`${c2.component_id}::${s.name}`);
+        const slot = {
+          name: s.name,
+          isDefault: Boolean(s.is_default)
+        };
+        if (s.description !== null) slot.description = s.description;
+        if (ac && ac.length > 0) slot.allowedComponents = ac.map((v) => v.allowed_component);
+        return slot;
+      })
+    })
+  );
+}
+function getClassifiedProps(db, sessionId2) {
+  return db.prepare(
+    `SELECT component_id, name, position, cdf_type, cdf_category, cdf_token_kind
+       FROM raw_props WHERE session_id = ? AND cdf_type IS NOT NULL`
+  ).all(sessionId2).map((row) => ({
+    component_id: String(row.component_id),
+    name: String(row.name),
+    position: Number(row.position),
+    cdf_type: String(row.cdf_type),
+    cdf_category: String(row.cdf_category),
+    cdf_token_kind: row.cdf_token_kind === null ? null : String(row.cdf_token_kind)
+  }));
+}
+function getComponentDescriptions(db, sessionId2) {
+  return db.prepare(
+    `SELECT component_id, description
+       FROM raw_components WHERE session_id = ? AND description IS NOT NULL`
+  ).all(sessionId2).map((row) => ({
+    component_id: String(row.component_id),
+    description: String(row.description)
+  }));
+}
+function getRawPropAllowedValues(db, sessionId2) {
+  return db.prepare(`SELECT component_id, prop_name, position, value FROM raw_prop_allowed_values WHERE session_id = ?`).all(sessionId2).map(mapAllowedValueSnapshotRow);
+}
+function getRawPropNameAtPosition(db, sessionId2, componentId, position) {
+  const row = db.prepare(`SELECT name FROM raw_props WHERE session_id = ? AND component_id = ? AND position = ?`).get(sessionId2, componentId, position);
+  return row ? String(row.name) : null;
+}
+var init_read4 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/components/raw/read.ts"() {
+    "use strict";
+    init_index_rows_by_key();
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/components/raw/write.ts
+function deleteRawComponentsForSession(db, sessionId2) {
+  db.prepare("DELETE FROM raw_components WHERE session_id = ?").run(sessionId2);
+}
+function createRawComponent(db, sessionId2, comp, extractedAt) {
+  const componentId = deriveComponentId(comp.name, comp.source);
+  db.prepare(
+    `INSERT INTO raw_components (session_id, component_id, name, source, framework, extracted_at, extraction_confidence, review_reasons, needs_review, source_path)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+  ).run(
+    sessionId2,
+    componentId,
+    comp.name,
+    comp.source,
+    comp.framework,
+    extractedAt,
+    comp.extractionConfidence ?? null,
+    JSON.stringify(comp.reviewReasons ?? []),
+    comp.needsReview ? 1 : 0,
+    comp.sourcePath ?? null
+  );
+  return componentId;
+}
+function createRawProps(db, sessionId2, componentId, props) {
+  const insertProp = db.prepare(
+    `INSERT INTO raw_props
+       (session_id, component_id, name, type, required, category, default_value, description, token_reference, position, source_start_line, source_end_line)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+  );
+  const insertAllowedValue = db.prepare(
+    `INSERT INTO raw_prop_allowed_values (session_id, component_id, prop_name, position, value)
+     VALUES (?, ?, ?, ?, ?)`
+  );
+  for (let i = 0; i < props.length; i++) {
+    const prop = props[i];
+    insertProp.run(
+      sessionId2,
+      componentId,
+      prop.name,
+      prop.type,
+      prop.required ? 1 : 0,
+      prop.category ?? null,
+      prop.defaultValue ?? null,
+      prop.description ?? null,
+      prop.tokenReference ?? null,
+      i,
+      prop.sourceStartLine ?? null,
+      prop.sourceEndLine ?? null
+    );
+    if (prop.allowedValues) {
+      prop.allowedValues.forEach((v, j) => insertAllowedValue.run(sessionId2, componentId, prop.name, j, v));
+    }
+  }
+}
+function createRawSlots(db, sessionId2, componentId, slots) {
+  const insertSlot = db.prepare(
+    `INSERT INTO raw_slots (session_id, component_id, name, is_default, description, position)
+     VALUES (?, ?, ?, ?, ?, ?)`
+  );
+  const insertAllowedComponent = db.prepare(
+    `INSERT INTO raw_slot_allowed_components (session_id, component_id, slot_name, position, allowed_component)
+     VALUES (?, ?, ?, ?, ?)`
+  );
+  for (let i = 0; i < slots.length; i++) {
+    const slot = slots[i];
+    insertSlot.run(sessionId2, componentId, slot.name, slot.isDefault ? 1 : 0, slot.description ?? null, i);
+    if (slot.allowedComponents) {
+      slot.allowedComponents.forEach((ac, j) => insertAllowedComponent.run(sessionId2, componentId, slot.name, j, ac));
+    }
+  }
+}
+function updateRawComponentsStatus(db, sessionId2, status) {
+  db.prepare("UPDATE raw_components SET status = ? WHERE session_id = ?").run(status, sessionId2);
+}
+function updateRawPropCdfByName(db, sessionId2, componentId, propName, cdfType, cdfCategory, cdfTokenKind) {
+  const result = db.prepare(
+    `UPDATE raw_props SET cdf_type = ?, cdf_category = ?, cdf_token_kind = ?
+       WHERE session_id = ? AND component_id = ? AND name = ?`
+  ).run(cdfType, cdfCategory, cdfTokenKind, sessionId2, componentId, propName);
+  return Number(result.changes);
+}
+function updateRawPropCdfByPosition(db, sessionId2, componentId, position, cdfType, cdfCategory, cdfTokenKind) {
+  const result = db.prepare(
+    `UPDATE raw_props SET cdf_type = ?, cdf_category = ?, cdf_token_kind = ?
+       WHERE session_id = ? AND component_id = ? AND position = ? AND cdf_type IS NULL`
+  ).run(cdfType, cdfCategory, cdfTokenKind, sessionId2, componentId, position);
+  return Number(result.changes);
+}
+function updateRawComponentDescription(db, sessionId2, componentId, description) {
+  db.prepare("UPDATE raw_components SET description = ? WHERE session_id = ? AND component_id = ?").run(
+    description,
+    sessionId2,
+    componentId
+  );
+}
+function deleteRawPropAllowedValuesForProp(db, sessionId2, componentId, propName) {
+  db.prepare("DELETE FROM raw_prop_allowed_values WHERE session_id = ? AND component_id = ? AND prop_name = ?").run(
+    sessionId2,
+    componentId,
+    propName
+  );
+}
+function createRawPropAllowedValue(db, sessionId2, componentId, propName, position, value) {
+  db.prepare(
+    `INSERT OR IGNORE INTO raw_prop_allowed_values (session_id, component_id, prop_name, position, value)
+     VALUES (?, ?, ?, ?, ?)`
+  ).run(sessionId2, componentId, propName, position, value);
+}
+var init_write4 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/components/raw/write.ts"() {
+    "use strict";
+    init_derive_component_id();
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/components/plan-cdf-restore.ts
+function planCdfRestore(cdfSnapshot, descSnapshot, avSnapshot, currentProps) {
+  const byName = [];
+  const byPosition = [];
+  const nameMatchedKeys = /* @__PURE__ */ new Set();
+  for (const snap of cdfSnapshot) {
+    if (currentProps.hasPropNamed(snap.component_id, snap.name)) {
+      byName.push(snap);
+      nameMatchedKeys.add(propKey(snap.component_id, snap.name));
+      continue;
+    }
+    if (currentProps.propNameAtPosition(snap.component_id, snap.position) !== null) {
+      byPosition.push(snap);
+    }
+  }
+  const buckets = /* @__PURE__ */ new Map();
+  for (const av of avSnapshot) {
+    const key = propKey(av.component_id, av.prop_name);
+    if (!nameMatchedKeys.has(key)) continue;
+    const bucket = buckets.get(key) ?? { componentId: av.component_id, propName: av.prop_name, values: [] };
+    bucket.values.push(av);
+    buckets.set(key, bucket);
+  }
+  return {
+    byName,
+    byPosition,
+    descriptions: descSnapshot,
+    allowedValues: [...buckets.values()]
+  };
+}
+function propKey(componentId, propName) {
+  return `${componentId}::${propName}`;
+}
+var init_plan_cdf_restore = __esm({
+  "packages/experience-design-system-cli/src/session/core/components/plan-cdf-restore.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/services/components/apply-cdf-restore.ts
+function applyCdfRestore(db, sessionId2, plan) {
+  for (const snap of plan.byName) {
+    updateRawPropCdfByName(
+      db,
+      sessionId2,
+      snap.component_id,
+      snap.name,
+      snap.cdf_type,
+      snap.cdf_category,
+      snap.cdf_token_kind
+    );
+  }
+  for (const snap of plan.byPosition) {
+    updateRawPropCdfByPosition(
+      db,
+      sessionId2,
+      snap.component_id,
+      snap.position,
+      snap.cdf_type,
+      snap.cdf_category,
+      snap.cdf_token_kind
+    );
+  }
+  for (const snap of plan.descriptions) {
+    updateRawComponentDescription(db, sessionId2, snap.component_id, snap.description);
+  }
+  for (const bucket of plan.allowedValues) {
+    deleteRawPropAllowedValuesForProp(db, sessionId2, bucket.componentId, bucket.propName);
+    for (const av of bucket.values) {
+      createRawPropAllowedValue(db, sessionId2, bucket.componentId, bucket.propName, av.position, av.value);
+    }
+  }
+}
+var init_apply_cdf_restore = __esm({
+  "packages/experience-design-system-cli/src/session/services/components/apply-cdf-restore.ts"() {
+    "use strict";
+    init_write4();
+  }
+});
+
+// packages/experience-design-system-cli/src/session/services/components/store-raw-components.ts
+function storeRawComponents(db, sessionId2, components, options) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  withTransaction(db, () => {
+    const cdfSnapshot = options?.preserveCDF ? getClassifiedProps(db, sessionId2) : [];
+    const descSnapshot = options?.preserveCDF ? getComponentDescriptions(db, sessionId2) : [];
+    const avSnapshot = options?.preserveCDF && cdfSnapshot.length > 0 ? getRawPropAllowedValues(db, sessionId2) : [];
+    deleteRawComponentsForSession(db, sessionId2);
+    for (const comp of components) {
+      const componentId = createRawComponent(db, sessionId2, comp, now);
+      createRawProps(db, sessionId2, componentId, comp.props);
+      createRawSlots(db, sessionId2, componentId, comp.slots);
+    }
+    if (options?.preserveCDF && cdfSnapshot.length > 0) {
+      const plan = planCdfRestore(cdfSnapshot, descSnapshot, avSnapshot, {
+        hasPropNamed: (componentId, propName) => hasPropByName(db, sessionId2, componentId, propName),
+        propNameAtPosition: memoize(
+          (componentId, position) => getRawPropNameAtPosition(db, sessionId2, componentId, position)
+        )
+      });
+      applyCdfRestore(db, sessionId2, plan);
+    }
+    if (options?.status) {
+      updateRawComponentsStatus(db, sessionId2, options.status);
+    }
+    updateSessionTimestamp(db, sessionId2, now);
+  });
+}
+function hasPropByName(db, sessionId2, componentId, propName) {
+  const row = db.prepare("SELECT 1 as one FROM raw_props WHERE session_id = ? AND component_id = ? AND name = ?").get(sessionId2, componentId, propName);
+  return row !== void 0;
+}
+function memoize(lookup) {
+  const cache = /* @__PURE__ */ new Map();
+  return (componentId, position) => {
+    const key = `${componentId}::${position}`;
+    if (cache.has(key)) return cache.get(key);
+    const value = lookup(componentId, position);
+    cache.set(key, value);
+    return value;
+  };
+}
+var init_store_raw_components = __esm({
+  "packages/experience-design-system-cli/src/session/services/components/store-raw-components.ts"() {
+    "use strict";
+    init_with_transaction();
+    init_write();
+    init_read4();
+    init_write4();
+    init_plan_cdf_restore();
+    init_apply_cdf_restore();
+  }
+});
+
 // packages/experience-design-system-cli/src/session/cache-keys.ts
 var cache_keys_exports = {};
 __export(cache_keys_exports, {
@@ -9756,239 +10169,6 @@ function updateStep(db, stepId, status, outputs, error) {
     throw e;
   }
 }
-function storeRawComponents(db, sessionId2, components, options) {
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  const insertComp = db.prepare(
-    `INSERT INTO raw_components (session_id, component_id, name, source, framework, extracted_at, extraction_confidence, review_reasons, needs_review, source_path)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-  );
-  const insertProp = db.prepare(
-    `INSERT INTO raw_props
-       (session_id, component_id, name, type, required, category, default_value, description, token_reference, position, source_start_line, source_end_line)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-  );
-  const insertAllowedValue = db.prepare(
-    `INSERT INTO raw_prop_allowed_values (session_id, component_id, prop_name, position, value)
-     VALUES (?, ?, ?, ?, ?)`
-  );
-  const insertSlot = db.prepare(
-    `INSERT INTO raw_slots (session_id, component_id, name, is_default, description, position)
-     VALUES (?, ?, ?, ?, ?, ?)`
-  );
-  const insertAllowedComponent = db.prepare(
-    `INSERT INTO raw_slot_allowed_components (session_id, component_id, slot_name, position, allowed_component)
-     VALUES (?, ?, ?, ?, ?)`
-  );
-  db.exec("BEGIN");
-  try {
-    let cdfSnapshot = [];
-    let descSnapshot = [];
-    let avSnapshot = [];
-    if (options?.preserveCDF) {
-      cdfSnapshot = db.prepare(
-        `SELECT component_id, name, position, cdf_type, cdf_category, cdf_token_kind
-           FROM raw_props WHERE session_id = ? AND cdf_type IS NOT NULL`
-      ).all(sessionId2);
-      descSnapshot = db.prepare(
-        `SELECT component_id, description
-           FROM raw_components WHERE session_id = ? AND description IS NOT NULL`
-      ).all(sessionId2);
-      if (cdfSnapshot.length > 0) {
-        avSnapshot = db.prepare(
-          `SELECT component_id, prop_name, position, value
-             FROM raw_prop_allowed_values WHERE session_id = ?`
-        ).all(sessionId2);
-      }
-    }
-    db.prepare("DELETE FROM raw_components WHERE session_id = ?").run(sessionId2);
-    for (const comp of components) {
-      const componentId = deriveComponentId(comp.name, comp.source);
-      insertComp.run(
-        sessionId2,
-        componentId,
-        comp.name,
-        comp.source,
-        comp.framework,
-        now,
-        comp.extractionConfidence ?? null,
-        JSON.stringify(comp.reviewReasons ?? []),
-        comp.needsReview ? 1 : 0,
-        comp.sourcePath ?? null
-      );
-      for (let i = 0; i < comp.props.length; i++) {
-        const prop = comp.props[i];
-        insertProp.run(
-          sessionId2,
-          componentId,
-          prop.name,
-          prop.type,
-          prop.required ? 1 : 0,
-          prop.category ?? null,
-          prop.defaultValue ?? null,
-          prop.description ?? null,
-          prop.tokenReference ?? null,
-          i,
-          prop.sourceStartLine ?? null,
-          prop.sourceEndLine ?? null
-        );
-        if (prop.allowedValues) {
-          prop.allowedValues.forEach((v, j) => insertAllowedValue.run(sessionId2, componentId, prop.name, j, v));
-        }
-      }
-      for (let i = 0; i < comp.slots.length; i++) {
-        const slot = comp.slots[i];
-        insertSlot.run(sessionId2, componentId, slot.name, slot.isDefault ? 1 : 0, slot.description ?? null, i);
-        if (slot.allowedComponents) {
-          slot.allowedComponents.forEach(
-            (ac, j) => insertAllowedComponent.run(sessionId2, componentId, slot.name, j, ac)
-          );
-        }
-      }
-    }
-    if (options?.preserveCDF && cdfSnapshot.length > 0) {
-      const updateCDFByName = db.prepare(
-        `UPDATE raw_props SET cdf_type = ?, cdf_category = ?, cdf_token_kind = ?
-         WHERE session_id = ? AND component_id = ? AND name = ?`
-      );
-      const updateCDFByPosition = db.prepare(
-        `UPDATE raw_props SET cdf_type = ?, cdf_category = ?, cdf_token_kind = ?
-         WHERE session_id = ? AND component_id = ? AND position = ? AND cdf_type IS NULL`
-      );
-      const restoredPropKeys = /* @__PURE__ */ new Set();
-      const unmatchedSnaps = [];
-      for (const snap of cdfSnapshot) {
-        const result = updateCDFByName.run(
-          snap.cdf_type,
-          snap.cdf_category,
-          snap.cdf_token_kind,
-          sessionId2,
-          snap.component_id,
-          snap.name
-        );
-        if (Number(result.changes) > 0) {
-          restoredPropKeys.add(`${snap.component_id}::${snap.name}`);
-        } else {
-          unmatchedSnaps.push(snap);
-        }
-      }
-      for (const snap of unmatchedSnaps) {
-        const result = updateCDFByPosition.run(
-          snap.cdf_type,
-          snap.cdf_category,
-          snap.cdf_token_kind,
-          sessionId2,
-          snap.component_id,
-          snap.position
-        );
-        if (Number(result.changes) > 0) {
-          const matched = db.prepare(`SELECT name FROM raw_props WHERE session_id = ? AND component_id = ? AND position = ?`).get(sessionId2, snap.component_id, snap.position);
-          if (matched) {
-            restoredPropKeys.add(`${snap.component_id}::${matched.name}`);
-          }
-        }
-      }
-      const updateDesc = db.prepare(
-        `UPDATE raw_components SET description = ? WHERE session_id = ? AND component_id = ?`
-      );
-      for (const snap of descSnapshot) {
-        updateDesc.run(snap.description, sessionId2, snap.component_id);
-      }
-      const relevantAV = avSnapshot.filter((av) => restoredPropKeys.has(`${av.component_id}::${av.prop_name}`));
-      if (relevantAV.length > 0) {
-        const deleteAV = db.prepare(
-          `DELETE FROM raw_prop_allowed_values WHERE session_id = ? AND component_id = ? AND prop_name = ?`
-        );
-        const insertAV = db.prepare(
-          `INSERT OR IGNORE INTO raw_prop_allowed_values (session_id, component_id, prop_name, position, value)
-           VALUES (?, ?, ?, ?, ?)`
-        );
-        const deletedKeys = /* @__PURE__ */ new Set();
-        for (const av of relevantAV) {
-          const key = `${av.component_id}::${av.prop_name}`;
-          if (!deletedKeys.has(key)) {
-            deleteAV.run(sessionId2, av.component_id, av.prop_name);
-            deletedKeys.add(key);
-          }
-          insertAV.run(sessionId2, av.component_id, av.prop_name, av.position, av.value);
-        }
-      }
-    }
-    if (options?.status) {
-      db.prepare("UPDATE raw_components SET status = ? WHERE session_id = ?").run(options.status, sessionId2);
-    }
-    db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
-    db.exec("COMMIT");
-  } catch (e) {
-    db.exec("ROLLBACK");
-    throw e;
-  }
-}
-function loadRawComponents(db, sessionId2, allowedNames) {
-  const all = db.prepare(
-    "SELECT component_id, name, source, framework, extraction_confidence, review_reasons, needs_review, source_path FROM raw_components WHERE session_id = ? ORDER BY rowid"
-  ).all(sessionId2);
-  const components = allowedNames ? all.filter((c2) => allowedNames.has(c2.name)) : all;
-  if (components.length === 0) return [];
-  const props = db.prepare(
-    `SELECT component_id, name, type, required, category, default_value, description, token_reference, position,
-              rationale, source_start_line, source_end_line
-       FROM raw_props WHERE session_id = ? ORDER BY component_id, position`
-  ).all(sessionId2);
-  const allowedValues = db.prepare(
-    `SELECT component_id, prop_name, position, value
-       FROM raw_prop_allowed_values WHERE session_id = ? ORDER BY component_id, prop_name, position`
-  ).all(sessionId2);
-  const slots = db.prepare(
-    `SELECT component_id, name, is_default, description, position
-       FROM raw_slots WHERE session_id = ? ORDER BY component_id, position`
-  ).all(sessionId2);
-  const allowedComponents = db.prepare(
-    `SELECT component_id, slot_name, position, allowed_component
-       FROM raw_slot_allowed_components WHERE session_id = ? ORDER BY component_id, slot_name, position`
-  ).all(sessionId2);
-  const propsByComponent = indexRowsByKey(props, (p) => p.component_id);
-  const allowedValuesByProp = indexRowsByKey(allowedValues, (av) => `${av.component_id}::${av.prop_name}`);
-  const slotsByComponent = indexRowsByKey(slots, (s) => s.component_id);
-  const allowedComponentsBySlot = indexRowsByKey(allowedComponents, (ac) => `${ac.component_id}::${ac.slot_name}`);
-  return components.map(
-    (c2) => ({
-      component_id: c2.component_id,
-      name: c2.name,
-      source: c2.source,
-      framework: c2.framework,
-      extractionConfidence: c2.extraction_confidence ?? null,
-      reviewReasons: parseReviewReasons(c2.review_reasons),
-      needsReview: Boolean(c2.needs_review),
-      sourcePath: c2.source_path ?? void 0,
-      props: (propsByComponent.get(c2.component_id) ?? []).map((p) => {
-        const av = allowedValuesByProp.get(`${c2.component_id}::${p.name}`);
-        const prop = {
-          name: p.name,
-          type: p.type,
-          required: Boolean(p.required)
-        };
-        if (p.category !== null) prop.category = p.category;
-        if (p.default_value !== null) prop.defaultValue = p.default_value;
-        if (p.description !== null) prop.description = p.description;
-        if (p.token_reference !== null) prop.tokenReference = p.token_reference;
-        if (av && av.length > 0) prop.allowedValues = av.map((v) => v.value);
-        if (p.source_start_line !== null) prop.sourceStartLine = p.source_start_line;
-        if (p.source_end_line !== null) prop.sourceEndLine = p.source_end_line;
-        return prop;
-      }),
-      slots: (slotsByComponent.get(c2.component_id) ?? []).map((s) => {
-        const ac = allowedComponentsBySlot.get(`${c2.component_id}::${s.name}`);
-        const slot = {
-          name: s.name,
-          isDefault: Boolean(s.is_default)
-        };
-        if (s.description !== null) slot.description = s.description;
-        if (ac && ac.length > 0) slot.allowedComponents = ac.map((v) => v.allowed_component);
-        return slot;
-      })
-    })
-  );
-}
 function rewrittenSourcePaths(basePath) {
   for (const [emitted, sources] of TS_ESM_EXTENSION_REWRITES) {
     if (!basePath.endsWith(emitted)) continue;
@@ -10167,7 +10347,7 @@ function renameEmptySlots(db, sessionId2, componentId, componentName, slotCount)
   }
   return { renames, warnings };
 }
-function parseReviewReasons(raw) {
+function parseReviewReasons2(raw) {
   try {
     const parsed = JSON.parse(raw ?? "[]");
     return Array.isArray(parsed) ? parsed.filter((reason) => typeof reason === "string") : [];
@@ -10421,7 +10601,7 @@ function loadScopeComponents(db, sessionId2) {
   const slotsByComponent = indexRowsByKey(slotRows, (s) => s.component_id);
   const allowedBySlot = indexRowsByKey(allowedRows, (a) => `${a.component_id}::${a.slot_name}`);
   return rows.map((r) => {
-    const reviewReasons = parseReviewReasons(r.review_reasons);
+    const reviewReasons = parseReviewReasons2(r.review_reasons);
     const nonAuthorableReason = reviewReasons.find((reason) => reason.startsWith("non-authorable:"));
     return {
       name: r.name,
@@ -10779,9 +10959,9 @@ function copyMapTokensFromCache(db, sourceSessionId, targetSessionId) {
       const targetComponentId = targetIdByName.get(row.component_name);
       if (!targetComponentId) continue;
       if (!targetProps.has(`${targetComponentId}::${row.prop_name}`)) continue;
-      const propKey = `${targetComponentId}::${row.prop_name}`;
-      if (!clearedProps.has(propKey)) {
-        clearedProps.add(propKey);
+      const propKey2 = `${targetComponentId}::${row.prop_name}`;
+      if (!clearedProps.has(propKey2)) {
+        clearedProps.add(propKey2);
         db.prepare(`DELETE FROM raw_prop_token_paths WHERE session_id = ? AND component_id = ? AND prop_name = ?`).run(
           targetSessionId,
           targetComponentId,
@@ -10789,7 +10969,7 @@ function copyMapTokensFromCache(db, sourceSessionId, targetSessionId) {
         );
       }
       insertPath.run(targetSessionId, targetComponentId, row.prop_name, row.source, row.position, row.path);
-      copiedProps.add(propKey);
+      copiedProps.add(propKey2);
     }
     copiedCount = copiedProps.size;
     db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, targetSessionId);
@@ -10887,6 +11067,8 @@ var init_db = __esm({
     init_apply_tool_calls();
     init_replace_raw_token_name_paths();
     init_replace_raw_prop_token_paths();
+    init_read4();
+    init_store_raw_components();
     SCHEMA = `
 PRAGMA journal_mode = WAL;
 PRAGMA foreign_keys = ON;
@@ -11128,7 +11310,7 @@ async function ensureRefineSession(sessionId2, artifactsRoot, initialSnapshot) {
 }
 async function writeScopeDecisionsSnapshot(db, sessionId2, decisions) {
   const acceptedSet = new Set(decisions.accepted);
-  const rawComponents = loadRawComponents(db, sessionId2);
+  const rawComponents = getRawComponents(db, sessionId2);
   const records = rawComponents.map((c2) => {
     const status = acceptedSet.has(c2.name) ? "accepted" : "rejected";
     const proposal = {
@@ -12183,7 +12365,7 @@ function useSession({ sessionId: sessionId2, artifactsRoot, reviewRoot }) {
       const db = openPipelineDb();
       let rawComponents;
       try {
-        rawComponents = loadRawComponents(db, sessionId2);
+        rawComponents = getRawComponents(db, sessionId2);
       } finally {
         db.close();
       }
@@ -16578,7 +16760,7 @@ async function loadAndValidateForReview(sessionId2, projectRoot) {
   const db = openPipelineDb();
   let rawComponents;
   try {
-    rawComponents = loadRawComponents(db, sessionId2);
+    rawComponents = getRawComponents(db, sessionId2);
   } finally {
     db.close();
   }
@@ -16697,7 +16879,7 @@ function registerAnalyzeEditCommand(program) {
       const db = openPipelineDb();
       let rawComponentCount = 0;
       try {
-        rawComponentCount = loadRawComponents(db, sessionId2).length;
+        rawComponentCount = getRawComponents(db, sessionId2).length;
       } finally {
         db.close();
       }
@@ -31118,7 +31300,7 @@ function registerAnalyzeSelectAgentCommand(program) {
       let rawComponents;
       let scannedFiles = [];
       try {
-        rawComponents = loadRawComponents(db, sessionId2);
+        rawComponents = getRawComponents(db, sessionId2);
         scannedFiles = loadScannedFiles(db, sessionId2);
       } finally {
         db.close();
@@ -33260,7 +33442,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     const acceptedNames = await loadAcceptedNames(sessionId2);
     const db = openPipelineDb();
     try {
-      allComponents = loadRawComponents(db, sessionId2, acceptedNames ?? void 0);
+      allComponents = getRawComponents(db, sessionId2, acceptedNames ?? void 0);
     } finally {
       db.close();
     }

package/dist/src/session/core/components/plan-cdf-restore.d.ts

@@ -0,0 +1,34 @@
+export interface CdfSnapshotEntry {
+    component_id: string;
+    name: string;
+    position: number;
+    cdf_type: string;
+    cdf_category: string;
+    cdf_token_kind: string | null;
+}
+export interface DescriptionSnapshotEntry {
+    component_id: string;
+    description: string;
+}
+export interface AllowedValueSnapshotEntry {
+    component_id: string;
+    prop_name: string;
+    position: number;
+    value: string;
+}
+export interface RestoredAllowedValues {
+    componentId: string;
+    propName: string;
+    values: AllowedValueSnapshotEntry[];
+}
+export interface CdfRestorePlan {
+    byName: CdfSnapshotEntry[];
+    byPosition: CdfSnapshotEntry[];
+    descriptions: DescriptionSnapshotEntry[];
+    allowedValues: RestoredAllowedValues[];
+}
+export interface CurrentPropsQuery {
+    hasPropNamed: (componentId: string, propName: string) => boolean;
+    propNameAtPosition: (componentId: string, position: number) => string | null;
+}
+export declare function planCdfRestore(cdfSnapshot: CdfSnapshotEntry[], descSnapshot: DescriptionSnapshotEntry[], avSnapshot: AllowedValueSnapshotEntry[], currentProps: CurrentPropsQuery): CdfRestorePlan;

package/dist/src/session/db.d.ts

@@ -16,6 +16,8 @@ export { storeDtcgTokens as storeDTCGTokens } from './services/tokens/store-dtcg
 export { applyTokenToolCalls, type ApplyTokenToolCallsResult } from './services/tokens/apply-tool-calls.js';
 export { replaceRawTokenNamePaths } from './services/tokens/replace-raw-token-name-paths.js';
 export { replaceRawPropTokenPaths } from './services/tokens/replace-raw-prop-token-paths.js';
+export { getRawComponents as loadRawComponents, type RawComponentWithId } from './repositories/components/raw/read.js';
+export { storeRawComponents } from './services/components/store-raw-components.js';
 export type StepStatus = 'pending' | 'complete' | 'failed' | 'interrupted';
 export type CommandName = 'analyze extract' | 'analyze select' | 'generate components' | 'generate tokens' | 'generate edit' | 'apply preview' | 'apply select' | 'apply push' | 'print components' | 'print tokens' | 'map tokens' | 'fetch existing entities' | 'import';
 export interface SessionRow {
@@ -79,14 +81,6 @@ export type { SessionResolution };
 export declare function getOrCreateSession(db: DatabaseSync, sessionFlag: string | undefined, sessionName: string | undefined, hints: MatchHints): SessionResolution;
 export declare function createStep(db: DatabaseSync, sessionId: string, command: CommandName, inputs: Record<string, string>): number;
 export declare function updateStep(db: DatabaseSync, stepId: number, status: 'complete' | 'failed', outputs: Record<string, string>, error?: string): void;
-export declare function storeRawComponents(db: DatabaseSync, sessionId: string, components: RawComponentDefinition[], options?: {
-    status?: string;
-    preserveCDF?: boolean;
-}): void;
-export type RawComponentWithId = RawComponentDefinition & {
-    component_id: string;
-};
-export declare function loadRawComponents(db: DatabaseSync, sessionId: string, allowedNames?: Set<string>): RawComponentWithId[];
 export declare function loadComponentSourceRef(name: string, sourcePath: string, propNames?: string[], propTypes?: string[]): Promise<ComponentSourceRef>;
 export declare function loadComponentSourceRefs(db: DatabaseSync, sessionId: string): Promise<ComponentSourceRef[]>;
 export declare function renameEmptySlots(db: DatabaseSync, sessionId: string, componentId: string, componentName: string, slotCount: number): {

package/dist/src/session/repositories/components/raw/read.d.ts

@@ -0,0 +1,11 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { RawComponentDefinition } from '../../../../types.js';
+import type { AllowedValueSnapshotEntry, CdfSnapshotEntry, DescriptionSnapshotEntry } from '../../../core/components/plan-cdf-restore.js';
+export type RawComponentWithId = RawComponentDefinition & {
+    component_id: string;
+};
+export declare function getRawComponents(db: DatabaseSync, sessionId: string, allowedNames?: Set<string>): RawComponentWithId[];
+export declare function getClassifiedProps(db: DatabaseSync, sessionId: string): CdfSnapshotEntry[];
+export declare function getComponentDescriptions(db: DatabaseSync, sessionId: string): DescriptionSnapshotEntry[];
+export declare function getRawPropAllowedValues(db: DatabaseSync, sessionId: string): AllowedValueSnapshotEntry[];
+export declare function getRawPropNameAtPosition(db: DatabaseSync, sessionId: string, componentId: string, position: number): string | null;

package/dist/src/session/repositories/components/raw/write.d.ts

@@ -0,0 +1,12 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { RawComponentDefinition } from '../../../../types.js';
+export declare function deleteRawComponentsForSession(db: DatabaseSync, sessionId: string): void;
+export declare function createRawComponent(db: DatabaseSync, sessionId: string, comp: RawComponentDefinition, extractedAt: string): string;
+export declare function createRawProps(db: DatabaseSync, sessionId: string, componentId: string, props: RawComponentDefinition['props']): void;
+export declare function createRawSlots(db: DatabaseSync, sessionId: string, componentId: string, slots: RawComponentDefinition['slots']): void;
+export declare function updateRawComponentsStatus(db: DatabaseSync, sessionId: string, status: string): void;
+export declare function updateRawPropCdfByName(db: DatabaseSync, sessionId: string, componentId: string, propName: string, cdfType: string, cdfCategory: string, cdfTokenKind: string | null): number;
+export declare function updateRawPropCdfByPosition(db: DatabaseSync, sessionId: string, componentId: string, position: number, cdfType: string, cdfCategory: string, cdfTokenKind: string | null): number;
+export declare function updateRawComponentDescription(db: DatabaseSync, sessionId: string, componentId: string, description: string): void;
+export declare function deleteRawPropAllowedValuesForProp(db: DatabaseSync, sessionId: string, componentId: string, propName: string): void;
+export declare function createRawPropAllowedValue(db: DatabaseSync, sessionId: string, componentId: string, propName: string, position: number, value: string): void;

package/dist/src/session/services/components/apply-cdf-restore.d.ts

@@ -0,0 +1,3 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { CdfRestorePlan } from '../../core/components/plan-cdf-restore.js';
+export declare function applyCdfRestore(db: DatabaseSync, sessionId: string, plan: CdfRestorePlan): void;

package/dist/src/session/services/components/store-raw-components.d.ts

@@ -0,0 +1,6 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { RawComponentDefinition } from '../../../types.js';
+export declare function storeRawComponents(db: DatabaseSync, sessionId: string, components: RawComponentDefinition[], options?: {
+    status?: string;
+    preserveCDF?: boolean;
+}): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-26a2030.0",
+  "version": "2.33.1-dev-build-9dba4a6.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -40,8 +40,8 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.32.1-dev-build-26a2030.0",
-    "@contentful/experience-design-system-cli-v2": "2.32.1-dev-build-26a2030.0"
+    "@contentful/experience-design-system-cli-v2": "2.33.1-dev-build-9dba4a6.0",
+    "@contentful/experience-design-system-types": "2.33.1-dev-build-9dba4a6.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -53,9 +53,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-client": "2.32.1-dev-build-26a2030.0",
-    "@contentful/experience-design-system-extraction": "2.32.1-dev-build-26a2030.0",
-    "@contentful/experience-design-system-generation": "2.32.1-dev-build-26a2030.0"
+    "@contentful/experience-design-system-client": "2.33.1-dev-build-9dba4a6.0",
+    "@contentful/experience-design-system-generation": "2.33.1-dev-build-9dba4a6.0",
+    "@contentful/experience-design-system-extraction": "2.33.1-dev-build-9dba4a6.0"
   },
   "repository": {
     "type": "git",