payload 4.0.0-internal.2fddfc0 → 4.0.0-internal.31ba7ee

package/dist/fields/config/types.d.ts

@@ -3,10 +3,10 @@ import type { JSONSchema4 } from 'json-schema';
 import type { CSSProperties } from 'react';
 import type React from 'react';
 import type { DeepUndefinable, MarkOptional, MarkRequired } from 'ts-essentials';
-import type { JoinFieldClientProps, JoinFieldErrorClientComponent, JoinFieldErrorServerComponent, JoinFieldLabelClientComponent, JoinFieldLabelServerComponent } from '../../admin/fields/Join.js';
-import type { FieldClientComponent, FieldServerComponent } from '../../admin/forms/Field.js';
+import type { JoinFieldClientProps, JoinFieldErrorClientProps, JoinFieldErrorServerProps, JoinFieldLabelClientProps, JoinFieldLabelServerProps } from '../../admin/fields/Join.js';
+import type { FieldClientProps, FieldServerProps } from '../../admin/forms/Field.js';
 import type { RichTextAdapter, RichTextAdapterProvider } from '../../admin/RichText.js';
-import type { ArrayFieldClientProps, ArrayFieldErrorClientComponent, ArrayFieldErrorServerComponent, ArrayFieldLabelClientComponent, ArrayFieldLabelServerComponent, BlocksFieldClientProps, BlocksFieldErrorClientComponent, BlocksFieldErrorServerComponent, BlocksFieldLabelClientComponent, BlocksFieldLabelServerComponent, CheckboxFieldClientProps, CheckboxFieldErrorClientComponent, CheckboxFieldErrorServerComponent, CheckboxFieldLabelClientComponent, CheckboxFieldLabelServerComponent, ClientTab, CodeFieldClientProps, CodeFieldErrorClientComponent, CodeFieldErrorServerComponent, CodeFieldLabelClientComponent, CodeFieldLabelServerComponent, CollapsibleFieldClientProps, CollapsibleFieldLabelClientComponent, CollapsibleFieldLabelServerComponent, ConditionalDateProps, Data, DateFieldClientProps, DateFieldErrorClientComponent, DateFieldErrorServerComponent, DateFieldLabelClientComponent, DateFieldLabelServerComponent, DefaultCellComponentProps, DefaultServerCellComponentProps, Description, EmailFieldClientProps, EmailFieldErrorClientComponent, EmailFieldErrorServerComponent, EmailFieldLabelClientComponent, EmailFieldLabelServerComponent, FieldDescriptionClientProps, FieldDescriptionServerProps, FieldDiffClientProps, FieldDiffServerProps, GroupFieldClientProps, GroupFieldLabelClientComponent, GroupFieldLabelServerComponent, HiddenFieldProps, JSONFieldClientProps, JSONFieldErrorClientComponent, JSONFieldErrorServerComponent, JSONFieldLabelClientComponent, JSONFieldLabelServerComponent, NumberFieldClientProps, NumberFieldErrorClientComponent, NumberFieldErrorServerComponent, NumberFieldLabelClientComponent, NumberFieldLabelServerComponent, PointFieldClientProps, PointFieldErrorClientComponent, PointFieldErrorServerComponent, PointFieldLabelClientComponent, PointFieldLabelServerComponent, RadioFieldClientProps, RadioFieldErrorClientComponent, RadioFieldErrorServerComponent, RadioFieldLabelClientComponent, RadioFieldLabelServerComponent, RelationshipFieldClientProps, RelationshipFieldErrorClientComponent, RelationshipFieldErrorServerComponent, RelationshipFieldLabelClientComponent, RelationshipFieldLabelServerComponent, RichTextFieldClientProps, RowFieldClientProps, RowLabelComponent, SelectFieldClientProps, SelectFieldErrorClientComponent, SelectFieldErrorServerComponent, SelectFieldLabelClientComponent, SelectFieldLabelServerComponent, StaticDescription, TabsFieldClientProps, TextareaFieldClientProps, TextareaFieldErrorClientComponent, TextareaFieldErrorServerComponent, TextareaFieldLabelClientComponent, TextareaFieldLabelServerComponent, TextFieldClientProps, TextFieldErrorClientComponent, TextFieldErrorServerComponent, TextFieldLabelClientComponent, TextFieldLabelServerComponent, UploadFieldClientProps } from '../../admin/types.js';
+import type { ArrayFieldClientProps, ArrayFieldErrorClientProps, ArrayFieldErrorServerProps, ArrayFieldLabelClientProps, ArrayFieldLabelServerProps, BlockRowLabelClientProps, BlockRowLabelServerProps, BlocksFieldClientProps, BlocksFieldErrorClientProps, BlocksFieldErrorServerProps, BlocksFieldLabelClientProps, BlocksFieldLabelServerProps, CheckboxFieldClientProps, CheckboxFieldErrorClientProps, CheckboxFieldErrorServerProps, CheckboxFieldLabelClientProps, CheckboxFieldLabelServerProps, ClientTab, CodeFieldClientProps, CodeFieldErrorClientProps, CodeFieldErrorServerProps, CodeFieldLabelClientProps, CodeFieldLabelServerProps, CollapsibleFieldClientProps, CollapsibleFieldLabelClientProps, CollapsibleFieldLabelServerProps, ConditionalDateProps, Data, DateFieldClientProps, DateFieldErrorClientProps, DateFieldErrorServerProps, DateFieldLabelClientProps, DateFieldLabelServerProps, DefaultCellComponentProps, DefaultServerCellComponentProps, Description, EmailFieldClientProps, EmailFieldErrorClientProps, EmailFieldErrorServerProps, EmailFieldLabelClientProps, EmailFieldLabelServerProps, FieldDescriptionClientProps, FieldDescriptionServerProps, FieldDiffClientProps, FieldDiffServerProps, GroupFieldClientProps, GroupFieldLabelClientProps, GroupFieldLabelServerProps, HiddenFieldProps, JSONFieldClientProps, JSONFieldErrorClientProps, JSONFieldErrorServerProps, JSONFieldLabelClientProps, JSONFieldLabelServerProps, NumberFieldClientProps, NumberFieldErrorClientProps, NumberFieldErrorServerProps, NumberFieldLabelClientProps, NumberFieldLabelServerProps, PointFieldClientProps, PointFieldErrorClientProps, PointFieldErrorServerProps, PointFieldLabelClientProps, PointFieldLabelServerProps, RadioFieldClientProps, RadioFieldErrorClientProps, RadioFieldErrorServerProps, RadioFieldLabelClientProps, RadioFieldLabelServerProps, RelationshipFieldClientProps, RelationshipFieldErrorClientProps, RelationshipFieldErrorServerProps, RelationshipFieldLabelClientProps, RelationshipFieldLabelServerProps, RichTextFieldClientProps, RowFieldClientProps, RowLabelComponent, SelectFieldClientProps, SelectFieldErrorClientProps, SelectFieldErrorServerProps, SelectFieldLabelClientProps, SelectFieldLabelServerProps, StaticDescription, TabsFieldClientProps, TextareaFieldClientProps, TextareaFieldErrorClientProps, TextareaFieldErrorServerProps, TextareaFieldLabelClientProps, TextareaFieldLabelServerProps, TextFieldClientProps, TextFieldErrorClientProps, TextFieldErrorServerProps, TextFieldLabelClientProps, TextFieldLabelServerProps, UploadFieldClientProps, UploadFieldErrorClientProps, UploadFieldErrorServerProps, UploadFieldLabelClientProps, UploadFieldLabelServerProps } from '../../admin/types.js';
 import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.js';
 import type { CustomComponent, LabelFunction, PayloadComponent, StaticLabel, Timezone, TimezonesConfig } from '../../config/types.js';
 import type { DBIdentifierName } from '../../database/types.js';
@@ -14,8 +14,11 @@ import type { SanitizedGlobalConfig } from '../../globals/config/types.js';
 import type { ArrayFieldValidation, BlocksFieldValidation, BlockSlug, CheckboxFieldValidation, CodeFieldValidation, CollectionSlug, DateFieldValidation, EmailFieldValidation, FieldCustom, JSONFieldValidation, PointFieldValidation, RadioFieldValidation, RequestContext, Sort, TextareaFieldValidation } from '../../index.js';
 import type { DocumentPreferences } from '../../preferences/types.js';
 import type { DefaultValue, JsonObject, Operation, PayloadRequest, PickPreserveOptional, Where } from '../../types/index.js';
+import type { SchemaVariant } from '../../utilities/configToJSONSchema.js';
+import type { Slugify } from '../baseFields/slug/types.js';
 import type { DisabledOptions } from '../isFieldDisabled.js';
 import type { NumberFieldManyValidation, NumberFieldSingleValidation, RelationshipFieldManyValidation, RelationshipFieldSingleValidation, RichTextFieldValidation, SelectFieldManyValidation, SelectFieldSingleValidation, TextFieldManyValidation, TextFieldSingleValidation, UploadFieldManyValidation, UploadFieldSingleValidation } from '../validations.js';
+export type BrowserAutoComplete = Extract<React.InputHTMLAttributes<HTMLInputElement>['autoComplete'], string>;
 export type FieldHookArgs<TData extends TypeWithID = any, TValue = any, TSiblingData = any> = {
     /**
      * The data of the nearest parent block. If the field is not within a block, `blockData` will be equal to `undefined`.
@@ -84,7 +87,7 @@ export type FieldHookArgs<TData extends TypeWithID = any, TValue = any, TSibling
     value?: TValue;
 };
 export type FieldHook<TData extends TypeWithID = any, TValue = any, TSiblingData = any> = (args: FieldHookArgs<TData, TValue, TSiblingData>) => Promise<TValue> | TValue;
-export type FieldAccessArgs<TData extends TypeWithID = any, TSiblingData = any> = {
+type SharedFieldAccessArgs<TData extends TypeWithID = any, TSiblingData = any> = {
     /**
      * The data of the nearest parent block. If the field is not within a block, `blockData` will be equal to `undefined`.
      */
@@ -108,6 +111,13 @@ export type FieldAccessArgs<TData extends TypeWithID = any, TSiblingData = any>
      */
     siblingData?: Partial<TSiblingData>;
 };
+export type FieldAccessArgs<TData extends TypeWithID = any, TSiblingData = any> = ({
+    collection: SanitizedCollectionConfig;
+    global?: never;
+} & SharedFieldAccessArgs<TData, TSiblingData>) | ({
+    collection?: never;
+    global: SanitizedGlobalConfig;
+} & SharedFieldAccessArgs<TData, TSiblingData>);
 export type FieldAccess<TData extends TypeWithID = any, TSiblingData = any> = (args: FieldAccessArgs<TData, TSiblingData>) => boolean | Promise<boolean>;
 export type Condition<TData extends TypeWithID = any, TSiblingData = any> = (
 /**
@@ -176,7 +186,7 @@ export type FieldAdmin = {
         Cell?: PayloadComponent<DefaultServerCellComponentProps, DefaultCellComponentProps>;
         Description?: PayloadComponent<FieldDescriptionServerProps, FieldDescriptionClientProps>;
         Diff?: PayloadComponent<FieldDiffServerProps, FieldDiffClientProps>;
-        Field?: PayloadComponent<FieldClientComponent | FieldServerComponent>;
+        Field?: PayloadComponent<FieldServerProps, FieldClientProps>;
         /**
          * The Filter component has to be a client component
          */
@@ -290,6 +300,8 @@ export interface FieldBase {
     /** Extension point to add your custom data. Server only. */
     custom?: FieldCustom;
     defaultValue?: DefaultValue;
+    /** Prevents the field's value from being copied when duplicating a document. */
+    disableDuplicate?: boolean;
     hidden?: boolean;
     hooks?: {
         afterChange?: FieldHook[];
@@ -306,9 +318,13 @@ export interface FieldBase {
      * Allows you to modify the base JSON schema that is generated for this field.
      * This JSON schema will be used to generate the TypeScript interface of this field, and to
      * validate the field's value in the MCP plugin.
+     *
+     * `variant` is `'input'` when generating the write shape (`create`/`update`) and `'output'` when
+     * generating the read shape, so a transform can differ between the two.
      */
     jsonSchema?: Array<(args: {
         jsonSchema: JSONSchema4;
+        variant: SchemaVariant;
     }) => JSONSchema4>;
     label?: false | LabelFunction | StaticLabel;
     localized?: boolean;
@@ -337,12 +353,12 @@ export interface FieldBaseClient extends Pick<FieldBase, 'hidden' | 'index' | 'j
 export type NumberField = {
     admin?: {
         /** Set this property to a string that will be used for browser autocomplete. */
-        autoComplete?: string;
+        autoComplete?: BrowserAutoComplete;
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<NumberFieldErrorClientComponent | NumberFieldErrorServerComponent>;
-            Label?: CustomComponent<NumberFieldLabelClientComponent | NumberFieldLabelServerComponent>;
+            Error?: PayloadComponent<NumberFieldErrorServerProps, NumberFieldErrorClientProps>;
+            Label?: PayloadComponent<NumberFieldLabelServerProps, NumberFieldLabelClientProps>;
         } & FieldAdmin['components'];
         /** Set this property to define a placeholder string for the field. */
         placeholder?: Record<string, string> | string;
@@ -376,12 +392,12 @@ export type NumberFieldClient = {
 } & FieldBaseClient & Pick<NumberField, 'hasMany' | 'max' | 'maxRows' | 'min' | 'minRows' | 'type'>;
 export type TextField = {
     admin?: {
-        autoComplete?: string;
+        autoComplete?: BrowserAutoComplete;
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<TextFieldErrorClientComponent | TextFieldErrorServerComponent>;
-            Label?: CustomComponent<TextFieldLabelClientComponent | TextFieldLabelServerComponent>;
+            Error?: PayloadComponent<TextFieldErrorServerProps, TextFieldErrorClientProps>;
+            Label?: PayloadComponent<TextFieldLabelServerProps, TextFieldLabelClientProps>;
         } & FieldAdmin['components'];
         placeholder?: Record<string, string> | string;
         rtl?: boolean;
@@ -411,12 +427,12 @@ export type TextFieldClient = {
 } & FieldBaseClient & Pick<TextField, 'hasMany' | 'maxLength' | 'maxRows' | 'minLength' | 'minRows' | 'type'>;
 export type EmailField = {
     admin?: {
-        autoComplete?: string;
+        autoComplete?: BrowserAutoComplete;
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<EmailFieldErrorClientComponent | EmailFieldErrorServerComponent>;
-            Label?: CustomComponent<EmailFieldLabelClientComponent | EmailFieldLabelServerComponent>;
+            Error?: PayloadComponent<EmailFieldErrorServerProps, EmailFieldErrorClientProps>;
+            Label?: PayloadComponent<EmailFieldLabelServerProps, EmailFieldLabelClientProps>;
         } & FieldAdmin['components'];
         placeholder?: Record<string, string> | string;
     } & FieldAdmin;
@@ -426,13 +442,37 @@ export type EmailField = {
 export type EmailFieldClient = {
     admin?: AdminClient & PickPreserveOptional<NonNullable<EmailField['admin']>, 'autoComplete' | 'placeholder'>;
 } & FieldBaseClient & Pick<EmailField, 'type'>;
+export type SlugField = {
+    admin?: {
+        components?: {
+            afterInput?: CustomComponent[];
+            beforeInput?: CustomComponent[];
+            Error?: PayloadComponent<TextFieldErrorServerProps, TextFieldErrorClientProps>;
+            Label?: PayloadComponent<TextFieldLabelServerProps, TextFieldLabelClientProps>;
+        } & FieldAdmin['components'];
+        placeholder?: Record<string, string> | string;
+    } & FieldAdmin;
+    /** Provide a custom slugify function. Runs on the server. */
+    slugify?: Slugify;
+    type: 'slug';
+    /**
+     * Name of the sibling field whose value the slug is generated from, e.g. `'title'`.
+     * Optional — when omitted, the slug is taken from an explicit value or falls back to a
+     * unique `<singular>-<N>`, so there is no source to derive from.
+     */
+    useAsSlug?: string;
+    validate?: TextFieldSingleValidation;
+} & Omit<FieldBase, 'validate'>;
+export type SlugFieldClient = {
+    admin?: AdminClient & PickPreserveOptional<NonNullable<SlugField['admin']>, 'placeholder'>;
+} & FieldBaseClient & Pick<SlugField, 'type' | 'useAsSlug'>;
 export type TextareaField = {
     admin?: {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<TextareaFieldErrorClientComponent | TextareaFieldErrorServerComponent>;
-            Label?: CustomComponent<TextareaFieldLabelClientComponent | TextareaFieldLabelServerComponent>;
+            Error?: PayloadComponent<TextareaFieldErrorServerProps, TextareaFieldErrorClientProps>;
+            Label?: PayloadComponent<TextareaFieldLabelServerProps, TextareaFieldLabelClientProps>;
         } & FieldAdmin['components'];
         placeholder?: Record<string, string> | string;
         rows?: number;
@@ -451,8 +491,8 @@ export type CheckboxField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<CheckboxFieldErrorClientComponent | CheckboxFieldErrorServerComponent>;
-            Label?: CustomComponent<CheckboxFieldLabelClientComponent | CheckboxFieldLabelServerComponent>;
+            Error?: PayloadComponent<CheckboxFieldErrorServerProps, CheckboxFieldErrorClientProps>;
+            Label?: PayloadComponent<CheckboxFieldLabelServerProps, CheckboxFieldLabelClientProps>;
         } & FieldAdmin['components'];
     } & FieldAdmin;
     type: 'checkbox';
@@ -499,8 +539,8 @@ export type DateField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<DateFieldErrorClientComponent | DateFieldErrorServerComponent>;
-            Label?: CustomComponent<DateFieldLabelClientComponent | DateFieldLabelServerComponent>;
+            Error?: PayloadComponent<DateFieldErrorServerProps, DateFieldErrorClientProps>;
+            Label?: PayloadComponent<DateFieldLabelServerProps, DateFieldLabelClientProps>;
         } & FieldAdmin['components'];
         date?: ConditionalDateProps;
         placeholder?: Record<string, string> | string;
@@ -525,7 +565,7 @@ export type GroupBase = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Label?: CustomComponent<GroupFieldLabelClientComponent | GroupFieldLabelServerComponent>;
+            Label?: PayloadComponent<GroupFieldLabelServerProps, GroupFieldLabelClientProps>;
         } & FieldAdmin['components'];
         hideGutter?: boolean;
     } & FieldAdmin;
@@ -545,7 +585,7 @@ export type NamedGroupField = {
 export type UnnamedGroupField = {
     interfaceName?: never;
     localized?: never;
-} & Omit<GroupBase, 'hooks' | 'name' | 'virtual'>;
+} & Omit<GroupBase, 'disableDuplicate' | 'hooks' | 'name' | 'virtual'>;
 export type GroupField = NamedGroupField | UnnamedGroupField;
 export type UnnamedGroupFieldClient = {
     admin?: AdminClient & Pick<UnnamedGroupField['admin'], 'hideGutter'>;
@@ -557,7 +597,7 @@ export type RowField = {
     admin?: Omit<FieldAdmin, 'description'>;
     fields: Field[];
     type: 'row';
-} & Omit<FieldBase, 'admin' | 'hooks' | 'label' | 'localized' | 'name' | 'validate' | 'virtual'>;
+} & Omit<FieldBase, 'admin' | 'disableDuplicate' | 'hooks' | 'label' | 'localized' | 'name' | 'validate' | 'virtual'>;
 export type RowFieldClient = {
     admin?: Omit<AdminClient, 'description'>;
     fields: ClientField[];
@@ -570,7 +610,7 @@ export type CollapsibleField = {
         components: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Label: CustomComponent<CollapsibleFieldLabelClientComponent | CollapsibleFieldLabelServerComponent>;
+            Label: PayloadComponent<CollapsibleFieldLabelServerProps, CollapsibleFieldLabelClientProps>;
         } & FieldAdmin['components'];
         initCollapsed?: boolean;
     } & FieldAdmin;
@@ -580,12 +620,12 @@ export type CollapsibleField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Label?: CustomComponent<CollapsibleFieldLabelClientComponent | CollapsibleFieldLabelServerComponent>;
+            Label?: PayloadComponent<CollapsibleFieldLabelServerProps, CollapsibleFieldLabelClientProps>;
         } & FieldAdmin['components'];
         initCollapsed?: boolean;
     } & FieldAdmin;
     label: Required<FieldBase['label']>;
-}) & Omit<FieldBase, 'hooks' | 'label' | 'localized' | 'name' | 'validate' | 'virtual'>;
+}) & Omit<FieldBase, 'disableDuplicate' | 'hooks' | 'label' | 'localized' | 'name' | 'validate' | 'virtual'>;
 export type CollapsibleFieldClient = {
     admin?: {
         initCollapsed?: boolean;
@@ -624,14 +664,14 @@ export type UnnamedTab = {
         [selectedLanguage: string]: string;
     } | LabelFunction | string;
     localized?: never;
-} & Omit<TabBase, 'hooks' | 'name' | 'virtual'>;
+} & Omit<TabBase, 'disableDuplicate' | 'hooks' | 'name' | 'virtual'>;
 export type Tab = NamedTab | UnnamedTab;
 export type TabsField = {
     admin?: Omit<FieldAdmin, 'description'>;
     type: 'tabs';
 } & {
     tabs: Tab[];
-} & Omit<FieldBase, 'admin' | 'localized' | 'name' | 'saveToJWT' | 'virtual'>;
+} & Omit<FieldBase, 'admin' | 'disableDuplicate' | 'localized' | 'name' | 'saveToJWT' | 'virtual'>;
 export type TabsFieldClient = {
     admin?: Omit<AdminClient, 'description'>;
     tabs: ClientTab[];
@@ -709,8 +749,8 @@ type UploadAdmin = {
     components?: {
         afterInput?: CustomComponent[];
         beforeInput?: CustomComponent[];
-        Error?: CustomComponent<RelationshipFieldErrorClientComponent | RelationshipFieldErrorServerComponent>;
-        Label?: CustomComponent<RelationshipFieldLabelClientComponent | RelationshipFieldLabelServerComponent>;
+        Error?: PayloadComponent<UploadFieldErrorServerProps, UploadFieldErrorClientProps>;
+        Label?: PayloadComponent<UploadFieldLabelServerProps, UploadFieldLabelClientProps>;
     } & FieldAdmin['components'];
     isSortable?: boolean;
 } & FieldAdmin;
@@ -745,8 +785,8 @@ export type CodeField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<CodeFieldErrorClientComponent | CodeFieldErrorServerComponent>;
-            Label?: CustomComponent<CodeFieldLabelClientComponent | CodeFieldLabelServerComponent>;
+            Error?: PayloadComponent<CodeFieldErrorServerProps, CodeFieldErrorClientProps>;
+            Label?: PayloadComponent<CodeFieldLabelServerProps, CodeFieldLabelClientProps>;
         } & FieldAdmin['components'];
         editorOptions?: EditorProps['options'];
         editorProps?: Partial<EditorProps>;
@@ -765,8 +805,8 @@ export type JSONField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<JSONFieldErrorClientComponent | JSONFieldErrorServerComponent>;
-            Label?: CustomComponent<JSONFieldLabelClientComponent | JSONFieldLabelServerComponent>;
+            Error?: PayloadComponent<JSONFieldErrorServerProps, JSONFieldErrorClientProps>;
+            Label?: PayloadComponent<JSONFieldLabelServerProps, JSONFieldLabelClientProps>;
         } & FieldAdmin['components'];
         editorOptions?: EditorProps['options'];
         maxHeight?: number;
@@ -787,8 +827,8 @@ export type SelectField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<SelectFieldErrorClientComponent | SelectFieldErrorServerComponent>;
-            Label?: CustomComponent<SelectFieldLabelClientComponent | SelectFieldLabelServerComponent>;
+            Error?: PayloadComponent<SelectFieldErrorServerProps, SelectFieldErrorClientProps>;
+            Label?: PayloadComponent<SelectFieldLabelServerProps, SelectFieldLabelClientProps>;
         } & FieldAdmin['components'];
         isClearable?: boolean;
         isSortable?: boolean;
@@ -811,7 +851,7 @@ export type SelectField = {
         options: Option[];
         req: PayloadRequest;
         siblingData: Data;
-    }) => Option[];
+    }) => Option[] | Promise<Option[]>;
     hasMany?: boolean;
     /**
      * Customize generated GraphQL and Typescript schema names.
@@ -861,8 +901,8 @@ type RelationshipAdmin = {
     components?: {
         afterInput?: CustomComponent[];
         beforeInput?: CustomComponent[];
-        Error?: CustomComponent<RelationshipFieldErrorClientComponent | RelationshipFieldErrorServerComponent>;
-        Label?: CustomComponent<RelationshipFieldLabelClientComponent | RelationshipFieldLabelServerComponent>;
+        Error?: PayloadComponent<RelationshipFieldErrorServerProps, RelationshipFieldErrorClientProps>;
+        Label?: PayloadComponent<RelationshipFieldLabelServerProps, RelationshipFieldLabelClientProps>;
     } & FieldAdmin['components'];
     isSortable?: boolean;
     placeholder?: LabelFunction | string;
@@ -926,8 +966,8 @@ export type ArrayField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<ArrayFieldErrorClientComponent | ArrayFieldErrorServerComponent>;
-            Label?: CustomComponent<ArrayFieldLabelClientComponent | ArrayFieldLabelServerComponent>;
+            Error?: PayloadComponent<ArrayFieldErrorServerProps, ArrayFieldErrorClientProps>;
+            Label?: PayloadComponent<ArrayFieldLabelServerProps, ArrayFieldLabelClientProps>;
             RowLabel?: RowLabelComponent;
         } & FieldAdmin['components'];
         initCollapsed?: boolean;
@@ -964,8 +1004,8 @@ export type RadioField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<RadioFieldErrorClientComponent | RadioFieldErrorServerComponent>;
-            Label?: CustomComponent<RadioFieldLabelClientComponent | RadioFieldLabelServerComponent>;
+            Error?: PayloadComponent<RadioFieldErrorServerProps, RadioFieldErrorClientProps>;
+            Label?: PayloadComponent<RadioFieldLabelServerProps, RadioFieldLabelClientProps>;
         } & FieldAdmin['components'];
         layout?: 'horizontal' | 'vertical';
     } & FieldAdmin;
@@ -1066,7 +1106,7 @@ export type Block = {
              * This will replace the entire block component, including the block header / collapsible.
              */
             Block?: PayloadComponent<any, any>;
-            Label?: PayloadComponent<any, any>;
+            Label?: PayloadComponent<BlockRowLabelServerProps, BlockRowLabelClientProps>;
         };
         /** Extension point to add your custom data. Available in server and client. */
         custom?: Record<string, any>;
@@ -1157,8 +1197,8 @@ export type BlocksField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<BlocksFieldErrorClientComponent | BlocksFieldErrorServerComponent>;
-            Label?: CustomComponent<BlocksFieldLabelClientComponent | BlocksFieldLabelServerComponent>;
+            Error?: PayloadComponent<BlocksFieldErrorServerProps, BlocksFieldErrorClientProps>;
+            Label?: PayloadComponent<BlocksFieldLabelServerProps, BlocksFieldLabelClientProps>;
         } & FieldAdmin['components'];
         initCollapsed?: boolean;
         /**
@@ -1217,8 +1257,8 @@ export type PointField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<PointFieldErrorClientComponent | PointFieldErrorServerComponent>;
-            Label?: CustomComponent<PointFieldLabelClientComponent | PointFieldLabelServerComponent>;
+            Error?: PayloadComponent<PointFieldErrorServerProps, PointFieldErrorClientProps>;
+            Label?: PayloadComponent<PointFieldLabelServerProps, PointFieldLabelClientProps>;
         } & FieldAdmin['components'];
         placeholder?: Record<string, string> | string;
         step?: number;
@@ -1243,8 +1283,8 @@ export type JoinField = {
         components?: {
             afterInput?: CustomComponent[];
             beforeInput?: CustomComponent[];
-            Error?: CustomComponent<JoinFieldErrorClientComponent | JoinFieldErrorServerComponent>;
-            Label?: CustomComponent<JoinFieldLabelClientComponent | JoinFieldLabelServerComponent>;
+            Error?: PayloadComponent<JoinFieldErrorServerProps, JoinFieldErrorClientProps>;
+            Label?: PayloadComponent<JoinFieldLabelServerProps, JoinFieldLabelClientProps>;
         } & FieldAdmin['components'];
         defaultColumns?: string[];
         disableBulkEdit?: never;
@@ -1320,18 +1360,18 @@ export type FlattenedTabAsField = {
 export type FlattenedJoinField = {
     targetField: RelationshipField | UploadField;
 } & JoinField;
-export type FlattenedField = CheckboxField | CodeField | DateField | EmailField | FlattenedArrayField | FlattenedBlocksField | FlattenedGroupField | FlattenedJoinField | FlattenedTabAsField | JSONField | NumberField | PointField | RadioField | RelationshipField | RichTextField | SelectField | TextareaField | TextField | UploadField;
-export type Field = ArrayField | BlocksField | CheckboxField | CodeField | CollapsibleField | DateField | EmailField | GroupField | JoinField | JSONField | NumberField | PointField | RadioField | RelationshipField | RichTextField | RowField | SelectField | TabsField | TextareaField | TextField | UIField | UploadField;
-export type ClientField = ArrayFieldClient | BlocksFieldClient | CheckboxFieldClient | CodeFieldClient | CollapsibleFieldClient | DateFieldClient | EmailFieldClient | GroupFieldClient | JoinFieldClient | JSONFieldClient | NumberFieldClient | PointFieldClient | RadioFieldClient | RelationshipFieldClient | RichTextFieldClient | RowFieldClient | SelectFieldClient | TabsFieldClient | TextareaFieldClient | TextFieldClient | UIFieldClient | UploadFieldClient;
+export type FlattenedField = CheckboxField | CodeField | DateField | EmailField | FlattenedArrayField | FlattenedBlocksField | FlattenedGroupField | FlattenedJoinField | FlattenedTabAsField | JSONField | NumberField | PointField | RadioField | RelationshipField | RichTextField | SelectField | SlugField | TextareaField | TextField | UploadField;
+export type Field = ArrayField | BlocksField | CheckboxField | CodeField | CollapsibleField | DateField | EmailField | GroupField | JoinField | JSONField | NumberField | PointField | RadioField | RelationshipField | RichTextField | RowField | SelectField | SlugField | TabsField | TextareaField | TextField | UIField | UploadField;
+export type ClientField = ArrayFieldClient | BlocksFieldClient | CheckboxFieldClient | CodeFieldClient | CollapsibleFieldClient | DateFieldClient | EmailFieldClient | GroupFieldClient | JoinFieldClient | JSONFieldClient | NumberFieldClient | PointFieldClient | RadioFieldClient | RelationshipFieldClient | RichTextFieldClient | RowFieldClient | SelectFieldClient | SlugFieldClient | TabsFieldClient | TextareaFieldClient | TextFieldClient | UIFieldClient | UploadFieldClient;
 export type ClientFieldProps = ArrayFieldClientProps | BlocksFieldClientProps | CheckboxFieldClientProps | CodeFieldClientProps | CollapsibleFieldClientProps | DateFieldClientProps | EmailFieldClientProps | GroupFieldClientProps | HiddenFieldProps | JoinFieldClientProps | JSONFieldClientProps | NumberFieldClientProps | PointFieldClientProps | RadioFieldClientProps | RelationshipFieldClientProps | RichTextFieldClientProps | RowFieldClientProps | SelectFieldClientProps | TabsFieldClientProps | TextareaFieldClientProps | TextFieldClientProps | UploadFieldClientProps;
 type ExtractFieldTypes<T> = T extends {
     type: infer U;
 } ? U : never;
 export type FieldTypes = ExtractFieldTypes<Field>;
-export type FieldAffectingData = ArrayField | BlocksField | CheckboxField | CodeField | DateField | EmailField | JoinField | JSONField | NamedGroupField | NumberField | PointField | RadioField | RelationshipField | RichTextField | SelectField | TabAsField | TextareaField | TextField | UploadField;
-export type FieldAffectingDataClient = ArrayFieldClient | BlocksFieldClient | CheckboxFieldClient | CodeFieldClient | DateFieldClient | EmailFieldClient | JoinFieldClient | JSONFieldClient | NamedGroupFieldClient | NumberFieldClient | PointFieldClient | RadioFieldClient | RelationshipFieldClient | RichTextFieldClient | SelectFieldClient | TabAsFieldClient | TextareaFieldClient | TextFieldClient | UploadFieldClient;
-export type NonPresentationalField = ArrayField | BlocksField | CheckboxField | CodeField | CollapsibleField | DateField | EmailField | JSONField | NamedGroupField | NumberField | PointField | RadioField | RelationshipField | RichTextField | RowField | SelectField | TabsField | TextareaField | TextField | UploadField;
-export type NonPresentationalFieldClient = ArrayFieldClient | BlocksFieldClient | CheckboxFieldClient | CodeFieldClient | CollapsibleFieldClient | DateFieldClient | EmailFieldClient | JSONFieldClient | NamedGroupFieldClient | NumberFieldClient | PointFieldClient | RadioFieldClient | RelationshipFieldClient | RichTextFieldClient | RowFieldClient | SelectFieldClient | TabsFieldClient | TextareaFieldClient | TextFieldClient | UploadFieldClient;
+export type FieldAffectingData = ArrayField | BlocksField | CheckboxField | CodeField | DateField | EmailField | JoinField | JSONField | NamedGroupField | NumberField | PointField | RadioField | RelationshipField | RichTextField | SelectField | SlugField | TabAsField | TextareaField | TextField | UploadField;
+export type FieldAffectingDataClient = ArrayFieldClient | BlocksFieldClient | CheckboxFieldClient | CodeFieldClient | DateFieldClient | EmailFieldClient | JoinFieldClient | JSONFieldClient | NamedGroupFieldClient | NumberFieldClient | PointFieldClient | RadioFieldClient | RelationshipFieldClient | RichTextFieldClient | SelectFieldClient | SlugFieldClient | TabAsFieldClient | TextareaFieldClient | TextFieldClient | UploadFieldClient;
+export type NonPresentationalField = ArrayField | BlocksField | CheckboxField | CodeField | CollapsibleField | DateField | EmailField | JSONField | NamedGroupField | NumberField | PointField | RadioField | RelationshipField | RichTextField | RowField | SelectField | SlugField | TabsField | TextareaField | TextField | UploadField;
+export type NonPresentationalFieldClient = ArrayFieldClient | BlocksFieldClient | CheckboxFieldClient | CodeFieldClient | CollapsibleFieldClient | DateFieldClient | EmailFieldClient | JSONFieldClient | NamedGroupFieldClient | NumberFieldClient | PointFieldClient | RadioFieldClient | RelationshipFieldClient | RichTextFieldClient | RowFieldClient | SelectFieldClient | SlugFieldClient | TabsFieldClient | TextareaFieldClient | TextFieldClient | UploadFieldClient;
 export type FieldWithPath = {
     path?: string;
 } & Field;