@contentful/experience-design-system-cli 2.11.4-dev-build-11add11.0 → 2.11.4-dev-build-f3b5300.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.11.4-dev-build-11add11.0",
+  "version": "2.11.4-dev-build-f3b5300.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/analyze/extract/svelte.js

@@ -202,28 +202,41 @@ async function retryComponentWithProject(component, ctx, project, warnings) {
     }
     if (!members || members.length === 0)
         return false;
-    // If the only members are Snippet-typed (the partial-heritage signal that
-    // tripped the original warning), we haven't actually recovered useful props.
-    if (members.every((m) => m.isSnippet))
-        return false;
+    // Snippet-only resolution is still useful — it confirms the slot surface
+    // and lets us replace the original (which may have had fewer slot entries
+    // because the cold AST-only pass missed members declared in heritage).
+    // Apply the recovered slots, but DON'T drop `props-type-unresolved` from
+    // reasons (the prop side genuinely has no resolvable members).
+    const onlySnippets = members.every((m) => m.isSnippet);
     const { props, snippetSlots } = extractFromTypeMembersOnly(members);
     // Merge any template <slot> entries that survived the original pass — we
     // can't easily re-derive those without re-parsing the fragment, but the
     // existing component already has them.
     const templateSlots = component.slots.filter((s) => !snippetSlots.some((ss) => ss.name === s.name));
-    component.props = props;
-    component.slots = mergeSlots(snippetSlots, templateSlots).slots;
-    // Drop props-type-unresolved from reasons; recompute confidence.
-    const remainingReasons = (component.reviewReasons ?? []).filter((r) => r !== 'props-type-unresolved');
+    const finalSlots = mergeSlots(snippetSlots, templateSlots).slots;
+    // Defensive dedupe: if a name somehow ended up in both buckets (e.g. when ts-morph
+    // returned `any` for a Snippet member and the Snippet detector failed downstream),
+    // the slot wins — slot semantics aren't recoverable from a duplicated prop.
+    const slotNames = new Set(finalSlots.map((s) => s.name));
+    component.props = props.filter((p) => !slotNames.has(p.name));
+    component.slots = finalSlots;
+    // Recompute confidence. When only Snippets came back, keep the
+    // `props-type-unresolved` reason — slot surface is real but the prop side
+    // is still legitimately unresolved (the extends-from-node_modules failed).
+    // When real props came back, drop the reason: full recovery.
+    const remainingReasons = onlySnippets
+        ? (component.reviewReasons ?? [])
+        : (component.reviewReasons ?? []).filter((r) => r !== 'props-type-unresolved');
     const score = computeExtractionScore(component, {
         additionalIssueCount: remainingReasons.length,
         additionalReasons: remainingReasons,
     });
     component.extractionConfidence = score.confidence;
     component.reviewReasons = score.reasons;
-    component.needsReview = deriveNeedsReview(score.confidence);
-    // Remove the per-component unresolved-type warning so it doesn't muddy the
-    // summary line / TUI grouping after recovery.
+    component.needsReview = deriveNeedsReview(score.confidence) || remainingReasons.includes('props-type-unresolved');
+    // Remove the per-component unresolved-type warning. The `props-type-unresolved`
+    // reason on the component itself still carries the signal for TUI drill-down;
+    // the warnings array is replaced by the collapsed summary upstream.
     const componentName = component.name;
     const idx = warnings.findIndex((w) => w.startsWith(`${componentName}: declared Props type `) && /resolved to /.test(w));
     if (idx >= 0)
@@ -456,22 +469,26 @@ function extractTypesFromExports(exportsField) {
  * When a large fraction of components emit the same `declared Props type ...
  * resolved to ... properties` warning (typical of headless libraries like
  * skeleton-svelte that extend types from external packages we can't reach),
- * collapse them into a single summary line at the top + the per-component
- * details below. Per-component reviewReasons and needsReview stay intact;
- * this only affects the warnings array's readability.
+ * replace ALL of them with a single summary line. Per-component
+ * reviewReasons + needsReview flags stay intact, so the user can still
+ * drill into any individual component to see the issue — we just don't
+ * flood the top-level warnings panel with N near-identical lines.
  *
  * Threshold: 3 or more identical-shape warnings. Below that, the literal
- * per-component lines are clearer than a summary.
+ * per-component lines are short enough to keep as-is.
  */
 function collapseUnresolvedTypeWarnings(warnings) {
     const isUnresolvedWarning = (w) => /declared Props type .* resolved to/.test(w);
-    const unresolved = warnings.filter(isUnresolvedWarning);
-    if (unresolved.length < 3)
+    const unresolvedCount = warnings.filter(isUnresolvedWarning).length;
+    if (unresolvedCount < 3)
         return warnings;
-    const summary = `Unresolved component types: ${unresolved.length} components have a declared Props type the parser couldn't fully resolve — ` +
+    const others = warnings.filter((w) => !isUnresolvedWarning(w));
+    const summary = `Unresolved component types: ${unresolvedCount} components have a declared Props type the parser couldn't fully resolve — ` +
         `most often a cross-package extends pattern (e.g. an interface that extends a type from a node_modules package). ` +
+        `Each affected component is flagged with reviewReasons: ['props-type-unresolved'] and needsReview = true; ` +
+        `select one in the TUI to drill in. ` +
         `See https://github.com/contentful/experience-design-system-sdk-public/pull/44 for context and partner workarounds.`;
-    return [summary, ...warnings];
+    return [summary, ...others];
 }
 async function extractFromSvelteFile(filePath, source) {
     const warnings = [];
@@ -872,10 +889,18 @@ async function resolveViaTypeChecker(annotation, instance, moduleScript, filePat
         }
         const allowed = extractAllowedValuesFromType(propType);
         const description = readJsDocFromDeclaration(declaration);
-        // Snippet detection is alias-based first (works through generic instantiation
-        // and full type expansion) and falls back to text-matching for the simple
-        // case where alias info isn't available.
-        const isSnippet = typeRefersToSnippet(propType) || isSnippetTypeText(typeText, snippetLocals);
+        // Snippet detection — try three signals in order of reliability:
+        //   1. The author's declared type-node text on the property's source declaration.
+        //      This survives even when ts-morph fails to fully resolve a generic
+        //      instantiation and falls back to `any`/`unknown` (intermittent under
+        //      partial type-checker state).
+        //   2. The resolved type's alias-symbol chain — works when ts-morph DID fully
+        //      resolve the type (`Snippet<[T]>` expanded to its call signature).
+        //   3. Text-match on the rendered type. Last-resort fallback.
+        const declaredTypeText = readDeclaredTypeNodeText(declaration);
+        const isSnippet = (declaredTypeText !== null && isSnippetTypeText(declaredTypeText, snippetLocals)) ||
+            typeRefersToSnippet(propType) ||
+            isSnippetTypeText(typeText, snippetLocals);
         members.push({
             name,
             optional,
@@ -924,6 +949,20 @@ function readJsDocFromDeclaration(decl) {
     }
     return undefined;
 }
+/**
+ * Read the literal text of the property's declared type annotation as the
+ * AUTHOR wrote it (e.g. `Snippet<[Attrs]>`), independent of what the TS
+ * checker resolved it to. This is critical because ts-morph's checker can
+ * intermittently fall back to `any`/`unknown` for cross-package generic
+ * instantiations, in which case the symbol-/alias-based detector has nothing
+ * to follow. The author's syntactic annotation is stable in either case.
+ */
+function readDeclaredTypeNodeText(decl) {
+    if (Node.isPropertySignature(decl)) {
+        return decl.getTypeNode()?.getText() ?? null;
+    }
+    return null;
+}
 function isSnippetTypeText(typeText, snippetLocals) {
     // Direct match against the local Snippet name (handles aliasing).
     for (const local of snippetLocals) {

package/dist/src/analyze/tui/AnalyzeView.js

@@ -60,5 +60,5 @@ export function AnalyzeView({ result, onExit }) {
                                 .map((e, i) => (_jsx(Text, { color: "red", children: '  ✗ ' + e.component + ': ' + e.error }, i)))] })), result.totalWarnings > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: '─'.repeat(70) }), _jsx(Text, { bold: true, color: "yellow", children: 'Warnings (' + result.totalWarnings + ')' }), _jsx(Text, { dimColor: true, children: '─'.repeat(70) }), _jsx(Text, { children: " " }), result.components
                                 .filter((c) => c.warnings.length > 0)
                                 .flatMap((c) => c.warnings.map((w) => ({ component: c.name, warning: w })))
-                                .map((w, i) => (_jsx(Text, { color: "yellow", children: '  ⚠ ' + w.component + ': ' + w.warning }, i)))] })), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: 'Run: analyze select --session ' + result.sessionId }), _jsx(Text, { children: " " })] }), _jsx(Box, { borderStyle: "single", paddingX: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter or q to exit" }) })] }));
+                                .map((w, i) => (_jsx(Text, { color: "yellow", children: '  ⚠ ' + (w.warning.startsWith(w.component + ': ') ? w.warning : w.component + ': ' + w.warning) }, i)))] })), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: 'Run: analyze select --session ' + result.sessionId }), _jsx(Text, { children: " " })] }), _jsx(Box, { borderStyle: "single", paddingX: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter or q to exit" }) })] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.11.4-dev-build-11add11.0",
+  "version": "2.11.4-dev-build-f3b5300.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.11.4-dev-build-11add11.0"
+    "@contentful/experience-design-system-types": "2.11.4-dev-build-f3b5300.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",