@conform-to/react 1.17.1 → 1.19.0

package/dist/future/index.d.ts

@@ -1,8 +1,8 @@
 export type { FieldName, FormError, FormValue, Submission, SubmissionResult, } from '@conform-to/dom/future';
 export { getFieldValue, parseSubmission, report, isDirty, } from '@conform-to/dom/future';
-export type { Control, DefaultValue, BaseMetadata, BaseFieldMetadata, CustomMetadata, CustomMetadataDefinition, BaseErrorShape, CustomTypes, CustomSchemaTypes, FormsConfig, FormContext, FormMetadata, FormOptions, FormRef, FieldMetadata, Fieldset, IntentDispatcher, InferBaseErrorShape, InferCustomFormMetadata, InferCustomFieldMetadata, } from './types';
-export { configureForms } from './forms';
-export { PreserveBoundary, FormProvider, FormOptionsProvider, useControl, useField, useForm, useFormData, useFormMetadata, useIntent, } from './hooks';
+export type { Control, ControlOptions, BaseControlProps, DefaultValue, BaseFieldMetadata, CustomSchemaTypes, FormsConfig, FormContext, FormMetadata, FormOptions, FormRef, FieldMetadata, Fieldset, IntentDispatcher, InferBaseErrorShape, InferCustomFormMetadata, InferCustomFieldMetadata, } from './types';
+export { configureForms, FormProvider, useForm, useFormMetadata, useField, useIntent, } from './forms';
+export { BaseControl, PreserveBoundary, useControl, useFormData, } from './hooks';
 export { shape } from './util';
 export { memoize } from './memoize';
 //# sourceMappingURL=index.d.ts.map

package/dist/future/index.js

@@ -26,15 +26,15 @@ Object.defineProperty(exports, 'report', {
 	enumerable: true,
 	get: function () { return future.report; }
 });
+exports.FormProvider = forms.FormProvider;
 exports.configureForms = forms.configureForms;
-exports.FormOptionsProvider = hooks.FormOptionsProvider;
-exports.FormProvider = hooks.FormProvider;
+exports.useField = forms.useField;
+exports.useForm = forms.useForm;
+exports.useFormMetadata = forms.useFormMetadata;
+exports.useIntent = forms.useIntent;
+exports.BaseControl = hooks.BaseControl;
 exports.PreserveBoundary = hooks.PreserveBoundary;
 exports.useControl = hooks.useControl;
-exports.useField = hooks.useField;
-exports.useForm = hooks.useForm;
 exports.useFormData = hooks.useFormData;
-exports.useFormMetadata = hooks.useFormMetadata;
-exports.useIntent = hooks.useIntent;
 exports.shape = util.shape;
 exports.memoize = memoize.memoize;

package/dist/future/index.mjs

@@ -1,5 +1,5 @@
 export { getFieldValue, isDirty, parseSubmission, report } from '@conform-to/dom/future';
-export { configureForms } from './forms.mjs';
-export { FormOptionsProvider, FormProvider, PreserveBoundary, useControl, useField, useForm, useFormData, useFormMetadata, useIntent } from './hooks.mjs';
+export { FormProvider, configureForms, useField, useForm, useFormMetadata, useIntent } from './forms.mjs';
+export { BaseControl, PreserveBoundary, useControl, useFormData } from './hooks.mjs';
 export { shape } from './util.mjs';
 export { memoize } from './memoize.mjs';

package/dist/future/intent.js

@@ -92,7 +92,7 @@ function updateListKeys() {
   var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var keyToBeRemoved = arguments.length > 1 ? arguments[1] : undefined;
   var updateKey = arguments.length > 2 ? arguments[2] : undefined;
-  var basePath = future.getPathSegments(keyToBeRemoved);
+  var basePath = future.parsePath(keyToBeRemoved);
   return util.transformKeys(keys, field => {
     var _updateKey;
     return future.getRelativePath(field, basePath) !== null ? null : (_updateKey = updateKey === null || updateKey === void 0 ? void 0 : updateKey(field)) !== null && _updateKey !== void 0 ? _updateKey : field;
@@ -135,7 +135,7 @@ var intentHandlers = {
         error
       } = _ref;
       var name = (_intent$payload = intent.payload) !== null && _intent$payload !== void 0 ? _intent$payload : '';
-      var basePath = future.getPathSegments(name);
+      var basePath = future.parsePath(name);
       var allFields = error ?
       // Consider fields / fieldset with errors as touched too
       submission.fields.concat(Object.keys(error.fieldErrors)) : submission.fields;
@@ -157,8 +157,8 @@ var intentHandlers = {
     },
     resolve(value, options) {
       var _options$value;
-      var name = future.appendPathSegment(options.name, options.index);
-      return util.updateValueAtPath(value, name, (_options$value = options.value) !== null && _options$value !== void 0 ? _options$value : name === '' ? {} : null);
+      var name = future.appendPath(options.name, options.index);
+      return util.updatePathValue(value, name, (_options$value = options.value) !== null && _options$value !== void 0 ? _options$value : name === '' ? {} : null);
     },
     update(state, _ref2) {
       var {
@@ -174,11 +174,11 @@ var intentHandlers = {
       // Update the keys only for client updates to avoid double updates if there is no client validation
       if (type === 'client') {
         // TODO: Do we really need to update the keys here?
-        var name = future.appendPathSegment(intent.payload.name, intent.payload.index);
+        var name = future.appendPath(intent.payload.name, intent.payload.index);
         // Remove all child keys
         listKeys = name === '' ? {} : updateListKeys(state.listKeys, name);
       }
-      var basePath = future.getPathSegments(intent.payload.name);
+      var basePath = future.parsePath(intent.payload.name);
       var touchedFields = state.touchedFields;
       for (var field of submission.fields) {
         if (basePath.length === 0 || future.getRelativePath(field, basePath) !== null) {
@@ -200,12 +200,12 @@ var intentHandlers = {
       var result = value;
       var itemValue = options.defaultValue;
       if (options.from !== undefined) {
-        itemValue = future.getValueAtPath(result, options.from);
-        result = util.updateValueAtPath(result, options.from, '');
+        itemValue = future.getPathValue(result, options.from);
+        result = util.updatePathValue(result, options.from, '');
       }
-      var list = Array.from(util.getArrayAtPath(result, options.name));
+      var list = Array.from(util.getPathArray(result, options.name));
       insertItem(list, itemValue, (_options$index = options.index) !== null && _options$index !== void 0 ? _options$index : list.length);
-      return util.updateValueAtPath(result, options.name, list);
+      return util.updatePathValue(result, options.name, list);
     },
     apply(result, options) {
       var _result$error;
@@ -215,27 +215,39 @@ var intentHandlers = {
         console.warn('intent.insert() with `onInvalid` or `from` requires the validation result to be available synchronously. ' + 'These options are ignored because the error is not yet known.');
         return result;
       }
-      var arrayErrors = (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.fieldErrors[options.name];
-      if (options.onInvalid === 'revert' && arrayErrors !== null && arrayErrors !== void 0 && arrayErrors.length) {
+      var listError = (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.fieldErrors[options.name];
+      if (options.onInvalid === 'revert' && listError != null) {
         return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, result), {}, {
           targetValue: undefined
         });
       }
       if (options.from !== undefined) {
-        var _options$index2, _result$error2;
-        var index = (_options$index2 = options.index) !== null && _options$index2 !== void 0 ? _options$index2 : util.getArrayAtPath(result.submission.payload, options.name).length;
-        var insertedItemPath = future.appendPathSegment(options.name, index);
-        var insertedItemErrors = (_result$error2 = result.error) === null || _result$error2 === void 0 ? void 0 : _result$error2.fieldErrors[insertedItemPath];
-        if (insertedItemErrors !== null && insertedItemErrors !== void 0 && insertedItemErrors.length) {
-          var _result$error$fieldEr, _result$error3, _result$error$formErr, _result$error4, _result$error5;
-          var fromErrors = (_result$error$fieldEr = (_result$error3 = result.error) === null || _result$error3 === void 0 ? void 0 : _result$error3.fieldErrors[options.from]) !== null && _result$error$fieldEr !== void 0 ? _result$error$fieldEr : [];
+        var _options$index2, _result$error2, _result$error3;
+        var index = (_options$index2 = options.index) !== null && _options$index2 !== void 0 ? _options$index2 : util.getPathArray(result.submission.payload, options.name).length;
+        var insertedItemPath = future.appendPath(options.name, index);
+        var insertedItemError = (_result$error2 = result.error) === null || _result$error2 === void 0 ? void 0 : _result$error2.fieldErrors[insertedItemPath];
+        var fromFieldError = (_result$error3 = result.error) === null || _result$error3 === void 0 ? void 0 : _result$error3.fieldErrors[options.from];
+        if (fromFieldError != null) {
+          var _result$error$formErr, _result$error4, _result$error5;
           return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, result), {}, {
             targetValue: undefined,
             error: {
-              formErrors: (_result$error$formErr = (_result$error4 = result.error) === null || _result$error4 === void 0 ? void 0 : _result$error4.formErrors) !== null && _result$error$formErr !== void 0 ? _result$error$formErr : [],
+              formErrors: (_result$error$formErr = (_result$error4 = result.error) === null || _result$error4 === void 0 ? void 0 : _result$error4.formErrors) !== null && _result$error$formErr !== void 0 ? _result$error$formErr : null,
               fieldErrors: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.fieldErrors), {}, {
-                [options.from]: [...fromErrors, ...insertedItemErrors],
-                [insertedItemPath]: []
+                [insertedItemPath]: null
+              })
+            }
+          });
+        }
+        if (insertedItemError != null) {
+          var _result$error$formErr2, _result$error6, _result$error7;
+          return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, result), {}, {
+            targetValue: undefined,
+            error: {
+              formErrors: (_result$error$formErr2 = (_result$error6 = result.error) === null || _result$error6 === void 0 ? void 0 : _result$error6.formErrors) !== null && _result$error$formErr2 !== void 0 ? _result$error$formErr2 : null,
+              fieldErrors: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, (_result$error7 = result.error) === null || _result$error7 === void 0 ? void 0 : _result$error7.fieldErrors), {}, {
+                [options.from]: insertedItemError,
+                [insertedItemPath]: null
               })
             }
           });
@@ -255,7 +267,7 @@ var intentHandlers = {
         return state$1;
       }
       var from = intent.payload.from;
-      var index = (_intent$payload$index = intent.payload.index) !== null && _intent$payload$index !== void 0 ? _intent$payload$index : util.getArrayAtPath(submission.payload, intent.payload.name).length;
+      var index = (_intent$payload$index = intent.payload.index) !== null && _intent$payload$index !== void 0 ? _intent$payload$index : util.getPathArray(submission.payload, intent.payload.name).length;
       var updateListIndex = util.createPathIndexUpdater(intent.payload.name, currentIndex => index <= currentIndex ? currentIndex + 1 : currentIndex);
       var touchedFields = state$1.touchedFields;
       var listKeys = state$1.listKeys;
@@ -267,7 +279,7 @@ var intentHandlers = {
           var _state$listKeys$inten;
           var selectedListKeys = Array.from((_state$listKeys$inten = state$1.listKeys[intent.payload.name]) !== null && _state$listKeys$inten !== void 0 ? _state$listKeys$inten : state.getDefaultListKey(state$1.resetKey, submission.payload, intent.payload.name));
           insertItem(selectedListKeys, util.generateUniqueKey(), index);
-          listKeys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPathSegment(intent.payload.name, index), updateListIndex)), {}, {
+          listKeys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPath(intent.payload.name, index), updateListIndex)), {}, {
             // Update existing list keys
             [intent.payload.name]: selectedListKeys
           });
@@ -288,12 +300,12 @@ var intentHandlers = {
       return future.isPlainObject(options) && util.isString(options.name) && util.isNumber(options.index) && util.isOptional(options.onInvalid, v => v === 'revert' || v === 'insert');
     },
     resolve(value, options) {
-      var list = Array.from(util.getArrayAtPath(value, options.name));
+      var list = Array.from(util.getPathArray(value, options.name));
       removeItem(list, options.index);
-      return util.updateValueAtPath(value, options.name, list);
+      return util.updatePathValue(value, options.name, list);
     },
     apply(result, options) {
-      var _result$error6;
+      var _result$error8;
       // Warn if validation result is not yet available
       if (typeof result.error === 'undefined' && options.onInvalid) {
         if (process.env.NODE_ENV !== 'production') {
@@ -302,7 +314,7 @@ var intentHandlers = {
         }
         return result;
       }
-      if (result.targetValue && (_result$error6 = result.error) !== null && _result$error6 !== void 0 && _result$error6.fieldErrors[options.name]) {
+      if (result.targetValue && (_result$error8 = result.error) !== null && _result$error8 !== void 0 && _result$error8.fieldErrors[options.name]) {
         switch (options.onInvalid) {
           case 'revert':
             return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, result), {}, {
@@ -310,10 +322,10 @@ var intentHandlers = {
             });
           case 'insert':
             {
-              var list = Array.from(util.getArrayAtPath(result.targetValue, options.name));
+              var list = Array.from(util.getPathArray(result.targetValue, options.name));
               insertItem(list, options.defaultValue, list.length);
               return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, result), {}, {
-                targetValue: util.updateValueAtPath(result.targetValue, options.name, list)
+                targetValue: util.updatePathValue(result.targetValue, options.name, list)
               });
             }
         }
@@ -349,14 +361,14 @@ var intentHandlers = {
           var _state$listKeys$inten2;
           var selectedListKeys = Array.from((_state$listKeys$inten2 = state$1.listKeys[intent.payload.name]) !== null && _state$listKeys$inten2 !== void 0 ? _state$listKeys$inten2 : state.getDefaultListKey(state$1.resetKey, currentValue, intent.payload.name));
           removeItem(selectedListKeys, intent.payload.index);
-          listKeys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPathSegment(intent.payload.name, intent.payload.index), updateListIndex)), {}, {
+          listKeys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPath(intent.payload.name, intent.payload.index), updateListIndex)), {}, {
             // Update existing list keys
             [intent.payload.name]: selectedListKeys
           });
           if (ctx.cancelled) {
             var index = selectedListKeys.length;
             insertItem(selectedListKeys, util.generateUniqueKey(), index);
-            listKeys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPathSegment(intent.payload.name, index), updateListIndex)), {}, {
+            listKeys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPath(intent.payload.name, index), updateListIndex)), {}, {
               // Update existing list keys
               [intent.payload.name]: selectedListKeys
             });
@@ -375,9 +387,9 @@ var intentHandlers = {
       return future.isPlainObject(options) && util.isString(options.name) && util.isNumber(options.from) && util.isNumber(options.to);
     },
     resolve(value, options) {
-      var list = Array.from(util.getArrayAtPath(value, options.name));
+      var list = Array.from(util.getPathArray(value, options.name));
       reorderItems(list, options.from, options.to);
-      return util.updateValueAtPath(value, options.name, list);
+      return util.updatePathValue(value, options.name, list);
     },
     update(state$1, _ref5) {
       var {
@@ -409,7 +421,7 @@ var intentHandlers = {
         var _state$listKeys$inten3;
         var listKeys = Array.from((_state$listKeys$inten3 = state$1.listKeys[intent.payload.name]) !== null && _state$listKeys$inten3 !== void 0 ? _state$listKeys$inten3 : state.getDefaultListKey(state$1.resetKey, currentValue, intent.payload.name));
         reorderItems(listKeys, intent.payload.from, intent.payload.to);
-        keys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPathSegment(intent.payload.name, intent.payload.from), updateListIndex)), {}, {
+        keys = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, updateListKeys(state$1.listKeys, future.appendPath(intent.payload.name, intent.payload.from), updateListIndex)), {}, {
           // Update existing list keys
           [intent.payload.name]: listKeys
         });

package/dist/future/intent.mjs

@@ -1,6 +1,6 @@
 import { objectSpread2 as _objectSpread2 } from '../_virtual/_rollupPluginBabelHelpers.mjs';
-import { getPathSegments, getRelativePath, isPlainObject, appendPathSegment, getValueAtPath } from '@conform-to/dom/future';
-import { isOptional, isUndefined, isNullable, appendUniqueItem, merge, updateValueAtPath, isString, getArrayAtPath, createPathIndexUpdater, compactMap, generateUniqueKey, isNumber, transformKeys } from './util.mjs';
+import { parsePath, getRelativePath, isPlainObject, appendPath, getPathValue } from '@conform-to/dom/future';
+import { isOptional, isUndefined, isNullable, appendUniqueItem, merge, updatePathValue, isString, getPathArray, createPathIndexUpdater, compactMap, generateUniqueKey, isNumber, transformKeys } from './util.mjs';
 import { getDefaultListKey } from './state.mjs';
 
 /**
@@ -88,7 +88,7 @@ function updateListKeys() {
   var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var keyToBeRemoved = arguments.length > 1 ? arguments[1] : undefined;
   var updateKey = arguments.length > 2 ? arguments[2] : undefined;
-  var basePath = getPathSegments(keyToBeRemoved);
+  var basePath = parsePath(keyToBeRemoved);
   return transformKeys(keys, field => {
     var _updateKey;
     return getRelativePath(field, basePath) !== null ? null : (_updateKey = updateKey === null || updateKey === void 0 ? void 0 : updateKey(field)) !== null && _updateKey !== void 0 ? _updateKey : field;
@@ -131,7 +131,7 @@ var intentHandlers = {
         error
       } = _ref;
       var name = (_intent$payload = intent.payload) !== null && _intent$payload !== void 0 ? _intent$payload : '';
-      var basePath = getPathSegments(name);
+      var basePath = parsePath(name);
       var allFields = error ?
       // Consider fields / fieldset with errors as touched too
       submission.fields.concat(Object.keys(error.fieldErrors)) : submission.fields;
@@ -153,8 +153,8 @@ var intentHandlers = {
     },
     resolve(value, options) {
       var _options$value;
-      var name = appendPathSegment(options.name, options.index);
-      return updateValueAtPath(value, name, (_options$value = options.value) !== null && _options$value !== void 0 ? _options$value : name === '' ? {} : null);
+      var name = appendPath(options.name, options.index);
+      return updatePathValue(value, name, (_options$value = options.value) !== null && _options$value !== void 0 ? _options$value : name === '' ? {} : null);
     },
     update(state, _ref2) {
       var {
@@ -170,11 +170,11 @@ var intentHandlers = {
       // Update the keys only for client updates to avoid double updates if there is no client validation
       if (type === 'client') {
         // TODO: Do we really need to update the keys here?
-        var name = appendPathSegment(intent.payload.name, intent.payload.index);
+        var name = appendPath(intent.payload.name, intent.payload.index);
         // Remove all child keys
         listKeys = name === '' ? {} : updateListKeys(state.listKeys, name);
       }
-      var basePath = getPathSegments(intent.payload.name);
+      var basePath = parsePath(intent.payload.name);
       var touchedFields = state.touchedFields;
       for (var field of submission.fields) {
         if (basePath.length === 0 || getRelativePath(field, basePath) !== null) {
@@ -196,12 +196,12 @@ var intentHandlers = {
       var result = value;
       var itemValue = options.defaultValue;
       if (options.from !== undefined) {
-        itemValue = getValueAtPath(result, options.from);
-        result = updateValueAtPath(result, options.from, '');
+        itemValue = getPathValue(result, options.from);
+        result = updatePathValue(result, options.from, '');
       }
-      var list = Array.from(getArrayAtPath(result, options.name));
+      var list = Array.from(getPathArray(result, options.name));
       insertItem(list, itemValue, (_options$index = options.index) !== null && _options$index !== void 0 ? _options$index : list.length);
-      return updateValueAtPath(result, options.name, list);
+      return updatePathValue(result, options.name, list);
     },
     apply(result, options) {
       var _result$error;
@@ -211,27 +211,39 @@ var intentHandlers = {
         console.warn('intent.insert() with `onInvalid` or `from` requires the validation result to be available synchronously. ' + 'These options are ignored because the error is not yet known.');
         return result;
       }
-      var arrayErrors = (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.fieldErrors[options.name];
-      if (options.onInvalid === 'revert' && arrayErrors !== null && arrayErrors !== void 0 && arrayErrors.length) {
+      var listError = (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.fieldErrors[options.name];
+      if (options.onInvalid === 'revert' && listError != null) {
         return _objectSpread2(_objectSpread2({}, result), {}, {
           targetValue: undefined
         });
       }
       if (options.from !== undefined) {
-        var _options$index2, _result$error2;
-        var index = (_options$index2 = options.index) !== null && _options$index2 !== void 0 ? _options$index2 : getArrayAtPath(result.submission.payload, options.name).length;
-        var insertedItemPath = appendPathSegment(options.name, index);
-        var insertedItemErrors = (_result$error2 = result.error) === null || _result$error2 === void 0 ? void 0 : _result$error2.fieldErrors[insertedItemPath];
-        if (insertedItemErrors !== null && insertedItemErrors !== void 0 && insertedItemErrors.length) {
-          var _result$error$fieldEr, _result$error3, _result$error$formErr, _result$error4, _result$error5;
-          var fromErrors = (_result$error$fieldEr = (_result$error3 = result.error) === null || _result$error3 === void 0 ? void 0 : _result$error3.fieldErrors[options.from]) !== null && _result$error$fieldEr !== void 0 ? _result$error$fieldEr : [];
+        var _options$index2, _result$error2, _result$error3;
+        var index = (_options$index2 = options.index) !== null && _options$index2 !== void 0 ? _options$index2 : getPathArray(result.submission.payload, options.name).length;
+        var insertedItemPath = appendPath(options.name, index);
+        var insertedItemError = (_result$error2 = result.error) === null || _result$error2 === void 0 ? void 0 : _result$error2.fieldErrors[insertedItemPath];
+        var fromFieldError = (_result$error3 = result.error) === null || _result$error3 === void 0 ? void 0 : _result$error3.fieldErrors[options.from];
+        if (fromFieldError != null) {
+          var _result$error$formErr, _result$error4, _result$error5;
           return _objectSpread2(_objectSpread2({}, result), {}, {
             targetValue: undefined,
             error: {
-              formErrors: (_result$error$formErr = (_result$error4 = result.error) === null || _result$error4 === void 0 ? void 0 : _result$error4.formErrors) !== null && _result$error$formErr !== void 0 ? _result$error$formErr : [],
+              formErrors: (_result$error$formErr = (_result$error4 = result.error) === null || _result$error4 === void 0 ? void 0 : _result$error4.formErrors) !== null && _result$error$formErr !== void 0 ? _result$error$formErr : null,
               fieldErrors: _objectSpread2(_objectSpread2({}, (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.fieldErrors), {}, {
-                [options.from]: [...fromErrors, ...insertedItemErrors],
-                [insertedItemPath]: []
+                [insertedItemPath]: null
+              })
+            }
+          });
+        }
+        if (insertedItemError != null) {
+          var _result$error$formErr2, _result$error6, _result$error7;
+          return _objectSpread2(_objectSpread2({}, result), {}, {
+            targetValue: undefined,
+            error: {
+              formErrors: (_result$error$formErr2 = (_result$error6 = result.error) === null || _result$error6 === void 0 ? void 0 : _result$error6.formErrors) !== null && _result$error$formErr2 !== void 0 ? _result$error$formErr2 : null,
+              fieldErrors: _objectSpread2(_objectSpread2({}, (_result$error7 = result.error) === null || _result$error7 === void 0 ? void 0 : _result$error7.fieldErrors), {}, {
+                [options.from]: insertedItemError,
+                [insertedItemPath]: null
               })
             }
           });
@@ -251,7 +263,7 @@ var intentHandlers = {
         return state;
       }
       var from = intent.payload.from;
-      var index = (_intent$payload$index = intent.payload.index) !== null && _intent$payload$index !== void 0 ? _intent$payload$index : getArrayAtPath(submission.payload, intent.payload.name).length;
+      var index = (_intent$payload$index = intent.payload.index) !== null && _intent$payload$index !== void 0 ? _intent$payload$index : getPathArray(submission.payload, intent.payload.name).length;
       var updateListIndex = createPathIndexUpdater(intent.payload.name, currentIndex => index <= currentIndex ? currentIndex + 1 : currentIndex);
       var touchedFields = state.touchedFields;
       var listKeys = state.listKeys;
@@ -263,7 +275,7 @@ var intentHandlers = {
           var _state$listKeys$inten;
           var selectedListKeys = Array.from((_state$listKeys$inten = state.listKeys[intent.payload.name]) !== null && _state$listKeys$inten !== void 0 ? _state$listKeys$inten : getDefaultListKey(state.resetKey, submission.payload, intent.payload.name));
           insertItem(selectedListKeys, generateUniqueKey(), index);
-          listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, index), updateListIndex)), {}, {
+          listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPath(intent.payload.name, index), updateListIndex)), {}, {
             // Update existing list keys
             [intent.payload.name]: selectedListKeys
           });
@@ -284,12 +296,12 @@ var intentHandlers = {
       return isPlainObject(options) && isString(options.name) && isNumber(options.index) && isOptional(options.onInvalid, v => v === 'revert' || v === 'insert');
     },
     resolve(value, options) {
-      var list = Array.from(getArrayAtPath(value, options.name));
+      var list = Array.from(getPathArray(value, options.name));
       removeItem(list, options.index);
-      return updateValueAtPath(value, options.name, list);
+      return updatePathValue(value, options.name, list);
     },
     apply(result, options) {
-      var _result$error6;
+      var _result$error8;
       // Warn if validation result is not yet available
       if (typeof result.error === 'undefined' && options.onInvalid) {
         if (process.env.NODE_ENV !== 'production') {
@@ -298,7 +310,7 @@ var intentHandlers = {
         }
         return result;
       }
-      if (result.targetValue && (_result$error6 = result.error) !== null && _result$error6 !== void 0 && _result$error6.fieldErrors[options.name]) {
+      if (result.targetValue && (_result$error8 = result.error) !== null && _result$error8 !== void 0 && _result$error8.fieldErrors[options.name]) {
         switch (options.onInvalid) {
           case 'revert':
             return _objectSpread2(_objectSpread2({}, result), {}, {
@@ -306,10 +318,10 @@ var intentHandlers = {
             });
           case 'insert':
             {
-              var list = Array.from(getArrayAtPath(result.targetValue, options.name));
+              var list = Array.from(getPathArray(result.targetValue, options.name));
               insertItem(list, options.defaultValue, list.length);
               return _objectSpread2(_objectSpread2({}, result), {}, {
-                targetValue: updateValueAtPath(result.targetValue, options.name, list)
+                targetValue: updatePathValue(result.targetValue, options.name, list)
               });
             }
         }
@@ -345,14 +357,14 @@ var intentHandlers = {
           var _state$listKeys$inten2;
           var selectedListKeys = Array.from((_state$listKeys$inten2 = state.listKeys[intent.payload.name]) !== null && _state$listKeys$inten2 !== void 0 ? _state$listKeys$inten2 : getDefaultListKey(state.resetKey, currentValue, intent.payload.name));
           removeItem(selectedListKeys, intent.payload.index);
-          listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, intent.payload.index), updateListIndex)), {}, {
+          listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPath(intent.payload.name, intent.payload.index), updateListIndex)), {}, {
             // Update existing list keys
             [intent.payload.name]: selectedListKeys
           });
           if (ctx.cancelled) {
             var index = selectedListKeys.length;
             insertItem(selectedListKeys, generateUniqueKey(), index);
-            listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, index), updateListIndex)), {}, {
+            listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPath(intent.payload.name, index), updateListIndex)), {}, {
               // Update existing list keys
               [intent.payload.name]: selectedListKeys
             });
@@ -371,9 +383,9 @@ var intentHandlers = {
       return isPlainObject(options) && isString(options.name) && isNumber(options.from) && isNumber(options.to);
     },
     resolve(value, options) {
-      var list = Array.from(getArrayAtPath(value, options.name));
+      var list = Array.from(getPathArray(value, options.name));
       reorderItems(list, options.from, options.to);
-      return updateValueAtPath(value, options.name, list);
+      return updatePathValue(value, options.name, list);
     },
     update(state, _ref5) {
       var {
@@ -405,7 +417,7 @@ var intentHandlers = {
         var _state$listKeys$inten3;
         var listKeys = Array.from((_state$listKeys$inten3 = state.listKeys[intent.payload.name]) !== null && _state$listKeys$inten3 !== void 0 ? _state$listKeys$inten3 : getDefaultListKey(state.resetKey, currentValue, intent.payload.name));
         reorderItems(listKeys, intent.payload.from, intent.payload.to);
-        keys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, intent.payload.from), updateListIndex)), {}, {
+        keys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPath(intent.payload.name, intent.payload.from), updateListIndex)), {}, {
           // Update existing list keys
           [intent.payload.name]: listKeys
         });

package/dist/future/memoize.d.ts

@@ -24,7 +24,7 @@ export declare function defaultEqualityCheck(prevArgs: any[], nextArgs: any[]):
  * @param isEqual - Custom equality function to compare arguments (defaults to shallow comparison)
  * @returns Memoized function with cache clearing capability
  *
- * @example
+ * **Example:**
  * ```ts
  * // Async validation with API call
  * const validateUsername = useMemo(

package/dist/future/memoize.js

@@ -35,7 +35,7 @@ function defaultEqualityCheck(prevArgs, nextArgs) {
  * @param isEqual - Custom equality function to compare arguments (defaults to shallow comparison)
  * @returns Memoized function with cache clearing capability
  *
- * @example
+ * **Example:**
  * ```ts
  * // Async validation with API call
  * const validateUsername = useMemo(

package/dist/future/memoize.mjs

@@ -31,7 +31,7 @@ function defaultEqualityCheck(prevArgs, nextArgs) {
  * @param isEqual - Custom equality function to compare arguments (defaults to shallow comparison)
  * @returns Memoized function with cache clearing capability
  *
- * @example
+ * **Example:**
  * ```ts
  * // Async validation with API call
  * const validateUsername = useMemo(

package/dist/future/state.d.ts

@@ -1,4 +1,4 @@
-import { type FieldName, type ValidationAttributes, type Serialize } from '@conform-to/dom/future';
+import { type FieldName, FormError } from '@conform-to/dom/future';
 import type { FieldMetadata, Fieldset, FormContext, FormMetadata, FormState, FormAction, UnknownIntent, IntentHandler, BaseFieldMetadata, BaseFormMetadata, DefineConditionalField } from './types';
 export declare function initializeState<ErrorShape>(options?: {
     defaultValue?: Record<string, unknown> | null | undefined;
@@ -20,9 +20,10 @@ export declare function updateState<ErrorShape>(state: FormState<ErrorShape>, ac
  * Minimizes UI state loss by only invalidating keys when necessary.
  */
 export declare function pruneListKeys(listKeys: Record<string, string[]>, targetValue: Record<string, unknown>): Record<string, string[]>;
-export declare function getDefaultValue(context: FormContext<any>, name: string, serialize?: Serialize): string;
-export declare function getDefaultOptions(context: FormContext<any>, name: string, serialize?: Serialize): string[];
-export declare function isDefaultChecked(context: FormContext<any>, name: string, serialize?: Serialize): boolean;
+export declare function getDefaultPayload(context: FormContext<any>, name: string): unknown;
+export declare function getDefaultValue(context: FormContext<any>, name: string): string;
+export declare function getDefaultOptions(context: FormContext<any>, name: string): string[];
+export declare function isDefaultChecked(context: FormContext<any>, name: string): boolean;
 /**
  * Determine if the field is touched
  *
@@ -32,16 +33,14 @@ export declare function isDefaultChecked(context: FormContext<any>, name: string
 export declare function isTouched(state: FormState<any>, name?: string): boolean;
 export declare function getDefaultListKey(prefix: string, initialValue: Record<string, unknown> | null, name: string): string[];
 export declare function getListKey(context: FormContext<any>, name: string): string[];
-export declare function getErrors<ErrorShape>(state: FormState<ErrorShape>, name?: string): ErrorShape[] | undefined;
-export declare function getFieldErrors<ErrorShape>(state: FormState<ErrorShape>, name?: string): Record<string, ErrorShape[]>;
-export declare function isValid(state: FormState<any>, name?: string): boolean;
+export declare function getErrors<ErrorShape>(state: FormState<ErrorShape>, name?: string): ErrorShape | undefined;
+export declare function getFieldErrors<ErrorShape>(state: FormState<ErrorShape>, name?: string): Record<string, ErrorShape>;
 /**
- * Gets validation constraint for a field, with fallback to parent array patterns.
- * e.g. "array[0].key" falls back to "array[].key" if specific constraint not found.
+ * Checks if fieldErrors contains any errors at the given name or any child path.
  */
-export declare function getConstraint(context: FormContext<any>, name: string): ValidationAttributes | undefined;
+export declare function hasFieldError<ErrorShape>(error: FormError<ErrorShape>, name: string): boolean;
+export declare function isValid(state: FormState<any>, name?: string): boolean;
 export declare function getFormMetadata<ErrorShape, CustomFormMetadata extends Record<string, unknown> = {}, CustomFieldMetadata extends Record<string, unknown> = {}>(context: FormContext<ErrorShape>, options?: {
-    serialize?: Serialize | undefined;
     extendFormMetadata?: ((metadata: BaseFormMetadata<ErrorShape>) => CustomFormMetadata) | undefined;
     extendFieldMetadata?: (<FieldShape>(metadata: BaseFieldMetadata<FieldShape, ErrorShape>, ctx: {
         form: BaseFormMetadata<ErrorShape>;
@@ -50,7 +49,6 @@ export declare function getFormMetadata<ErrorShape, CustomFormMetadata extends R
 }): FormMetadata<ErrorShape, CustomFormMetadata, CustomFieldMetadata>;
 export declare function getField<FieldShape, ErrorShape = string, CustomFieldMetadata extends Record<string, unknown> = {}>(context: FormContext<ErrorShape>, options: {
     name: FieldName<FieldShape>;
-    serialize?: Serialize | undefined;
     extendFieldMetadata?: (<F>(metadata: BaseFieldMetadata<F, ErrorShape>, ctx: {
         form: BaseFormMetadata<ErrorShape>;
         when: DefineConditionalField;
@@ -63,7 +61,6 @@ export declare function getField<FieldShape, ErrorShape = string, CustomFieldMet
  */
 export declare function getFieldset<FieldShape = Record<string, any>, ErrorShape = string, CustomFieldMetadata extends Record<string, unknown> = {}>(context: FormContext<ErrorShape>, options: {
     name?: FieldName<FieldShape> | undefined;
-    serialize?: Serialize | undefined;
     extendFieldMetadata?: (<F>(metadata: BaseFieldMetadata<F, ErrorShape>, ctx: {
         form: BaseFormMetadata<ErrorShape>;
         when: DefineConditionalField;
@@ -75,7 +72,6 @@ export declare function getFieldset<FieldShape = Record<string, any>, ErrorShape
  */
 export declare function getFieldList<FieldShape = Array<any>, ErrorShape = string, CustomFieldMetadata extends Record<string, unknown> = {}>(context: FormContext<ErrorShape>, options: {
     name: FieldName<FieldShape>;
-    serialize?: Serialize | undefined;
     extendFieldMetadata?: (<F>(metadata: BaseFieldMetadata<F, ErrorShape>, ctx: {
         form: BaseFormMetadata<ErrorShape>;
         when: DefineConditionalField;