@conform-to/react 1.19.4 → 1.20.0

package/dist/future/intent.mjs

@@ -1,72 +1,116 @@
 import { objectSpread2 as _objectSpread2 } from '../_virtual/_rollupPluginBabelHelpers.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';
+import { getRelativePath, isPlainObject, appendPath, getPathValue } from '@conform-to/dom/future';
+import { isOptional, isUndefined, isNullable, updatePathValue, isString, getPathArray, updatePathIndex, isNumber } from './util.mjs';
+
+function defineIntent(definition) {
+  var _definition$parse;
+  return _objectSpread2(_objectSpread2({}, definition), {}, {
+    parse: (_definition$parse = definition === null || definition === void 0 ? void 0 : definition.parse) !== null && _definition$parse !== void 0 ? _definition$parse : function () {
+      if (arguments.length > 1) {
+        throw new Error('Invalid intent arguments');
+      }
+      return arguments.length <= 0 ? undefined : arguments[0];
+    }
+  });
+}
+function mergeIntentHandlers(defaultHandlers, customHandlers) {
+  return _objectSpread2(_objectSpread2({}, defaultHandlers), customHandlers);
+}
+var undefinedArg = '$$__undefined__$$';
+function deserializeIntentArgs(value) {
+  return JSON.parse("[".concat(value, "]"), (_, value) => value === undefinedArg ? undefined : value);
+}
 
 /**
- * Serializes intent to string format: "type" or "type(payload)".
+ * Serializes a transport intent to string format.
  */
 function serializeIntent(intent) {
-  if (!intent.payload) {
+  var args = intent.args.slice();
+  while (args.length > 0 && args[args.length - 1] === undefined) {
+    args.pop();
+  }
+  if (args.length === 0) {
     return intent.type;
   }
-  return "".concat(intent.type, "(").concat(JSON.stringify(intent.payload), ")");
+  var serializedArgs = JSON.stringify(args, function (_, value) {
+    if (value === undefined && Array.isArray(this)) {
+      return undefinedArg;
+    }
+    return value;
+  });
+  return "".concat(intent.type, "(").concat(serializedArgs.slice(1, -1), ")");
 }
 
 /**
- * Parses serialized intent string back to intent object.
+ * Parses the serialized intent string into a transport intent.
  */
-function deserializeIntent(value) {
-  var type = value;
-  var payload;
-  var serializedPayload;
-  var openParenIndex = value.indexOf('(');
-  if (openParenIndex > 0 && value[value.length - 1] === ')') {
-    type = value.slice(0, openParenIndex);
-    serializedPayload = value.slice(openParenIndex + 1, -1);
+function deserializeIntent(serializedIntent) {
+  if (serializedIntent === '') {
+    return undefined;
   }
-  if (serializedPayload) {
-    try {
-      payload = JSON.parse(serializedPayload);
-    } catch (_unused) {
-      // Ignore the error
+  var type = serializedIntent;
+  var args = [];
+  var openParenIndex = serializedIntent.indexOf('(');
+  if (openParenIndex > 0 && serializedIntent[serializedIntent.length - 1] === ')') {
+    type = serializedIntent.slice(0, openParenIndex);
+    var serializedArgs = serializedIntent.slice(openParenIndex + 1, -1);
+    if (serializedArgs !== '') {
+      try {
+        args = deserializeIntentArgs(serializedArgs);
+      } catch (_unused) {
+        return undefined;
+      }
     }
   }
   return {
     type,
-    payload
+    args
   };
 }
-
-/**
- * Applies intent transformation to submission payload.
- * Returns modified payload or null for reset intent.
- */
+function parseIntent(intentValue, options) {
+  if (intentValue === null) {
+    return {
+      type: 'submit',
+      payload: undefined
+    };
+  }
+  var transportIntent = deserializeIntent(intentValue);
+  if (!transportIntent) {
+    return undefined;
+  }
+  var handler = options.handlers[transportIntent.type];
+  if (!handler) {
+    return undefined;
+  }
+  try {
+    return {
+      type: transportIntent.type,
+      payload: handler.parse(...transportIntent.args)
+    };
+  } catch (_unused2) {
+    return undefined;
+  }
+}
 function resolveIntent(submission, options) {
-  var _options$handlers, _handler$validate, _handler$validate2;
-  if (!submission.intent) {
+  var handlers = options.handlers;
+  var intent = options.intent;
+  var handler = intent ? handlers[intent.type] : null;
+  if (!intent || !(handler !== null && handler !== void 0 && handler.resolve)) {
     return submission.payload;
   }
-  var intent = deserializeIntent(submission.intent);
-  var handlers = (_options$handlers = options === null || options === void 0 ? void 0 : options.handlers) !== null && _options$handlers !== void 0 ? _options$handlers : intentHandlers;
-  var handler = handlers[intent.type];
-  if (handler !== null && handler !== void 0 && handler.resolve && ((_handler$validate = (_handler$validate2 = handler.validate) === null || _handler$validate2 === void 0 ? void 0 : _handler$validate2.call(handler, intent.payload)) !== null && _handler$validate !== void 0 ? _handler$validate : true)) {
-    return handler.resolve(submission.payload, intent.payload);
-  }
-  return submission.payload;
+  return handler.resolve({
+    value: submission.payload,
+    payload: intent.payload
+  });
 }
-
-/**
- * Resolves an intent after validation by calling the handler's onResolve.
- * Mutates the result with updated value/error and returns whether the intent was cancelled.
- */
 function applyIntent(result, intent, options) {
   if (intent) {
-    var _options$handlers2, _handler$validate3, _handler$validate4;
-    var handlers = (_options$handlers2 = options === null || options === void 0 ? void 0 : options.handlers) !== null && _options$handlers2 !== void 0 ? _options$handlers2 : intentHandlers;
-    var handler = handlers[intent.type];
-    if (handler !== null && handler !== void 0 && handler.apply && ((_handler$validate3 = (_handler$validate4 = handler.validate) === null || _handler$validate4 === void 0 ? void 0 : _handler$validate4.call(handler, intent.payload)) !== null && _handler$validate3 !== void 0 ? _handler$validate3 : true)) {
-      return handler.apply(result, intent.payload);
+    var handler = options.handlers[intent.type];
+    if (handler !== null && handler !== void 0 && handler.apply) {
+      return handler.apply({
+        result,
+        payload: intent.payload
+      });
     }
   }
   return result;
@@ -80,354 +124,299 @@ function removeItem(list, index) {
 function reorderItems(list, fromIndex, toIndex) {
   list.splice(toIndex, 0, ...list.splice(fromIndex, 1));
 }
-
-/**
- * Updates list keys by removing child keys and optionally transforming remaining keys.
- */
-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 = 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;
-  });
-}
-
-/**
- * Built-in action handlers for form intents:
- * - reset: clears form data
- * - validate: marks fields as touched for validation display
- * - update: updates specific field values
- * - insert/remove/reorder: manages array field operations
- */
-var intentHandlers = {
-  reset: {
-    validate(options) {
-      return isOptional(options, isPlainObject) && (isUndefined(options === null || options === void 0 ? void 0 : options.defaultValue) || isNullable(options === null || options === void 0 ? void 0 : options.defaultValue, isPlainObject));
-    },
-    resolve(_, options) {
-      if ((options === null || options === void 0 ? void 0 : options.defaultValue) === null) {
-        return {};
-      }
-      return options === null || options === void 0 ? void 0 : options.defaultValue;
-    },
-    apply(result) {
-      return _objectSpread2(_objectSpread2({}, result), {}, {
-        reset: true
-      });
+var submit = defineIntent({
+  touch() {
+    return true;
+  }
+});
+var reset = defineIntent({
+  parse(options) {
+    if (!isOptional(options, isPlainObject) || !isUndefined(options === null || options === void 0 ? void 0 : options.defaultValue) && !isNullable(options === null || options === void 0 ? void 0 : options.defaultValue, isPlainObject)) {
+      throw new Error('Invalid reset intent arguments');
     }
+    return options;
   },
-  validate: {
-    validate(name) {
-      return isOptional(name, isString);
-    },
-    update(state, _ref) {
-      var _intent$payload;
-      var {
-        submission,
-        intent,
-        error
-      } = _ref;
-      var name = (_intent$payload = intent.payload) !== null && _intent$payload !== void 0 ? _intent$payload : '';
-      var basePath = parsePath(name);
-      var allFields = error ?
-      // Consider fields / fieldset with errors as touched too
-      submission.fields.concat(Object.keys(error.fieldErrors)) : submission.fields;
-      var touchedFields = appendUniqueItem(state.touchedFields, name);
-      for (var field of allFields) {
-        // Add all child fields to the touched fields too
-        if (getRelativePath(field, basePath) !== null) {
-          touchedFields = appendUniqueItem(touchedFields, field);
-        }
-      }
-      return merge(state, {
-        touchedFields
-      });
+  resolve(_ref) {
+    var {
+      payload
+    } = _ref;
+    if ((payload === null || payload === void 0 ? void 0 : payload.defaultValue) === null) {
+      return {};
     }
+    return payload === null || payload === void 0 ? void 0 : payload.defaultValue;
   },
-  update: {
-    validate(options) {
-      return isPlainObject(options) && isOptional(options.name, isString) && isOptional(options.index, isNumber) && !isUndefined(options.value);
-    },
-    resolve(value, options) {
-      var _options$value;
-      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 {
-        type,
-        submission,
-        intent
-      } = _ref2;
-      if (type === 'server') {
-        return state;
-      }
-      var listKeys = state.listKeys;
-
-      // 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 = appendPath(intent.payload.name, intent.payload.index);
-        // Remove all child keys
-        listKeys = name === '' ? {} : updateListKeys(state.listKeys, 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) {
-          touchedFields = appendUniqueItem(touchedFields, field);
-        }
-      }
-      return _objectSpread2(_objectSpread2({}, state), {}, {
-        listKeys,
-        touchedFields
-      });
+  apply(_ref2) {
+    var {
+      result
+    } = _ref2;
+    return _objectSpread2(_objectSpread2({}, result), {}, {
+      reset: true
+    });
+  }
+});
+var validate = defineIntent({
+  parse(name) {
+    if (!isOptional(name, isString)) {
+      throw new Error('Invalid validate intent arguments');
     }
+    return name;
   },
-  insert: {
-    validate(options) {
-      return isPlainObject(options) && isString(options.name) && isOptional(options.index, isNumber) && isOptional(options.from, isString) && isOptional(options.onInvalid, mode => mode === 'revert');
-    },
-    resolve(value, options) {
-      var _options$index;
-      var result = value;
-      var itemValue = options.defaultValue;
-      if (options.from !== undefined) {
-        itemValue = getPathValue(result, options.from);
-        result = updatePathValue(result, options.from, '');
-      }
-      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 updatePathValue(result, options.name, list);
-    },
-    apply(result, options) {
-      var _result$error;
-      // Warn if validation result is not yet available
-      if (typeof result.error === 'undefined' && (options.onInvalid || options.from)) {
-        // eslint-disable-next-line no-console
-        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 listError = (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.fieldErrors[options.name];
-      if (options.onInvalid === 'revert' && listError != null) {
+  touch(_ref3) {
+    var {
+      name,
+      payload
+    } = _ref3;
+    return getRelativePath(name, payload !== null && payload !== void 0 ? payload : '') !== null;
+  }
+});
+var update = defineIntent({
+  parse(options) {
+    if (!isPlainObject(options) || !isOptional(options.name, isString) || !isOptional(options.index, isNumber) || isUndefined(options.value)) {
+      throw new Error('Invalid update intent arguments');
+    }
+    return options;
+  },
+  resolve(_ref4) {
+    var _payload$value;
+    var {
+      value,
+      payload
+    } = _ref4;
+    var fieldName = appendPath(payload.name, payload.index);
+    var nextValue = (_payload$value = payload.value) !== null && _payload$value !== void 0 ? _payload$value : fieldName === '' ? {} : null;
+    return updatePathValue(value, fieldName, nextValue);
+  },
+  touch(_ref5) {
+    var {
+      name,
+      payload
+    } = _ref5;
+    var fieldName = appendPath(payload.name, payload.index);
+    return getRelativePath(name, fieldName) !== null;
+  }
+});
+var insert = defineIntent({
+  parse(options) {
+    if (!isPlainObject(options) || !isString(options.name) || !isOptional(options.index, isNumber) || !isOptional(options.from, isString) || !isOptional(options.onInvalid, mode => mode === 'revert')) {
+      throw new Error('Invalid insert intent arguments');
+    }
+    return options;
+  },
+  resolve(_ref6) {
+    var _payload$index;
+    var {
+      value,
+      payload
+    } = _ref6;
+    var result = value;
+    var itemValue = payload.defaultValue;
+    if (payload.from !== undefined) {
+      itemValue = getPathValue(result, payload.from);
+      result = updatePathValue(result, payload.from, '');
+    }
+    var list = Array.from(getPathArray(result, payload.name));
+    insertItem(list, itemValue, (_payload$index = payload.index) !== null && _payload$index !== void 0 ? _payload$index : list.length);
+    return updatePathValue(result, payload.name, list);
+  },
+  apply(_ref7) {
+    var _result$error;
+    var {
+      result,
+      payload
+    } = _ref7;
+    // Warn if validation result is not yet available
+    if (typeof result.error === 'undefined' && (payload.onInvalid || payload.from)) {
+      // eslint-disable-next-line no-console
+      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 listError = (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.fieldErrors[payload.name];
+    if (payload.onInvalid === 'revert' && listError != null) {
+      return _objectSpread2(_objectSpread2({}, result), {}, {
+        targetValue: undefined
+      });
+    }
+    if (payload.from !== undefined) {
+      var _payload$index2, _result$error2, _result$error3;
+      var index = (_payload$index2 = payload.index) !== null && _payload$index2 !== void 0 ? _payload$index2 : getPathArray(result.submission.payload, payload.name).length;
+      var insertedItemPath = appendPath(payload.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[payload.from];
+      if (fromFieldError != null) {
+        var _result$error$formErr, _result$error4, _result$error5;
         return _objectSpread2(_objectSpread2({}, result), {}, {
-          targetValue: undefined
+          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 : null,
+            fieldErrors: _objectSpread2(_objectSpread2({}, (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.fieldErrors), {}, {
+              [insertedItemPath]: null
+            })
+          }
         });
       }
-      if (options.from !== undefined) {
-        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 : null,
-              fieldErrors: _objectSpread2(_objectSpread2({}, (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.fieldErrors), {}, {
-                [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
-              })
-            }
-          });
-        }
-      }
-      return result;
-    },
-    update(state, _ref3) {
-      var _intent$payload$index;
-      var {
-        type,
-        submission,
-        intent,
-        ctx
-      } = _ref3;
-      if (type === 'server') {
-        return state;
-      }
-      var from = intent.payload.from;
-      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;
-      if (!ctx.cancelled) {
-        touchedFields = compactMap(state.touchedFields, updateListIndex);
-
-        // Update the keys only for client updates to avoid double updates if there is no client validation
-        if (type === 'client') {
-          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, appendPath(intent.payload.name, index), updateListIndex)), {}, {
-            // Update existing list keys
-            [intent.payload.name]: selectedListKeys
-          });
-        }
-      }
-      touchedFields = appendUniqueItem(touchedFields, intent.payload.name);
-      if (from !== undefined) {
-        touchedFields = appendUniqueItem(touchedFields, from);
+      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), {}, {
+              [payload.from]: insertedItemError,
+              [insertedItemPath]: null
+            })
+          }
+        });
       }
-      return _objectSpread2(_objectSpread2({}, state), {}, {
-        listKeys,
-        touchedFields
-      });
     }
+    return result;
   },
-  remove: {
-    validate(options) {
-      return isPlainObject(options) && isString(options.name) && isNumber(options.index) && isOptional(options.onInvalid, v => v === 'revert' || v === 'insert');
-    },
-    resolve(value, options) {
-      var list = Array.from(getPathArray(value, options.name));
-      removeItem(list, options.index);
-      return updatePathValue(value, options.name, list);
-    },
-    apply(result, options) {
-      var _result$error8;
-      // Warn if validation result is not yet available
-      if (typeof result.error === 'undefined' && options.onInvalid) {
-        if (process.env.NODE_ENV !== 'production') {
-          // eslint-disable-next-line no-console
-          console.warn('intent.remove() with `onInvalid` requires the validation result to be available synchronously. ' + 'This option is ignored because the error is not yet known.');
-        }
-        return result;
-      }
-      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), {}, {
-              targetValue: undefined
-            });
-          case 'insert':
-            {
-              var list = Array.from(getPathArray(result.targetValue, options.name));
-              insertItem(list, options.defaultValue, list.length);
-              return _objectSpread2(_objectSpread2({}, result), {}, {
-                targetValue: updatePathValue(result.targetValue, options.name, list)
-              });
-            }
-        }
-      }
+  touch(_ref8) {
+    var {
+      name,
+      payload
+    } = _ref8;
+    return name === payload.name || name === payload.from;
+  },
+  move(_ref9) {
+    var {
+      name,
+      payload,
+      status
+    } = _ref9;
+    if (status !== 'applied' || typeof payload.index === 'undefined') {
+      return name;
+    }
+    return updatePathIndex(name, payload.name, currentIndex => payload.index !== undefined && payload.index <= currentIndex ? currentIndex + 1 : currentIndex);
+  }
+});
+var remove = defineIntent({
+  parse(options) {
+    if (!isPlainObject(options) || !isString(options.name) || !isNumber(options.index) || !isOptional(options.onInvalid, v => v === 'revert' || v === 'insert')) {
+      throw new Error('Invalid remove intent arguments');
+    }
+    return options;
+  },
+  resolve(_ref10) {
+    var {
+      value,
+      payload
+    } = _ref10;
+    var list = Array.from(getPathArray(value, payload.name));
+    removeItem(list, payload.index);
+    return updatePathValue(value, payload.name, list);
+  },
+  apply(_ref11) {
+    var _result$error8;
+    var {
+      result,
+      payload
+    } = _ref11;
+    // Warn if validation result is not yet available
+    if (typeof result.error === 'undefined' && payload.onInvalid) {
+      // eslint-disable-next-line no-console
+      console.warn('intent.remove() with `onInvalid` requires the validation result to be available synchronously. ' + 'This option is ignored because the error is not yet known.');
       return result;
-    },
-    update(state, _ref4) {
-      var {
-        type,
-        submission,
-        intent,
-        ctx
-      } = _ref4;
-      if (type === 'server') {
-        return state;
-      }
-      var currentValue = submission.payload;
-      var updateListIndex = createPathIndexUpdater(intent.payload.name, currentIndex => {
-        if (intent.payload.index === currentIndex) {
-          return null;
-        }
-        return intent.payload.index < currentIndex ? currentIndex - 1 : currentIndex;
-      });
-      var touchedFields = state.touchedFields;
-      var listKeys = state.listKeys;
-
-      // If onInvalid is 'insert', we still remove the item and then insert a new item at the end
-      if (!ctx.cancelled || intent.payload.onInvalid === 'insert') {
-        touchedFields = compactMap(touchedFields, updateListIndex);
-
-        // Update the keys only for client updates to avoid double updates if there is no client validation
-        if (type === 'client') {
-          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, appendPath(intent.payload.name, intent.payload.index), updateListIndex)), {}, {
-            // Update existing list keys
-            [intent.payload.name]: selectedListKeys
+    }
+    if (result.targetValue && (_result$error8 = result.error) !== null && _result$error8 !== void 0 && _result$error8.fieldErrors[payload.name]) {
+      switch (payload.onInvalid) {
+        case 'revert':
+          return _objectSpread2(_objectSpread2({}, result), {}, {
+            targetValue: undefined
           });
-          if (ctx.cancelled) {
-            var index = selectedListKeys.length;
-            insertItem(selectedListKeys, generateUniqueKey(), index);
-            listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPath(intent.payload.name, index), updateListIndex)), {}, {
-              // Update existing list keys
-              [intent.payload.name]: selectedListKeys
+        case 'insert':
+          {
+            var list = Array.from(getPathArray(result.targetValue, payload.name));
+            insertItem(list, payload.defaultValue, list.length);
+            return _objectSpread2(_objectSpread2({}, result), {}, {
+              targetValue: updatePathValue(result.targetValue, payload.name, list)
             });
           }
-        }
       }
-      touchedFields = appendUniqueItem(touchedFields, intent.payload.name);
-      return _objectSpread2(_objectSpread2({}, state), {}, {
-        listKeys: listKeys,
-        touchedFields
-      });
     }
+    return result;
   },
-  reorder: {
-    validate(options) {
-      return isPlainObject(options) && isString(options.name) && isNumber(options.from) && isNumber(options.to);
-    },
-    resolve(value, options) {
-      var list = Array.from(getPathArray(value, options.name));
-      reorderItems(list, options.from, options.to);
-      return updatePathValue(value, options.name, list);
-    },
-    update(state, _ref5) {
-      var {
-        type,
-        submission,
-        intent
-      } = _ref5;
-      if (type === 'server') {
-        return state;
-      }
-      var currentValue = submission.payload;
-      var updateListIndex = createPathIndexUpdater(intent.payload.name, currentIndex => {
-        if (intent.payload.from === intent.payload.to) {
-          return currentIndex;
-        }
-        if (currentIndex === intent.payload.from) {
-          return intent.payload.to;
-        }
-        if (intent.payload.from < intent.payload.to) {
-          return currentIndex > intent.payload.from && currentIndex <= intent.payload.to ? currentIndex - 1 : currentIndex;
-        }
-        return currentIndex >= intent.payload.to && currentIndex < intent.payload.from ? currentIndex + 1 : currentIndex;
-      });
-      var touchedFields = appendUniqueItem(compactMap(state.touchedFields, updateListIndex), intent.payload.name);
-      var keys = state.listKeys;
-
-      // Update the keys only for client updates to avoid double updates if there is no client validation
-      if (type === 'client') {
-        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, appendPath(intent.payload.name, intent.payload.from), updateListIndex)), {}, {
-          // Update existing list keys
-          [intent.payload.name]: listKeys
-        });
+  touch(_ref12) {
+    var {
+      name,
+      payload
+    } = _ref12;
+    return name === payload.name;
+  },
+  move(_ref13) {
+    var {
+      name,
+      payload,
+      status
+    } = _ref13;
+    if (status === 'reverted') {
+      return name;
+    }
+    return updatePathIndex(name, payload.name, currentIndex => {
+      if (payload.index === currentIndex) {
+        return null;
       }
-      return _objectSpread2(_objectSpread2({}, state), {}, {
-        listKeys: keys,
-        touchedFields
-      });
+      return payload.index < currentIndex ? currentIndex - 1 : currentIndex;
+    });
+  }
+});
+var reorder = defineIntent({
+  parse(options) {
+    if (!isPlainObject(options) || !isString(options.name) || !isNumber(options.from) || !isNumber(options.to)) {
+      throw new Error('Invalid reorder intent arguments');
     }
+    return options;
+  },
+  resolve(_ref14) {
+    var {
+      value,
+      payload
+    } = _ref14;
+    var list = Array.from(getPathArray(value, payload.name));
+    reorderItems(list, payload.from, payload.to);
+    return updatePathValue(value, payload.name, list);
+  },
+  touch(_ref15) {
+    var {
+      name,
+      payload
+    } = _ref15;
+    return name === payload.name;
+  },
+  move(_ref16) {
+    var {
+      name,
+      payload
+    } = _ref16;
+    return updatePathIndex(name, payload.name, currentIndex => {
+      if (payload.from === payload.to) {
+        return currentIndex;
+      }
+      if (currentIndex === payload.from) {
+        return payload.to;
+      }
+      if (payload.from < payload.to) {
+        return currentIndex > payload.from && currentIndex <= payload.to ? currentIndex - 1 : currentIndex;
+      }
+      return currentIndex >= payload.to && currentIndex < payload.from ? currentIndex + 1 : currentIndex;
+    });
   }
+});
+
+/**
+ * Default Intent handlers
+ * - reset: clears form data
+ * - validate: marks fields as touched for validation display
+ * - update: updates specific field values
+ * - insert/remove/reorder: manages array field operations
+ */
+var defaultIntentHandlers = {
+  submit,
+  reset,
+  validate,
+  update,
+  insert,
+  remove,
+  reorder
 };
 
-export { applyIntent, deserializeIntent, insertItem, intentHandlers, removeItem, reorderItems, resolveIntent, serializeIntent, updateListKeys };
+export { applyIntent, defaultIntentHandlers, defineIntent, deserializeIntent, insert, insertItem, mergeIntentHandlers, parseIntent, remove, removeItem, reorder, reorderItems, reset, resolveIntent, serializeIntent, submit, update, validate };