payload 4.0.0-internal.d28e9fb → 4.0.0-internal.fa345ef

package/dist/fields/config/sanitize.js

@@ -1,9 +1,7 @@
-import { deepMergeSimple } from '@payloadcms/translations/utilities';
 import { DuplicateFieldName, InvalidConfiguration, InvalidFieldName, InvalidFieldRelationship, MissingEditorProp, MissingFieldType } from '../../errors/index.js';
 import { ReservedFieldName } from '../../errors/ReservedFieldName.js';
 import { flattenAllFields } from '../../utilities/flattenAllFields.js';
 import { formatLabels, toWords } from '../../utilities/formatLabels.js';
-import { endSpan, startSpan } from '../../utilities/sanitizeProfiler.js';
 import { validateTimezones } from '../../utilities/validateTimezones.js';
 import { baseBlockFields } from '../baseFields/baseBlockFields.js';
 import { baseIDField } from '../baseFields/baseIDField.js';
@@ -28,394 +26,373 @@ import { fieldAffectsData as _fieldAffectsData, fieldIsLocalized, tabHasName } f
     if ('_sanitized' in field && field._sanitized === true) {
         return result;
     }
-    const __profSpan = startSpan(`sanitizeField:${field.type}`);
-    try {
-        if ('_sanitized' in field) {
-            field._sanitized = true;
-        }
-        if (!field.type) {
-            throw new MissingFieldType(field);
+    if ('_sanitized' in field) {
+        field._sanitized = true;
+    }
+    if (!field.type) {
+        throw new MissingFieldType(field);
+    }
+    const fieldAffectsData = _fieldAffectsData(field);
+    const { indexPath, schemaPath } = getFieldPaths({
+        field,
+        index,
+        parentIndexPath,
+        parentSchemaPath
+    });
+    // Reserved field name checks
+    if (isTopLevelField && fieldAffectsData && field.name) {
+        if (collectionConfig && collectionConfig.upload) {
+            if (reservedBaseUploadFieldNames.includes(field.name)) {
+                throw new ReservedFieldName(field, field.name);
+            }
         }
-        const fieldAffectsData = _fieldAffectsData(field);
-        const { indexPath, schemaPath } = getFieldPaths({
-            field,
-            index,
-            parentIndexPath,
-            parentSchemaPath
-        });
-        // Reserved field name checks
-        if (isTopLevelField && fieldAffectsData && field.name) {
-            if (collectionConfig && collectionConfig.upload) {
-                if (reservedBaseUploadFieldNames.includes(field.name)) {
-                    throw new ReservedFieldName(field, field.name);
-                }
+        if (collectionConfig && collectionConfig.auth && typeof collectionConfig.auth === 'object' && !collectionConfig.auth.disableLocalStrategy) {
+            if (reservedBaseAuthFieldNames.includes(field.name)) {
+                throw new ReservedFieldName(field, field.name);
             }
-            if (collectionConfig && collectionConfig.auth && typeof collectionConfig.auth === 'object' && !collectionConfig.auth.disableLocalStrategy) {
-                if (reservedBaseAuthFieldNames.includes(field.name)) {
+            if (collectionConfig.auth.verify) {
+                // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
+                if (reservedAPIKeyFieldNames.includes(field.name)) {
                     throw new ReservedFieldName(field, field.name);
                 }
-                if (collectionConfig.auth.verify) {
-                    // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
-                    if (reservedAPIKeyFieldNames.includes(field.name)) {
-                        throw new ReservedFieldName(field, field.name);
-                    }
-                    // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
-                    if (reservedVerifyFieldNames.includes(field.name)) {
-                        throw new ReservedFieldName(field, field.name);
-                    }
+                // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
+                if (reservedVerifyFieldNames.includes(field.name)) {
+                    throw new ReservedFieldName(field, field.name);
                 }
             }
         }
-        // Invalid field name check
-        if (fieldAffectsData && field.name.includes('.')) {
-            throw new InvalidFieldName(field, field.name);
-        }
-        // Auto-label
-        if ('name' in field && field.name && typeof field.label !== 'object' && typeof field.label !== 'string' && typeof field.label !== 'function' && field.label !== false) {
-            field.label = toWords(field.name);
-        }
-        // Checkbox default
-        if (field.type === 'checkbox' && typeof field.defaultValue === 'undefined' && field.required === true) {
-            field.defaultValue = false;
+    }
+    // Invalid field name check
+    if (fieldAffectsData && field.name.includes('.')) {
+        throw new InvalidFieldName(field, field.name);
+    }
+    // Auto-label
+    if ('name' in field && field.name && typeof field.label !== 'object' && typeof field.label !== 'string' && typeof field.label !== 'function' && field.label !== false) {
+        field.label = toWords(field.name);
+    }
+    // Checkbox default
+    if (field.type === 'checkbox' && typeof field.defaultValue === 'undefined' && field.required === true) {
+        field.defaultValue = false;
+    }
+    // Join field sanitization
+    if (field.type === 'join') {
+        sanitizeJoinField({
+            config,
+            field,
+            joinPath,
+            joins,
+            orderableJoins,
+            parentIsLocalized,
+            polymorphicJoins
+        });
+    }
+    // Relationship/upload validation
+    if (field.type === 'relationship' || field.type === 'upload') {
+        if (Array.isArray(field.relationTo) && field.relationTo.length === 0) {
+            throw new Error(`Field "${field.name}" of type "${field.type}" has an empty relationTo array. At least one collection must be specified.`);
         }
-        // Join field sanitization
-        if (field.type === 'join') {
-            sanitizeJoinField({
-                config,
-                field,
-                joinPath,
-                joins,
-                orderableJoins,
-                parentIsLocalized,
-                polymorphicJoins
+        if (validRelationships) {
+            const relationships = Array.isArray(field.relationTo) ? field.relationTo : [
+                field.relationTo
+            ];
+            relationships.forEach((relationship)=>{
+                if (!validRelationships.includes(relationship)) {
+                    throw new InvalidFieldRelationship(field, relationship);
+                }
             });
         }
-        // Relationship/upload validation
-        if (field.type === 'relationship' || field.type === 'upload') {
-            if (Array.isArray(field.relationTo) && field.relationTo.length === 0) {
-                throw new Error(`Field "${field.name}" of type "${field.type}" has an empty relationTo array. At least one collection must be specified.`);
-            }
-            if (validRelationships) {
-                const relationships = Array.isArray(field.relationTo) ? field.relationTo : [
-                    field.relationTo
-                ];
-                relationships.forEach((relationship)=>{
-                    if (!validRelationships.includes(relationship)) {
-                        throw new InvalidFieldRelationship(field, relationship);
-                    }
-                });
-            }
-        }
-        // Upload isSortable default
-        if (field.type === 'upload') {
-            if (!field.admin || !('isSortable' in field.admin)) {
-                field.admin = {
-                    isSortable: true,
-                    ...field.admin
-                };
-            }
+    }
+    // Upload isSortable default
+    if (field.type === 'upload') {
+        if (!field.admin || !('isSortable' in field.admin)) {
+            field.admin = {
+                isSortable: true,
+                ...field.admin
+            };
         }
-        // Array ID field
-        if (field.type === 'array' && field.fields) {
-            const hasCustomID = field.fields.some((f)=>'name' in f && f.name === 'id');
-            if (!hasCustomID) {
-                field.fields.push(baseIDField);
-            }
+    }
+    // Array ID field
+    if (field.type === 'array' && field.fields) {
+        const hasCustomID = field.fields.some((f)=>'name' in f && f.name === 'id');
+        if (!hasCustomID) {
+            field.fields.push(baseIDField);
         }
-        // Blocks/array labels
-        if ((field.type === 'blocks' || field.type === 'array') && field.label) {
-            field.labels = field.labels || formatLabels(field.name);
+    }
+    // Blocks/array labels
+    if ((field.type === 'blocks' || field.type === 'array') && field.label) {
+        field.labels = field.labels || formatLabels(field.name);
+    }
+    if (fieldAffectsData) {
+        if (existingFieldNames.has(field.name)) {
+            throw new DuplicateFieldName(field.name);
+        } else if (![
+            'blockName',
+            'id'
+        ].includes(field.name)) {
+            existingFieldNames.add(field.name);
         }
-        if (fieldAffectsData) {
-            if (existingFieldNames.has(field.name)) {
-                throw new DuplicateFieldName(field.name);
-            } else if (![
-                'blockName',
-                'id'
-            ].includes(field.name)) {
-                existingFieldNames.add(field.name);
+        if (typeof field.localized !== 'undefined') {
+            if (!config.localization) {
+                delete field.localized;
             }
-            if (typeof field.localized !== 'undefined') {
-                let shouldDisableLocalized = !config.localization;
-                if (process.env.NEXT_PUBLIC_PAYLOAD_COMPATIBILITY_allowLocalizedWithinLocalized !== 'true' && parentIsLocalized && // @todo PAYLOAD_DO_NOT_SANITIZE_LOCALIZED_PROPERTY=true will be the default in 4.0
-                process.env.PAYLOAD_DO_NOT_SANITIZE_LOCALIZED_PROPERTY !== 'true') {
-                    shouldDisableLocalized = true;
-                }
-                if (shouldDisableLocalized) {
-                    delete field.localized;
-                }
-            }
-            if (typeof field.validate === 'undefined') {
-                if ('virtual' in field && field.virtual) {
-                    field.validate = ()=>true;
+        }
+        if (typeof field.validate === 'undefined') {
+            if ('virtual' in field && field.virtual) {
+                field.validate = ()=>true;
+            } else {
+                const defaultValidate = validations[field.type];
+                if (defaultValidate) {
+                    field.validate = (val, options)=>defaultValidate(val, {
+                            ...field,
+                            ...options
+                        });
                 } else {
-                    const defaultValidate = validations[field.type];
-                    if (defaultValidate) {
-                        field.validate = (val, options)=>defaultValidate(val, {
-                                ...field,
-                                ...options
-                            });
-                    } else {
-                        field.validate = ()=>true;
-                    }
+                    field.validate = ()=>true;
                 }
             }
-            if (!field.hooks) {
-                field.hooks = {};
-            }
-            if (!field.access) {
-                field.access = {};
-            }
-            setDefaultBeforeDuplicate(field, parentIsLocalized);
         }
-        if (!field.admin) {
-            field.admin = {};
+        if (!field.hooks) {
+            field.hooks = {};
         }
-        if ('virtual' in field && field.virtual && field.admin.readOnly !== false && fieldAffectsData) {
-            field.admin.readOnly = true;
+        if (!field.access) {
+            field.access = {};
         }
-        // Make sure that the richText field has an editor
-        if (field.type === 'richText') {
-            const sanitizeRichText = async (_config)=>{
-                if (!field.editor) {
-                    if (_config.editor && !requireFieldLevelRichTextEditor) {
-                        // config.editor should be sanitized at this point
-                        field.editor = _config.editor;
-                    } else {
-                        throw new MissingEditorProp(field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor
-                        ;
-                    }
-                }
-                if (typeof field.editor === 'function') {
-                    field.editor = await field.editor({
-                        config: _config,
-                        isRoot: requireFieldLevelRichTextEditor,
-                        parentIsLocalized: parentIsLocalized || field.localized
-                    });
-                }
-                if (field.editor.i18n && Object.keys(field.editor.i18n).length >= 0) {
-                    config.i18n.translations = deepMergeSimple(config.i18n.translations, field.editor.i18n);
+        setDefaultBeforeDuplicate(field, parentIsLocalized);
+    }
+    if (!field.admin) {
+        field.admin = {};
+    }
+    if ('virtual' in field && field.virtual && field.admin.readOnly !== false && fieldAffectsData) {
+        field.admin.readOnly = true;
+    }
+    // Make sure that the richText field has an editor
+    if (field.type === 'richText') {
+        const sanitizeRichText = async (_config)=>{
+            if (!field.editor) {
+                if (_config.editor && !requireFieldLevelRichTextEditor) {
+                    // config.editor should be sanitized at this point
+                    field.editor = _config.editor;
+                } else {
+                    throw new MissingEditorProp(field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor
+                    ;
                 }
-            };
-            if (richTextSanitizationPromises) {
-                richTextSanitizationPromises.push(sanitizeRichText);
-            } else {
-                await sanitizeRichText(config);
             }
+            if (typeof field.editor === 'function') {
+                field.editor = await field.editor({
+                    config: _config,
+                    isRoot: requireFieldLevelRichTextEditor,
+                    parentIsLocalized: parentIsLocalized || field.localized
+                });
+            }
+        };
+        if (richTextSanitizationPromises) {
+            richTextSanitizationPromises.push(sanitizeRichText);
+        } else {
+            await sanitizeRichText(config);
         }
-        if (field.type === 'blocks' && field.blocks) {
-            if (field.blockReferences && field.blocks?.length) {
-                throw new Error('You cannot have both blockReferences and blocks in the same blocks field');
+    }
+    if (field.type === 'blocks' && field.blocks) {
+        const blockSlugs = [];
+        for (const block of field.blocks){
+            const blockSlug = typeof block === 'string' ? block : block.slug;
+            if (blockSlugs.includes(blockSlug)) {
+                throw new DuplicateFieldName(blockSlug);
             }
-            const blockSlugs = [];
-            for (const block of field.blockReferences ?? field.blocks){
-                const blockSlug = typeof block === 'string' ? block : block.slug;
-                if (blockSlugs.includes(blockSlug)) {
-                    throw new DuplicateFieldName(blockSlug);
-                }
-                blockSlugs.push(blockSlug);
-                if (typeof block === 'string') {
-                    continue;
-                }
-                if (block._sanitized === true) {
-                    continue;
-                }
-                block._sanitized = true;
-                block.fields = block.fields.concat(baseBlockFields);
-                block.labels = !block.labels ? formatLabels(block.slug) : block.labels;
-                block.fields = await sanitizeFields({
-                    collectionConfig,
-                    config,
-                    existingFieldNames: new Set(),
-                    fields: block.fields,
-                    isTopLevelField: false,
-                    parentIndexPath: '',
-                    parentIsLocalized: parentIsLocalized || field.localized,
-                    parentSchemaPath: schemaPath + '.' + block.slug,
-                    requireFieldLevelRichTextEditor,
-                    richTextSanitizationPromises,
-                    validRelationships
-                });
+            blockSlugs.push(blockSlug);
+            if (typeof block === 'string') {
+                continue;
             }
+            if (block._sanitized === true) {
+                continue;
+            }
+            block._sanitized = true;
+            block.fields = block.fields.concat(baseBlockFields);
+            block.labels = !block.labels ? formatLabels(block.slug) : block.labels;
+            block.fields = await sanitizeFields({
+                collectionConfig,
+                config,
+                existingFieldNames: new Set(),
+                fields: block.fields,
+                isTopLevelField: false,
+                parentIndexPath: '',
+                parentIsLocalized: parentIsLocalized || field.localized,
+                parentSchemaPath: schemaPath + '.' + block.slug,
+                requireFieldLevelRichTextEditor,
+                richTextSanitizationPromises,
+                validRelationships
+            });
         }
-        if ('fields' in field && field.fields) {
-            field.fields = await sanitizeFields({
+    }
+    if ('fields' in field && field.fields) {
+        field.fields = await sanitizeFields({
+            collectionConfig,
+            config,
+            existingFieldNames: fieldAffectsData ? new Set() : existingFieldNames,
+            fields: field.fields,
+            isTopLevelField: isTopLevelField && !fieldAffectsData,
+            joinPath: fieldAffectsData ? `${joinPath ? joinPath + '.' : ''}${field.name}` : joinPath,
+            joins,
+            orderableJoins,
+            parentIndexPath: fieldAffectsData ? '' : indexPath,
+            parentIsLocalized: parentIsLocalized || fieldIsLocalized(field),
+            parentSchemaPath: schemaPath,
+            polymorphicJoins,
+            requireFieldLevelRichTextEditor,
+            richTextSanitizationPromises,
+            validRelationships
+        });
+    }
+    if (field.type === 'tabs') {
+        for(let j = 0; j < field.tabs.length; j++){
+            const tab = field.tabs[j];
+            const isNamedTab = tabHasName(tab);
+            if (isNamedTab && typeof tab.label === 'undefined') {
+                tab.label = toWords(tab.name);
+            }
+            const { indexPath: tabIndexPath, schemaPath: tabSchemaPath } = getFieldPaths({
+                field: tab,
+                index: j,
+                parentIndexPath: indexPath,
+                parentSchemaPath: schemaPath
+            });
+            if ('admin' in tab && tab.admin?.condition && typeof tab.admin.condition === 'function' && !tab.id) {
+                tab.id = tabSchemaPath;
+            }
+            tab.fields = await sanitizeFields({
                 collectionConfig,
                 config,
-                existingFieldNames: fieldAffectsData ? new Set() : existingFieldNames,
-                fields: field.fields,
-                isTopLevelField: isTopLevelField && !fieldAffectsData,
-                joinPath: fieldAffectsData ? `${joinPath ? joinPath + '.' : ''}${field.name}` : joinPath,
+                existingFieldNames: isNamedTab ? new Set() : existingFieldNames,
+                fields: tab.fields,
+                isTopLevelField: isTopLevelField && !isNamedTab,
+                joinPath: isNamedTab ? `${joinPath ? joinPath + '.' : ''}${tab.name}` : joinPath,
                 joins,
                 orderableJoins,
-                parentIndexPath: fieldAffectsData ? '' : indexPath,
-                parentIsLocalized: parentIsLocalized || fieldIsLocalized(field),
-                parentSchemaPath: schemaPath,
+                parentIndexPath: isNamedTab ? '' : tabIndexPath,
+                parentIsLocalized: parentIsLocalized || isNamedTab && tab.localized,
+                parentSchemaPath: tabSchemaPath,
                 polymorphicJoins,
                 requireFieldLevelRichTextEditor,
                 richTextSanitizationPromises,
                 validRelationships
             });
+            field.tabs[j] = tab;
         }
-        if (field.type === 'tabs') {
-            for(let j = 0; j < field.tabs.length; j++){
-                const tab = field.tabs[j];
-                const isNamedTab = tabHasName(tab);
-                if (isNamedTab && typeof tab.label === 'undefined') {
-                    tab.label = toWords(tab.name);
-                }
-                const { indexPath: tabIndexPath, schemaPath: tabSchemaPath } = getFieldPaths({
-                    field: tab,
-                    index: j,
-                    parentIndexPath: indexPath,
-                    parentSchemaPath: schemaPath
-                });
-                if ('admin' in tab && tab.admin?.condition && typeof tab.admin.condition === 'function' && !tab.id) {
-                    tab.id = tabSchemaPath;
-                }
-                tab.fields = await sanitizeFields({
-                    collectionConfig,
-                    config,
-                    existingFieldNames: isNamedTab ? new Set() : existingFieldNames,
-                    fields: tab.fields,
-                    isTopLevelField: isTopLevelField && !isNamedTab,
-                    joinPath: isNamedTab ? `${joinPath ? joinPath + '.' : ''}${tab.name}` : joinPath,
-                    joins,
-                    orderableJoins,
-                    parentIndexPath: isNamedTab ? '' : tabIndexPath,
-                    parentIsLocalized: parentIsLocalized || isNamedTab && tab.localized,
-                    parentSchemaPath: tabSchemaPath,
-                    polymorphicJoins,
-                    requireFieldLevelRichTextEditor,
-                    richTextSanitizationPromises,
-                    validRelationships
-                });
-                field.tabs[j] = tab;
-            }
+    }
+    if (field.type === 'ui') {
+        const existing = field.admin.disabled;
+        if (existing === undefined) {
+            field.admin.disabled = {
+                bulkEdit: true
+            };
+        } else if (existing !== true && typeof existing === 'object' && existing.bulkEdit === undefined) {
+            field.admin.disabled = {
+                ...existing,
+                bulkEdit: true
+            };
         }
-        if (field.type === 'ui') {
-            const existing = field.admin.disabled;
-            if (existing === undefined) {
-                field.admin.disabled = {
-                    bulkEdit: true
-                };
-            } else if (existing !== true && typeof existing === 'object' && existing.bulkEdit === undefined) {
-                field.admin.disabled = {
-                    ...existing,
-                    bulkEdit: true
-                };
-            }
+    }
+    // Timezone field insertion
+    if (field.type === 'date' && field.timezone) {
+        const name = field.name + '_tz';
+        let defaultTimezone = field.timezone && typeof field.timezone === 'object' ? field.timezone.defaultTimezone : config.admin?.timezones?.defaultTimezone;
+        const required = field.required || field.timezone && typeof field.timezone === 'object' && field.timezone.required;
+        const supportedTimezones = field.timezone && typeof field.timezone === 'object' && field.timezone.supportedTimezones ? field.timezone.supportedTimezones : config.admin?.timezones?.supportedTimezones;
+        const options = typeof supportedTimezones === 'function' ? supportedTimezones({
+            defaultTimezones
+        }) : supportedTimezones;
+        validateTimezones({
+            source: `field "${field.name}" timezone.supportedTimezones`,
+            timezones: options
+        });
+        if (options && options.length === 1 && options[0]?.value) {
+            defaultTimezone = options[0].value;
         }
-        // Timezone field insertion
-        if (field.type === 'date' && field.timezone) {
-            const name = field.name + '_tz';
-            let defaultTimezone = field.timezone && typeof field.timezone === 'object' ? field.timezone.defaultTimezone : config.admin?.timezones?.defaultTimezone;
-            const required = field.required || field.timezone && typeof field.timezone === 'object' && field.timezone.required;
-            const supportedTimezones = field.timezone && typeof field.timezone === 'object' && field.timezone.supportedTimezones ? field.timezone.supportedTimezones : config.admin?.timezones?.supportedTimezones;
-            const options = typeof supportedTimezones === 'function' ? supportedTimezones({
-                defaultTimezones
-            }) : supportedTimezones;
-            validateTimezones({
-                source: `field "${field.name}" timezone.supportedTimezones`,
-                timezones: options
-            });
-            if (options && options.length === 1 && options[0]?.value) {
-                defaultTimezone = options[0].value;
-            }
-            // Generate label for timezone field
-            const timezoneLabel = typeof field.label === 'string' ? `${field.label} Tz` : toWords(name);
-            const baseField = baseTimezoneField({
-                name,
-                defaultValue: defaultTimezone,
-                label: timezoneLabel,
-                options,
-                required
+        // Generate label for timezone field
+        const timezoneLabel = typeof field.label === 'string' ? `${field.label} Tz` : toWords(name);
+        const baseField = baseTimezoneField({
+            name,
+            defaultValue: defaultTimezone,
+            label: timezoneLabel,
+            options,
+            required
+        });
+        // Apply override if provided
+        const timezoneField = typeof field.timezone === 'object' && typeof field.timezone.override === 'function' ? field.timezone.override({
+            baseField
+        }) : baseField;
+        result.fieldsToInsert = [
+            timezoneField
+        ];
+    }
+    // Virtual field handling
+    if ('virtual' in field && typeof field.virtual === 'string') {
+        const virtualField = field;
+        const configFields = (collectionConfig || globalConfig)?.fields;
+        if (configFields) {
+            let flattenFields = flattenAllFields({
+                fields: configFields
             });
-            // Apply override if provided
-            const timezoneField = typeof field.timezone === 'object' && typeof field.timezone.override === 'function' ? field.timezone.override({
-                baseField
-            }) : baseField;
-            result.fieldsToInsert = [
-                timezoneField
-            ];
-        }
-        // Virtual field handling
-        if ('virtual' in field && typeof field.virtual === 'string') {
-            const virtualField = field;
-            const configFields = (collectionConfig || globalConfig)?.fields;
-            if (configFields) {
-                let flattenFields = flattenAllFields({
-                    fields: configFields
-                });
-                const paths = field.virtual.split('.');
-                let isHasMany = false;
-                for (const [idx, segment] of paths.entries()){
-                    const foundField = flattenFields.find((e)=>e.name === segment);
-                    if (!foundField) {
-                        break;
-                    }
-                    if (foundField.type === 'group' || foundField.type === 'tab' || foundField.type === 'array') {
-                        flattenFields = foundField.flattenedFields;
-                    } else if ((foundField.type === 'relationship' || foundField.type === 'upload') && idx !== paths.length - 1 && typeof foundField.relationTo === 'string') {
-                        if (foundField.hasMany && (virtualField.type === 'text' || virtualField.type === 'number' || virtualField.type === 'select')) {
-                            if (isHasMany) {
-                                throw new InvalidConfiguration(`Virtual field ${virtualField.name} in ${globalConfig ? `global ${globalConfig.slug}` : `collection ${collectionConfig?.slug}`} references 2 or more hasMany relationships on the path ${virtualField.virtual} which is not allowed.`);
-                            }
-                            isHasMany = true;
-                            virtualField.hasMany = true;
-                        }
-                        const relatedCollection = config.collections?.find((e)=>e.slug === foundField.relationTo);
-                        if (relatedCollection) {
-                            flattenFields = flattenAllFields({
-                                fields: relatedCollection.fields
-                            });
+            const paths = field.virtual.split('.');
+            let isHasMany = false;
+            for (const [idx, segment] of paths.entries()){
+                const foundField = flattenFields.find((e)=>e.name === segment);
+                if (!foundField) {
+                    break;
+                }
+                if (foundField.type === 'group' || foundField.type === 'tab' || foundField.type === 'array') {
+                    flattenFields = foundField.flattenedFields;
+                } else if ((foundField.type === 'relationship' || foundField.type === 'upload') && idx !== paths.length - 1 && typeof foundField.relationTo === 'string') {
+                    if (foundField.hasMany && (virtualField.type === 'text' || virtualField.type === 'number' || virtualField.type === 'select')) {
+                        if (isHasMany) {
+                            throw new InvalidConfiguration(`Virtual field ${virtualField.name} in ${globalConfig ? `global ${globalConfig.slug}` : `collection ${collectionConfig?.slug}`} references 2 or more hasMany relationships on the path ${virtualField.virtual} which is not allowed.`);
                         }
+                        isHasMany = true;
+                        virtualField.hasMany = true;
+                    }
+                    const relatedCollection = config.collections?.find((e)=>e.slug === foundField.relationTo);
+                    if (relatedCollection) {
+                        flattenFields = flattenAllFields({
+                            fields: relatedCollection.fields
+                        });
                     }
                 }
             }
         }
-        return result;
-    } finally{
-        endSpan(__profSpan);
     }
+    return result;
 };
 export const sanitizeFields = async ({ collectionConfig, config, existingFieldNames = new Set(), fields, globalConfig, isTopLevelField = true, joinPath = '', joins, orderableJoins, parentIndexPath = '', parentIsLocalized, parentSchemaPath = '', polymorphicJoins, requireFieldLevelRichTextEditor = false, richTextSanitizationPromises, validRelationships })=>{
     if (!fields) {
         return [];
     }
-    const __profSpan = startSpan('sanitizeFields', String(fields.length));
-    try {
-        for(let i = 0; i < fields.length; i++){
-            const field = fields[i];
-            const result = await sanitizeField({
-                collectionConfig,
-                config,
-                existingFieldNames,
-                field,
-                globalConfig,
-                index: i,
-                isTopLevelField,
-                joinPath,
-                joins,
-                orderableJoins,
-                parentIndexPath,
-                parentIsLocalized,
-                parentSchemaPath,
-                polymorphicJoins,
-                requireFieldLevelRichTextEditor,
-                richTextSanitizationPromises,
-                validRelationships
-            });
-            fields[i] = field;
-            if (result.fieldsToInsert?.length) {
-                fields.splice(i + 1, 0, ...result.fieldsToInsert);
-                i += result.fieldsToInsert.length;
-            }
+    for(let i = 0; i < fields.length; i++){
+        const field = fields[i];
+        const result = await sanitizeField({
+            collectionConfig,
+            config,
+            existingFieldNames,
+            field,
+            globalConfig,
+            index: i,
+            isTopLevelField,
+            joinPath,
+            joins,
+            orderableJoins,
+            parentIndexPath,
+            parentIsLocalized,
+            parentSchemaPath,
+            polymorphicJoins,
+            requireFieldLevelRichTextEditor,
+            richTextSanitizationPromises,
+            validRelationships
+        });
+        fields[i] = field;
+        if (result.fieldsToInsert?.length) {
+            fields.splice(i + 1, 0, ...result.fieldsToInsert);
+            i += result.fieldsToInsert.length;
         }
-        return fields;
-    } finally{
-        endSpan(__profSpan);
     }
+    return fields;
 };
 
 //# sourceMappingURL=sanitize.js.map