@contentful/experience-design-system-cli 2.12.4-dev-build-262febd.0 → 2.12.4-dev-build-5aa6a69.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.12.4-dev-build-262febd.0",
+  "version": "2.12.4-dev-build-5aa6a69.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/analyze/extract/slot-allowed-components.js

@@ -2,25 +2,26 @@
 // expands the second generic argument to string | JSXElementConstructor<any>).
 // Only the first generic argument (the props type name) is captured.
 const REACT_ELEMENT_GENERIC = /(?:React\.)?ReactElement\s*<\s*([A-Za-z_$][\w$.]*)(?![\w$.])/g;
-// Svelte 5 typed snippets: `Snippet<[XProps]>`. The type argument is a tuple
-// listing render args; when a snippet is authored to render a nested
-// ComponentType, the single tuple element is that component's Props type.
-// We only match the single-element tuple form — non-props render args
-// (e.g. `Snippet<[year: number]>`) don't reference a ComponentType and are
-// filtered out below via propsToComponent lookup.
-const SVELTE_SNIPPET_GENERIC = /Snippet\s*<\s*\[\s*([A-Za-z_$][\w$.]*)\s*\]\s*>/g;
+const SVELTE_SNIPPET_TUPLE = /Snippet\s*<\s*\[([^\]]*)\]\s*>/g;
+const IDENTIFIER = /[A-Za-z_$][\w$.]*/g;
 export function extractAllowedComponentsFromTypeText(typeText, ctx) {
     const found = new Set();
-    for (const re of [REACT_ELEMENT_GENERIC, SVELTE_SNIPPET_GENERIC]) {
-        re.lastIndex = 0;
-        let m;
-        while ((m = re.exec(typeText)) !== null) {
-            const propsTypeName = m[1];
-            const componentName = ctx.propsToComponent.get(propsTypeName);
-            if (componentName && ctx.componentNames.has(componentName)) {
-                found.add(componentName);
-            }
-        }
+    const record = (propsTypeName) => {
+        const componentName = ctx.propsToComponent.get(propsTypeName);
+        if (componentName && ctx.componentNames.has(componentName))
+            found.add(componentName);
+    };
+    REACT_ELEMENT_GENERIC.lastIndex = 0;
+    let m;
+    while ((m = REACT_ELEMENT_GENERIC.exec(typeText)) !== null)
+        record(m[1]);
+    SVELTE_SNIPPET_TUPLE.lastIndex = 0;
+    while ((m = SVELTE_SNIPPET_TUPLE.exec(typeText)) !== null) {
+        const tupleBody = m[1];
+        IDENTIFIER.lastIndex = 0;
+        let id;
+        while ((id = IDENTIFIER.exec(tupleBody)) !== null)
+            record(id[0]);
     }
     return [...found].sort();
 }

package/dist/src/analyze/select/tui/components/FieldEditor.js

@@ -924,10 +924,7 @@ export function FieldEditor({ value, width, height, active = true, onChange, onS
     if (props.length === 0 && slots.length === 0) {
         return (_jsxs(Box, { flexDirection: "column", width: width, borderStyle: "single", borderColor: "yellow", children: [_jsx(Text, { bold: true, color: "yellow", children: "FIELD EDITOR \u2014 no fields" }), _jsx(Text, { color: "yellow", children: "⚠ No properties classified for this component. The LLM didn't find anything to classify." }), _jsx(Text, { dimColor: true, children: "You can add fields manually below or reject this component." }), _jsx(Text, { dimColor: true, children: "Ctrl+S to save \u00B7 Esc to discard" })] }));
     }
-    // When $properties is empty but $slots exist, surface the same warning
-    // prominently in the panel so the user understands why the component looks
-    // sparse — and can act on it (manually add a prop or reject).
-    const hasEmptyProperties = props.length === 0;
+    const hasEmptyProperties = props.length === 0 && slots.length === 0;
     const modeLabel = (() => {
         if (editingValue) {
             return editingValue.mode === 'add' ? 'Enter to add · Esc to cancel' : 'Enter to save edit · Esc to cancel';

package/dist/src/import/tui/steps/GenerateReviewStep.js

@@ -25,9 +25,10 @@ import { computeNextScrollOffset } from '../../../analyze/select/tui/hooks/scrol
  * Within each tier (empty / non-empty) we tie-break alphabetically by `key`.
  */
 export function sortComponentsForSidebar(components) {
+    const isEmpty = (entry) => Object.keys(entry.$properties ?? {}).length === 0 && Object.keys(entry.$slots ?? {}).length === 0;
     return [...components].sort((a, b) => {
-        const aEmpty = Object.keys(a.entry.$properties ?? {}).length === 0;
-        const bEmpty = Object.keys(b.entry.$properties ?? {}).length === 0;
+        const aEmpty = isEmpty(a.entry);
+        const bEmpty = isEmpty(b.entry);
         if (aEmpty !== bEmpty)
             return aEmpty ? -1 : 1;
         return a.key.localeCompare(b.key);
@@ -473,12 +474,7 @@ export function GenerateReviewStep({ extractSessionId, onFinalize, onQuit, liveP
     }
     const selected = components[selectedIdx] ?? null;
     const selectedJson = selected ? JSON.stringify({ [selected.key]: selected.entry }, null, 2) : '';
-    // A component with zero classified $properties is a real defensibility issue —
-    // it can't be pushed to Contentful (no fields). Surface it in the sidebar via
-    // the existing warning-color path (yellow) and a "(empty)" suffix so the user
-    // can see what went wrong. They can manually add props in FieldEditor or
-    // explicitly reject the component.
-    const isEmpty = (c) => Object.keys(c.entry.$properties).length === 0;
+    const isEmpty = (c) => Object.keys(c.entry.$properties).length === 0 && Object.keys(c.entry.$slots ?? {}).length === 0;
     const emptyCount = components.filter(isEmpty).length;
     const sidebarItems = components.map((c) => ({
         id: c.key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.12.4-dev-build-262febd.0",
+  "version": "2.12.4-dev-build-5aa6a69.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -37,7 +37,7 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.12.4-dev-build-262febd.0"
+    "@contentful/experience-design-system-types": "2.12.4-dev-build-5aa6a69.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",