@contentful/experience-design-system-cli 2.11.4-dev-build-11add11.0 → 2.11.4-dev-build-7abd382.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-7abd382.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

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

@@ -211,8 +211,13 @@ async function retryComponentWithProject(component, ctx, project, warnings) {
     // 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;
+    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;
     // Drop props-type-unresolved from reasons; recompute confidence.
     const remainingReasons = (component.reviewReasons ?? []).filter((r) => r !== 'props-type-unresolved');
     const score = computeExtractionScore(component, {
@@ -872,10 +877,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 +937,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/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-7abd382.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-7abd382.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",