@contentful/experience-design-system-cli 2.34.5-dev-build-ab8465d2.0 → 2.34.5-dev-build-f8f0b1fa.0

package/dist/package.json

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

package/dist/src/index.js

@@ -11334,30 +11334,26 @@ function getTsxExtractionContext(filePaths, componentFilePattern) {
     project: createTsxProject(getTsxProjectFiles(filePaths))
   };
 }
-function extractTsxComponents(filePaths, componentFilePattern, extractSourceFile) {
+function extractTsxComponents(filePaths, componentFilePattern, extract) {
   const extractionContext = getTsxExtractionContext(filePaths, componentFilePattern);
-  if (!extractionContext)
-    return void 0;
-  const warnings = [];
+  if (!extractionContext) {
+    return { components: [], warnings: [], exclusions: [] };
+  }
+  const { componentFiles, project } = extractionContext;
   const components = [];
-  for (const filePath of extractionContext.componentFiles) {
+  const warnings = [];
+  const exclusions = [];
+  for (const filePath of componentFiles) {
     try {
-      const sourceFile = extractionContext.project.getSourceFile(filePath);
+      const sourceFile = project.getSourceFile(filePath);
       if (!sourceFile)
         continue;
-      components.push(...extractSourceFile(sourceFile));
+      components.push(...extract(sourceFile, exclusions));
     } catch (e) {
       warnings.push(`Failed to extract from ${filePath}: ${e instanceof Error ? e.message : String(e)}`);
     }
   }
-  return { ...extractionContext, components, warnings };
-}
-function resolveComponentExportName(exportKey, declarations, exported, allowVariableDeclaration = false) {
-  const name = exportKey === "default" ? resolveDefaultExportName(declarations, exported, allowVariableDeclaration) : exportKey;
-  return name && /^[A-Z]/.test(name) ? name : void 0;
-}
-function isCompositionHookName(name) {
-  return name.startsWith("use");
+  return { components, warnings, exclusions, project };
 }
 function resolveDefaultExportName(declarations, exported, allowVariableDeclaration = false) {
   const declaration = declarations[0];
@@ -11366,6 +11362,27 @@ function resolveDefaultExportName(declarations, exported, allowVariableDeclarati
     return void 0;
   return name;
 }
+function getRenderableExports(sourceFile, exclusions, options) {
+  const renderable = [];
+  const exported = sourceFile.getExportedDeclarations();
+  for (const [exportKey, declarations] of exported) {
+    const name = exportKey === "default" ? resolveDefaultExportName(declarations, exported, options.allowVariableDeclaration) : exportKey;
+    if (!name || !/^[A-Z]/.test(name))
+      continue;
+    if (name.startsWith("use")) {
+      exclusions.push({
+        itemType: "component",
+        name,
+        source: sourceFile.getFilePath(),
+        reason: options.hookReason,
+        stage: "component-filter"
+      });
+      continue;
+    }
+    renderable.push({ name, declarations });
+  }
+  return renderable;
+}
 function kebabToPascal(input) {
   return input.split("-").filter(Boolean).map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("");
 }
@@ -13649,18 +13666,13 @@ function hasImplementationChildrenHint(funcNode, param) {
   return body.getDescendantsOfKind(SyntaxKind4.JsxSpreadAttribute).some((attr) => isComponentSpreadAttribute(attr, /* @__PURE__ */ new Set([paramName])));
 }
 async function extractReactComponents(filePaths) {
-  const exclusions = [];
-  const extractionContext = extractTsxComponents(filePaths, /\.[jt]sx$/, (sourceFile) => {
+  const { components, warnings, exclusions, project } = extractTsxComponents(filePaths, /\.[jt]sx$/, (sourceFile, exclusions2) => {
     if (isStencilFile2(sourceFile))
       return [];
     const fileExports = [...sourceFile.getExportedDeclarations().keys()];
     const isNext = isNextJsComponent(sourceFile.getFilePath(), fileExports);
-    return extractFromSourceFile2(sourceFile, isNext, exclusions);
+    return extractFromSourceFile2(sourceFile, isNext, exclusions2);
   });
-  if (!extractionContext) {
-    return { components: [], warnings: [] };
-  }
-  const { project, components, warnings } = extractionContext;
   const propsToComponent = /* @__PURE__ */ new Map();
   const componentNames = /* @__PURE__ */ new Set();
   for (const c2 of components) {
@@ -13696,7 +13708,7 @@ async function extractReactComponents(filePaths) {
     const cached = structuralByFile.get(filePath);
     if (cached)
       return cached;
-    const sourceFile = project.getSourceFile(filePath);
+    const sourceFile = project?.getSourceFile(filePath);
     if (!sourceFile)
       return [];
     const ctx = { propsToComponent, componentNames };
@@ -13758,22 +13770,11 @@ async function extractReactComponents(filePaths) {
 }
 function extractFromSourceFile2(sourceFile, isNext, exclusions) {
   const components = [];
-  const exported = sourceFile.getExportedDeclarations();
   const usesCreateContext = sourceFileUsesCreateContext(sourceFile);
-  for (const [exportKey, declarations] of exported) {
-    const name = resolveComponentExportName(exportKey, declarations, exported, true);
-    if (!name)
-      continue;
-    if (isCompositionHookName(name)) {
-      exclusions.push({
-        itemType: "component",
-        name,
-        source: sourceFile.getFilePath(),
-        reason: "React hook names are not renderable components",
-        stage: "component-filter"
-      });
-      continue;
-    }
+  for (const { name, declarations } of getRenderableExports(sourceFile, exclusions, {
+    allowVariableDeclaration: true,
+    hookReason: "React hook names are not renderable components"
+  })) {
     const funcNode = resolveBestFunctionNode(declarations);
     if (!funcNode)
       continue;
@@ -14251,12 +14252,7 @@ var init_react = __esm({
 // packages/experience-design-system-extraction/dist/src/extract/vue-tsx.js
 import { Node as Node5, SyntaxKind as SyntaxKind5 } from "ts-morph";
 async function extractVueTsxComponents(filePaths) {
-  const exclusions = [];
-  const extractionContext = extractTsxComponents(filePaths, /\.tsx$/, (sourceFile) => extractFromSourceFile3(sourceFile, exclusions));
-  if (!extractionContext) {
-    return { components: [], warnings: [] };
-  }
-  const { components, warnings } = extractionContext;
+  const { components, warnings, exclusions } = extractTsxComponents(filePaths, /\.tsx$/, extractFromSourceFile3);
   return {
     components: components.sort((a, b) => a.name.localeCompare(b.name)),
     warnings,
@@ -14265,21 +14261,9 @@ async function extractVueTsxComponents(filePaths) {
 }
 function extractFromSourceFile3(sourceFile, exclusions) {
   const components = [];
-  const exported = sourceFile.getExportedDeclarations();
-  for (const [exportKey, declarations] of exported) {
-    const name = resolveComponentExportName(exportKey, declarations, exported);
-    if (!name)
-      continue;
-    if (isCompositionHookName(name)) {
-      exclusions.push({
-        itemType: "component",
-        name,
-        source: sourceFile.getFilePath(),
-        reason: "Vue composition hook names are not renderable components",
-        stage: "component-filter"
-      });
-      continue;
-    }
+  for (const { name, declarations } of getRenderableExports(sourceFile, exclusions, {
+    hookReason: "Vue composition hook names are not renderable components"
+  })) {
     const component = extractVueTsxComponent(declarations, name, sourceFile);
     if (component) {
       components.push(component);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.34.5-dev-build-ab8465d2.0",
+  "version": "2.34.5-dev-build-f8f0b1fa.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -41,8 +41,8 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.34.5-dev-build-ab8465d2.0",
-    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-ab8465d2.0"
+    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-f8f0b1fa.0",
+    "@contentful/experience-design-system-types": "2.34.5-dev-build-f8f0b1fa.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -54,9 +54,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-client": "2.34.5-dev-build-ab8465d2.0",
-    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-ab8465d2.0",
-    "@contentful/experience-design-system-generation": "2.34.5-dev-build-ab8465d2.0"
+    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-f8f0b1fa.0",
+    "@contentful/experience-design-system-client": "2.34.5-dev-build-f8f0b1fa.0",
+    "@contentful/experience-design-system-generation": "2.34.5-dev-build-f8f0b1fa.0"
   },
   "repository": {
     "type": "git",