@contentful/experience-design-system-cli 2.11.4-dev-build-8f1adf3.0 → 2.11.4-dev-build-a9b4d34.0

package/dist/package.json

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

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

@@ -3,7 +3,7 @@ import { readFile } from 'node:fs/promises';
 import { existsSync, statSync } from 'node:fs';
 import os from 'node:os';
 import { parse as parseSvelte } from 'svelte/compiler';
-import { Project, Node } from 'ts-morph';
+import { Project, Node, ScriptTarget, ModuleKind, ts } from 'ts-morph';
 import { computeExtractionScore, deriveNeedsReview } from './scoring.js';
 const SVELTE_EXTRACT_CONCURRENCY = Number(process.env['EDS_EXTRACT_CONCURRENCY'] ?? 0) || os.cpus().length;
 export async function extractSvelteComponents(filePaths, onProgress) {
@@ -226,7 +226,7 @@ async function extractPropsFromCall(ctx) {
     if (idType === 'Identifier') {
         // const props: Props = $props(); — no destructure, no defaults, no per-name binding.
         if (typeMembers) {
-            return extractFromTypeMembersOnly(typeMembers, ctx.snippetLocals, warnings);
+            return extractFromTypeMembersOnly(typeMembers);
         }
         warnings.push(`${ctx.filePath}: $props() called without destructuring; cannot extract individual props`);
         return { props: [], snippetNames: new Set(), snippetSlots: [], warnings };
@@ -290,7 +290,13 @@ async function resolveViaTypeChecker(annotation, instance, moduleScript, filePat
     const instanceText = sliceScriptContent(source, instance);
     const synthetic = [moduleText, instanceText, `type __SveltePropsT__ = ${annotationText};`].filter(Boolean).join('\n');
     const project = new Project({
-        compilerOptions: { strict: false, target: 99, module: 99, allowJs: true, jsx: 1 },
+        compilerOptions: {
+            strict: false,
+            target: ScriptTarget.ESNext,
+            module: ModuleKind.ESNext,
+            allowJs: true,
+            jsx: ts.JsxEmit.Preserve,
+        },
         useInMemoryFileSystem: false,
         skipAddingFilesFromTsConfig: true,
     });
@@ -629,7 +635,7 @@ function extractFromDestructure(propsCall, ctx, typeMembers, warnings) {
         warnings,
     };
 }
-function extractFromTypeMembersOnly(typeMembers, _snippetLocals, _warnings) {
+function extractFromTypeMembersOnly(typeMembers) {
     const props = [];
     const snippetNames = new Set();
     const snippetSlots = [];
@@ -759,13 +765,22 @@ function resolveLocalScriptModule(importingFilePath, specifier) {
 }
 function readMembersFromExternalFile(filePath, exportName) {
     const project = new Project({
-        compilerOptions: { strict: false, target: 99, module: 99, allowJs: true },
+        compilerOptions: {
+            strict: false,
+            target: ScriptTarget.ESNext,
+            module: ModuleKind.ESNext,
+            allowJs: true,
+        },
         useInMemoryFileSystem: false,
         skipAddingFilesFromTsConfig: true,
     });
     const sf = project.addSourceFileAtPathIfExists(filePath);
     if (!sf)
         return null;
+    // Collect Snippet locals from the resolved file's own imports so that
+    // aliased imports (`import { Snippet as LocalSnippet } from 'svelte'`) are
+    // honored. Mirrors collectSnippetImportLocals() but adapted to ts-morph.
+    const snippetLocals = collectSnippetLocalsFromSourceFile(sf);
     // Use getExportedDeclarations() so re-export chains (`export { ... } from './x'`,
     // `export * from './x'`, named or namespace) resolve transparently. ts-morph
     // follows them recursively and returns the underlying declaration.
@@ -775,18 +790,39 @@ function readMembersFromExternalFile(filePath, exportName) {
         return null;
     for (const decl of decls) {
         if (Node.isInterfaceDeclaration(decl)) {
-            return readInterfaceMembers(decl);
+            // The declaration may live in a different source file than `sf` if the
+            // export chain walked across files; pull snippet locals from that file
+            // so aliased imports are recognized.
+            const declSf = decl.getSourceFile();
+            const declLocals = declSf === sf ? snippetLocals : collectSnippetLocalsFromSourceFile(declSf);
+            return readInterfaceMembers(decl, declLocals);
         }
         if (Node.isTypeAliasDeclaration(decl)) {
             const typeNode = decl.getTypeNode();
             if (typeNode && Node.isTypeLiteral(typeNode)) {
-                return readTypeLiteralMembers(typeNode);
+                const declSf = decl.getSourceFile();
+                const declLocals = declSf === sf ? snippetLocals : collectSnippetLocalsFromSourceFile(declSf);
+                return readTypeLiteralMembers(typeNode, declLocals);
             }
         }
     }
     return null;
 }
-function readInterfaceMembers(iface) {
+function collectSnippetLocalsFromSourceFile(sf) {
+    const locals = new Set();
+    for (const importDecl of sf.getImportDeclarations()) {
+        if (importDecl.getModuleSpecifierValue() !== 'svelte')
+            continue;
+        for (const named of importDecl.getNamedImports()) {
+            if (named.getName() === 'Snippet') {
+                const aliasNode = named.getAliasNode();
+                locals.add(aliasNode ? aliasNode.getText() : named.getName());
+            }
+        }
+    }
+    return locals;
+}
+function readInterfaceMembers(iface, snippetLocals) {
     return iface.getProperties().map((prop) => {
         const typeNode = prop.getTypeNode();
         const typeText = typeNode ? typeNode.getText() : prop.getType().getText(prop);
@@ -797,7 +833,7 @@ function readInterfaceMembers(iface) {
             name: prop.getName(),
             optional: prop.hasQuestionToken(),
             typeText,
-            isSnippet: typeText === 'Snippet' || /^Snippet</.test(typeText),
+            isSnippet: isSnippetTypeText(typeText, snippetLocals),
             ...(allowed ? { allowedValues: allowed } : {}),
             ...(description ? { description } : {}),
             line: prop.getStartLineNumber(),
@@ -805,7 +841,7 @@ function readInterfaceMembers(iface) {
         };
     });
 }
-function readTypeLiteralMembers(typeNode) {
+function readTypeLiteralMembers(typeNode, snippetLocals) {
     return typeNode.getMembers().flatMap((m) => {
         if (!Node.isPropertySignature(m))
             return [];
@@ -819,7 +855,7 @@ function readTypeLiteralMembers(typeNode) {
                 name: m.getName(),
                 optional: m.hasQuestionToken(),
                 typeText,
-                isSnippet: typeText === 'Snippet' || /^Snippet</.test(typeText),
+                isSnippet: isSnippetTypeText(typeText, snippetLocals),
                 ...(allowed ? { allowedValues: allowed } : {}),
                 ...(description ? { description } : {}),
                 line: m.getStartLineNumber(),

package/package.json

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