payload 3.0.0-alpha.65 → 3.0.0-alpha.66

package/dist/fields/config/sanitize.js

@@ -1,4 +1,4 @@
-import MissingEditorProp from '../../errors/MissingEditorProp.js';
+import { MissingEditorProp } from '../../errors/MissingEditorProp.js';
 import { DuplicateFieldName, InvalidFieldName, InvalidFieldRelationship, MissingFieldType } from '../../errors/index.js';
 import { formatLabels, toWords } from '../../utilities/formatLabels.js';
 import { baseBlockFields } from '../baseFields/baseBlockFields.js';
@@ -6,12 +6,10 @@ import { baseIDField } from '../baseFields/baseIDField.js';
 import { setDefaultBeforeDuplicate } from '../setDefaultBeforeDuplicate.js';
 import validations from '../validations.js';
 import { fieldAffectsData, tabHasName } from './types.js';
-export const sanitizeFields = ({ config, existingFieldNames = new Set(), fields, requireFieldLevelRichTextEditor = false, validRelationships })=>{
+export const sanitizeFields = async ({ config, existingFieldNames = new Set(), fields, requireFieldLevelRichTextEditor = false, richTextSanitizationPromises, validRelationships })=>{
     if (!fields) return [];
-    return fields.map((unsanitizedField)=>{
-        const field = {
-            ...unsanitizedField
-        };
+    for(let i = 0; i < fields.length; i++){
+        const field = fields[i];
         if (!field.type) throw new MissingFieldType(field);
         // assert that field names do not contain forbidden characters
         if (fieldAffectsData(field) && field.name.includes('.')) {
@@ -88,74 +86,87 @@ export const sanitizeFields = ({ config, existingFieldNames = new Set(), fields,
         }
         // Make sure that the richText field has an editor
         if (field.type === 'richText') {
-            if (!field.editor) {
-                if (config.editor && !requireFieldLevelRichTextEditor) {
-                    field.editor = config.editor;
-                } else {
-                    throw new MissingEditorProp(field);
+            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);
+                    }
                 }
-            }
-            // Add editor adapter hooks to field hooks
-            if (!field.hooks) field.hooks = {};
-            if (field?.editor?.hooks?.afterRead?.length) {
-                field.hooks.afterRead = field.hooks.afterRead ? field.hooks.afterRead.concat(field.editor.hooks.afterRead) : field.editor.hooks.afterRead;
-            }
-            if (field?.editor?.hooks?.beforeChange?.length) {
-                field.hooks.beforeChange = field.hooks.beforeChange ? field.hooks.beforeChange.concat(field.editor.hooks.beforeChange) : field.editor.hooks.beforeChange;
-            }
-            if (field?.editor?.hooks?.beforeValidate?.length) {
-                field.hooks.beforeValidate = field.hooks.beforeValidate ? field.hooks.beforeValidate.concat(field.editor.hooks.beforeValidate) : field.editor.hooks.beforeValidate;
-            }
-            if (field?.editor?.hooks?.beforeChange?.length) {
-                field.hooks.beforeChange = field.hooks.beforeChange ? field.hooks.beforeChange.concat(field.editor.hooks.beforeChange) : field.editor.hooks.beforeChange;
+                if (typeof field.editor === 'function') {
+                    field.editor = await field.editor({
+                        config: _config
+                    });
+                }
+                // Add editor adapter hooks to field hooks
+                if (!field.hooks) field.hooks = {};
+                const mergeHooks = (hookName)=>{
+                    if (typeof field.editor === 'function') return;
+                    if (field.editor?.hooks?.[hookName]?.length) {
+                        field.hooks[hookName] = field.hooks[hookName] ? field.hooks[hookName].concat(field.editor.hooks[hookName]) : [
+                            ...field.editor.hooks[hookName]
+                        ];
+                    }
+                };
+                mergeHooks('afterRead');
+                mergeHooks('afterChange');
+                mergeHooks('beforeChange');
+                mergeHooks('beforeValidate');
+                mergeHooks('beforeDuplicate');
+            };
+            if (richTextSanitizationPromises) {
+                richTextSanitizationPromises.push(sanitizeRichText);
+            } else {
+                await sanitizeRichText(config);
             }
         }
-        // TODO: Handle sanitization for any lexical sub-fields here as well
         if ('fields' in field && field.fields) {
-            field.fields = sanitizeFields({
+            field.fields = await sanitizeFields({
                 config,
                 existingFieldNames: fieldAffectsData(field) ? new Set() : existingFieldNames,
                 fields: field.fields,
                 requireFieldLevelRichTextEditor,
+                richTextSanitizationPromises,
                 validRelationships
             });
         }
         if (field.type === 'tabs') {
-            field.tabs = field.tabs.map((tab)=>{
-                const unsanitizedTab = {
-                    ...tab
-                };
+            for(let j = 0; j < field.tabs.length; j++){
+                const tab = field.tabs[j];
                 if (tabHasName(tab) && typeof tab.label === 'undefined') {
-                    unsanitizedTab.label = toWords(tab.name);
+                    tab.label = toWords(tab.name);
                 }
-                unsanitizedTab.fields = sanitizeFields({
+                tab.fields = await sanitizeFields({
                     config,
                     existingFieldNames: tabHasName(tab) ? new Set() : existingFieldNames,
                     fields: tab.fields,
                     requireFieldLevelRichTextEditor,
+                    richTextSanitizationPromises,
                     validRelationships
                 });
-                return unsanitizedTab;
-            });
+                field.tabs[j] = tab;
+            }
         }
         if ('blocks' in field && field.blocks) {
-            field.blocks = field.blocks.map((block)=>{
-                const unsanitizedBlock = {
-                    ...block
-                };
-                unsanitizedBlock.labels = !unsanitizedBlock.labels ? formatLabels(unsanitizedBlock.slug) : unsanitizedBlock.labels;
-                unsanitizedBlock.fields = sanitizeFields({
+            for(let j = 0; j < field.blocks.length; j++){
+                const block = field.blocks[j];
+                block.labels = !block.labels ? formatLabels(block.slug) : block.labels;
+                block.fields = await sanitizeFields({
                     config,
                     existingFieldNames: new Set(),
                     fields: block.fields,
                     requireFieldLevelRichTextEditor,
+                    richTextSanitizationPromises,
                     validRelationships
                 });
-                return unsanitizedBlock;
-            });
+                field.blocks[j] = block;
+            }
         }
-        return field;
-    });
+        fields[i] = field;
+    }
+    return fields;
 };
 
 //# sourceMappingURL=sanitize.js.map

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    // 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    // Make sure that the richText field has an editor\n    if (field.type === 'richText') {\n      if (!field.editor) {\n        if (config.editor && !requireFieldLevelRichTextEditor) {\n          field.editor = config.editor\n        } else {\n          throw new MissingEditorProp(field)\n        }\n      }\n\n      // Add editor adapter hooks to field hooks\n      if (!field.hooks) field.hooks = {}\n\n      if (field?.editor?.hooks?.afterRead?.length) {\n        field.hooks.afterRead = field.hooks.afterRead\n          ? field.hooks.afterRead.concat(field.editor.hooks.afterRead)\n          : field.editor.hooks.afterRead\n      }\n      if (field?.editor?.hooks?.beforeChange?.length) {\n        field.hooks.beforeChange = field.hooks.beforeChange\n          ? field.hooks.beforeChange.concat(field.editor.hooks.beforeChange)\n          : field.editor.hooks.beforeChange\n      }\n      if (field?.editor?.hooks?.beforeValidate?.length) {\n        field.hooks.beforeValidate = field.hooks.beforeValidate\n          ? field.hooks.beforeValidate.concat(field.editor.hooks.beforeValidate)\n          : field.editor.hooks.beforeValidate\n      }\n      if (field?.editor?.hooks?.beforeChange?.length) {\n        field.hooks.beforeChange = field.hooks.beforeChange\n          ? field.hooks.beforeChange.concat(field.editor.hooks.beforeChange)\n          : field.editor.hooks.beforeChange\n      }\n    }\n\n    // TODO: Handle sanitization for any lexical sub-fields here as well\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","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","editor","afterRead","length","beforeChange","beforeValidate","tabs","tab","unsanitizedTab","unsanitizedBlock","slug"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/fields/config/sanitize.ts"],"sourcesContent":["import type { Config, SanitizedConfig } 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 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  /**\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  requireFieldLevelRichTextEditor = false,\n  richTextSanitizationPromises,\n  validRelationships,\n}: Args): Promise<Field[]> => {\n  if (!fields) return []\n\n  for (let i = 0; i < fields.length; i++) {\n    const field = fields[i]\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    // 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    // 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)\n          }\n        }\n\n        if (typeof field.editor === 'function') {\n          field.editor = await field.editor({ config: _config })\n        }\n\n        // Add editor adapter hooks to field hooks\n        if (!field.hooks) field.hooks = {}\n\n        const mergeHooks = (hookName: keyof typeof field.editor.hooks) => {\n          if (typeof field.editor === 'function') return\n\n          if (field.editor?.hooks?.[hookName]?.length) {\n            field.hooks[hookName] = field.hooks[hookName]\n              ? field.hooks[hookName].concat(field.editor.hooks[hookName])\n              : [...field.editor.hooks[hookName]]\n          }\n        }\n\n        mergeHooks('afterRead')\n        mergeHooks('afterChange')\n        mergeHooks('beforeChange')\n        mergeHooks('beforeValidate')\n        mergeHooks('beforeDuplicate')\n      }\n      if (richTextSanitizationPromises) {\n        richTextSanitizationPromises.push(sanitizeRichText)\n      } else {\n        await sanitizeRichText(config as unknown as SanitizedConfig)\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        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          requireFieldLevelRichTextEditor,\n          richTextSanitizationPromises,\n          validRelationships,\n        })\n        field.tabs[j] = tab\n      }\n    }\n\n    if ('blocks' in field && field.blocks) {\n      for (let j = 0; j < field.blocks.length; j++) {\n        const block = field.blocks[j]\n        block.labels = !block.labels ? formatLabels(block.slug) : block.labels\n\n        block.fields = await sanitizeFields({\n          config,\n          existingFieldNames: new Set(),\n          fields: block.fields,\n          requireFieldLevelRichTextEditor,\n          richTextSanitizationPromises,\n          validRelationships,\n        })\n        field.blocks[j] = block\n      }\n    }\n\n    fields[i] = field\n  }\n\n  return fields\n}\n"],"names":["MissingEditorProp","DuplicateFieldName","InvalidFieldName","InvalidFieldRelationship","MissingFieldType","formatLabels","toWords","baseBlockFields","baseIDField","setDefaultBeforeDuplicate","validations","fieldAffectsData","tabHasName","sanitizeFields","config","existingFieldNames","Set","fields","requireFieldLevelRichTextEditor","richTextSanitizationPromises","validRelationships","i","length","field","type","name","includes","label","defaultValue","required","relationships","Array","isArray","relationTo","forEach","relationship","min","minRows","console","warn","max","maxRows","blocks","map","block","concat","push","labels","has","add","localized","localization","validate","defaultValidate","val","options","hooks","access","admin","sanitizeRichText","_config","editor","mergeHooks","hookName","j","tabs","tab","slug"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

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

@@ -1,33 +1,24 @@
-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'
             }
         ];
-        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',
@@ -35,32 +26,32 @@ describe('sanitizeFields', ()=>{
                 type: 'text'
             }
         ];
-        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',
@@ -68,17 +59,17 @@ describe('sanitizeFields', ()=>{
                     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('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,
@@ -86,16 +77,16 @@ describe('sanitizeFields', ()=>{
                         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(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 = {
                     fields: [
                         {
@@ -107,19 +98,19 @@ describe('sanitizeFields', ()=>{
                     name: 'items',
                     type: 'array'
                 };
-                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 = [
                     {
                         blocks: [
@@ -138,18 +129,18 @@ describe('sanitizeFields', ()=>{
                         type: 'blocks'
                     }
                 ];
-                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 = [
                 {
                     fields: [
@@ -162,11 +153,11 @@ describe('sanitizeFields', ()=>{
                     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,7 +166,7 @@ describe('sanitizeFields', ()=>{
                 singular: 'Item'
             });
         });
-        it('should label blocks with plural and singular', ()=>{
+        it('should label blocks with plural and singular', async ()=>{
             const fields = [
                 {
                     blocks: [
@@ -193,11 +184,11 @@ describe('sanitizeFields', ()=>{
                     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,7 +200,7 @@ describe('sanitizeFields', ()=>{
         });
     });
     describe('relationships', ()=>{
-        it('should not throw on valid relationship', ()=>{
+        it('should not throw on valid relationship', async ()=>{
             const validRelationships = [
                 'some-collection'
             ];
@@ -221,15 +212,15 @@ describe('sanitizeFields', ()=>{
                     type: 'relationship'
                 }
             ];
-            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'
@@ -245,15 +236,15 @@ describe('sanitizeFields', ()=>{
                     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'
             ];
@@ -278,15 +269,15 @@ describe('sanitizeFields', ()=>{
                     type: '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'
             ];
@@ -298,15 +289,15 @@ describe('sanitizeFields', ()=>{
                     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 - multiple', ()=>{
+        it('should throw on invalid relationship - multiple', async ()=>{
             const validRelationships = [
                 'some-collection',
                 'another-collection'
@@ -322,15 +313,15 @@ describe('sanitizeFields', ()=>{
                     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'
             ];
@@ -355,15 +346,15 @@ describe('sanitizeFields', ()=>{
                     type: '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',
@@ -371,16 +362,16 @@ describe('sanitizeFields', ()=>{
                     type: 'checkbox'
                 }
             ];
-            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: []
             });