@conform-to/react 1.13.3 → 1.14.0

package/dist/future/state.js

@@ -6,12 +6,14 @@ var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.j
 var future = require('@conform-to/dom/future');
 var util = require('./util.js');
 
-function initializeState(resetKey) {
+function initializeState(options) {
+  var _options$resetKey, _options$defaultValue;
   return {
-    resetKey: resetKey !== null && resetKey !== void 0 ? resetKey : util.generateUniqueKey(),
+    resetKey: (_options$resetKey = options === null || options === void 0 ? void 0 : options.resetKey) !== null && _options$resetKey !== void 0 ? _options$resetKey : util.generateUniqueKey(),
     listKeys: {},
-    clientIntendedValue: null,
-    serverIntendedValue: null,
+    defaultValue: (_options$defaultValue = options === null || options === void 0 ? void 0 : options.defaultValue) !== null && _options$defaultValue !== void 0 ? _options$defaultValue : {},
+    targetValue: null,
+    serverValue: null,
     serverError: null,
     clientError: null,
     touchedFields: []
@@ -20,33 +22,35 @@ function initializeState(resetKey) {
 
 /**
  * Updates form state based on action type:
- * - Client actions: update intended value and client errors
- * - Server actions: update server errors and clear client errors
- * - Initialize: set initial intended value
+ * - Client actions: update target value and client errors
+ * - Server actions: update server errors and clear client errors, with optional target value
+ * - Initialize: set initial server value
  */
 function updateState(state, action) {
-  var _action$intendedValue, _action$intendedValue2, _action$intent, _action$ctx$handlers;
-  if (action.intendedValue === null) {
-    return action.ctx.reset();
+  var _action$targetValue, _action$targetValue2, _action$intent, _action$ctx$handlers;
+  if (action.reset) {
+    return action.ctx.reset(action.targetValue);
   }
-  var value = (_action$intendedValue = action.intendedValue) !== null && _action$intendedValue !== void 0 ? _action$intendedValue : action.submission.payload;
+  var value = (_action$targetValue = action.targetValue) !== null && _action$targetValue !== void 0 ? _action$targetValue : action.submission.payload;
 
-  // Apply the form error and intended value from the result first
+  // Apply the form error and target value from the result first
   state = action.type === 'client' ? util.merge(state, {
-    clientIntendedValue: (_action$intendedValue2 = action.intendedValue) !== null && _action$intendedValue2 !== void 0 ? _action$intendedValue2 : state.clientIntendedValue,
-    serverIntendedValue: action.intendedValue ? null : state.serverIntendedValue,
+    targetValue: (_action$targetValue2 = action.targetValue) !== null && _action$targetValue2 !== void 0 ? _action$targetValue2 : state.targetValue,
+    serverValue: action.targetValue ? null : state.serverValue,
     // Update client error only if the error is different from the previous one to minimize unnecessary re-renders
     clientError: typeof action.error !== 'undefined' && !future.deepEqual(state.clientError, action.error) ? action.error : state.clientError,
     // Reset server error if form value is changed
-    serverError: typeof action.error !== 'undefined' && !future.deepEqual(state.serverIntendedValue, value) ? null : state.serverError
+    serverError: typeof action.error !== 'undefined' && !future.deepEqual(state.serverValue, value) ? null : state.serverError
   }) : util.merge(state, {
     // Clear client error to avoid showing stale errors
     clientError: null,
     // Update server error if the error is defined.
     // There is no need to check if the error is different as we are updating other states as well
     serverError: typeof action.error !== 'undefined' ? action.error : state.serverError,
+    listKeys: action.type === 'server' && action.targetValue ? pruneListKeys(state.listKeys, action.targetValue) : state.listKeys,
+    targetValue: action.type === 'server' && action.targetValue ? action.targetValue : state.targetValue,
     // Keep track of the value that the serverError is based on
-    serverIntendedValue: !future.deepEqual(state.serverIntendedValue, value) ? value : state.serverIntendedValue
+    serverValue: !future.deepEqual(state.serverValue, value) ? value : state.serverValue
   });
   // Validate the whole form if no intent is provided (default submission)
   var intent = (_action$intent = action.intent) !== null && _action$intent !== void 0 ? _action$intent : {
@@ -57,6 +61,9 @@ function updateState(state, action) {
     var _handler$validatePayl, _handler$validatePayl2;
     if ((_handler$validatePayl = (_handler$validatePayl2 = handler.validatePayload) === null || _handler$validatePayl2 === void 0 ? void 0 : _handler$validatePayl2.call(handler, intent.payload)) !== null && _handler$validatePayl !== void 0 ? _handler$validatePayl : true) {
       return handler.onUpdate(state, _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, action), {}, {
+        ctx: {
+          reset: action.ctx.reset
+        },
         intent: {
           type: intent.type,
           payload: intent.payload
@@ -66,10 +73,34 @@ function updateState(state, action) {
   }
   return state;
 }
+
+/**
+ * Removes list keys where array length has changed to force regeneration.
+ * Minimizes UI state loss by only invalidating keys when necessary.
+ */
+function pruneListKeys(listKeys, targetValue) {
+  var result = listKeys;
+  for (var [name, keys] of Object.entries(listKeys)) {
+    var list = util.getArrayAtPath(targetValue, name);
+
+    // Reset list keys only if the length has changed
+    // to minimize potential UI state loss due to key changes
+    if (keys.length !== list.length) {
+      // Create a shallow copy to avoid mutating the original object
+      if (result === listKeys) {
+        result = _rollupPluginBabelHelpers.objectSpread2({}, result);
+      }
+
+      // Remove the list key to force regeneration
+      delete result[name];
+    }
+  }
+  return result;
+}
 function getDefaultValue(context, name) {
   var _ref, _context$state$server;
   var serialize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : future.serialize;
-  var value = future.getValueAtPath((_ref = (_context$state$server = context.state.serverIntendedValue) !== null && _context$state$server !== void 0 ? _context$state$server : context.state.clientIntendedValue) !== null && _ref !== void 0 ? _ref : context.defaultValue, name);
+  var value = future.getValueAtPath((_ref = (_context$state$server = context.state.serverValue) !== null && _context$state$server !== void 0 ? _context$state$server : context.state.targetValue) !== null && _ref !== void 0 ? _ref : context.state.defaultValue, name);
   var serializedValue = serialize(value);
   if (typeof serializedValue === 'string') {
     return serializedValue;
@@ -79,7 +110,7 @@ function getDefaultValue(context, name) {
 function getDefaultOptions(context, name) {
   var _ref2, _context$state$server2;
   var serialize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : future.serialize;
-  var value = future.getValueAtPath((_ref2 = (_context$state$server2 = context.state.serverIntendedValue) !== null && _context$state$server2 !== void 0 ? _context$state$server2 : context.state.clientIntendedValue) !== null && _ref2 !== void 0 ? _ref2 : context.defaultValue, name);
+  var value = future.getValueAtPath((_ref2 = (_context$state$server2 = context.state.serverValue) !== null && _context$state$server2 !== void 0 ? _context$state$server2 : context.state.targetValue) !== null && _ref2 !== void 0 ? _ref2 : context.state.defaultValue, name);
   var serializedValue = serialize(value);
   if (Array.isArray(serializedValue) && serializedValue.every(item => typeof item === 'string')) {
     return serializedValue;
@@ -92,7 +123,7 @@ function getDefaultOptions(context, name) {
 function isDefaultChecked(context, name) {
   var _ref3, _context$state$server3;
   var serialize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : future.serialize;
-  var value = future.getValueAtPath((_ref3 = (_context$state$server3 = context.state.serverIntendedValue) !== null && _context$state$server3 !== void 0 ? _context$state$server3 : context.state.clientIntendedValue) !== null && _ref3 !== void 0 ? _ref3 : context.defaultValue, name);
+  var value = future.getValueAtPath((_ref3 = (_context$state$server3 = context.state.serverValue) !== null && _context$state$server3 !== void 0 ? _context$state$server3 : context.state.targetValue) !== null && _ref3 !== void 0 ? _ref3 : context.state.defaultValue, name);
   var serializedValue = serialize(value);
   if (typeof serializedValue === 'string') {
     return serializedValue === 'on';
@@ -119,7 +150,7 @@ function getDefaultListKey(prefix, initialValue, name) {
 }
 function getListKey(context, name) {
   var _context$state$listKe, _context$state$listKe2, _ref4, _context$state$server4;
-  return (_context$state$listKe = (_context$state$listKe2 = context.state.listKeys) === null || _context$state$listKe2 === void 0 ? void 0 : _context$state$listKe2[name]) !== null && _context$state$listKe !== void 0 ? _context$state$listKe : getDefaultListKey(context.state.resetKey, (_ref4 = (_context$state$server4 = context.state.serverIntendedValue) !== null && _context$state$server4 !== void 0 ? _context$state$server4 : context.state.clientIntendedValue) !== null && _ref4 !== void 0 ? _ref4 : context.defaultValue, name);
+  return (_context$state$listKe = (_context$state$listKe2 = context.state.listKeys) === null || _context$state$listKe2 === void 0 ? void 0 : _context$state$listKe2[name]) !== null && _context$state$listKe !== void 0 ? _context$state$listKe : getDefaultListKey(context.state.resetKey, (_ref4 = (_context$state$server4 = context.state.serverValue) !== null && _context$state$server4 !== void 0 ? _context$state$server4 : context.state.targetValue) !== null && _ref4 !== void 0 ? _ref4 : context.state.defaultValue, name);
 }
 function getErrors(state, name) {
   var _state$serverError;
@@ -215,6 +246,7 @@ function getFormMetadata(context, options) {
     id: context.formId,
     errorId: "".concat(context.formId, "-form-error"),
     descriptionId: "".concat(context.formId, "-form-description"),
+    defaultValue: context.state.defaultValue,
     get errors() {
       return getErrors(context.state);
     },
@@ -403,4 +435,5 @@ exports.initializeState = initializeState;
 exports.isDefaultChecked = isDefaultChecked;
 exports.isTouched = isTouched;
 exports.isValid = isValid;
+exports.pruneListKeys = pruneListKeys;
 exports.updateState = updateState;

package/dist/future/state.mjs

@@ -2,12 +2,14 @@ import { objectSpread2 as _objectSpread2 } from '../_virtual/_rollupPluginBabelH
 import { getPathSegments, getRelativePath, appendPathSegment, deepEqual, getValueAtPath, formatPathSegments, serialize } from '@conform-to/dom/future';
 import { generateUniqueKey, merge, getArrayAtPath } from './util.mjs';
 
-function initializeState(resetKey) {
+function initializeState(options) {
+  var _options$resetKey, _options$defaultValue;
   return {
-    resetKey: resetKey !== null && resetKey !== void 0 ? resetKey : generateUniqueKey(),
+    resetKey: (_options$resetKey = options === null || options === void 0 ? void 0 : options.resetKey) !== null && _options$resetKey !== void 0 ? _options$resetKey : generateUniqueKey(),
     listKeys: {},
-    clientIntendedValue: null,
-    serverIntendedValue: null,
+    defaultValue: (_options$defaultValue = options === null || options === void 0 ? void 0 : options.defaultValue) !== null && _options$defaultValue !== void 0 ? _options$defaultValue : {},
+    targetValue: null,
+    serverValue: null,
     serverError: null,
     clientError: null,
     touchedFields: []
@@ -16,33 +18,35 @@ function initializeState(resetKey) {
 
 /**
  * Updates form state based on action type:
- * - Client actions: update intended value and client errors
- * - Server actions: update server errors and clear client errors
- * - Initialize: set initial intended value
+ * - Client actions: update target value and client errors
+ * - Server actions: update server errors and clear client errors, with optional target value
+ * - Initialize: set initial server value
  */
 function updateState(state, action) {
-  var _action$intendedValue, _action$intendedValue2, _action$intent, _action$ctx$handlers;
-  if (action.intendedValue === null) {
-    return action.ctx.reset();
+  var _action$targetValue, _action$targetValue2, _action$intent, _action$ctx$handlers;
+  if (action.reset) {
+    return action.ctx.reset(action.targetValue);
   }
-  var value = (_action$intendedValue = action.intendedValue) !== null && _action$intendedValue !== void 0 ? _action$intendedValue : action.submission.payload;
+  var value = (_action$targetValue = action.targetValue) !== null && _action$targetValue !== void 0 ? _action$targetValue : action.submission.payload;
 
-  // Apply the form error and intended value from the result first
+  // Apply the form error and target value from the result first
   state = action.type === 'client' ? merge(state, {
-    clientIntendedValue: (_action$intendedValue2 = action.intendedValue) !== null && _action$intendedValue2 !== void 0 ? _action$intendedValue2 : state.clientIntendedValue,
-    serverIntendedValue: action.intendedValue ? null : state.serverIntendedValue,
+    targetValue: (_action$targetValue2 = action.targetValue) !== null && _action$targetValue2 !== void 0 ? _action$targetValue2 : state.targetValue,
+    serverValue: action.targetValue ? null : state.serverValue,
     // Update client error only if the error is different from the previous one to minimize unnecessary re-renders
     clientError: typeof action.error !== 'undefined' && !deepEqual(state.clientError, action.error) ? action.error : state.clientError,
     // Reset server error if form value is changed
-    serverError: typeof action.error !== 'undefined' && !deepEqual(state.serverIntendedValue, value) ? null : state.serverError
+    serverError: typeof action.error !== 'undefined' && !deepEqual(state.serverValue, value) ? null : state.serverError
   }) : merge(state, {
     // Clear client error to avoid showing stale errors
     clientError: null,
     // Update server error if the error is defined.
     // There is no need to check if the error is different as we are updating other states as well
     serverError: typeof action.error !== 'undefined' ? action.error : state.serverError,
+    listKeys: action.type === 'server' && action.targetValue ? pruneListKeys(state.listKeys, action.targetValue) : state.listKeys,
+    targetValue: action.type === 'server' && action.targetValue ? action.targetValue : state.targetValue,
     // Keep track of the value that the serverError is based on
-    serverIntendedValue: !deepEqual(state.serverIntendedValue, value) ? value : state.serverIntendedValue
+    serverValue: !deepEqual(state.serverValue, value) ? value : state.serverValue
   });
   // Validate the whole form if no intent is provided (default submission)
   var intent = (_action$intent = action.intent) !== null && _action$intent !== void 0 ? _action$intent : {
@@ -53,6 +57,9 @@ function updateState(state, action) {
     var _handler$validatePayl, _handler$validatePayl2;
     if ((_handler$validatePayl = (_handler$validatePayl2 = handler.validatePayload) === null || _handler$validatePayl2 === void 0 ? void 0 : _handler$validatePayl2.call(handler, intent.payload)) !== null && _handler$validatePayl !== void 0 ? _handler$validatePayl : true) {
       return handler.onUpdate(state, _objectSpread2(_objectSpread2({}, action), {}, {
+        ctx: {
+          reset: action.ctx.reset
+        },
         intent: {
           type: intent.type,
           payload: intent.payload
@@ -62,10 +69,34 @@ function updateState(state, action) {
   }
   return state;
 }
+
+/**
+ * Removes list keys where array length has changed to force regeneration.
+ * Minimizes UI state loss by only invalidating keys when necessary.
+ */
+function pruneListKeys(listKeys, targetValue) {
+  var result = listKeys;
+  for (var [name, keys] of Object.entries(listKeys)) {
+    var list = getArrayAtPath(targetValue, name);
+
+    // Reset list keys only if the length has changed
+    // to minimize potential UI state loss due to key changes
+    if (keys.length !== list.length) {
+      // Create a shallow copy to avoid mutating the original object
+      if (result === listKeys) {
+        result = _objectSpread2({}, result);
+      }
+
+      // Remove the list key to force regeneration
+      delete result[name];
+    }
+  }
+  return result;
+}
 function getDefaultValue(context, name) {
   var _ref, _context$state$server;
   var serialize$1 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : serialize;
-  var value = getValueAtPath((_ref = (_context$state$server = context.state.serverIntendedValue) !== null && _context$state$server !== void 0 ? _context$state$server : context.state.clientIntendedValue) !== null && _ref !== void 0 ? _ref : context.defaultValue, name);
+  var value = getValueAtPath((_ref = (_context$state$server = context.state.serverValue) !== null && _context$state$server !== void 0 ? _context$state$server : context.state.targetValue) !== null && _ref !== void 0 ? _ref : context.state.defaultValue, name);
   var serializedValue = serialize$1(value);
   if (typeof serializedValue === 'string') {
     return serializedValue;
@@ -75,7 +106,7 @@ function getDefaultValue(context, name) {
 function getDefaultOptions(context, name) {
   var _ref2, _context$state$server2;
   var serialize$1 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : serialize;
-  var value = getValueAtPath((_ref2 = (_context$state$server2 = context.state.serverIntendedValue) !== null && _context$state$server2 !== void 0 ? _context$state$server2 : context.state.clientIntendedValue) !== null && _ref2 !== void 0 ? _ref2 : context.defaultValue, name);
+  var value = getValueAtPath((_ref2 = (_context$state$server2 = context.state.serverValue) !== null && _context$state$server2 !== void 0 ? _context$state$server2 : context.state.targetValue) !== null && _ref2 !== void 0 ? _ref2 : context.state.defaultValue, name);
   var serializedValue = serialize$1(value);
   if (Array.isArray(serializedValue) && serializedValue.every(item => typeof item === 'string')) {
     return serializedValue;
@@ -88,7 +119,7 @@ function getDefaultOptions(context, name) {
 function isDefaultChecked(context, name) {
   var _ref3, _context$state$server3;
   var serialize$1 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : serialize;
-  var value = getValueAtPath((_ref3 = (_context$state$server3 = context.state.serverIntendedValue) !== null && _context$state$server3 !== void 0 ? _context$state$server3 : context.state.clientIntendedValue) !== null && _ref3 !== void 0 ? _ref3 : context.defaultValue, name);
+  var value = getValueAtPath((_ref3 = (_context$state$server3 = context.state.serverValue) !== null && _context$state$server3 !== void 0 ? _context$state$server3 : context.state.targetValue) !== null && _ref3 !== void 0 ? _ref3 : context.state.defaultValue, name);
   var serializedValue = serialize$1(value);
   if (typeof serializedValue === 'string') {
     return serializedValue === 'on';
@@ -115,7 +146,7 @@ function getDefaultListKey(prefix, initialValue, name) {
 }
 function getListKey(context, name) {
   var _context$state$listKe, _context$state$listKe2, _ref4, _context$state$server4;
-  return (_context$state$listKe = (_context$state$listKe2 = context.state.listKeys) === null || _context$state$listKe2 === void 0 ? void 0 : _context$state$listKe2[name]) !== null && _context$state$listKe !== void 0 ? _context$state$listKe : getDefaultListKey(context.state.resetKey, (_ref4 = (_context$state$server4 = context.state.serverIntendedValue) !== null && _context$state$server4 !== void 0 ? _context$state$server4 : context.state.clientIntendedValue) !== null && _ref4 !== void 0 ? _ref4 : context.defaultValue, name);
+  return (_context$state$listKe = (_context$state$listKe2 = context.state.listKeys) === null || _context$state$listKe2 === void 0 ? void 0 : _context$state$listKe2[name]) !== null && _context$state$listKe !== void 0 ? _context$state$listKe : getDefaultListKey(context.state.resetKey, (_ref4 = (_context$state$server4 = context.state.serverValue) !== null && _context$state$server4 !== void 0 ? _context$state$server4 : context.state.targetValue) !== null && _ref4 !== void 0 ? _ref4 : context.state.defaultValue, name);
 }
 function getErrors(state, name) {
   var _state$serverError;
@@ -211,6 +242,7 @@ function getFormMetadata(context, options) {
     id: context.formId,
     errorId: "".concat(context.formId, "-form-error"),
     descriptionId: "".concat(context.formId, "-form-description"),
+    defaultValue: context.state.defaultValue,
     get errors() {
       return getErrors(context.state);
     },
@@ -384,4 +416,4 @@ function getFieldList(context, options) {
   });
 }
 
-export { getConstraint, getDefaultListKey, getDefaultOptions, getDefaultValue, getErrors, getField, getFieldErrors, getFieldList, getFieldset, getFormMetadata, getListKey, initializeState, isDefaultChecked, isTouched, isValid, updateState };
+export { getConstraint, getDefaultListKey, getDefaultOptions, getDefaultValue, getErrors, getField, getFieldErrors, getFieldList, getFieldset, getFormMetadata, getListKey, initializeState, isDefaultChecked, isTouched, isValid, pruneListKeys, updateState };

package/dist/future/types.d.ts

@@ -6,10 +6,10 @@ export type Prettify<T> = {
 /** Reference to a form element. Can be either a React ref object or a form ID string. */
 export type FormRef = React.RefObject<HTMLFormElement | HTMLFieldSetElement | HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement | HTMLButtonElement | null> | string;
 export type InputSnapshot = {
-    value?: string;
-    options?: string[];
-    checked?: boolean;
-    files?: File[];
+    value?: string | undefined;
+    options?: string[] | undefined;
+    checked?: boolean | undefined;
+    files?: File[] | undefined;
 };
 export type Control = {
     /**
@@ -75,10 +75,12 @@ export type DefaultValue<Shape> = Shape extends Record<string, any> ? {
 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  */
-    clientIntendedValue: Record<string, unknown> | null;
+    /** Initial form values */
+    defaultValue: Record<string, unknown>;
+    /** Form values that will be synced to the DOM  */
+    targetValue: Record<string, unknown> | null;
     /** Form values from server actions, or submitted values when no server intent exists */
-    serverIntendedValue: Record<string, unknown> | null;
+    serverValue: Record<string, unknown> | null;
     /** Validation errors from server-side processing */
     serverError: FormError<ErrorShape> | null;
     /** Validation errors from client-side validation */
@@ -122,55 +124,58 @@ export type GlobalFormOptions = {
      */
     defineCustomMetadata?: CustomMetadataDefinition;
 };
-export type FormOptions<FormShape extends Record<string, any> = Record<string, any>, ErrorShape extends BaseErrorShape = string extends BaseErrorShape ? string : BaseErrorShape, Value = undefined> = {
+export type NonPartial<T> = {
+    [K in keyof Required<T>]: T[K];
+};
+export type RequireKey<T, K extends keyof T> = Prettify<T & Pick<NonPartial<T>, K>>;
+export type RequireOneOf<T, K extends keyof T> = Prettify<{
+    [K in keyof T]-?: RequireKey<T, K>;
+}[K]>;
+export type BaseSchemaType = StandardSchemaV1<any, any>;
+export type InferInput<Schema> = Schema extends StandardSchemaV1<infer input, any> ? input : unknown;
+export type InferOutput<Schema> = Schema extends StandardSchemaV1<any, infer output> ? output : undefined;
+export type BaseFormOptions<FormShape extends Record<string, any> = Record<string, any>, ErrorShape extends BaseErrorShape = string extends BaseErrorShape ? string : BaseErrorShape, Value = undefined, Schema = undefined> = {
     /** Optional form identifier. If not provided, a unique ID is automatically generated. */
-    id?: string;
+    id?: string | undefined;
     /** Optional key for form state reset. When the key changes, the form resets to its initial state. */
-    key?: string;
-    /** Optional standard schema for validation (e.g., Zod, Valibot, Yup). Removes the need for manual onValidate setup. */
-    schema?: StandardSchemaV1<FormShape, Value>;
+    key?: string | undefined;
+    /** Server-side submission result for form state synchronization. */
+    lastResult?: SubmissionResult<ErrorShape> | null | undefined;
+    /** Form submission handler called when the form is submitted with no validation errors. */
+    onSubmit?: SubmitHandler<FormShape, NoInfer<ErrorShape>, NoInfer<Value>> | undefined;
     /** Initial form values. Can be a partial object matching your form structure. */
-    defaultValue?: NoInfer<DefaultValue<FormShape>>;
+    defaultValue?: DefaultValue<FormShape> | undefined;
     /** HTML validation attributes for fields (required, minLength, pattern, etc.). */
-    constraint?: Record<string, ValidationAttributes>;
+    constraint?: Record<string, ValidationAttributes> | undefined;
     /**
      * Determines when validation should run for the first time on a field.
      * Overrides the global default set by FormOptionsProvider if provided.
      *
      * @default Inherits from FormOptionsProvider, or "onSubmit" if not configured
      */
-    shouldValidate?: 'onSubmit' | 'onBlur' | 'onInput';
+    shouldValidate?: 'onSubmit' | 'onBlur' | 'onInput' | undefined;
     /**
      * Determines when validation should run again after the field has been validated once.
      * Overrides the global default set by FormOptionsProvider if 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;
+    shouldRevalidate?: 'onSubmit' | 'onBlur' | 'onInput' | undefined;
     /** 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. */
-    onSubmit?: SubmitHandler<NoInfer<ErrorShape>, NoInfer<Value>>;
+    onError?: ErrorHandler<NoInfer<ErrorShape>> | undefined;
     /** Input event handler for custom input event logic. */
-    onInput?: InputHandler;
+    onInput?: InputHandler | undefined;
     /** Blur event handler for custom focus handling logic. */
-    onBlur?: BlurHandler;
-} & (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>;
-} : {
+    onBlur?: BlurHandler | undefined;
     /** Custom validation handler. Can be skipped if using the schema property, or combined with schema to customize validation errors. */
-    onValidate: ValidateHandler<ErrorShape, Value>;
-});
+    onValidate?: ValidateHandler<ErrorShape, Value, InferOutput<Schema>> | undefined;
+};
+export type FormOptions<FormShape extends Record<string, any> = Record<string, any>, ErrorShape extends BaseErrorShape = string extends BaseErrorShape ? string : BaseErrorShape, Value = undefined, Schema = undefined, RequiredKeys extends keyof BaseFormOptions<FormShape, ErrorShape, Value, Schema> = never> = RequireOneOf<RequireKey<BaseFormOptions<FormShape, ErrorShape, Value, Schema>, RequiredKeys>, 'onSubmit' | 'lastResult'>;
 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: Record<string, any> | null;
     /** HTML validation attributes for fields */
     constraint: Record<string, ValidationAttributes> | null;
     /** Form submission event handler */
@@ -231,11 +236,25 @@ export interface IntentDispatcher<FormShape extends Record<string, any> = Record
         /**
          * Specify the index of the item to update if the field is an array.
          */
-        index?: FieldShape extends Array<any> ? number : unknown extends FieldShape ? number : never;
+        index?: undefined;
         /**
          * The new value for the field or fieldset.
          */
         value: DefaultValue<FieldShape>;
+    } | {
+        /**
+         * The name of the field. If you provide a fieldset name, it will update all fields within that fieldset.
+         */
+        name: FieldName<FieldShape>;
+        /**
+         * Specify the index of the item to update if the field is an array.
+         */
+        index: number;
+        /**
+         * The new value for the field or fieldset.
+         * When index is specified, this should be the item type, not the array type.
+         */
+        value: unknown extends FieldShape ? any : FieldShape extends Array<infer ItemShape> ? ItemShape : any;
     }): void;
     /**
      * Insert a new item into an array field.
@@ -285,10 +304,12 @@ export type FormIntent<Dispatcher extends IntentDispatcher = IntentDispatcher> =
 }[keyof Dispatcher];
 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;
+    onApply?(value: Record<string, FormValue>, ...args: Parameters<Signature>): Record<string, FormValue> | undefined;
     onUpdate?<ErrorShape extends BaseErrorShape>(state: FormState<ErrorShape>, action: FormAction<ErrorShape, {
         type: string;
         payload: Signature extends (payload: infer Payload) => void ? Payload : undefined;
+    }, {
+        reset: (defaultValue?: Record<string, unknown> | null) => FormState<ErrorShape>;
     }>): FormState<ErrorShape>;
 };
 type BaseCombine<T, K extends PropertyKey = T extends unknown ? keyof T : never> = T extends unknown ? T & Partial<Record<Exclude<K, keyof T>, never>> : never;
@@ -366,9 +387,7 @@ export type BaseMetadata<FieldShape, ErrorShape extends BaseErrorShape> = Valida
     /** 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<FieldsetShape = [FieldShape] extends [
-        Record<string, unknown> | null | undefined
-    ] ? FieldShape : unknown>(): Fieldset<FieldsetShape, ErrorShape>;
+    getFieldset<FieldsetShape = keyof NonNullable<FieldShape> extends never ? unknown : FieldShape>(): Fieldset<FieldsetShape, ErrorShape>;
     /** Method to get array of fields for list/array fields under this field. */
     getFieldList<FieldItemShape = [FieldShape] extends [
         Array<infer ItemShape> | null | undefined
@@ -407,6 +426,8 @@ export type FormMetadata<ErrorShape extends BaseErrorShape = DefaultErrorShape>
     errors: ErrorShape[] | undefined;
     /** Object containing errors for all touched fields. */
     fieldErrors: Record<string, ErrorShape[]>;
+    /** The form's initial default values. */
+    defaultValue: Record<string, unknown>;
     /** Form props object for spreading onto the <form> element. */
     props: Readonly<{
         id: string;
@@ -420,9 +441,7 @@ export type FormMetadata<ErrorShape extends BaseErrorShape = DefaultErrorShape>
     /** Method to get metadata for a specific field by name. */
     getField<FieldShape>(name: FieldName<FieldShape>): FieldMetadata<FieldShape, ErrorShape>;
     /** Method to get a fieldset object for nested object fields. */
-    getFieldset<FieldShape>(name?: FieldName<FieldShape>): Fieldset<[
-        FieldShape
-    ] extends [Record<string, unknown> | null | undefined] ? FieldShape : unknown, ErrorShape>;
+    getFieldset<FieldShape>(name?: FieldName<FieldShape>): Fieldset<keyof NonNullable<FieldShape> extends never ? unknown : FieldShape, ErrorShape>;
     /** Method to get an array of field objects for array fields. */
     getFieldList<FieldShape>(name: FieldName<FieldShape>): Array<FieldMetadata<[
         FieldShape
@@ -432,7 +451,7 @@ export type ValidateResult<ErrorShape, Value> = FormError<ErrorShape> | null | {
     error: FormError<ErrorShape> | null;
     value?: Value;
 };
-export type ValidateContext<Value> = {
+export type ValidateContext<SchemaValue> = {
     /**
      * The submitted values mapped by field name.
      * Supports nested names like `user.email` and indexed names like `items[0].id`.
@@ -463,9 +482,9 @@ export type ValidateContext<Value> = {
      * The validated value from schema validation. Only defined when a schema is provided
      * and the validation succeeds. Undefined if no schema is provided or validation fails.
      */
-    schemaValue: Value | undefined;
+    schemaValue: SchemaValue;
 };
-export type ValidateHandler<ErrorShape, Value> = (ctx: ValidateContext<Value>) => ValidateResult<ErrorShape, Value> | Promise<ValidateResult<ErrorShape, Value>> | [
+export type ValidateHandler<ErrorShape, Value, SchemaValue = undefined> = (ctx: ValidateContext<SchemaValue>) => ValidateResult<ErrorShape, Value> | Promise<ValidateResult<ErrorShape, Value>> | [
     ValidateResult<ErrorShape, Value> | undefined,
     Promise<ValidateResult<ErrorShape, Value>> | undefined
 ] | undefined;
@@ -486,14 +505,15 @@ 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 extends BaseErrorShape = DefaultErrorShape, Value = undefined> = {
+export type SubmitContext<FormShape extends Record<string, any> = Record<string, any>, ErrorShape extends BaseErrorShape = DefaultErrorShape, Value = undefined> = {
     formData: FormData;
     value: Value;
     update: (options: {
-        error?: Partial<FormError<ErrorShape>> | null;
-        reset?: boolean;
+        error?: Partial<FormError<ErrorShape>> | null | undefined;
+        value?: FormShape | null | undefined;
+        reset?: boolean | undefined;
     }) => void;
 };
-export type SubmitHandler<ErrorShape extends BaseErrorShape = DefaultErrorShape, Value = undefined> = (event: React.FormEvent<HTMLFormElement>, ctx: SubmitContext<ErrorShape, Value>) => void | Promise<void>;
+export type SubmitHandler<FormShape extends Record<string, any> = Record<string, any>, ErrorShape extends BaseErrorShape = DefaultErrorShape, Value = undefined> = (event: React.FormEvent<HTMLFormElement>, ctx: SubmitContext<FormShape, 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.13.3",
+  "version": "1.14.0",
   "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.13.3"
+    "@conform-to/dom": "1.14.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.8",