@vendure/dashboard 3.4.3-master-202509260228 → 3.5.0-minor-202510012036

package/src/lib/framework/document-introspection/add-custom-fields.ts

@@ -114,25 +114,75 @@ export function addCustomFields<T, V extends Variables = Variables>(
     const customFields = options?.customFieldsMap || globalCustomFieldsMap;
 
     const targetNodes: Array<{ typeName: string; selectionSet: SelectionSetNode }> = [];
+    const topLevelFragments = new Set<string>();
 
-    const fragmentDefs = clone.definitions.filter(isFragmentDefinition);
-    for (const fragmentDef of fragmentDefs) {
-        targetNodes.push({
-            typeName: fragmentDef.typeCondition.name.value,
-            selectionSet: fragmentDef.selectionSet,
-        });
-    }
+    // First, identify which fragments are used at the top level (directly in items or in the main query)
     const queryDefs = clone.definitions.filter(isOperationDefinition);
 
     for (const queryDef of queryDefs) {
         const typeInfo = getOperationTypeInfo(queryDef);
         const fieldNode = queryDef.selectionSet.selections[0] as FieldNode;
         if (typeInfo && fieldNode?.selectionSet) {
+            let topLevelSelectionSet: SelectionSetNode | undefined;
+
+            // For paginated list queries, find the items field and add custom fields to its entity type
+            if (typeInfo.isPaginatedList) {
+                const itemsField = fieldNode.selectionSet.selections.find(
+                    sel => sel.kind === 'Field' && sel.name.value === 'items',
+                ) as FieldNode | undefined;
+
+                if (itemsField?.selectionSet) {
+                    // For paginated lists, the type is like "ProductList" but we need "Product"
+                    const entityTypeName = typeInfo.type.replace(/List$/, '');
+                    targetNodes.push({
+                        typeName: entityTypeName,
+                        selectionSet: itemsField.selectionSet,
+                    });
+                    topLevelSelectionSet = itemsField.selectionSet;
+                }
+            } else {
+                // For single entity queries, add custom fields to the top-level entity
+                targetNodes.push({
+                    typeName: typeInfo.type,
+                    selectionSet: fieldNode.selectionSet,
+                });
+                topLevelSelectionSet = fieldNode.selectionSet;
+            }
+
+            // Track which fragments are used at the top level (not in nested entities)
+            if (topLevelSelectionSet) {
+                for (const selection of topLevelSelectionSet.selections) {
+                    if (selection.kind === Kind.FRAGMENT_SPREAD) {
+                        topLevelFragments.add(selection.name.value);
+                    }
+                }
+            }
+        }
+    }
+
+    // Now add fragments
+    const fragmentDefs = clone.definitions.filter(isFragmentDefinition);
+
+    // Check if this document has query definitions - if not, add all fragments
+    const hasQueries = queryDefs.length > 0;
+
+    for (const fragmentDef of fragmentDefs) {
+        if (hasQueries) {
+            // If we have queries, only add custom fields to fragments used at the top level
+            // Skip fragments that are only used in nested contexts
+            if (topLevelFragments.has(fragmentDef.name.value)) {
+                targetNodes.push({
+                    typeName: fragmentDef.typeCondition.name.value,
+                    selectionSet: fragmentDef.selectionSet,
+                });
+            }
+        } else {
+            // For standalone fragments (no queries), add custom fields to all fragments
+            // since we don't know where they'll be used
             targetNodes.push({
-                typeName: typeInfo.type,
-                selectionSet: fieldNode.selectionSet,
+                typeName: fragmentDef.typeCondition.name.value,
+                selectionSet: fragmentDef.selectionSet,
             });
-            addTargetNodesRecursively(fieldNode.selectionSet, typeInfo.type, targetNodes);
         }
     }
 
@@ -271,24 +321,3 @@ function isOperationDefinition(value: DefinitionNode): value is OperationDefinit
 function isFieldNode(value: SelectionNode): value is FieldNode {
     return value.kind === Kind.FIELD;
 }
-
-function addTargetNodesRecursively(
-    selectionSet: SelectionSetNode,
-    parentTypeName: string,
-    targetNodes: Array<{ typeName: string; selectionSet: SelectionSetNode }>,
-) {
-    for (const selection of selectionSet.selections) {
-        if (selection.kind === 'Field' && selection.selectionSet) {
-            const fieldNode = selection;
-            const typeInfo = getOperationTypeInfo(fieldNode, parentTypeName); // Assuming this function can handle FieldNode
-            if (typeInfo && fieldNode.selectionSet) {
-                targetNodes.push({
-                    typeName: typeInfo.type,
-                    selectionSet: fieldNode.selectionSet,
-                });
-                // Recursively process the selection set of the current field
-                addTargetNodesRecursively(fieldNode.selectionSet, typeInfo.type, targetNodes);
-            }
-        }
-    }
-}

package/src/lib/framework/document-introspection/get-document-structure.spec.ts

@@ -8,165 +8,7 @@ import {
 } from './get-document-structure.js';
 
 vi.mock('virtual:admin-api-schema', () => {
-    return {
-        schemaInfo: {
-            types: {
-                Query: {
-                    products: ['ProductList', false, false, true],
-                    product: ['Product', false, false, false],
-                    collection: ['Collection', false, false, false],
-                    order: ['Order', false, false, false],
-                },
-                Mutation: {
-                    updateProduct: ['Product', false, false, false],
-                    adjustDraftOrderLine: ['Order', false, false, false],
-                },
-
-                Collection: {
-                    id: ['ID', false, false, false],
-                    name: ['String', false, false, false],
-                    productVariants: ['ProductVariantList', false, false, true],
-                },
-
-                ProductVariantList: {
-                    items: ['ProductVariant', false, true, false],
-                    totalItems: ['Int', false, false, false],
-                },
-
-                Product: {
-                    channels: ['Channel', false, true, false],
-                    id: ['ID', false, false, false],
-                    createdAt: ['DateTime', false, false, false],
-                    updatedAt: ['DateTime', false, false, false],
-                    languageCode: ['LanguageCode', false, false, false],
-                    name: ['String', false, false, false],
-                    slug: ['String', false, false, false],
-                    description: ['String', false, false, false],
-                    enabled: ['Boolean', false, false, false],
-                    featuredAsset: ['Asset', true, false, false],
-                    assets: ['Asset', false, true, false],
-                    variants: ['ProductVariant', false, true, false],
-                    variantList: ['ProductVariantList', false, false, true],
-                    optionGroups: ['ProductOptionGroup', false, true, false],
-                    facetValues: ['FacetValue', false, true, false],
-                    translations: ['ProductTranslation', false, true, false],
-                    collections: ['Collection', false, true, false],
-                    reviews: ['ProductReviewList', false, false, true],
-                    reviewsHistogram: ['ProductReviewHistogramItem', false, true, false],
-                    customFields: ['ProductCustomFields', true, false, false],
-                },
-                ProductVariantPrice: {
-                    currencyCode: ['CurrencyCode', false, false, false],
-                    price: ['Money', false, false, false],
-                    customFields: ['JSON', true, false, false],
-                },
-                ProductVariant: {
-                    enabled: ['Boolean', false, false, false],
-                    trackInventory: ['GlobalFlag', false, false, false],
-                    stockOnHand: ['Int', false, false, false],
-                    stockAllocated: ['Int', false, false, false],
-                    outOfStockThreshold: ['Int', false, false, false],
-                    useGlobalOutOfStockThreshold: ['Boolean', false, false, false],
-                    prices: ['ProductVariantPrice', false, true, false],
-                    stockLevels: ['StockLevel', false, true, false],
-                    stockMovements: ['StockMovementList', false, false, false],
-                    channels: ['Channel', false, true, false],
-                    id: ['ID', false, false, false],
-                    product: ['Product', false, false, false],
-                    productId: ['ID', false, false, false],
-                    createdAt: ['DateTime', false, false, false],
-                    updatedAt: ['DateTime', false, false, false],
-                    languageCode: ['LanguageCode', false, false, false],
-                    sku: ['String', false, false, false],
-                    name: ['String', false, false, false],
-                    featuredAsset: ['Asset', true, false, false],
-                    assets: ['Asset', false, true, false],
-                    price: ['Money', false, false, false],
-                    currencyCode: ['CurrencyCode', false, false, false],
-                    priceWithTax: ['Money', false, false, false],
-                    stockLevel: ['String', false, false, false],
-                    taxRateApplied: ['TaxRate', false, false, false],
-                    taxCategory: ['TaxCategory', false, false, false],
-                    options: ['ProductOption', false, true, false],
-                    facetValues: ['FacetValue', false, true, false],
-                    translations: ['ProductVariantTranslation', false, true, false],
-                    customFields: ['JSON', true, false, false],
-                },
-                ProductCustomFields: {
-                    custom1: ['String', false, false, false],
-                },
-
-                Asset: {
-                    id: ['ID', false, false, false],
-                    createdAt: ['DateTime', false, false, false],
-                    updatedAt: ['DateTime', false, false, false],
-                    name: ['String', false, false, false],
-                    type: ['AssetType', false, false, false],
-                    fileSize: ['Int', false, false, false],
-                    mimeType: ['String', false, false, false],
-                    width: ['Int', false, false, false],
-                    height: ['Int', false, false, false],
-                    source: ['String', false, false, false],
-                    preview: ['String', false, false, false],
-                    focalPoint: ['Coordinate', true, false, false],
-                    tags: ['Tag', false, true, false],
-                    customFields: ['JSON', true, false, false],
-                },
-                ProductTranslation: {
-                    id: ['ID', false, false, false],
-                    createdAt: ['DateTime', false, false, false],
-                    updatedAt: ['DateTime', false, false, false],
-                    languageCode: ['LanguageCode', false, false, false],
-                    name: ['String', false, false, false],
-                    slug: ['String', false, false, false],
-                    description: ['String', false, false, false],
-                    customFields: ['ProductTranslationCustomFields', true, false, false],
-                },
-                ProductList: {
-                    items: ['Product', false, true, false],
-                    totalItems: ['Int', false, false, false],
-                },
-
-                ProductVariantTranslation: {
-                    id: ['ID', false, false, false],
-                    createdAt: ['DateTime', false, false, false],
-                    updatedAt: ['DateTime', false, false, false],
-                    languageCode: ['LanguageCode', false, false, false],
-                    name: ['String', false, false, false],
-                },
-                Order: {
-                    id: ['ID', false, false, false],
-                    lines: ['OrderLine', false, true, false],
-                },
-                OrderLine: {
-                    id: ['ID', false, false, false],
-                    quantity: ['Int', false, false, false],
-                },
-            },
-            inputs: {
-                UpdateProductInput: {
-                    id: ['ID', false, false, false],
-                    name: ['String', false, false, false],
-                },
-                AdjustDraftOrderLineInput: {
-                    orderLineId: ['ID', false, false, false],
-                    quantity: ['Int', false, false, false],
-                },
-            },
-            scalars: [
-                'ID',
-                'String',
-                'Int',
-                'Boolean',
-                'Float',
-                'JSON',
-                'DateTime',
-                'Upload',
-                'CurrencyCode',
-            ],
-            enums: {},
-        },
-    };
+    return import('./testing-utils.js').then(m => m.getMockSchemaInfo());
 });
 
 describe('getListQueryFields', () => {