@contentful/experience-design-system-cli 2.25.1-dev-build-26ec156.0 → 2.25.1-dev-build-7be7857.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.25.1-dev-build-26ec156.0",
+  "version": "2.25.1-dev-build-7be7857.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -57,7 +57,7 @@
     "eslint-plugin-prettier": "^5.5.6",
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
-    "vitest": "^4.1.11"
+    "vitest": "^4.0.16"
   },
   "repository": {
     "type": "git",

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

@@ -26,6 +26,15 @@ export interface StepRow {
 }
 export declare function getPipelineDbPath(): string;
 export declare function openPipelineDb(dbPath?: string): DatabaseSync;
+export type RawPropTokenPathKind = 'set' | 'allowed';
+export interface RawPropTokenPathGroup {
+    componentId: string;
+    propName: string;
+    kind: RawPropTokenPathKind;
+    paths: string[];
+}
+export declare function replaceRawPropTokenPaths(db: DatabaseSync, sessionId: string, componentId: string, propName: string, kind: RawPropTokenPathKind, paths: string[]): void;
+export declare function loadRawPropTokenPaths(db: DatabaseSync, sessionId: string): RawPropTokenPathGroup[];
 export interface ApplyToolCallsResult {
     classified: number;
     excluded: number;

package/dist/src/session/db.js

@@ -185,6 +185,40 @@ export function openPipelineDb(dbPath) {
     }
 }
 function applyDbMigrations(db) {
+    const migrations = [
+        {
+            name: '001-raw-prop-token-paths',
+            sql: `
+        CREATE TABLE IF NOT EXISTS raw_prop_token_paths (
+          session_id   TEXT NOT NULL,
+          component_id TEXT NOT NULL,
+          prop_name    TEXT NOT NULL,
+          kind         TEXT NOT NULL CHECK (kind IN ('set', 'allowed')),
+          position     INTEGER NOT NULL,
+          path         TEXT NOT NULL,
+          PRIMARY KEY (session_id, component_id, prop_name, kind, position),
+          FOREIGN KEY (session_id, component_id, prop_name)
+            REFERENCES raw_props(session_id, component_id, name) ON DELETE CASCADE
+        );
+      `,
+        },
+    ];
+    const hasAppliedMigration = db.prepare('SELECT 1 FROM migrations WHERE name = ?');
+    const recordMigration = db.prepare('INSERT INTO migrations (name, applied_at) VALUES (?, ?)');
+    for (const migration of migrations) {
+        if (hasAppliedMigration.get(migration.name))
+            continue;
+        db.exec('BEGIN');
+        try {
+            db.exec(migration.sql);
+            recordMigration.run(migration.name, new Date().toISOString());
+            db.exec('COMMIT');
+        }
+        catch (e) {
+            db.exec('ROLLBACK');
+            throw e;
+        }
+    }
     const cols = db.prepare('PRAGMA table_info(raw_slots)').all();
     if (!cols.some((c) => c.name === 'required')) {
         db.exec('ALTER TABLE raw_slots ADD COLUMN required INTEGER NOT NULL DEFAULT 1 CHECK (required IN (0, 1))');
@@ -337,6 +371,59 @@ function applyDbMigrations(db) {
     `);
     }
 }
+export function replaceRawPropTokenPaths(db, sessionId, componentId, propName, kind, paths) {
+    const deletePaths = db.prepare(`DELETE FROM raw_prop_token_paths
+     WHERE session_id = ? AND component_id = ? AND prop_name = ? AND kind = ?`);
+    const insertPath = db.prepare(`INSERT INTO raw_prop_token_paths (session_id, component_id, prop_name, kind, position, path)
+     VALUES (?, ?, ?, ?, ?, ?)`);
+    db.exec('BEGIN');
+    try {
+        deletePaths.run(sessionId, componentId, propName, kind);
+        if (paths.length === 0) {
+            // Row absence means the mapping has never been recorded. Keep an explicit
+            // marker for an empty mapping so it can round-trip distinctly.
+            insertPath.run(sessionId, componentId, propName, kind, -1, '');
+        }
+        else {
+            paths.forEach((path, position) => {
+                insertPath.run(sessionId, componentId, propName, kind, position, path);
+            });
+        }
+        db.exec('COMMIT');
+    }
+    catch (e) {
+        db.exec('ROLLBACK');
+        throw e;
+    }
+}
+export function loadRawPropTokenPaths(db, sessionId) {
+    const rows = db
+        .prepare(`SELECT component_id, prop_name, kind, position, path
+       FROM raw_prop_token_paths
+       WHERE session_id = ?
+       ORDER BY component_id, prop_name, kind, position`)
+        .all(sessionId);
+    const groups = [];
+    for (const row of rows) {
+        const isEmptyMapping = row.position === -1 && row.path === '';
+        const previous = groups.at(-1);
+        if (previous &&
+            previous.componentId === row.component_id &&
+            previous.propName === row.prop_name &&
+            previous.kind === row.kind) {
+            if (!isEmptyMapping)
+                previous.paths.push(row.path);
+            continue;
+        }
+        groups.push({
+            componentId: row.component_id,
+            propName: row.prop_name,
+            kind: row.kind,
+            paths: isEmptyMapping ? [] : [row.path],
+        });
+    }
+    return groups;
+}
 export function loadComponentReviewMetadata(db, sessionId, componentName) {
     const compRow = db
         .prepare(`SELECT component_id, source, source_path FROM raw_components WHERE session_id = ? AND name = ?`)
@@ -785,6 +872,20 @@ export function storeCDFComponents(db, sessionId, components) {
      VALUES (?, ?, ?, ?, ?)`);
     const insertAllowedComponent = db.prepare(`INSERT INTO raw_slot_allowed_components (session_id, component_id, slot_name, allowed_component, position)
      VALUES (?, ?, ?, ?, ?)`);
+    const deleteTokenPaths = db.prepare(`DELETE FROM raw_prop_token_paths WHERE session_id = ? AND component_id = ? AND prop_name = ? AND kind = ?`);
+    const insertTokenPath = db.prepare(`INSERT INTO raw_prop_token_paths (session_id, component_id, prop_name, kind, position, path)
+     VALUES (?, ?, ?, ?, ?, ?)`);
+    // Absence of rows already means "mapping never ran", so a persisted-but-empty $token.allowed
+    // needs a sentinel row (position -1, empty path) to stay distinguishable on read-back.
+    const writeTokenPaths = (componentId, propName, kind, paths) => {
+        deleteTokenPaths.run(sessionId, componentId, propName, kind);
+        if (paths.length === 0) {
+            insertTokenPath.run(sessionId, componentId, propName, kind, -1, '');
+        }
+        else {
+            paths.forEach((path, position) => insertTokenPath.run(sessionId, componentId, propName, kind, position, path));
+        }
+    };
     const deleteSlots = db.prepare(`DELETE FROM raw_slots WHERE session_id = ? AND component_id = ?`);
     const deleteSlotAllowedComponents = db.prepare(`DELETE FROM raw_slot_allowed_components WHERE session_id = ? AND component_id = ?`);
     const readExistingSlotDefaults = db.prepare(`SELECT name, is_default FROM raw_slots WHERE session_id = ? AND component_id = ?`);
@@ -805,6 +906,11 @@ export function storeCDFComponents(db, sessionId, components) {
                         deleteAllowedValues.run(sessionId, componentId, propName);
                         prop.$values.forEach((v, i) => insertAllowedValue.run(sessionId, componentId, propName, v, i));
                     }
+                    if (prop['$token.sets'] !== undefined)
+                        writeTokenPaths(componentId, propName, 'set', prop['$token.sets']);
+                    if (prop['$token.allowed'] !== undefined) {
+                        writeTokenPaths(componentId, propName, 'allowed', prop['$token.allowed']);
+                    }
                 }
                 const existingDefaults = new Map(readExistingSlotDefaults.all(sessionId, componentId).map((r) => [r.name, r.is_default]));
                 deleteSlotAllowedComponents.run(sessionId, componentId);
@@ -830,6 +936,11 @@ export function storeCDFComponents(db, sessionId, components) {
                     if (prop.$values && prop.$values.length > 0) {
                         prop.$values.forEach((v, i) => insertAllowedValue.run(sessionId, componentId, propName, v, i));
                     }
+                    if (prop['$token.sets'] !== undefined)
+                        writeTokenPaths(componentId, propName, 'set', prop['$token.sets']);
+                    if (prop['$token.allowed'] !== undefined) {
+                        writeTokenPaths(componentId, propName, 'allowed', prop['$token.allowed']);
+                    }
                 }
                 let slotPos = 0;
                 for (const [slotName, slot] of Object.entries(entry.$slots ?? {})) {
@@ -875,10 +986,17 @@ export function loadCDFComponents(db, sessionId) {
         .prepare(`SELECT component_id, slot_name, allowed_component
        FROM raw_slot_allowed_components WHERE session_id = ? ORDER BY component_id, slot_name, position`)
         .all(sessionId);
+    const tokenPaths = db
+        .prepare(`SELECT component_id, prop_name, kind, position, path
+       FROM raw_prop_token_paths WHERE session_id = ? ORDER BY component_id, prop_name, kind, position`)
+        .all(sessionId);
     const propsByComponent = groupBy(props, (p) => p.component_id);
     const allowedValuesByProp = groupBy(allowedValues, (av) => `${av.component_id}::${av.prop_name}`);
     const slotsByComponent = groupBy(slots, (s) => s.component_id);
     const allowedComponentsBySlot = groupBy(allowedComponents, (ac) => `${ac.component_id}::${ac.slot_name}`);
+    const tokenPathsByPropAndKind = groupBy(tokenPaths, (t) => `${t.component_id}::${t.prop_name}::${t.kind}`);
+    // A single sentinel row (position -1, empty path) means the mapping ran but produced no paths.
+    const toTokenPaths = (rows) => rows === undefined ? undefined : rows.length === 1 && rows[0].position === -1 ? [] : rows.map((r) => r.path);
     return components.map(({ component_id, name, description }) => {
         const compProps = propsByComponent.get(component_id) ?? [];
         const $properties = {};
@@ -906,6 +1024,14 @@ export function loadCDFComponents(db, sessionId) {
                 propDef.$values = av.map((v) => v.value);
             if (p.cdf_token_kind !== null)
                 propDef['$token.kind'] = p.cdf_token_kind;
+            if (p.cdf_type === 'token' && p.cdf_category === 'design') {
+                const sets = toTokenPaths(tokenPathsByPropAndKind.get(`${component_id}::${p.name}::set`));
+                if (sets !== undefined)
+                    propDef['$token.sets'] = sets;
+                const allowed = toTokenPaths(tokenPathsByPropAndKind.get(`${component_id}::${p.name}::allowed`));
+                if (allowed !== undefined)
+                    propDef['$token.allowed'] = allowed;
+            }
             $properties[p.name] = propDef;
         }
         const compSlots = slotsByComponent.get(component_id) ?? [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.25.1-dev-build-26ec156.0",
+  "version": "2.25.1-dev-build-7be7857.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -34,10 +34,10 @@
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",
     "react-dom": "^18.3.1",
-    "@contentful/experience-design-system-extraction": "2.25.1-dev-build-26ec156.0",
-    "@contentful/experience-design-system-types": "2.25.1-dev-build-26ec156.0",
-    "@contentful/experience-design-system-client": "2.25.1-dev-build-26ec156.0",
-    "@contentful/experience-design-system-generation": "2.25.1-dev-build-26ec156.0"
+    "@contentful/experience-design-system-client": "2.25.1-dev-build-7be7857.0",
+    "@contentful/experience-design-system-extraction": "2.25.1-dev-build-7be7857.0",
+    "@contentful/experience-design-system-types": "2.25.1-dev-build-7be7857.0",
+    "@contentful/experience-design-system-generation": "2.25.1-dev-build-7be7857.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -48,7 +48,7 @@
     "eslint-plugin-prettier": "^5.5.6",
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
-    "vitest": "^4.1.11"
+    "vitest": "^4.0.16"
   },
   "repository": {
     "type": "git",