@contentful/experience-design-system-extraction 2.34.5-dev-build-a95aeeba.0 → 2.34.5-dev-build-f8f0b1fa.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-extraction",
-  "version": "2.34.5-dev-build-a95aeeba.0",
+  "version": "2.34.5-dev-build-f8f0b1fa.0",
   "description": "Component extraction engine for the Contentful Experience Design System SDK",
   "license": "MIT",
   "type": "module",

package/dist/src/extract/react.js

@@ -1,5 +1,5 @@
 import { Node, SyntaxKind, } from 'ts-morph';
-import { extractAllowedValues, getNodeDefinitions, getTypeReferenceName, getTypeTargetDeclarations, extractTsxComponents, getValueTargetDeclarations, getJsxTagNameNode, isIntrinsicJsxElement, isCompositionHookName, resolveComponentExportName, } from './tsx-shared.js';
+import { extractAllowedValues, getNodeDefinitions, getTypeReferenceName, getTypeTargetDeclarations, getValueTargetDeclarations, getJsxTagNameNode, extractTsxComponents, getRenderableExports, isIntrinsicJsxElement, } from './tsx-shared.js';
 import { shouldBeSlot } from './slot-detection.js';
 import { extractAllowedComponentsFromTypeText, extractAllowedComponentsFromJsdoc } from './slot-allowed-components.js';
 import { getSourceLineMetadata } from './source-line-metadata.js';
@@ -1626,18 +1626,13 @@ function hasImplementationChildrenHint(funcNode, param) {
         .some((attr) => isComponentSpreadAttribute(attr, new Set([paramName])));
 }
 export async function extractReactComponents(filePaths) {
-    const exclusions = [];
-    const extractionContext = extractTsxComponents(filePaths, /\.[jt]sx$/, (sourceFile) => {
+    const { components, warnings, exclusions, project } = extractTsxComponents(filePaths, /\.[jt]sx$/, (sourceFile, exclusions) => {
         if (isStencilFile(sourceFile))
             return [];
         const fileExports = [...sourceFile.getExportedDeclarations().keys()];
         const isNext = isNextJsComponent(sourceFile.getFilePath(), fileExports);
         return extractFromSourceFile(sourceFile, isNext, exclusions);
     });
-    if (!extractionContext) {
-        return { components: [], warnings: [] };
-    }
-    const { project, components, warnings } = extractionContext;
     const propsToComponent = new Map();
     const componentNames = new Set();
     for (const c of components) {
@@ -1679,7 +1674,7 @@ export 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 };
@@ -1758,22 +1753,11 @@ export async function extractReactComponents(filePaths) {
 }
 function extractFromSourceFile(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;

package/dist/src/extract/tsx-shared.d.ts

@@ -1,21 +1,25 @@
 import { Node, Project, type SourceFile, type Type } from 'ts-morph';
+import type { ExtractionExclusion } from '../types.js';
 export declare function getTsxExtractionContext(filePaths: string[], componentFilePattern: RegExp): {
     componentFiles: string[];
     project: Project;
 } | undefined;
-export declare function extractTsxComponents<T>(filePaths: string[], componentFilePattern: RegExp, extractSourceFile: (sourceFile: SourceFile) => T[]): {
-    componentFiles: string[];
-    project: Project;
+export declare function extractTsxComponents<T>(filePaths: string[], componentFilePattern: RegExp, extract: (sourceFile: SourceFile, exclusions: ExtractionExclusion[]) => T[]): {
     components: T[];
     warnings: string[];
-} | undefined;
-export declare function resolveComponentExportName(exportKey: string, declarations: Node[], exported: {
-    has(name: string): boolean;
-}, allowVariableDeclaration?: boolean): string | undefined;
-export declare function isCompositionHookName(name: string): boolean;
+    exclusions: ExtractionExclusion[];
+    project?: Project;
+};
 export declare function resolveDefaultExportName(declarations: Node[], exported: {
     has(name: string): boolean;
 }, allowVariableDeclaration?: boolean): string | undefined;
+export declare function getRenderableExports(sourceFile: SourceFile, exclusions: ExtractionExclusion[], options: {
+    allowVariableDeclaration?: boolean;
+    hookReason: string;
+}): Array<{
+    name: string;
+    declarations: Node[];
+}>;
 export declare function kebabToPascal(input: string): string;
 export declare function extractAllowedValues(type: Type): string[] | undefined;
 /**

package/dist/src/extract/tsx-shared.js

@@ -35,31 +35,27 @@ export function getTsxExtractionContext(filePaths, componentFilePattern) {
         project: createTsxProject(getTsxProjectFiles(filePaths)),
     };
 }
-export function extractTsxComponents(filePaths, componentFilePattern, extractSourceFile) {
+export function extractTsxComponents(filePaths, componentFilePattern, extract) {
     const extractionContext = getTsxExtractionContext(filePaths, componentFilePattern);
-    if (!extractionContext)
-        return undefined;
-    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 };
-}
-export function resolveComponentExportName(exportKey, declarations, exported, allowVariableDeclaration = false) {
-    const name = exportKey === 'default' ? resolveDefaultExportName(declarations, exported, allowVariableDeclaration) : exportKey;
-    return name && /^[A-Z]/.test(name) ? name : undefined;
-}
-export function isCompositionHookName(name) {
-    return name.startsWith('use');
+    return { components, warnings, exclusions, project };
 }
 export function resolveDefaultExportName(declarations, exported, allowVariableDeclaration = false) {
     const declaration = declarations[0];
@@ -72,6 +68,29 @@ export function resolveDefaultExportName(declarations, exported, allowVariableDe
         return undefined;
     return name;
 }
+export 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;
+}
 export function kebabToPascal(input) {
     return input
         .split('-')

package/dist/src/extract/vue-tsx.js

@@ -1,12 +1,7 @@
 import { Node, SyntaxKind } from 'ts-morph';
-import { extractAllowedValues, extractTsxComponents, getTypeReferenceName, getTypeTargetDeclarations, getValueTargetDeclarations, isCompositionHookName, resolveComponentExportName, } from './tsx-shared.js';
+import { extractAllowedValues, extractTsxComponents, getTypeReferenceName, getTypeTargetDeclarations, getValueTargetDeclarations, getRenderableExports, } from './tsx-shared.js';
 export async function extractVueTsxComponents(filePaths) {
-    const exclusions = [];
-    const extractionContext = extractTsxComponents(filePaths, /\.tsx$/, (sourceFile) => extractFromSourceFile(sourceFile, exclusions));
-    if (!extractionContext) {
-        return { components: [], warnings: [] };
-    }
-    const { components, warnings } = extractionContext;
+    const { components, warnings, exclusions } = extractTsxComponents(filePaths, /\.tsx$/, extractFromSourceFile);
     return {
         components: components.sort((a, b) => a.name.localeCompare(b.name)),
         warnings,
@@ -15,21 +10,9 @@ export async function extractVueTsxComponents(filePaths) {
 }
 function extractFromSourceFile(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-extraction",
-  "version": "2.34.5-dev-build-a95aeeba.0",
+  "version": "2.34.5-dev-build-f8f0b1fa.0",
   "description": "Component extraction engine for the Contentful Experience Design System SDK",
   "license": "MIT",
   "type": "module",