payload 3.0.0-beta.1 → 3.0.0-beta.100

package/dist/fields/validations.d.ts

@@ -1,68 +1,72 @@
-import type { ArrayField, BlockField, CheckboxField, CodeField, DateField, EmailField, JSONField, NumberField, PointField, RadioField, RelationshipField, RelationshipValue, RichTextField, SelectField, TextField, TextareaField, UploadField, Validate } from './config/types.js';
-export declare const text: Validate<string | string[], unknown, unknown, TextField>;
-export declare const password: Validate<string, unknown, unknown, TextField>;
-export declare const email: Validate<string, unknown, unknown, EmailField>;
-export declare const textarea: Validate<string, unknown, unknown, TextareaField>;
-export declare const code: Validate<string, unknown, unknown, CodeField>;
-export declare const json: Validate<string, unknown, unknown, JSONField & {
+import type { ArrayField, BlockField, CheckboxField, CodeField, DateField, EmailField, JSONField, NumberField, PointField, RadioField, RelationshipField, RelationshipValue, RichTextField, SelectField, TextareaField, TextField, UploadField, Validate } from './config/types.js';
+export type TextFieldValidation = Validate<string, unknown, unknown, TextField>;
+export declare const text: TextFieldValidation;
+export type PasswordFieldValidation = Validate<string, unknown, unknown, TextField>;
+export declare const password: PasswordFieldValidation;
+export type ConfirmPasswordFieldValidation = Validate<string, unknown, {
+    password: string;
+}, TextField>;
+export declare const confirmPassword: ConfirmPasswordFieldValidation;
+export type EmailFieldValidation = Validate<string, unknown, {
+    username?: string;
+}, EmailField>;
+export declare const email: EmailFieldValidation;
+export type UsernameFieldValidation = Validate<string, unknown, {
+    email?: string;
+}, TextField>;
+export declare const username: UsernameFieldValidation;
+export type TextareaFieldValidation = Validate<string, unknown, unknown, TextareaField>;
+export declare const textarea: TextareaFieldValidation;
+export type CodeFieldValidation = Validate<string, unknown, unknown, CodeField>;
+export declare const code: CodeFieldValidation;
+export type JSONFieldValidation = Validate<string, unknown, unknown, {
     jsonError?: string;
-}>;
-export declare const checkbox: Validate<boolean, unknown, unknown, CheckboxField>;
-export declare const date: Validate<Date, unknown, unknown, DateField>;
-export declare const richText: Validate<object, unknown, unknown, RichTextField>;
-export declare const number: Validate<number | number[], unknown, unknown, NumberField>;
-export declare const array: Validate<unknown[], unknown, unknown, ArrayField>;
-export declare const blocks: Validate<unknown, unknown, unknown, BlockField>;
-export declare const upload: Validate<unknown, unknown, unknown, UploadField>;
-export declare const relationship: Validate<RelationshipValue, unknown, unknown, RelationshipField>;
-export declare const select: Validate<unknown, unknown, unknown, SelectField>;
-export declare const radio: Validate<unknown, unknown, unknown, RadioField>;
-export declare const point: Validate<[number | string, number | string], unknown, unknown, PointField>;
+} & JSONField>;
+export declare const json: JSONFieldValidation;
+export type CheckboxFieldValidation = Validate<boolean, unknown, unknown, CheckboxField>;
+export declare const checkbox: CheckboxFieldValidation;
+export type DateFieldValidation = Validate<Date, unknown, unknown, DateField>;
+export declare const date: DateFieldValidation;
+export type RichTextFieldValidation = Validate<object, unknown, unknown, RichTextField>;
+export declare const richText: RichTextFieldValidation;
+export type NumberFieldValidation = Validate<number | number[], unknown, unknown, NumberField>;
+export declare const number: NumberFieldValidation;
+export type ArrayFieldValidation = Validate<unknown[], unknown, unknown, ArrayField>;
+export declare const array: ArrayFieldValidation;
+export type BlockFieldValidation = Validate<unknown, unknown, unknown, BlockField>;
+export declare const blocks: BlockFieldValidation;
+export type UploadFieldValidation = Validate<unknown, unknown, unknown, UploadField>;
+export declare const upload: UploadFieldValidation;
+export type RelationshipFieldValidation = Validate<RelationshipValue, unknown, unknown, RelationshipField>;
+export declare const relationship: RelationshipFieldValidation;
+export type SelectFieldValidation = Validate<string | string[], unknown, unknown, SelectField>;
+export declare const select: SelectFieldValidation;
+export type RadioFieldValidation = Validate<unknown, unknown, unknown, RadioField>;
+export declare const radio: RadioFieldValidation;
+export type PointFieldValidation = Validate<[
+    number | string,
+    number | string
+], unknown, unknown, PointField>;
+export declare const point: PointFieldValidation;
 declare const _default: {
-    array: Validate<unknown[], unknown, unknown, ArrayField>;
-    blocks: Validate<unknown, unknown, unknown, BlockField>;
-    checkbox: Validate<boolean, unknown, unknown, CheckboxField>;
-    code: Validate<string, unknown, unknown, CodeField>;
-    date: Validate<Date, unknown, unknown, DateField>;
-    email: Validate<string, unknown, unknown, EmailField>;
-    json: Validate<string, unknown, unknown, Omit<import("./config/types.js").FieldBase, "admin"> & {
-        admin?: {
-            className?: string;
-            components?: {
-                Cell?: import("react").ComponentType<any>;
-                Field?: import("react").ComponentType<any>;
-                Filter?: import("react").ComponentType<any>;
-            };
-            condition?: import("./config/types.js").Condition<any, any>;
-            description?: import("../admin/types.js").Description;
-            disableBulkEdit?: boolean;
-            disabled?: boolean;
-            hidden?: boolean;
-            position?: "sidebar";
-            readOnly?: boolean;
-            style?: import("react").CSSProperties;
-            width?: string;
-        } & {
-            components?: {
-                Error?: import("react").ComponentType<import("../admin/types.js").ErrorProps>;
-                Label?: import("react").ComponentType<import("../admin/types.js").LabelProps>;
-            };
-            editorOptions?: import("monaco-editor").editor.IStandaloneEditorConstructionOptions;
-        };
-        type: "json";
-    } & {
-        jsonError?: string;
-    }>;
-    number: Validate<number | number[], unknown, unknown, NumberField>;
-    password: Validate<string, unknown, unknown, TextField>;
-    point: Validate<[string | number, string | number], unknown, unknown, PointField>;
-    radio: Validate<unknown, unknown, unknown, RadioField>;
-    relationship: Validate<RelationshipValue, unknown, unknown, RelationshipField>;
-    richText: Validate<object, unknown, unknown, RichTextField>;
-    select: Validate<unknown, unknown, unknown, SelectField>;
-    text: Validate<string | string[], unknown, unknown, TextField>;
-    textarea: Validate<string, unknown, unknown, TextareaField>;
-    upload: Validate<unknown, unknown, unknown, UploadField>;
+    array: ArrayFieldValidation;
+    blocks: BlockFieldValidation;
+    checkbox: CheckboxFieldValidation;
+    code: CodeFieldValidation;
+    confirmPassword: ConfirmPasswordFieldValidation;
+    date: DateFieldValidation;
+    email: EmailFieldValidation;
+    json: JSONFieldValidation;
+    number: NumberFieldValidation;
+    password: PasswordFieldValidation;
+    point: PointFieldValidation;
+    radio: RadioFieldValidation;
+    relationship: RelationshipFieldValidation;
+    richText: RichTextFieldValidation;
+    select: SelectFieldValidation;
+    text: TextFieldValidation;
+    textarea: TextareaFieldValidation;
+    upload: UploadFieldValidation;
 };
 export default _default;
 //# sourceMappingURL=validations.d.ts.map

package/dist/fields/validations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../src/fields/validations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,aAAa,EACb,SAAS,EACT,SAAS,EACT,UAAU,EACV,SAAS,EACT,WAAW,EACX,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,SAAS,EACT,aAAa,EACb,WAAW,EACX,QAAQ,EACT,MAAM,mBAAmB,CAAA;AAO1B,eAAO,MAAM,IAAI,EAAE,QAAQ,CAAC,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAkDzE,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CA8BlE,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAShE,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CA6BtE,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAS9D,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAavF,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CASvE,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAkB5D,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAOtE,CAAA;AAgCD,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAgC7E,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAKnE,CAAA;AAED,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAKlE,CAAA;AA0HD,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAqBnE,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,QAAQ,CACjC,iBAAiB,EACjB,OAAO,EACP,OAAO,EACP,iBAAiB,CA8ElB,CAAA;AAED,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAmCnE,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAYjE,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,QAAQ,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAqB5F,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAED,wBAkBC"}
+{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../src/fields/validations.ts"],"names":[],"mappings":"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"}

package/dist/fields/validations.js

@@ -1,11 +1,14 @@
-import { getIDType } from '../utilities/getIDType.js';
+import Ajv from 'ajv';
+import ObjectIdImport from 'bson-objectid';
+const ObjectId = ObjectIdImport.default || ObjectIdImport;
 import { isNumber } from '../utilities/isNumber.js';
 import { isValidID } from '../utilities/isValidID.js';
-import { fieldAffectsData } from './config/types.js';
 export const text = (value, { hasMany, maxLength: fieldMaxLength, maxRows, minLength, minRows, req: { payload: { config }, t }, required })=>{
     let maxLength;
     if (!required) {
-        if (!value) return true;
+        if (!value) {
+            return true;
+        }
     }
     if (hasMany === true) {
         const lengthValidationResult = validateArrayLength(value, {
@@ -14,10 +17,16 @@ export const text = (value, { hasMany, maxLength: fieldMaxLength, maxRows, minLe
             required,
             t
         });
-        if (typeof lengthValidationResult === 'string') return lengthValidationResult;
+        if (typeof lengthValidationResult === 'string') {
+            return lengthValidationResult;
+        }
+    }
+    if (typeof config?.defaultMaxTextLength === 'number') {
+        maxLength = config.defaultMaxTextLength;
+    }
+    if (typeof fieldMaxLength === 'number') {
+        maxLength = fieldMaxLength;
     }
-    if (typeof config?.defaultMaxTextLength === 'number') maxLength = config.defaultMaxTextLength;
-    if (typeof fieldMaxLength === 'number') maxLength = fieldMaxLength;
     const stringsToValidate = Array.isArray(value) ? value : [
         value
     ];
@@ -25,14 +34,14 @@ export const text = (value, { hasMany, maxLength: fieldMaxLength, maxRows, minLe
         const length = stringValue?.length || 0;
         if (typeof maxLength === 'number' && length > maxLength) {
             return t('validation:shorterThanMax', {
-                label: t('value'),
+                label: t('general:value'),
                 maxLength,
                 stringValue
             });
         }
         if (typeof minLength === 'number' && length < minLength) {
             return t('validation:longerThanMin', {
-                label: t('value'),
+                label: t('general:value'),
                 minLength,
                 stringValue
             });
@@ -45,10 +54,14 @@ export const text = (value, { hasMany, maxLength: fieldMaxLength, maxRows, minLe
     }
     return true;
 };
-export const password = (value, { maxLength: fieldMaxLength, minLength, req: { payload: { config }, t }, required })=>{
+export const password = (value, { maxLength: fieldMaxLength, minLength = 3, req: { payload: { config }, t }, required })=>{
     let maxLength;
-    if (typeof config?.defaultMaxTextLength === 'number') maxLength = config.defaultMaxTextLength;
-    if (typeof fieldMaxLength === 'number') maxLength = fieldMaxLength;
+    if (typeof config?.defaultMaxTextLength === 'number') {
+        maxLength = config.defaultMaxTextLength;
+    }
+    if (typeof fieldMaxLength === 'number') {
+        maxLength = fieldMaxLength;
+    }
     if (value && maxLength && value.length > maxLength) {
         return t('validation:shorterThanMax', {
             maxLength
@@ -64,16 +77,60 @@ export const password = (value, { maxLength: fieldMaxLength, minLength, req: { p
     }
     return true;
 };
-export const email = (value, { req: { t }, required })=>{
+export const confirmPassword = (value, { req: { t }, required, siblingData })=>{
+    if (required && !value) {
+        return t('validation:required');
+    }
+    if (value && value !== siblingData.password) {
+        return t('fields:passwordsDoNotMatch');
+    }
+    return true;
+};
+export const email = (value, { collectionSlug, req: { payload: { config }, t }, required, siblingData })=>{
+    if (collectionSlug) {
+        const collection = config.collections.find(({ slug })=>slug === collectionSlug);
+        if (collection.auth.loginWithUsername && !collection.auth.loginWithUsername?.requireUsername && !collection.auth.loginWithUsername?.requireEmail) {
+            if (!value && !siblingData?.username) {
+                return t('validation:required');
+            }
+        }
+    }
     if (value && !/\S[^\s@]*@\S+\.\S+/.test(value) || !value && required) {
         return t('validation:emailAddress');
     }
     return true;
 };
+export const username = (value, { collectionSlug, req: { payload: { config }, t }, required, siblingData })=>{
+    let maxLength;
+    if (collectionSlug) {
+        const collection = config.collections.find(({ slug })=>slug === collectionSlug);
+        if (collection.auth.loginWithUsername && !collection.auth.loginWithUsername?.requireUsername && !collection.auth.loginWithUsername?.requireEmail) {
+            if (!value && !siblingData?.email) {
+                return t('validation:required');
+            }
+        }
+    }
+    if (typeof config?.defaultMaxTextLength === 'number') {
+        maxLength = config.defaultMaxTextLength;
+    }
+    if (value && maxLength && value.length > maxLength) {
+        return t('validation:shorterThanMax', {
+            maxLength
+        });
+    }
+    if (value && !/^[\w.-]+$/.test(value) || !value && required) {
+        return t('validation:username');
+    }
+    return true;
+};
 export const textarea = (value, { maxLength: fieldMaxLength, minLength, req: { payload: { config }, t }, required })=>{
     let maxLength;
-    if (typeof config?.defaultMaxTextLength === 'number') maxLength = config.defaultMaxTextLength;
-    if (typeof fieldMaxLength === 'number') maxLength = fieldMaxLength;
+    if (typeof config?.defaultMaxTextLength === 'number') {
+        maxLength = config.defaultMaxTextLength;
+    }
+    if (typeof fieldMaxLength === 'number') {
+        maxLength = fieldMaxLength;
+    }
     if (value && maxLength && value.length > maxLength) {
         return t('validation:shorterThanMax', {
             maxLength
@@ -95,13 +152,57 @@ export const code = (value, { req: { t }, required })=>{
     }
     return true;
 };
-export const json = (value, { jsonError, req: { t }, required })=>{
+export const json = async (value, { jsonError, jsonSchema, req: { t }, required })=>{
+    const isNotEmpty = (value)=>{
+        if (value === undefined || value === null) {
+            return false;
+        }
+        if (Array.isArray(value) && value.length === 0) {
+            return false;
+        }
+        if (typeof value === 'object' && Object.keys(value).length === 0) {
+            return false;
+        }
+        return true;
+    };
+    const fetchSchema = ({ schema, uri })=>{
+        if (uri && schema) {
+            return schema;
+        }
+        // @ts-expect-error
+        return fetch(uri).then((response)=>{
+            if (!response.ok) {
+                throw new Error('Network response was not ok');
+            }
+            return response.json();
+        }).then((json)=>{
+            const jsonSchemaSanitizations = {
+                id: undefined,
+                $id: json.id,
+                $schema: 'http://json-schema.org/draft-07/schema#'
+            };
+            return Object.assign(json, jsonSchemaSanitizations);
+        });
+    };
     if (required && !value) {
         return t('validation:required');
     }
     if (jsonError !== undefined) {
         return t('validation:invalidInput');
     }
+    if (jsonSchema && isNotEmpty(value)) {
+        try {
+            jsonSchema.schema = await fetchSchema(jsonSchema);
+            const { schema } = jsonSchema;
+            // @ts-expect-error
+            const ajv = new Ajv();
+            if (!ajv.validate(schema, value)) {
+                return t(ajv.errorsText());
+            }
+        } catch (error) {
+            return t(error.message);
+        }
+    }
     return true;
 };
 export const checkbox = (value, { req: { t }, required })=>{
@@ -112,7 +213,7 @@ export const checkbox = (value, { req: { t }, required })=>{
 };
 export const date = (value, { req: { t }, required })=>{
     if (value && !isNaN(Date.parse(value.toString()))) {
-        /* eslint-disable-line */ return true;
+        return true;
     }
     if (value) {
         return t('validation:notValidDate', {
@@ -125,13 +226,21 @@ export const date = (value, { req: { t }, required })=>{
     return true;
 };
 export const richText = async (value, options)=>{
+    if (!options?.editor) {
+        throw new Error('richText field has no editor property.');
+    }
+    if (typeof options?.editor === 'function') {
+        throw new Error('Attempted to access unsanitized rich text editor.');
+    }
     const editor = options?.editor;
     return editor.validate(value, options);
 };
 const validateArrayLength = (value, options)=>{
     const { maxRows, minRows, required, t } = options;
     const arrayLength = Array.isArray(value) ? value.length : value || 0;
-    if (!required && arrayLength === 0) return true;
+    if (!required && arrayLength === 0) {
+        return true;
+    }
     if (minRows && arrayLength < minRows) {
         return t('validation:requiresAtLeast', {
             count: minRows,
@@ -160,18 +269,26 @@ export const number = (value, { hasMany, max, maxRows, min, minRows, req: { t },
             required,
             t
         });
-        if (typeof lengthValidationResult === 'string') return lengthValidationResult;
+        if (typeof lengthValidationResult === 'string') {
+            return lengthValidationResult;
+        }
     }
     if (!value && !isNumber(value)) {
         // if no value is present, validate based on required
-        if (required) return t('validation:required');
-        if (!required) return true;
+        if (required) {
+            return t('validation:required');
+        }
+        if (!required) {
+            return true;
+        }
     }
     const numbersToValidate = Array.isArray(value) ? value : [
         value
     ];
     for (const number of numbersToValidate){
-        if (!isNumber(number)) return t('validation:enterNumber');
+        if (!isNumber(number)) {
+            return t('validation:enterNumber');
+        }
         const numberValue = parseFloat(number);
         if (typeof max === 'number' && numberValue > max) {
             return t('validation:greaterThanMax', {
@@ -210,7 +327,7 @@ const validateFilterOptions = async (value, { id, data, filterOptions, relationT
     if (typeof filterOptions !== 'undefined' && value) {
         const options = {};
         const falseCollections = [];
-        const collections = typeof relationTo === 'string' ? [
+        const collections = !Array.isArray(relationTo) ? [
             relationTo
         ] : relationTo;
         const values = Array.isArray(value) ? value : [
@@ -230,8 +347,12 @@ const validateFilterOptions = async (value, { id, data, filterOptions, relationT
                 }
                 const valueIDs = [];
                 values.forEach((val)=>{
-                    if (typeof val === 'object' && val?.value) {
-                        valueIDs.push(val.value);
+                    if (typeof val === 'object') {
+                        if (val?.value) {
+                            valueIDs.push(val.value);
+                        } else if (ObjectId.isValid(val)) {
+                            valueIDs.push(new ObjectId(val).toHexString());
+                        }
                     }
                     if (typeof val === 'string' || typeof val === 'number') {
                         valueIDs.push(val);
@@ -247,7 +368,9 @@ const validateFilterOptions = async (value, { id, data, filterOptions, relationT
                             }
                         ]
                     };
-                    if (optionFilter && optionFilter !== true) findWhere.and.push(optionFilter);
+                    if (optionFilter && optionFilter !== true) {
+                        findWhere.and.push(optionFilter);
+                    }
                     if (optionFilter === false) {
                         falseCollections.push(collection);
                     }
@@ -279,6 +402,9 @@ const validateFilterOptions = async (value, { id, data, filterOptions, relationT
                 if (typeof val === 'string' || typeof val === 'number') {
                     requestedID = val;
                 }
+                if (typeof val === 'object' && ObjectId.isValid(val)) {
+                    requestedID = new ObjectId(val).toHexString();
+                }
             }
             if (Array.isArray(relationTo) && typeof val === 'object' && val?.relationTo) {
                 collection = val.relationTo;
@@ -287,7 +413,9 @@ const validateFilterOptions = async (value, { id, data, filterOptions, relationT
             if (falseCollections.find((slug)=>relationTo === slug)) {
                 return true;
             }
-            if (!options[collection]) return true;
+            if (!options[collection]) {
+                return true;
+            }
             return options[collection].indexOf(requestedID) === -1;
         });
         if (invalidRelationships.length > 0) {
@@ -299,22 +427,62 @@ const validateFilterOptions = async (value, { id, data, filterOptions, relationT
     }
     return true;
 };
-export const upload = (value, options)=>{
-    if (!value && options.required) {
-        return options?.req?.t('validation:required');
+export const upload = async (value, options)=>{
+    const { maxRows, minRows, relationTo, req: { payload, t }, required } = options;
+    if ((!value && typeof value !== 'number' || Array.isArray(value) && value.length === 0) && required) {
+        return t('validation:required');
+    }
+    if (Array.isArray(value) && value.length > 0) {
+        if (minRows && value.length < minRows) {
+            return t('validation:lessThanMin', {
+                label: t('general:rows'),
+                min: minRows,
+                value: value.length
+            });
+        }
+        if (maxRows && value.length > maxRows) {
+            return t('validation:greaterThanMax', {
+                label: t('general:rows'),
+                max: maxRows,
+                value: value.length
+            });
+        }
     }
     if (typeof value !== 'undefined' && value !== null) {
-        const idField = options?.req?.payload?.config?.collections?.find((collection)=>collection.slug === options.relationTo)?.fields?.find((field)=>fieldAffectsData(field) && field.name === 'id');
-        const type = getIDType(idField, options?.req?.payload?.db?.defaultIDType);
-        if (!isValidID(value, type)) {
-            return options.req?.t('validation:validUploadID');
+        const values = Array.isArray(value) ? value : [
+            value
+        ];
+        const invalidRelationships = values.filter((val)=>{
+            let collectionSlug;
+            let requestedID;
+            if (typeof relationTo === 'string') {
+                collectionSlug = relationTo;
+                // custom id
+                if (val || typeof val === 'number') {
+                    requestedID = val;
+                }
+            }
+            if (Array.isArray(relationTo) && typeof val === 'object' && val?.relationTo) {
+                collectionSlug = val.relationTo;
+                requestedID = val.value;
+            }
+            if (requestedID === null) {
+                return false;
+            }
+            const idType = payload.collections[collectionSlug]?.customIDType || payload?.db?.defaultIDType || 'text';
+            return !isValidID(requestedID, idType);
+        });
+        if (invalidRelationships.length > 0) {
+            return `This relationship field has the following invalid relationships: ${invalidRelationships.map((err, invalid)=>{
+                return `${err} ${JSON.stringify(invalid)}`;
+            }).join(', ')}`;
         }
     }
     return validateFilterOptions(value, options);
 };
 export const relationship = async (value, options)=>{
-    const { maxRows, minRows, relationTo, req: { payload, payload: { config }, t }, required } = options;
-    if ((!value || Array.isArray(value) && value.length === 0) && required) {
+    const { maxRows, minRows, relationTo, req: { payload, t }, required } = options;
+    if ((!value && typeof value !== 'number' || Array.isArray(value) && value.length === 0) && required) {
         return t('validation:required');
     }
     if (Array.isArray(value) && value.length > 0) {
@@ -343,7 +511,7 @@ export const relationship = async (value, options)=>{
             if (typeof relationTo === 'string') {
                 collectionSlug = relationTo;
                 // custom id
-                if (val) {
+                if (val || typeof val === 'number') {
                     requestedID = val;
                 }
             }
@@ -351,10 +519,11 @@ export const relationship = async (value, options)=>{
                 collectionSlug = val.relationTo;
                 requestedID = val.value;
             }
-            if (requestedID === null) return false;
-            const idField = config?.collections?.find((collection)=>collection.slug === collectionSlug)?.fields?.find((field)=>fieldAffectsData(field) && field.name === 'id');
-            const type = getIDType(idField, payload?.db?.defaultIDType);
-            return !isValidID(requestedID, type);
+            if (requestedID === null) {
+                return false;
+            }
+            const idType = payload.collections[collectionSlug]?.customIDType || payload?.db?.defaultIDType || 'text';
+            return !isValidID(requestedID, idType);
         });
         if (invalidRelationships.length > 0) {
             return `This relationship field has the following invalid relationships: ${invalidRelationships.map((err, invalid)=>{
@@ -402,6 +571,7 @@ export default {
     blocks,
     checkbox,
     code,
+    confirmPassword,
     date,
     email,
     json,