@conform-to/react 1.11.0 → 1.12.1

package/dist/future/types.d.ts

@@ -1,4 +1,4 @@
-import type { FormError, FormValue, SubmissionResult, ValidationAttributes } from '@conform-to/dom/future';
+import type { FormError, FormValue, Serialize, SubmissionResult, ValidationAttributes } from '@conform-to/dom/future';
 import type { StandardSchemaV1 } from './standard-schema';
 export type Prettify<T> = {
     [K in keyof T]: T[K];
@@ -64,10 +64,10 @@ export type UseFormDataOptions = {
      */
     acceptFiles?: boolean;
 };
-export type DefaultValue<FormShape> = FormShape extends string | number | boolean | Date | File | bigint | null | undefined ? FormShape | null | undefined : FormShape extends Array<infer Item> | null | undefined ? Array<DefaultValue<Item>> | null | undefined : FormShape extends Record<string, any> | null | undefined ? {
+export type DefaultValue<FormShape> = FormShape extends Record<string, any> ? {
     [Key in keyof FormShape]?: DefaultValue<FormShape[Key]>;
-} | null | undefined : unknown;
-export type FormState<ErrorShape> = {
+} | null | undefined : FormShape extends Array<infer Item> ? Array<DefaultValue<Item>> | null | undefined : FormShape | string | null | undefined;
+export type FormState<ErrorShape extends BaseErrorShape = DefaultErrorShape> = {
     /** Unique identifier that changes on form reset to trigger reset side effects */
     resetKey: string;
     /** Form values from client actions that will be synced to the DOM  */
@@ -83,12 +83,41 @@ export type FormState<ErrorShape> = {
     /** Mapping of array field names to their item keys for React list rendering */
     listKeys: Record<string, string[]>;
 };
-export type FormAction<ErrorShape, Intent extends UnknownIntent | null | undefined = UnknownIntent | null, Context = {}> = SubmissionResult<ErrorShape> & {
+export type FormAction<ErrorShape extends BaseErrorShape = DefaultErrorShape, Intent extends UnknownIntent | null | undefined = UnknownIntent | null, Context = {}> = SubmissionResult<ErrorShape> & {
     type: 'initialize' | 'server' | 'client';
     intent: Intent;
     ctx: Context;
 };
-export interface FormOptions<FormShape, ErrorShape = string, Value = undefined> {
+export type GlobalFormOptions = {
+    /**
+     * The name of the submit button field that indicates the submission intent.
+     *
+     * @default "__intent__"
+     */
+    intentName: string;
+    /**
+     * A custom serialization function for converting form data.
+     */
+    serialize: Serialize;
+    /**
+     * Determines when validation should run for the first time on a field.
+     *
+     * @default "onSubmit"
+     */
+    shouldValidate: 'onSubmit' | 'onBlur' | 'onInput';
+    /**
+     * Determines when validation should run again after the field has been validated once.
+     *
+     * @default Same as shouldValidate
+     */
+    shouldRevalidate?: 'onSubmit' | 'onBlur' | 'onInput';
+    /**
+     * A function that defines custom metadata properties for form fields.
+     * Useful for integrating with UI libraries or custom form components.
+     */
+    defineCustomMetadata?: CustomMetadataDefinition;
+};
+export type FormOptions<FormShape extends Record<string, any> = Record<string, any>, ErrorShape extends BaseErrorShape = string extends BaseErrorShape ? string : BaseErrorShape, Value = undefined> = {
     /** Optional form identifier. If not provided, a unique ID is automatically generated. */
     id?: string;
     /** Optional key for form state reset. When the key changes, the form resets to its initial state. */
@@ -100,23 +129,21 @@ export interface FormOptions<FormShape, ErrorShape = string, Value = undefined>
     /** HTML validation attributes for fields (required, minLength, pattern, etc.). */
     constraint?: Record<string, ValidationAttributes>;
     /**
-     * Define when conform should start validation.
-     * Support "onSubmit", "onInput", "onBlur".
+     * Determines when validation should run for the first time on a field.
+     * Overrides the global default set by FormOptionsProvider if provided.
      *
-     * @default "onSubmit"
+     * @default Inherits from FormOptionsProvider, or "onSubmit" if not configured
      */
     shouldValidate?: 'onSubmit' | 'onBlur' | 'onInput';
     /**
-     * Define when conform should revalidate again.
-     * Support "onSubmit", "onInput", "onBlur".
+     * Determines when validation should run again after the field has been validated once.
+     * Overrides the global default set by FormOptionsProvider if provided.
      *
-     * @default Same as shouldValidate, or "onSubmit" if shouldValidate is not provided.
+     * @default Inherits from FormOptionsProvider, or same as shouldValidate
      */
     shouldRevalidate?: 'onSubmit' | 'onBlur' | 'onInput';
     /** Server-side submission result for form state synchronization. */
     lastResult?: SubmissionResult<NoInfer<ErrorShape>> | null;
-    /** Custom validation handler. Can be skipped if using the schema property, or combined with schema to customize validation errors. */
-    onValidate?: ValidateHandler<ErrorShape, Value>;
     /** Error handling callback triggered when validation errors occur. By default, it focuses the first invalid field. */
     onError?: ErrorHandler<ErrorShape>;
     /** Form submission handler called when the form is submitted with no validation errors. */
@@ -125,14 +152,20 @@ export interface FormOptions<FormShape, ErrorShape = string, Value = undefined>
     onInput?: InputHandler;
     /** Blur event handler for custom focus handling logic. */
     onBlur?: BlurHandler;
-}
-export interface FormContext<ErrorShape = string> {
+} & (string extends ErrorShape ? {
+    /** Custom validation handler. Can be skipped if using the schema property, or combined with schema to customize validation errors. */
+    onValidate?: ValidateHandler<ErrorShape, Value>;
+} : {
+    /** Custom validation handler. Can be skipped if using the schema property, or combined with schema to customize validation errors. */
+    onValidate: ValidateHandler<ErrorShape, Value>;
+});
+export interface FormContext<ErrorShape extends BaseErrorShape = DefaultErrorShape> {
     /** The form's unique identifier */
     formId: string;
     /** Internal form state with validation results and field data */
     state: FormState<ErrorShape>;
     /** Initial form values */
-    defaultValue: NonNullable<DefaultValue<Record<string, any>>> | null;
+    defaultValue: Record<string, any> | null;
     /** HTML validation attributes for fields */
     constraint: Record<string, ValidationAttributes> | null;
     /** Form submission event handler */
@@ -174,11 +207,11 @@ export interface IntentDispatcher {
         /**
          * Specify the index of the item to update if the field is an array.
          */
-        index?: [FieldShape] extends [Array<any> | null | undefined] ? number : never;
+        index?: FieldShape extends Array<any> ? number : never;
         /**
          * The new value for the field or fieldset.
          */
-        value: Partial<FieldShape>;
+        value: DefaultValue<FieldShape>;
     }): void;
     /**
      * Insert a new item into an array field.
@@ -196,9 +229,7 @@ export interface IntentDispatcher {
         /**
          * The default value for the new item.
          */
-        defaultValue?: [FieldShape] extends [
-            Array<infer ItemShape> | null | undefined
-        ] ? Partial<ItemShape> : never;
+        defaultValue?: FieldShape extends Array<infer ItemShape> ? DefaultValue<ItemShape> : never;
     }): void;
     /**
      * Remove an item from an array field.
@@ -231,7 +262,7 @@ export type FormIntent<Dispatcher extends IntentDispatcher = IntentDispatcher> =
 export type ActionHandler<Signature extends (payload: any) => void = (payload: any) => void> = {
     validatePayload?(...args: UnknownArgs<Parameters<Signature>>): boolean;
     onApply?(value: Record<string, FormValue>, ...args: Parameters<Signature>): Record<string, FormValue> | null;
-    onUpdate?<ErrorShape>(state: FormState<ErrorShape>, action: FormAction<ErrorShape, {
+    onUpdate?<ErrorShape extends BaseErrorShape>(state: FormState<ErrorShape>, action: FormAction<ErrorShape, {
         type: string;
         payload: Signature extends (payload: infer Payload) => void ? Payload : undefined;
     }>): FormState<ErrorShape>;
@@ -240,27 +271,84 @@ type BaseCombine<T, K extends PropertyKey = T extends unknown ? keyof T : never>
 export type Combine<T> = {
     [K in keyof BaseCombine<T>]: BaseCombine<T>[K];
 };
-/** Field metadata object containing field state, validation attributes, and nested field access methods. */
-export type FieldMetadata<FieldShape, ErrorShape = string> = Readonly<DefaultMetadata<ErrorShape> & {
+/**
+ * Extend this interface to define the base error shape for validation.
+ *
+ * @example
+ * ```ts
+ * declare module '@conform-to/react/future' {
+ *   interface CustomTypes {
+ *     errorShape: { message: string; code: string };
+ *   }
+ * }
+ * ```
+ */
+export interface CustomTypes {
+}
+export type BaseErrorShape = CustomTypes extends {
+    errorShape: infer Shape;
+} ? Shape : unknown;
+export type DefaultErrorShape = CustomTypes extends {
+    errorShape: infer Shape;
+} ? Shape : string;
+/** Base field metadata object containing field state, validation attributes, and accessibility IDs. */
+export type BaseMetadata<FieldShape, ErrorShape extends BaseErrorShape> = ValidationAttributes & {
     /** Unique key for React list rendering (for array fields). */
     key: string | undefined;
     /** The field name path exactly as provided. */
     name: FieldName<FieldShape>;
+    /** The field's unique identifier, automatically generated as {formId}-field-{fieldName}. */
+    id: string;
+    /** Auto-generated ID for associating field descriptions via aria-describedby. */
+    descriptionId: string;
+    /** Auto-generated ID for associating field errors via aria-describedby. */
+    errorId: string;
+    /** The form's unique identifier for associating field via the `form` attribute. */
+    formId: string;
+    /** The field's default value as a string. */
+    defaultValue: string | undefined;
+    /** Default selected options for multi-select fields or checkbox group. */
+    defaultOptions: string[] | undefined;
+    /** Default checked state for checkbox/radio inputs. */
+    defaultChecked: boolean | undefined;
+    /** Whether this field has been touched (through intent.validate() or the shouldValidate option). */
+    touched: boolean;
+    /** Whether this field currently has no validation errors. */
+    valid: boolean;
+    /** @deprecated Use `.valid` instead. This was not an intentionl breaking change and would be removed in the next minor version soon  */
+    invalid: boolean;
+    /** Array of validation error messages for this field. */
+    errors: ErrorShape[] | undefined;
+    /** Object containing errors for all touched subfields. */
+    fieldErrors: Record<string, ErrorShape[]>;
+    /** Boolean value for the `aria-invalid` attribute. Indicates whether the field has validation errors for screen readers. */
+    ariaInvalid: boolean | undefined;
+    /** String value for the `aria-describedby` attribute. Contains the errorId when invalid, undefined otherwise. Merge with descriptionId manually if needed (e.g. `${metadata.descriptionId} ${metadata.ariaDescribedBy}`). */
+    ariaDescribedBy: string | undefined;
     /** Method to get nested fieldset for object fields under this field. */
-    getFieldset(): Fieldset<[
-        FieldShape
-    ] extends [Record<string, unknown> | null | undefined] ? FieldShape : unknown, ErrorShape>;
+    getFieldset<FieldsetShape = [FieldShape] extends [
+        Record<string, unknown> | null | undefined
+    ] ? FieldShape : unknown>(): Fieldset<FieldsetShape, ErrorShape>;
     /** Method to get array of fields for list/array fields under this field. */
-    getFieldList(): Array<FieldMetadata<[
-        FieldShape
-    ] extends [Array<infer ItemShape> | null | undefined] ? ItemShape : unknown, ErrorShape>>;
-}>;
+    getFieldList<FieldItemShape = [FieldShape] extends [
+        Array<infer ItemShape> | null | undefined
+    ] ? ItemShape : unknown>(): Array<FieldMetadata<FieldItemShape, ErrorShape>>;
+};
+export type SatisfyComponentProps<ElementType extends React.ElementType, CustomProps extends React.ComponentPropsWithoutRef<ElementType>> = CustomProps;
+/**
+ * Interface for extending field metadata with additional properties.
+ */
+export interface CustomMetadata<FieldShape = any, ErrorShape extends BaseErrorShape = DefaultErrorShape> {
+}
+export type CustomMetadataDefinition = <FieldShape, ErrorShape extends BaseErrorShape>(metadata: BaseMetadata<FieldShape, ErrorShape>) => keyof CustomMetadata<FieldShape, ErrorShape> extends never ? {} : CustomMetadata<any, any>;
+/** Field metadata object containing field state, validation attributes, and nested field access methods. */
+export type FieldMetadata<FieldShape, ErrorShape extends BaseErrorShape = DefaultErrorShape> = Readonly<(keyof CustomMetadata<FieldShape, ErrorShape> extends never ? {} : CustomMetadata<FieldShape, ErrorShape>) & BaseMetadata<FieldShape, ErrorShape>>;
 /** Fieldset object containing all form fields as properties with their respective field metadata. */
-export type Fieldset<FieldShape, ErrorShape = string> = {
+export type Fieldset<FieldShape, ErrorShape extends BaseErrorShape = DefaultErrorShape> = {
     [Key in keyof Combine<FieldShape>]-?: FieldMetadata<Combine<FieldShape>[Key], ErrorShape>;
 };
 /** Form-level metadata and state object containing validation status, errors, and field access methods. */
-export type FormMetadata<ErrorShape = string> = Readonly<{
+export type FormMetadata<ErrorShape extends BaseErrorShape = DefaultErrorShape> = Readonly<{
     /** Unique identifier that changes on form reset */
     key: string;
     /** The form's unique identifier. */
@@ -300,33 +388,6 @@ export type FormMetadata<ErrorShape = string> = Readonly<{
         FieldShape
     ] extends [Array<infer ItemShape> | null | undefined] ? ItemShape : unknown, ErrorShape>>;
 }>;
-/** Default field metadata object containing field state, validation attributes, and accessibility IDs. */
-export type DefaultMetadata<ErrorShape> = Readonly<ValidationAttributes & {
-    /** The field's unique identifier, automatically generated as {formId}-field-{fieldName}. */
-    id: string;
-    /** Auto-generated ID for associating field descriptions via aria-describedby. */
-    descriptionId: string;
-    /** Auto-generated ID for associating field errors via aria-describedby. */
-    errorId: string;
-    /** The form's unique identifier for associating field via the `form` attribute. */
-    formId: string;
-    /** The field's default value as a string. */
-    defaultValue: string | undefined;
-    /** Default selected options for multi-select fields or checkbox group. */
-    defaultOptions: string[] | undefined;
-    /** Default checked state for checkbox/radio inputs. */
-    defaultChecked: boolean | undefined;
-    /** Whether this field has been touched (through intent.validate() or the shouldValidate option). */
-    touched: boolean;
-    /** Whether this field currently has no validation errors. */
-    valid: boolean;
-    /** @deprecated Use `.valid` instead. This was not an intentionl breaking change and would be removed in the next minor version soon  */
-    invalid: boolean;
-    /** Array of validation error messages for this field. */
-    errors: ErrorShape[] | undefined;
-    /** Object containing errors for all touched subfields. */
-    fieldErrors: Record<string, ErrorShape[]>;
-}>;
 export type ValidateResult<ErrorShape, Value> = FormError<ErrorShape> | null | {
     error: FormError<ErrorShape> | null;
     value?: Value;
@@ -385,7 +446,7 @@ export type ErrorContext<ErrorShape> = {
 export type ErrorHandler<ErrorShape> = (ctx: ErrorContext<ErrorShape>) => void;
 export type InputHandler = (event: FormInputEvent) => void;
 export type BlurHandler = (event: FormFocusEvent) => void;
-export type SubmitContext<ErrorShape = string, Value = undefined> = {
+export type SubmitContext<ErrorShape extends BaseErrorShape = DefaultErrorShape, Value = undefined> = {
     formData: FormData;
     value: Value;
     update: (options: {
@@ -393,6 +454,6 @@ export type SubmitContext<ErrorShape = string, Value = undefined> = {
         reset?: boolean;
     }) => void;
 };
-export type SubmitHandler<ErrorShape = string, Value = undefined> = (event: React.FormEvent<HTMLFormElement>, ctx: SubmitContext<ErrorShape, Value>) => void | Promise<void>;
+export type SubmitHandler<ErrorShape extends BaseErrorShape = DefaultErrorShape, Value = undefined> = (event: React.FormEvent<HTMLFormElement>, ctx: SubmitContext<ErrorShape, Value>) => void | Promise<void>;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -3,7 +3,7 @@
   "description": "Conform view adapter for react",
   "homepage": "https://conform.guide",
   "license": "MIT",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
     "url": "https://github.com/edmundhung/conform/issues"
   },
   "dependencies": {
-    "@conform-to/dom": "1.11.0"
+    "@conform-to/dom": "1.12.1"
   },
   "devDependencies": {
     "@babel/core": "^7.17.8",