@contentful/experience-design-system-extraction 2.33.1-dev-build-1b6f259.0 → 2.33.1-dev-build-a73f696.0

package/dist/package.json

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

package/dist/src/extract/astro.js

@@ -1,9 +1,7 @@
 import { basename } from 'node:path';
+import { readFile } from 'node:fs/promises';
 import os from 'node:os';
 import { Project, Node } from 'ts-morph';
-import { createSortedExtractionResult, runFileExtractionWorkers } from './file-extraction-workers.js';
-import { resolveTypeProperty } from './resolve-type-property.js';
-import { getSourceLineMetadata } from './source-line-metadata.js';
 function extractAllowedValues(typeText) {
     // Check if the type is a union of string literals like 'a' | 'b' | 'c'
     const parts = typeText.split('|').map((p) => p.trim());
@@ -32,8 +30,8 @@ function extractBindingPropName(element) {
         return null;
     return element.getPropertyNameNode()?.getText() ?? element.getNameNode().getText();
 }
-function createAstroFrontmatterProject() {
-    return new Project({
+function extractFallbackPropsFromFrontmatter(frontmatter) {
+    const project = new Project({
         compilerOptions: {
             strict: false,
             target: 99,
@@ -43,33 +41,27 @@ function createAstroFrontmatterProject() {
         useInMemoryFileSystem: true,
         skipAddingFilesFromTsConfig: true,
     });
-}
-function forEachAstroPropsBinding(frontmatter, visit) {
-    const sf = createAstroFrontmatterProject().createSourceFile('__frontmatter__.ts', frontmatter);
+    const sf = project.createSourceFile('__frontmatter__.ts', frontmatter);
+    const props = new Map();
     sf.forEachDescendant((node) => {
         if (!Node.isVariableDeclaration(node))
             return;
         const initializer = node.getInitializer();
-        if (!initializer || !usesAstroProps(initializer))
+        if (!usesAstroProps(initializer))
             return;
         const nameNode = node.getNameNode();
         if (!Node.isObjectBindingPattern(nameNode))
             return;
-        for (const element of nameNode.getElements())
-            visit(element);
-    });
-}
-function extractFallbackPropsFromFrontmatter(frontmatter) {
-    const props = new Map();
-    forEachAstroPropsBinding(frontmatter, (element) => {
-        const propName = extractBindingPropName(element);
-        if (!propName)
-            return;
-        props.set(propName, {
-            name: propName,
-            type: 'any',
-            required: !element.getInitializer(),
-        });
+        for (const element of nameNode.getElements()) {
+            const propName = extractBindingPropName(element);
+            if (!propName)
+                continue;
+            props.set(propName, {
+                name: propName,
+                type: 'any',
+                required: !element.getInitializer(),
+            });
+        }
     });
     return [...props.values()].sort((a, b) => a.name.localeCompare(b.name));
 }
@@ -90,7 +82,17 @@ function mergeProps(...propGroups) {
     return [...merged.values()].sort((a, b) => a.name.localeCompare(b.name));
 }
 function extractPropsFromFrontmatter(frontmatter) {
-    const sf = createAstroFrontmatterProject().createSourceFile('__frontmatter__.ts', frontmatter);
+    const project = new Project({
+        compilerOptions: {
+            strict: false,
+            target: 99, // ESNext
+            module: 99, // ESNext
+            allowJs: true,
+        },
+        useInMemoryFileSystem: true,
+        skipAddingFilesFromTsConfig: true,
+    });
+    const sf = project.createSourceFile('__frontmatter__.ts', frontmatter);
     const props = [];
     // Find `interface Props` or `type Props = ...`
     const propsInterface = sf.getInterface('Props');
@@ -114,17 +116,25 @@ function extractPropsFromFrontmatter(frontmatter) {
     else if (propsTypeAlias) {
         const type = propsTypeAlias.getType();
         for (const property of type.getProperties()) {
-            const resolved = resolveTypeProperty(property);
-            if (!resolved)
+            const name = property.getName();
+            const decl = property.getValueDeclaration() ?? property.getDeclarations()[0];
+            if (!decl)
                 continue;
-            const { name, declaration: decl, typeText, required } = resolved;
+            const propType = property.getTypeAtLocation(decl);
+            const typeText = propType.getText(decl);
+            const required = !property.isOptional();
             const allowedValues = extractAllowedValues(typeText);
             props.push({
                 name,
                 type: typeText,
                 required,
                 ...(allowedValues && { allowedValues }),
-                ...getSourceLineMetadata(decl),
+                ...(typeof decl.getStartLineNumber === 'function'
+                    ? {
+                        sourceStartLine: decl.getStartLineNumber(),
+                        sourceEndLine: decl.getEndLineNumber(),
+                    }
+                    : {}),
             });
         }
     }
@@ -132,15 +142,38 @@ function extractPropsFromFrontmatter(frontmatter) {
 }
 function extractDefaultsFromFrontmatter(frontmatter) {
     const defaults = new Map();
-    forEachAstroPropsBinding(frontmatter, (element) => {
-        const propName = extractBindingPropName(element);
-        if (!propName)
+    const project = new Project({
+        compilerOptions: {
+            strict: false,
+            target: 99,
+            module: 99,
+            allowJs: true,
+        },
+        useInMemoryFileSystem: true,
+        skipAddingFilesFromTsConfig: true,
+    });
+    const sf = project.createSourceFile('__frontmatter__.ts', frontmatter);
+    sf.forEachDescendant((node) => {
+        if (!Node.isVariableDeclaration(node))
+            return;
+        const initializer = node.getInitializer();
+        if (!initializer)
             return;
-        const elementInitializer = element.getInitializer();
-        if (!elementInitializer)
+        if (!usesAstroProps(initializer))
             return;
-        const value = elementInitializer.getText().replace(/^['"]|['"]$/g, '');
-        defaults.set(propName, value);
+        const nameNode = node.getNameNode();
+        if (!Node.isObjectBindingPattern(nameNode))
+            return;
+        for (const element of nameNode.getElements()) {
+            const propName = extractBindingPropName(element);
+            if (!propName)
+                continue;
+            const elementInitializer = element.getInitializer();
+            if (!elementInitializer)
+                continue;
+            const value = elementInitializer.getText().replace(/^['"]|['"]$/g, '');
+            defaults.set(propName, value);
+        }
     });
     return defaults;
 }
@@ -220,8 +253,37 @@ function extractFromAstroFile(filePath, source) {
 const ASTRO_EXTRACT_CONCURRENCY = Number(process.env['EDS_EXTRACT_CONCURRENCY'] ?? 0) || os.cpus().length;
 export async function extractAstroComponents(filePaths, onProgress) {
     const astroFiles = filePaths.filter((f) => f.endsWith('.astro'));
-    const { items: components, warnings } = await runFileExtractionWorkers(astroFiles, ASTRO_EXTRACT_CONCURRENCY, async (filePath, source) => ({
-        item: extractFromAstroFile(filePath, source),
-    }), (filePath, error) => `Failed to extract from ${filePath}: ${error instanceof Error ? error.message : String(error)}`, onProgress);
-    return createSortedExtractionResult(components, warnings);
+    if (astroFiles.length === 0) {
+        return { components: [], warnings: [] };
+    }
+    const warnings = [];
+    const components = [];
+    let filesProcessed = 0;
+    let componentsFound = 0;
+    const queue = [...astroFiles];
+    async function worker() {
+        while (queue.length > 0) {
+            const filePath = queue.shift();
+            if (!filePath)
+                break;
+            try {
+                const source = await readFile(filePath, 'utf-8');
+                const component = extractFromAstroFile(filePath, source);
+                if (component) {
+                    components.push(component);
+                    componentsFound++;
+                }
+            }
+            catch (e) {
+                warnings.push(`Failed to extract from ${filePath}: ${e instanceof Error ? e.message : String(e)}`);
+            }
+            filesProcessed++;
+            onProgress?.({ filesProcessed, componentsFound });
+        }
+    }
+    await Promise.all(Array.from({ length: Math.min(ASTRO_EXTRACT_CONCURRENCY, astroFiles.length) }, worker));
+    return {
+        components: components.sort((a, b) => a.name.localeCompare(b.name)),
+        warnings,
+    };
 }

package/dist/src/extract/non-authorable-filter.d.ts

@@ -1,5 +1,5 @@
 import type { RawComponentDefinition } from '../types.js';
-interface NonAuthorableResult {
+export interface NonAuthorableResult {
     skip: boolean;
     reason?: string;
 }
@@ -14,4 +14,3 @@ interface NonAuthorableResult {
  * other repos.
  */
 export declare function isNonAuthorableComponent(component: RawComponentDefinition): NonAuthorableResult;
-export {};

package/dist/src/extract/pipeline.d.ts

@@ -1,7 +1,6 @@
 import type { ComponentExtractionResult, ExtractorOptions } from '../types.js';
-type ExtractProgress = {
+export type ExtractProgress = {
     filesProcessed: number;
     componentsFound: number;
 };
 export declare function extractComponents(filePaths: string[], onProgress?: (progress: ExtractProgress) => void, opts?: ExtractorOptions): Promise<ComponentExtractionResult>;
-export {};