payload 3.0.0-beta.13 → 3.0.0-beta.130

package/dist/fields/config/sanitize.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/fields/config/sanitize.ts"],"sourcesContent":["import type { Config } from '../../config/types.js'\nimport type { Field } from './types.js'\n\nimport MissingEditorProp from '../../errors/MissingEditorProp.js'\nimport {\n  DuplicateFieldName,\n  InvalidFieldName,\n  InvalidFieldRelationship,\n  MissingFieldType,\n} from '../../errors/index.js'\nimport { formatLabels, toWords } from '../../utilities/formatLabels.js'\nimport { baseBlockFields } from '../baseFields/baseBlockFields.js'\nimport { baseIDField } from '../baseFields/baseIDField.js'\nimport { setDefaultBeforeDuplicate } from '../setDefaultBeforeDuplicate.js'\nimport validations from '../validations.js'\nimport { fieldAffectsData, tabHasName } from './types.js'\n\ntype Args = {\n  config: Config\n  existingFieldNames?: Set<string>\n  fields: Field[]\n  /**\n   * If true, a richText field will require an editor property to be set, as the sanitizeFields function will not add it from the payload config if not present.\n   *\n   * @default false\n   */\n  requireFieldLevelRichTextEditor?: boolean\n  /**\n   * If not null, will validate that upload and relationship fields do not relate to a collection that is not in this array.\n   * This validation will be skipped if validRelationships is null.\n   */\n  validRelationships: null | string[]\n}\n\nexport const sanitizeFields = ({\n  config,\n  existingFieldNames = new Set(),\n  fields,\n  requireFieldLevelRichTextEditor = false,\n  validRelationships,\n}: Args): Field[] => {\n  if (!fields) return []\n\n  return fields.map((unsanitizedField) => {\n    const field: Field = { ...unsanitizedField }\n\n    if (!field.type) throw new MissingFieldType(field)\n\n    // assert that field names do not contain forbidden characters\n    if (fieldAffectsData(field) && field.name.includes('.')) {\n      throw new InvalidFieldName(field, field.name)\n    }\n\n    // Make sure that the richText field has an editor\n    if (field.type === 'richText' && !field.editor) {\n      if (config.editor && !requireFieldLevelRichTextEditor) {\n        field.editor = config.editor\n      } else {\n        throw new MissingEditorProp(field)\n      }\n    }\n\n    // Auto-label\n    if (\n      'name' in field &&\n      field.name &&\n      typeof field.label !== 'object' &&\n      typeof field.label !== 'string' &&\n      field.label !== false\n    ) {\n      field.label = toWords(field.name)\n    }\n\n    if (\n      field.type === 'checkbox' &&\n      typeof field.defaultValue === 'undefined' &&\n      field.required === true\n    ) {\n      field.defaultValue = false\n    }\n\n    if (field.type === 'relationship' || field.type === 'upload') {\n      if (validRelationships) {\n        const relationships = Array.isArray(field.relationTo)\n          ? field.relationTo\n          : [field.relationTo]\n        relationships.forEach((relationship: string) => {\n          if (!validRelationships.includes(relationship)) {\n            throw new InvalidFieldRelationship(field, relationship)\n          }\n        })\n      }\n\n      if (field.type === 'relationship') {\n        if (field.min && !field.minRows) {\n          console.warn(\n            `(payload): The \"min\" property is deprecated for the Relationship field \"${field.name}\" and will be removed in a future version. Please use \"minRows\" instead.`,\n          )\n        }\n        if (field.max && !field.maxRows) {\n          console.warn(\n            `(payload): The \"max\" property is deprecated for the Relationship field \"${field.name}\" and will be removed in a future version. Please use \"maxRows\" instead.`,\n          )\n        }\n        field.minRows = field.minRows || field.min\n        field.maxRows = field.maxRows || field.max\n      }\n    }\n\n    if (field.type === 'blocks' && field.blocks) {\n      field.blocks = field.blocks.map((block) => ({\n        ...block,\n        fields: block.fields.concat(baseBlockFields),\n      }))\n    }\n\n    if (field.type === 'array' && field.fields) {\n      field.fields.push(baseIDField)\n    }\n\n    if ((field.type === 'blocks' || field.type === 'array') && field.label) {\n      field.labels = field.labels || formatLabels(field.name)\n    }\n\n    if (fieldAffectsData(field)) {\n      if (existingFieldNames.has(field.name)) {\n        throw new DuplicateFieldName(field.name)\n      } else if (!['blockName', 'id'].includes(field.name)) {\n        existingFieldNames.add(field.name)\n      }\n\n      if (field.localized && !config.localization) delete field.localized\n\n      if (typeof field.validate === 'undefined') {\n        const defaultValidate = validations[field.type]\n        if (defaultValidate) {\n          field.validate = (val, options) => defaultValidate(val, { ...field, ...options })\n        } else {\n          field.validate = () => true\n        }\n      }\n\n      if (!field.hooks) field.hooks = {}\n      if (!field.access) field.access = {}\n\n      setDefaultBeforeDuplicate(field)\n    }\n\n    if (!field.admin) {\n      field.admin = {}\n    }\n\n    if ('fields' in field && field.fields) {\n      field.fields = sanitizeFields({\n        config,\n        existingFieldNames: fieldAffectsData(field) ? new Set() : existingFieldNames,\n        fields: field.fields,\n        requireFieldLevelRichTextEditor,\n        validRelationships,\n      })\n    }\n\n    if (field.type === 'tabs') {\n      field.tabs = field.tabs.map((tab) => {\n        const unsanitizedTab = { ...tab }\n        if (tabHasName(tab) && typeof tab.label === 'undefined') {\n          unsanitizedTab.label = toWords(tab.name)\n        }\n\n        unsanitizedTab.fields = sanitizeFields({\n          config,\n          existingFieldNames: tabHasName(tab) ? new Set() : existingFieldNames,\n          fields: tab.fields,\n          requireFieldLevelRichTextEditor,\n          validRelationships,\n        })\n\n        return unsanitizedTab\n      })\n    }\n\n    if ('blocks' in field && field.blocks) {\n      field.blocks = field.blocks.map((block) => {\n        const unsanitizedBlock = { ...block }\n        unsanitizedBlock.labels = !unsanitizedBlock.labels\n          ? formatLabels(unsanitizedBlock.slug)\n          : unsanitizedBlock.labels\n\n        unsanitizedBlock.fields = sanitizeFields({\n          config,\n          existingFieldNames: new Set(),\n          fields: block.fields,\n          requireFieldLevelRichTextEditor,\n          validRelationships,\n        })\n\n        return unsanitizedBlock\n      })\n    }\n\n    return field\n  })\n}\n"],"names":["MissingEditorProp","DuplicateFieldName","InvalidFieldName","InvalidFieldRelationship","MissingFieldType","formatLabels","toWords","baseBlockFields","baseIDField","setDefaultBeforeDuplicate","validations","fieldAffectsData","tabHasName","sanitizeFields","config","existingFieldNames","Set","fields","requireFieldLevelRichTextEditor","validRelationships","map","unsanitizedField","field","type","name","includes","editor","label","defaultValue","required","relationships","Array","isArray","relationTo","forEach","relationship","min","minRows","console","warn","max","maxRows","blocks","block","concat","push","labels","has","add","localized","localization","validate","defaultValidate","val","options","hooks","access","admin","tabs","tab","unsanitizedTab","unsanitizedBlock","slug"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/fields/config/sanitize.ts"],"sourcesContent":["import { deepMergeSimple } from '@payloadcms/translations/utilities'\n\nimport type { CollectionConfig, SanitizedJoins } from '../../collections/config/types.js'\nimport type { Config, SanitizedConfig } from '../../config/types.js'\nimport type { Field } from './types.js'\n\nimport {\n  DuplicateFieldName,\n  InvalidFieldName,\n  InvalidFieldRelationship,\n  MissingEditorProp,\n  MissingFieldType,\n} from '../../errors/index.js'\nimport { formatLabels, toWords } from '../../utilities/formatLabels.js'\nimport { baseBlockFields } from '../baseFields/baseBlockFields.js'\nimport { baseIDField } from '../baseFields/baseIDField.js'\nimport { setDefaultBeforeDuplicate } from '../setDefaultBeforeDuplicate.js'\nimport validations from '../validations.js'\nimport { sanitizeJoinField } from './sanitizeJoinField.js'\nimport { fieldAffectsData, tabHasName } from './types.js'\n\ntype Args = {\n  collectionConfig?: CollectionConfig\n  config: Config\n  existingFieldNames?: Set<string>\n  fields: Field[]\n  joinPath?: string\n  /**\n   * When not passed in, assume that join are not supported (globals, arrays, blocks)\n   */\n  joins?: SanitizedJoins\n  parentIsLocalized: boolean\n\n  /**\n   * If true, a richText field will require an editor property to be set, as the sanitizeFields function will not add it from the payload config if not present.\n   *\n   * @default false\n   */\n  requireFieldLevelRichTextEditor?: boolean\n  /**\n   * If this property is set, RichText fields won't be sanitized immediately. Instead, they will be added to this array as promises\n   * so that you can sanitize them together, after the config has been sanitized.\n   */\n  richTextSanitizationPromises?: Array<(config: SanitizedConfig) => Promise<void>>\n  /**\n   * If not null, will validate that upload and relationship fields do not relate to a collection that is not in this array.\n   * This validation will be skipped if validRelationships is null.\n   */\n  validRelationships: null | string[]\n}\n\nexport const sanitizeFields = async ({\n  config,\n  existingFieldNames = new Set(),\n  fields,\n  joinPath = '',\n  joins,\n  parentIsLocalized,\n  requireFieldLevelRichTextEditor = false,\n  richTextSanitizationPromises,\n  validRelationships,\n}: Args): Promise<Field[]> => {\n  if (!fields) {\n    return []\n  }\n\n  for (let i = 0; i < fields.length; i++) {\n    const field = fields[i]\n\n    if ('_sanitized' in field && field._sanitized === true) {\n      continue\n    }\n\n    if (!field.type) {\n      throw new MissingFieldType(field)\n    }\n\n    // assert that field names do not contain forbidden characters\n    if (fieldAffectsData(field) && field.name.includes('.')) {\n      throw new InvalidFieldName(field, field.name)\n    }\n\n    // Auto-label\n    if (\n      'name' in field &&\n      field.name &&\n      typeof field.label !== 'object' &&\n      typeof field.label !== 'string' &&\n      typeof field.label !== 'function' &&\n      field.label !== false\n    ) {\n      field.label = toWords(field.name)\n    }\n\n    if (\n      field.type === 'checkbox' &&\n      typeof field.defaultValue === 'undefined' &&\n      field.required === true\n    ) {\n      field.defaultValue = false\n    }\n\n    if (field.type === 'join') {\n      sanitizeJoinField({ config, field, joinPath, joins })\n    }\n\n    if (field.type === 'relationship' || field.type === 'upload') {\n      if (validRelationships) {\n        const relationships = Array.isArray(field.relationTo)\n          ? field.relationTo\n          : [field.relationTo]\n        relationships.forEach((relationship: string) => {\n          if (!validRelationships.includes(relationship)) {\n            throw new InvalidFieldRelationship(field, relationship)\n          }\n        })\n      }\n\n      if (field.min && !field.minRows) {\n        console.warn(\n          `(payload): The \"min\" property is deprecated for the Relationship field \"${field.name}\" and will be removed in a future version. Please use \"minRows\" instead.`,\n        )\n      }\n      if (field.max && !field.maxRows) {\n        console.warn(\n          `(payload): The \"max\" property is deprecated for the Relationship field \"${field.name}\" and will be removed in a future version. Please use \"maxRows\" instead.`,\n        )\n      }\n      field.minRows = field.minRows || field.min\n      field.maxRows = field.maxRows || field.max\n    }\n\n    if (field.type === 'upload') {\n      if (!field.admin || !('isSortable' in field.admin)) {\n        field.admin = {\n          isSortable: true,\n          ...field.admin,\n        }\n      }\n    }\n\n    if (field.type === 'array' && field.fields) {\n      field.fields.push(baseIDField)\n    }\n\n    if ((field.type === 'blocks' || field.type === 'array') && field.label) {\n      field.labels = field.labels || formatLabels(field.name)\n    }\n\n    if (fieldAffectsData(field)) {\n      if (existingFieldNames.has(field.name)) {\n        throw new DuplicateFieldName(field.name)\n      } else if (!['blockName', 'id'].includes(field.name)) {\n        existingFieldNames.add(field.name)\n      }\n\n      if (typeof field.localized !== 'undefined') {\n        let shouldDisableLocalized = !config.localization\n\n        if (!config.compatibility?.allowLocalizedWithinLocalized && parentIsLocalized) {\n          shouldDisableLocalized = true\n        }\n\n        if (shouldDisableLocalized) {\n          delete field.localized\n        }\n      }\n\n      if (typeof field.validate === 'undefined') {\n        const defaultValidate = validations[field.type]\n        if (defaultValidate) {\n          field.validate = (val, options) => defaultValidate(val, { ...field, ...options })\n        } else {\n          field.validate = (): true => true\n        }\n      }\n\n      if (typeof field.virtual === 'undefined') {\n        field.virtual = false\n      }\n\n      if (!field.hooks) {\n        field.hooks = {}\n      }\n      if (!field.access) {\n        field.access = {}\n      }\n\n      setDefaultBeforeDuplicate(field)\n    }\n\n    if (!field.admin) {\n      field.admin = {}\n    }\n\n    // Make sure that the richText field has an editor\n    if (field.type === 'richText') {\n      const sanitizeRichText = async (_config: SanitizedConfig) => {\n        if (!field.editor) {\n          if (_config.editor && !requireFieldLevelRichTextEditor) {\n            // config.editor should be sanitized at this point\n            field.editor = _config.editor\n          } else {\n            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\n          }\n        }\n\n        if (typeof field.editor === 'function') {\n          field.editor = await field.editor({\n            config: _config,\n            isRoot: requireFieldLevelRichTextEditor,\n            parentIsLocalized: parentIsLocalized || field.localized,\n          })\n        }\n\n        if (field.editor.i18n && Object.keys(field.editor.i18n).length >= 0) {\n          config.i18n.translations = deepMergeSimple(config.i18n.translations, field.editor.i18n)\n        }\n      }\n      if (richTextSanitizationPromises) {\n        richTextSanitizationPromises.push(sanitizeRichText)\n      } else {\n        await sanitizeRichText(config as unknown as SanitizedConfig)\n      }\n    }\n\n    if (field.type === 'blocks' && field.blocks) {\n      for (const block of field.blocks) {\n        if (block._sanitized === true) {\n          continue\n        }\n        block._sanitized = true\n        block.fields = block.fields.concat(baseBlockFields)\n        block.labels = !block.labels ? formatLabels(block.slug) : block.labels\n        block.fields = await sanitizeFields({\n          config,\n          existingFieldNames: new Set(),\n          fields: block.fields,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          requireFieldLevelRichTextEditor,\n          richTextSanitizationPromises,\n          validRelationships,\n        })\n      }\n    }\n\n    if ('fields' in field && field.fields) {\n      field.fields = await sanitizeFields({\n        config,\n        existingFieldNames: fieldAffectsData(field) ? new Set() : existingFieldNames,\n        fields: field.fields,\n        joinPath: fieldAffectsData(field)\n          ? `${joinPath ? joinPath + '.' : ''}${field.name}`\n          : joinPath,\n        joins,\n        parentIsLocalized: parentIsLocalized || field.localized,\n        requireFieldLevelRichTextEditor,\n        richTextSanitizationPromises,\n        validRelationships,\n      })\n    }\n\n    if (field.type === 'tabs') {\n      for (let j = 0; j < field.tabs.length; j++) {\n        const tab = field.tabs[j]\n        if (tabHasName(tab) && typeof tab.label === 'undefined') {\n          tab.label = toWords(tab.name)\n        }\n\n        tab.fields = await sanitizeFields({\n          config,\n          existingFieldNames: tabHasName(tab) ? new Set() : existingFieldNames,\n          fields: tab.fields,\n          joinPath: tabHasName(tab) ? `${joinPath ? joinPath + '.' : ''}${tab.name}` : joinPath,\n          joins,\n          parentIsLocalized: parentIsLocalized || (tabHasName(tab) && tab.localized),\n          requireFieldLevelRichTextEditor,\n          richTextSanitizationPromises,\n          validRelationships,\n        })\n        field.tabs[j] = tab\n      }\n    }\n\n    if (field.type === 'ui' && typeof field.admin.disableBulkEdit === 'undefined') {\n      field.admin.disableBulkEdit = true\n    }\n\n    if ('_sanitized' in field) {\n      field._sanitized = true\n    }\n\n    fields[i] = field\n  }\n\n  return fields\n}\n"],"names":["deepMergeSimple","DuplicateFieldName","InvalidFieldName","InvalidFieldRelationship","MissingEditorProp","MissingFieldType","formatLabels","toWords","baseBlockFields","baseIDField","setDefaultBeforeDuplicate","validations","sanitizeJoinField","fieldAffectsData","tabHasName","sanitizeFields","config","existingFieldNames","Set","fields","joinPath","joins","parentIsLocalized","requireFieldLevelRichTextEditor","richTextSanitizationPromises","validRelationships","i","length","field","_sanitized","type","name","includes","label","defaultValue","required","relationships","Array","isArray","relationTo","forEach","relationship","min","minRows","console","warn","max","maxRows","admin","isSortable","push","labels","has","add","localized","shouldDisableLocalized","localization","compatibility","allowLocalizedWithinLocalized","validate","defaultValidate","val","options","virtual","hooks","access","sanitizeRichText","_config","editor","isRoot","i18n","Object","keys","translations","blocks","block","concat","slug","j","tabs","tab","disableBulkEdit"],"mappings":"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"}

package/dist/fields/config/sanitize.spec.js

@@ -1,172 +1,163 @@
-import { InvalidFieldName, InvalidFieldRelationship, MissingFieldType } from '../../errors';
-import { sanitizeFields } from './sanitize';
-const dummyConfig = {
-    collections: [],
-    db: {
-        defaultIDType: 'text',
-        init: ()=>({})
-    }
-};
+import { InvalidFieldName, InvalidFieldRelationship, MissingFieldType } from '../../errors/index.js';
+import { sanitizeFields } from './sanitize.js';
 describe('sanitizeFields', ()=>{
-    it('should throw on missing type field', ()=>{
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
+    const config = {};
+    it('should throw on missing type field', async ()=>{
         const fields = [
+            // @ts-expect-error
             {
-                label: 'some-collection',
-                name: 'Some Collection'
+                name: 'Some Collection',
+                label: 'some-collection'
             }
         ];
-        expect(()=>{
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            sanitizeFields({
-                config: dummyConfig,
+        await expect(async ()=>{
+            await sanitizeFields({
+                config,
                 fields,
                 validRelationships: []
             });
-        }).toThrow(MissingFieldType);
+        }).rejects.toThrow(MissingFieldType);
     });
-    it('should throw on invalid field name', ()=>{
+    it('should throw on invalid field name', async ()=>{
         const fields = [
             {
-                label: 'some.collection',
                 name: 'some.collection',
-                type: 'text'
+                type: 'text',
+                label: 'some.collection'
             }
         ];
-        expect(()=>{
-            sanitizeFields({
-                config: dummyConfig,
+        await expect(async ()=>{
+            await sanitizeFields({
+                config,
                 fields,
                 validRelationships: []
             });
-        }).toThrow(InvalidFieldName);
+        }).rejects.toThrow(InvalidFieldName);
     });
     describe('auto-labeling', ()=>{
-        it('should populate label if missing', ()=>{
+        it('should populate label if missing', async ()=>{
             const fields = [
                 {
                     name: 'someField',
                     type: 'text'
                 }
             ];
-            const sanitizedField = sanitizeFields({
-                config: dummyConfig,
+            const sanitizedField = (await sanitizeFields({
+                config,
                 fields,
                 validRelationships: []
-            })[0];
+            }))[0];
             expect(sanitizedField.name).toStrictEqual('someField');
             expect(sanitizedField.label).toStrictEqual('Some Field');
             expect(sanitizedField.type).toStrictEqual('text');
         });
-        it('should allow auto-label override', ()=>{
+        it('should allow auto-label override', async ()=>{
             const fields = [
                 {
-                    label: 'Do not label',
                     name: 'someField',
-                    type: 'text'
+                    type: 'text',
+                    label: 'Do not label'
                 }
             ];
-            const sanitizedField = sanitizeFields({
-                config: dummyConfig,
+            const sanitizedField = (await sanitizeFields({
+                config,
                 fields,
                 validRelationships: []
-            })[0];
+            }))[0];
             expect(sanitizedField.name).toStrictEqual('someField');
             expect(sanitizedField.label).toStrictEqual('Do not label');
             expect(sanitizedField.type).toStrictEqual('text');
         });
         describe('opt-out', ()=>{
-            it('should allow label opt-out', ()=>{
+            it('should allow label opt-out', async ()=>{
                 const fields = [
                     {
-                        label: false,
                         name: 'someField',
-                        type: 'text'
+                        type: 'text',
+                        label: false
                     }
                 ];
-                const sanitizedField = sanitizeFields({
-                    config: dummyConfig,
+                const sanitizedField = (await sanitizeFields({
+                    config,
                     fields,
                     validRelationships: []
-                })[0];
+                }))[0];
                 expect(sanitizedField.name).toStrictEqual('someField');
                 expect(sanitizedField.label).toStrictEqual(false);
                 expect(sanitizedField.type).toStrictEqual('text');
             });
-            it('should allow label opt-out for arrays', ()=>{
+            it('should allow label opt-out for arrays', async ()=>{
                 const arrayField = {
+                    name: 'items',
+                    type: 'array',
                     fields: [
                         {
                             name: 'itemName',
                             type: 'text'
                         }
                     ],
-                    label: false,
-                    name: 'items',
-                    type: 'array'
+                    label: false
                 };
-                const sanitizedField = sanitizeFields({
-                    config: dummyConfig,
+                const sanitizedField = (await sanitizeFields({
+                    config,
                     fields: [
                         arrayField
                     ],
                     validRelationships: []
-                })[0];
+                }))[0];
                 expect(sanitizedField.name).toStrictEqual('items');
                 expect(sanitizedField.label).toStrictEqual(false);
                 expect(sanitizedField.type).toStrictEqual('array');
                 expect(sanitizedField.labels).toBeUndefined();
             });
-            it('should allow label opt-out for blocks', ()=>{
+            it('should allow label opt-out for blocks', async ()=>{
                 const fields = [
                     {
+                        name: 'noLabelBlock',
+                        type: 'blocks',
                         blocks: [
                             {
+                                slug: 'number',
                                 fields: [
                                     {
                                         name: 'testNumber',
                                         type: 'number'
                                     }
-                                ],
-                                slug: 'number'
+                                ]
                             }
                         ],
-                        label: false,
-                        name: 'noLabelBlock',
-                        type: 'blocks'
+                        label: false
                     }
                 ];
-                const sanitizedField = sanitizeFields({
-                    config: dummyConfig,
+                const sanitizedField = (await sanitizeFields({
+                    config,
                     fields,
                     validRelationships: []
-                })[0];
+                }))[0];
                 expect(sanitizedField.name).toStrictEqual('noLabelBlock');
                 expect(sanitizedField.label).toStrictEqual(false);
                 expect(sanitizedField.type).toStrictEqual('blocks');
                 expect(sanitizedField.labels).toBeUndefined();
             });
         });
-        it('should label arrays with plural and singular', ()=>{
+        it('should label arrays with plural and singular', async ()=>{
             const fields = [
                 {
+                    name: 'items',
+                    type: 'array',
                     fields: [
                         {
                             name: 'itemName',
                             type: 'text'
                         }
-                    ],
-                    name: 'items',
-                    type: 'array'
+                    ]
                 }
             ];
-            const sanitizedField = sanitizeFields({
-                config: dummyConfig,
+            const sanitizedField = (await sanitizeFields({
+                config,
                 fields,
                 validRelationships: []
-            })[0];
+            }))[0];
             expect(sanitizedField.name).toStrictEqual('items');
             expect(sanitizedField.label).toStrictEqual('Items');
             expect(sanitizedField.type).toStrictEqual('array');
@@ -175,29 +166,29 @@ describe('sanitizeFields', ()=>{
                 singular: 'Item'
             });
         });
-        it('should label blocks with plural and singular', ()=>{
+        it('should label blocks with plural and singular', async ()=>{
             const fields = [
                 {
+                    name: 'specialBlock',
+                    type: 'blocks',
                     blocks: [
                         {
+                            slug: 'number',
                             fields: [
                                 {
                                     name: 'testNumber',
                                     type: 'number'
                                 }
-                            ],
-                            slug: 'number'
+                            ]
                         }
-                    ],
-                    name: 'specialBlock',
-                    type: 'blocks'
+                    ]
                 }
             ];
-            const sanitizedField = sanitizeFields({
-                config: dummyConfig,
+            const sanitizedField = (await sanitizeFields({
+                config,
                 fields,
                 validRelationships: []
-            })[0];
+            }))[0];
             expect(sanitizedField.name).toStrictEqual('specialBlock');
             expect(sanitizedField.label).toStrictEqual('Special Block');
             expect(sanitizedField.type).toStrictEqual('blocks');
@@ -209,178 +200,178 @@ describe('sanitizeFields', ()=>{
         });
     });
     describe('relationships', ()=>{
-        it('should not throw on valid relationship', ()=>{
+        it('should not throw on valid relationship', async ()=>{
             const validRelationships = [
                 'some-collection'
             ];
             const fields = [
                 {
-                    label: 'my-relationship',
                     name: 'My Relationship',
-                    relationTo: 'some-collection',
-                    type: 'relationship'
+                    type: 'relationship',
+                    label: 'my-relationship',
+                    relationTo: 'some-collection'
                 }
             ];
-            expect(()=>{
-                sanitizeFields({
-                    config: dummyConfig,
+            await expect(async ()=>{
+                await sanitizeFields({
+                    config,
                     fields,
                     validRelationships
                 });
             }).not.toThrow();
         });
-        it('should not throw on valid relationship - multiple', ()=>{
+        it('should not throw on valid relationship - multiple', async ()=>{
             const validRelationships = [
                 'some-collection',
                 'another-collection'
             ];
             const fields = [
                 {
-                    label: 'my-relationship',
                     name: 'My Relationship',
+                    type: 'relationship',
+                    label: 'my-relationship',
                     relationTo: [
                         'some-collection',
                         'another-collection'
-                    ],
-                    type: 'relationship'
+                    ]
                 }
             ];
-            expect(()=>{
-                sanitizeFields({
-                    config: dummyConfig,
+            await expect(async ()=>{
+                await sanitizeFields({
+                    config,
                     fields,
                     validRelationships
                 });
             }).not.toThrow();
         });
-        it('should not throw on valid relationship inside blocks', ()=>{
+        it('should not throw on valid relationship inside blocks', async ()=>{
             const validRelationships = [
                 'some-collection'
             ];
             const relationshipBlock = {
+                slug: 'relationshipBlock',
                 fields: [
                     {
-                        label: 'my-relationship',
                         name: 'My Relationship',
-                        relationTo: 'some-collection',
-                        type: 'relationship'
+                        type: 'relationship',
+                        label: 'my-relationship',
+                        relationTo: 'some-collection'
                     }
-                ],
-                slug: 'relationshipBlock'
+                ]
             };
             const fields = [
                 {
+                    name: 'layout',
+                    type: 'blocks',
                     blocks: [
                         relationshipBlock
                     ],
-                    label: 'Layout Blocks',
-                    name: 'layout',
-                    type: 'blocks'
+                    label: 'Layout Blocks'
                 }
             ];
-            expect(()=>{
-                sanitizeFields({
-                    config: dummyConfig,
+            await expect(async ()=>{
+                await sanitizeFields({
+                    config,
                     fields,
                     validRelationships
                 });
             }).not.toThrow();
         });
-        it('should throw on invalid relationship', ()=>{
+        it('should throw on invalid relationship', async ()=>{
             const validRelationships = [
                 'some-collection'
             ];
             const fields = [
                 {
-                    label: 'my-relationship',
                     name: 'My Relationship',
-                    relationTo: 'not-valid',
-                    type: 'relationship'
+                    type: 'relationship',
+                    label: 'my-relationship',
+                    relationTo: 'not-valid'
                 }
             ];
-            expect(()=>{
-                sanitizeFields({
-                    config: dummyConfig,
+            await expect(async ()=>{
+                await sanitizeFields({
+                    config,
                     fields,
                     validRelationships
                 });
-            }).toThrow(InvalidFieldRelationship);
+            }).rejects.toThrow(InvalidFieldRelationship);
         });
-        it('should throw on invalid relationship - multiple', ()=>{
+        it('should throw on invalid relationship - multiple', async ()=>{
             const validRelationships = [
                 'some-collection',
                 'another-collection'
             ];
             const fields = [
                 {
-                    label: 'my-relationship',
                     name: 'My Relationship',
+                    type: 'relationship',
+                    label: 'my-relationship',
                     relationTo: [
                         'some-collection',
                         'not-valid'
-                    ],
-                    type: 'relationship'
+                    ]
                 }
             ];
-            expect(()=>{
-                sanitizeFields({
-                    config: dummyConfig,
+            await expect(async ()=>{
+                await sanitizeFields({
+                    config,
                     fields,
                     validRelationships
                 });
-            }).toThrow(InvalidFieldRelationship);
+            }).rejects.toThrow(InvalidFieldRelationship);
         });
-        it('should throw on invalid relationship inside blocks', ()=>{
+        it('should throw on invalid relationship inside blocks', async ()=>{
             const validRelationships = [
                 'some-collection'
             ];
             const relationshipBlock = {
+                slug: 'relationshipBlock',
                 fields: [
                     {
-                        label: 'my-relationship',
                         name: 'My Relationship',
-                        relationTo: 'not-valid',
-                        type: 'relationship'
+                        type: 'relationship',
+                        label: 'my-relationship',
+                        relationTo: 'not-valid'
                     }
-                ],
-                slug: 'relationshipBlock'
+                ]
             };
             const fields = [
                 {
+                    name: 'layout',
+                    type: 'blocks',
                     blocks: [
                         relationshipBlock
                     ],
-                    label: 'Layout Blocks',
-                    name: 'layout',
-                    type: 'blocks'
+                    label: 'Layout Blocks'
                 }
             ];
-            expect(()=>{
-                sanitizeFields({
-                    config: dummyConfig,
+            await expect(async ()=>{
+                await sanitizeFields({
+                    config,
                     fields,
                     validRelationships
                 });
-            }).toThrow(InvalidFieldRelationship);
+            }).rejects.toThrow(InvalidFieldRelationship);
         });
-        it('should defaultValue of checkbox to false if required and undefined', ()=>{
+        it('should defaultValue of checkbox to false if required and undefined', async ()=>{
             const fields = [
                 {
                     name: 'My Checkbox',
-                    required: true,
-                    type: 'checkbox'
+                    type: 'checkbox',
+                    required: true
                 }
             ];
-            const sanitizedField = sanitizeFields({
-                config: dummyConfig,
+            const sanitizedField = (await sanitizeFields({
+                config,
                 fields,
                 validRelationships: []
-            })[0];
+            }))[0];
             expect(sanitizedField.defaultValue).toStrictEqual(false);
         });
-        it('should return empty field array if no fields', ()=>{
-            const sanitizedFields = sanitizeFields({
-                config: dummyConfig,
+        it('should return empty field array if no fields', async ()=>{
+            const sanitizedFields = await sanitizeFields({
+                config,
                 fields: [],
                 validRelationships: []
             });