@conform-to/dom 1.1.2 → 1.1.4

package/README

@@ -8,7 +8,7 @@
  ╚══════╝  ╚═════╝  ╚═╝  ╚══╝ ╚═╝        ╚═════╝  ╚═╝   ╚═╝ ╚═╝   ╚═╝
 
 
-Version 1.1.1 / License MIT / Copyright (c) 2024 Edmund Hung
+Version 1.1.3 / License MIT / Copyright (c) 2024 Edmund Hung
 
 A type-safe form validation library utilizing web fundamentals to progressively enhance HTML Forms with full support for server frameworks like Remix and Next.js.
 

package/form.js

@@ -51,6 +51,7 @@ function setFieldsValidated(meta, fields) {
   }
 }
 function handleIntent(meta, intent, fields, initialized) {
+  var _fields$filter;
   if (!intent) {
     setFieldsValidated(meta, fields);
     return;
@@ -73,7 +74,7 @@ function handleIntent(meta, intent, fields, initialized) {
         } = intent.payload;
         var _name2 = formdata.formatName(intent.payload.name, intent.payload.index);
         if (typeof value !== 'undefined') {
-          updateValue(meta, _name2 !== null && _name2 !== void 0 ? _name2 : '', submission.serialize(value));
+          updateValue(meta, _name2 !== null && _name2 !== void 0 ? _name2 : '', value);
         }
         if (typeof validated !== 'undefined') {
           // Clean up previous validated state
@@ -133,9 +134,10 @@ function handleIntent(meta, intent, fields, initialized) {
         break;
       }
   }
+  var validatedFields = (_fields$filter = fields === null || fields === void 0 ? void 0 : fields.filter(name => meta.validated[name])) !== null && _fields$filter !== void 0 ? _fields$filter : [];
   meta.error = Object.entries(meta.error).reduce((result, _ref3) => {
     var [name, error] = _ref3;
-    if (meta.validated[name]) {
+    if (meta.validated[name] || validatedFields.some(field => formdata.isPrefix(name, field))) {
       result[name] = error;
     }
     return result;
@@ -145,7 +147,9 @@ function updateValue(meta, name, value) {
   if (name === '') {
     meta.initialValue = value;
     meta.value = value;
-    meta.key = getDefaultKey(value);
+    meta.key = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, getDefaultKey(value)), {}, {
+      '': util.generateId()
+    });
     return;
   }
   meta.initialValue = util.clone(meta.initialValue);

package/form.mjs

@@ -1,5 +1,5 @@
 import { objectSpread2 as _objectSpread2 } from './_virtual/_rollupPluginBabelHelpers.mjs';
-import { flatten, formatName, getValue, isPlainObject, setValue, normalize, getFormData, getPaths, formatPaths, isPrefix } from './formdata.mjs';
+import { flatten, formatName, getValue, isPlainObject, isPrefix, setValue, normalize, getFormData, getPaths, formatPaths } from './formdata.mjs';
 import { getFormAction, getFormEncType, getFormMethod, isFieldElement, requestSubmit } from './dom.mjs';
 import { generateId, clone, invariant } from './util.mjs';
 import { serialize, setListState, setListValue, setState, INTENT, serializeIntent, root, getSubmissionContext } from './submission.mjs';
@@ -47,6 +47,7 @@ function setFieldsValidated(meta, fields) {
   }
 }
 function handleIntent(meta, intent, fields, initialized) {
+  var _fields$filter;
   if (!intent) {
     setFieldsValidated(meta, fields);
     return;
@@ -69,7 +70,7 @@ function handleIntent(meta, intent, fields, initialized) {
         } = intent.payload;
         var _name2 = formatName(intent.payload.name, intent.payload.index);
         if (typeof value !== 'undefined') {
-          updateValue(meta, _name2 !== null && _name2 !== void 0 ? _name2 : '', serialize(value));
+          updateValue(meta, _name2 !== null && _name2 !== void 0 ? _name2 : '', value);
         }
         if (typeof validated !== 'undefined') {
           // Clean up previous validated state
@@ -129,9 +130,10 @@ function handleIntent(meta, intent, fields, initialized) {
         break;
       }
   }
+  var validatedFields = (_fields$filter = fields === null || fields === void 0 ? void 0 : fields.filter(name => meta.validated[name])) !== null && _fields$filter !== void 0 ? _fields$filter : [];
   meta.error = Object.entries(meta.error).reduce((result, _ref3) => {
     var [name, error] = _ref3;
-    if (meta.validated[name]) {
+    if (meta.validated[name] || validatedFields.some(field => isPrefix(name, field))) {
       result[name] = error;
     }
     return result;
@@ -141,7 +143,9 @@ function updateValue(meta, name, value) {
   if (name === '') {
     meta.initialValue = value;
     meta.value = value;
-    meta.key = getDefaultKey(value);
+    meta.key = _objectSpread2(_objectSpread2({}, getDefaultKey(value)), {}, {
+      '': generateId()
+    });
     return;
   }
   meta.initialValue = clone(meta.initialValue);

package/formdata.d.ts

@@ -55,7 +55,7 @@ export declare function normalize(value: unknown, acceptFile?: boolean): unknown
 /**
  * Flatten a tree into a dictionary
  */
-export declare function flatten(data: Record<string | number | symbol, unknown> | Array<unknown> | undefined, options?: {
-    resolve?: (data: unknown) => unknown | null;
+export declare function flatten(data: unknown, options?: {
+    resolve?: (data: unknown) => unknown;
     prefix?: string;
 }): Record<string, unknown>;

package/formdata.js

@@ -93,7 +93,7 @@ function setValue(target, name, valueFn) {
   while (pointer != null && ++index < length) {
     var key = paths[index];
     var nextKey = paths[index + 1];
-    var newValue = index != lastIndex ? Object.prototype.hasOwnProperty.call(pointer, key) ? pointer[key] : typeof nextKey === 'number' ? [] : {} : valueFn(pointer[key]);
+    var newValue = index != lastIndex ? Object.prototype.hasOwnProperty.call(pointer, key) && pointer[key] !== null ? pointer[key] : typeof nextKey === 'number' ? [] : {} : valueFn(pointer[key]);
     pointer[key] = newValue;
     pointer = pointer[key];
   }
@@ -174,51 +174,29 @@ function normalize(value) {
 /**
  * Flatten a tree into a dictionary
  */
-function flatten(data, options) {
+function flatten(data) {
   var _options$resolve;
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var result = {};
-  var resolve = (_options$resolve = options === null || options === void 0 ? void 0 : options.resolve) !== null && _options$resolve !== void 0 ? _options$resolve : data => data;
-  function setResult(data, name) {
+  var resolve = (_options$resolve = options.resolve) !== null && _options$resolve !== void 0 ? _options$resolve : data => data;
+  function process(data, prefix) {
     var value = normalize(resolve(data));
     if (typeof value !== 'undefined') {
-      result[name] = value;
+      result[prefix] = value;
     }
-  }
-  function processObject(obj, prefix) {
-    setResult(obj, prefix);
-    for (var [key, _value] of Object.entries(obj)) {
-      var name = prefix ? "".concat(prefix, ".").concat(key) : key;
-      if (Array.isArray(_value)) {
-        processArray(_value, name);
-      } else if (_value && isPlainObject(_value)) {
-        processObject(_value, name);
-      } else {
-        setResult(_value, name);
+    if (Array.isArray(data)) {
+      for (var i = 0; i < data.length; i++) {
+        process(data[i], "".concat(prefix, "[").concat(i, "]"));
       }
-    }
-  }
-  function processArray(array, prefix) {
-    setResult(array, prefix);
-    for (var i = 0; i < array.length; i++) {
-      var item = array[i];
-      var name = "".concat(prefix, "[").concat(i, "]");
-      if (Array.isArray(item)) {
-        processArray(item, name);
-      } else if (item && isPlainObject(item)) {
-        processObject(item, name);
-      } else {
-        setResult(item, name);
+    } else if (isPlainObject(data)) {
+      for (var [key, _value] of Object.entries(data)) {
+        process(_value, prefix ? "".concat(prefix, ".").concat(key) : key);
       }
     }
   }
   if (data) {
     var _options$prefix;
-    var prefix = (_options$prefix = options === null || options === void 0 ? void 0 : options.prefix) !== null && _options$prefix !== void 0 ? _options$prefix : '';
-    if (Array.isArray(data)) {
-      processArray(data, prefix);
-    } else {
-      processObject(data, prefix);
-    }
+    process(data, (_options$prefix = options.prefix) !== null && _options$prefix !== void 0 ? _options$prefix : '');
   }
   return result;
 }

package/formdata.mjs

@@ -89,7 +89,7 @@ function setValue(target, name, valueFn) {
   while (pointer != null && ++index < length) {
     var key = paths[index];
     var nextKey = paths[index + 1];
-    var newValue = index != lastIndex ? Object.prototype.hasOwnProperty.call(pointer, key) ? pointer[key] : typeof nextKey === 'number' ? [] : {} : valueFn(pointer[key]);
+    var newValue = index != lastIndex ? Object.prototype.hasOwnProperty.call(pointer, key) && pointer[key] !== null ? pointer[key] : typeof nextKey === 'number' ? [] : {} : valueFn(pointer[key]);
     pointer[key] = newValue;
     pointer = pointer[key];
   }
@@ -170,51 +170,29 @@ function normalize(value) {
 /**
  * Flatten a tree into a dictionary
  */
-function flatten(data, options) {
+function flatten(data) {
   var _options$resolve;
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var result = {};
-  var resolve = (_options$resolve = options === null || options === void 0 ? void 0 : options.resolve) !== null && _options$resolve !== void 0 ? _options$resolve : data => data;
-  function setResult(data, name) {
+  var resolve = (_options$resolve = options.resolve) !== null && _options$resolve !== void 0 ? _options$resolve : data => data;
+  function process(data, prefix) {
     var value = normalize(resolve(data));
     if (typeof value !== 'undefined') {
-      result[name] = value;
+      result[prefix] = value;
     }
-  }
-  function processObject(obj, prefix) {
-    setResult(obj, prefix);
-    for (var [key, _value] of Object.entries(obj)) {
-      var name = prefix ? "".concat(prefix, ".").concat(key) : key;
-      if (Array.isArray(_value)) {
-        processArray(_value, name);
-      } else if (_value && isPlainObject(_value)) {
-        processObject(_value, name);
-      } else {
-        setResult(_value, name);
+    if (Array.isArray(data)) {
+      for (var i = 0; i < data.length; i++) {
+        process(data[i], "".concat(prefix, "[").concat(i, "]"));
       }
-    }
-  }
-  function processArray(array, prefix) {
-    setResult(array, prefix);
-    for (var i = 0; i < array.length; i++) {
-      var item = array[i];
-      var name = "".concat(prefix, "[").concat(i, "]");
-      if (Array.isArray(item)) {
-        processArray(item, name);
-      } else if (item && isPlainObject(item)) {
-        processObject(item, name);
-      } else {
-        setResult(item, name);
+    } else if (isPlainObject(data)) {
+      for (var [key, _value] of Object.entries(data)) {
+        process(_value, prefix ? "".concat(prefix, ".").concat(key) : key);
       }
     }
   }
   if (data) {
     var _options$prefix;
-    var prefix = (_options$prefix = options === null || options === void 0 ? void 0 : options.prefix) !== null && _options$prefix !== void 0 ? _options$prefix : '';
-    if (Array.isArray(data)) {
-      processArray(data, prefix);
-    } else {
-      processObject(data, prefix);
-    }
+    process(data, (_options$prefix = options.prefix) !== null && _options$prefix !== void 0 ? _options$prefix : '');
   }
   return result;
 }

package/intent.d.ts

@@ -0,0 +1,82 @@
+import { type Pretty } from './types.js';
+export interface IntentButtonProps {
+    name: typeof INTENT;
+    value: string;
+    formNoValidate?: boolean;
+}
+export type ListIntentPayload<Schema = unknown> = {
+    name: string;
+    operation: 'insert';
+    defaultValue?: Schema;
+    index?: number;
+} | {
+    name: string;
+    operation: 'prepend';
+    defaultValue?: Schema;
+} | {
+    name: string;
+    operation: 'append';
+    defaultValue?: Schema;
+} | {
+    name: string;
+    operation: 'replace';
+    defaultValue: Schema;
+    index: number;
+} | {
+    name: string;
+    operation: 'remove';
+    index: number;
+} | {
+    name: string;
+    operation: 'reorder';
+    from: number;
+    to: number;
+};
+type ExtractListIntentPayload<Operation, Schema = unknown> = Pretty<Omit<Extract<ListIntentPayload<Schema>, {
+    operation: Operation;
+}>, 'name' | 'operation'>>;
+type ListIntent<Operation> = {} extends ExtractListIntentPayload<Operation> ? <Schema>(name: string, payload?: ExtractListIntentPayload<Operation, Schema>) => IntentButtonProps : <Schema>(name: string, payload: ExtractListIntentPayload<Operation, Schema>) => IntentButtonProps;
+/**
+ * Helpers to configure an intent button for modifying a list
+ *
+ * @see https://conform.guide/api/react#list
+ */
+export declare const list: {
+    /**
+     * @deprecated You can use `insert` without specifying an index instead
+     */
+    append: ListIntent<'append'>;
+    /**
+     * @deprecated You can use `insert` with zero index instead
+     */
+    prepend: ListIntent<'prepend'>;
+    insert: ListIntent<'insert'>;
+    replace: ListIntent<'replace'>;
+    remove: ListIntent<'remove'>;
+    reorder: ListIntent<'reorder'>;
+};
+export declare const INTENT = "__intent__";
+/**
+ * Returns the intent from the form data or search params.
+ * It throws an error if multiple intent is set.
+ */
+export declare function getIntent(payload: FormData | URLSearchParams): string;
+/**
+ * Returns the properties required to configure an intent button for validation
+ *
+ * @see https://conform.guide/api/react#validate
+ */
+export declare function validate(field: string): IntentButtonProps;
+export declare function requestIntent(form: HTMLFormElement | null | undefined, buttonProps: {
+    value: string;
+    formNoValidate?: boolean;
+}): void;
+export declare function parseIntent<Schema>(intent: string): {
+    type: 'validate';
+    payload: string;
+} | {
+    type: 'list';
+    payload: ListIntentPayload<Schema>;
+} | null;
+export declare function updateList<Schema>(list: Array<Schema>, payload: ListIntentPayload<Schema>): Array<Schema>;
+export {};

package/intent.js

@@ -0,0 +1,136 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
+var dom = require('./dom.js');
+
+/**
+ * Helpers to configure an intent button for modifying a list
+ *
+ * @see https://conform.guide/api/react#list
+ */
+var list = new Proxy({}, {
+  get(_target, operation) {
+    return function (name) {
+      var payload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      return {
+        name: INTENT,
+        value: "list/".concat(JSON.stringify(_rollupPluginBabelHelpers.objectSpread2({
+          name,
+          operation
+        }, payload))),
+        formNoValidate: true
+      };
+    };
+  }
+});
+var INTENT = '__intent__';
+
+/**
+ * Returns the intent from the form data or search params.
+ * It throws an error if multiple intent is set.
+ */
+function getIntent(payload) {
+  if (!payload.has(INTENT)) {
+    return 'submit';
+  }
+  var [intent, secondIntent, ...rest] = payload.getAll(INTENT);
+
+  // The submitter value is included in the formData directly on Safari 15.6.
+  // This causes the intent to be duplicated in the payload.
+  // We will ignore the second intent if it is the same as the first one.
+  if (typeof intent !== 'string' || secondIntent && intent !== secondIntent || rest.length > 0) {
+    throw new Error('The intent could only be set on a button');
+  }
+  return intent;
+}
+
+/**
+ * Returns the properties required to configure an intent button for validation
+ *
+ * @see https://conform.guide/api/react#validate
+ */
+function validate(field) {
+  return {
+    name: INTENT,
+    value: "validate/".concat(field),
+    formNoValidate: true
+  };
+}
+function requestIntent(form, buttonProps) {
+  if (!form) {
+    // eslint-disable-next-line no-console
+    console.warn('No form element is provided');
+    return;
+  }
+  var submitter = dom.createSubmitter({
+    name: INTENT,
+    value: buttonProps.value,
+    hidden: true,
+    formNoValidate: buttonProps.formNoValidate
+  });
+  dom.requestSubmit(form, submitter);
+}
+function parseIntent(intent) {
+  var seperatorIndex = intent.indexOf('/');
+  if (seperatorIndex > -1) {
+    var type = intent.slice(0, seperatorIndex);
+    var _payload = intent.slice(seperatorIndex + 1);
+    if (typeof _payload !== 'undefined') {
+      try {
+        switch (type) {
+          case 'validate':
+            return {
+              type,
+              payload: _payload
+            };
+          case 'list':
+            return {
+              type,
+              payload: JSON.parse(_payload)
+            };
+        }
+      } catch (error) {
+        throw new Error("Failed parsing intent: ".concat(intent), {
+          cause: error
+        });
+      }
+    }
+  }
+  return null;
+}
+function updateList(list, payload) {
+  var _payload$index;
+  switch (payload.operation) {
+    case 'prepend':
+      list.unshift(payload.defaultValue);
+      break;
+    case 'append':
+      list.push(payload.defaultValue);
+      break;
+    case 'insert':
+      list.splice((_payload$index = payload.index) !== null && _payload$index !== void 0 ? _payload$index : list.length, 0, payload.defaultValue);
+      break;
+    case 'replace':
+      list.splice(payload.index, 1, payload.defaultValue);
+      break;
+    case 'remove':
+      list.splice(payload.index, 1);
+      break;
+    case 'reorder':
+      list.splice(payload.to, 0, ...list.splice(payload.from, 1));
+      break;
+    default:
+      throw new Error('Unknown list intent received');
+  }
+  return list;
+}
+
+exports.INTENT = INTENT;
+exports.getIntent = getIntent;
+exports.list = list;
+exports.parseIntent = parseIntent;
+exports.requestIntent = requestIntent;
+exports.updateList = updateList;
+exports.validate = validate;

package/intent.mjs

@@ -0,0 +1,126 @@
+import { objectSpread2 as _objectSpread2 } from './_virtual/_rollupPluginBabelHelpers.mjs';
+import { createSubmitter, requestSubmit } from './dom.mjs';
+
+/**
+ * Helpers to configure an intent button for modifying a list
+ *
+ * @see https://conform.guide/api/react#list
+ */
+var list = new Proxy({}, {
+  get(_target, operation) {
+    return function (name) {
+      var payload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      return {
+        name: INTENT,
+        value: "list/".concat(JSON.stringify(_objectSpread2({
+          name,
+          operation
+        }, payload))),
+        formNoValidate: true
+      };
+    };
+  }
+});
+var INTENT = '__intent__';
+
+/**
+ * Returns the intent from the form data or search params.
+ * It throws an error if multiple intent is set.
+ */
+function getIntent(payload) {
+  if (!payload.has(INTENT)) {
+    return 'submit';
+  }
+  var [intent, secondIntent, ...rest] = payload.getAll(INTENT);
+
+  // The submitter value is included in the formData directly on Safari 15.6.
+  // This causes the intent to be duplicated in the payload.
+  // We will ignore the second intent if it is the same as the first one.
+  if (typeof intent !== 'string' || secondIntent && intent !== secondIntent || rest.length > 0) {
+    throw new Error('The intent could only be set on a button');
+  }
+  return intent;
+}
+
+/**
+ * Returns the properties required to configure an intent button for validation
+ *
+ * @see https://conform.guide/api/react#validate
+ */
+function validate(field) {
+  return {
+    name: INTENT,
+    value: "validate/".concat(field),
+    formNoValidate: true
+  };
+}
+function requestIntent(form, buttonProps) {
+  if (!form) {
+    // eslint-disable-next-line no-console
+    console.warn('No form element is provided');
+    return;
+  }
+  var submitter = createSubmitter({
+    name: INTENT,
+    value: buttonProps.value,
+    hidden: true,
+    formNoValidate: buttonProps.formNoValidate
+  });
+  requestSubmit(form, submitter);
+}
+function parseIntent(intent) {
+  var seperatorIndex = intent.indexOf('/');
+  if (seperatorIndex > -1) {
+    var type = intent.slice(0, seperatorIndex);
+    var _payload = intent.slice(seperatorIndex + 1);
+    if (typeof _payload !== 'undefined') {
+      try {
+        switch (type) {
+          case 'validate':
+            return {
+              type,
+              payload: _payload
+            };
+          case 'list':
+            return {
+              type,
+              payload: JSON.parse(_payload)
+            };
+        }
+      } catch (error) {
+        throw new Error("Failed parsing intent: ".concat(intent), {
+          cause: error
+        });
+      }
+    }
+  }
+  return null;
+}
+function updateList(list, payload) {
+  var _payload$index;
+  switch (payload.operation) {
+    case 'prepend':
+      list.unshift(payload.defaultValue);
+      break;
+    case 'append':
+      list.push(payload.defaultValue);
+      break;
+    case 'insert':
+      list.splice((_payload$index = payload.index) !== null && _payload$index !== void 0 ? _payload$index : list.length, 0, payload.defaultValue);
+      break;
+    case 'replace':
+      list.splice(payload.index, 1, payload.defaultValue);
+      break;
+    case 'remove':
+      list.splice(payload.index, 1);
+      break;
+    case 'reorder':
+      list.splice(payload.to, 0, ...list.splice(payload.from, 1));
+      break;
+    default:
+      throw new Error('Unknown list intent received');
+  }
+  return list;
+}
+
+export { INTENT, getIntent, list, parseIntent, requestIntent, updateList, validate };

package/package.json

@@ -1,42 +1,59 @@
 {
-	"name": "@conform-to/dom",
-	"description": "A set of opinionated helpers built on top of the Constraint Validation API",
-	"homepage": "https://conform.guide",
-	"license": "MIT",
-	"version": "1.1.2",
-	"main": "index.js",
-	"module": "index.mjs",
-	"types": "index.d.ts",
-	"exports": {
-		".": {
-			"types": "./index.d.ts",
-			"module": "./index.mjs",
-			"import": "./index.mjs",
-			"require": "./index.js",
-			"default": "./index.mjs"
-		}
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/edmundhung/conform",
-		"directory": "packages/conform-dom"
-	},
-	"author": {
-		"name": "Edmund Hung",
-		"email": "me@edmund.dev",
-		"url": "https://edmund.dev"
-	},
-	"bugs": {
-		"url": "https://github.com/edmundhung/conform/issues"
-	},
-	"keywords": [
-		"constraint-validation",
-		"form",
-		"form-validation",
-		"html",
-		"progressive-enhancement",
-		"validation",
-		"dom"
-	],
-	"sideEffects": false
-}
+  "name": "@conform-to/dom",
+  "description": "A set of opinionated helpers built on top of the Constraint Validation API",
+  "homepage": "https://conform.guide",
+  "license": "MIT",
+  "version": "1.1.4",
+  "main": "index.js",
+  "module": "index.mjs",
+  "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "module": "./index.mjs",
+      "import": "./index.mjs",
+      "require": "./index.js",
+      "default": "./index.mjs"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/edmundhung/conform",
+    "directory": "packages/conform-dom"
+  },
+  "author": {
+    "name": "Edmund Hung",
+    "email": "me@edmund.dev",
+    "url": "https://edmund.dev"
+  },
+  "bugs": {
+    "url": "https://github.com/edmundhung/conform/issues"
+  },
+  "keywords": [
+    "constraint-validation",
+    "form",
+    "form-validation",
+    "html",
+    "progressive-enhancement",
+    "validation",
+    "dom"
+  ],
+  "sideEffects": false,
+  "devDependencies": {
+    "@babel/core": "^7.17.8",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.20.2",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "rollup-plugin-copy": "^3.4.0",
+    "rollup": "^2.79.1"
+  },
+  "scripts": {
+    "build:js": "rollup -c",
+    "build:ts": "tsc",
+    "build": "pnpm run \"/^build:.*/\"",
+    "dev:js": "pnpm run build:js --watch",
+    "dev:ts": "pnpm run build:ts --watch",
+    "dev": "pnpm run \"/^dev:.*/\""
+  }
+}

package/parse.d.ts

@@ -0,0 +1,30 @@
+export type Submission<Schema = any> = {
+    intent: string;
+    payload: Record<string, unknown>;
+    error: Record<string, string[]>;
+    value?: Schema | null;
+};
+export declare const VALIDATION_UNDEFINED = "__undefined__";
+export declare const VALIDATION_SKIPPED = "__skipped__";
+export declare function parse(payload: FormData | URLSearchParams): Submission;
+export declare function parse<Schema>(payload: FormData | URLSearchParams, options?: {
+    resolve?: (payload: Record<string, any>, intent: string) => {
+        value?: Schema;
+        error?: Record<string, string[]>;
+    };
+}): Submission<Schema>;
+export declare function parse<Schema>(payload: FormData | URLSearchParams, options?: {
+    resolve?: (payload: Record<string, any>, intent: string) => Promise<{
+        value?: Schema;
+        error?: Record<string, string[]>;
+    }>;
+}): Promise<Submission<Schema>>;
+export declare function parse<Schema>(payload: FormData | URLSearchParams, options?: {
+    resolve?: (payload: Record<string, any>, intent: string) => {
+        value?: Schema;
+        error?: Record<string, string[]>;
+    } | Promise<{
+        value?: Schema;
+        error?: Record<string, string[]>;
+    }>;
+}): Submission<Schema> | Promise<Submission<Schema>>;

package/parse.js

@@ -0,0 +1,43 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
+var formdata = require('./formdata.js');
+var intent = require('./intent.js');
+
+var VALIDATION_UNDEFINED = '__undefined__';
+var VALIDATION_SKIPPED = '__skipped__';
+function parse(payload, options) {
+  var submission = {
+    intent: intent.getIntent(payload),
+    payload: formdata.resolve(payload, {
+      ignoreKeys: [intent.INTENT]
+    }),
+    error: {}
+  };
+  var intent$1 = intent.parseIntent(submission.intent);
+  if (intent$1 && intent$1.type === 'list') {
+    formdata.setValue(submission.payload, intent$1.payload.name, list => {
+      if (typeof list !== 'undefined' && !Array.isArray(list)) {
+        throw new Error('The list intent can only be applied to a list');
+      }
+      return intent.updateList(list !== null && list !== void 0 ? list : [], intent$1.payload);
+    });
+  }
+  if (typeof (options === null || options === void 0 ? void 0 : options.resolve) === 'undefined') {
+    return submission;
+  }
+  var result = options.resolve(submission.payload, submission.intent);
+  var mergeResolveResult = resolved => {
+    return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, submission), resolved);
+  };
+  if (result instanceof Promise) {
+    return result.then(mergeResolveResult);
+  }
+  return mergeResolveResult(result);
+}
+
+exports.VALIDATION_SKIPPED = VALIDATION_SKIPPED;
+exports.VALIDATION_UNDEFINED = VALIDATION_UNDEFINED;
+exports.parse = parse;

package/parse.mjs

@@ -0,0 +1,37 @@
+import { objectSpread2 as _objectSpread2 } from './_virtual/_rollupPluginBabelHelpers.mjs';
+import { resolve, setValue } from './formdata.mjs';
+import { getIntent, parseIntent, updateList, INTENT } from './intent.mjs';
+
+var VALIDATION_UNDEFINED = '__undefined__';
+var VALIDATION_SKIPPED = '__skipped__';
+function parse(payload, options) {
+  var submission = {
+    intent: getIntent(payload),
+    payload: resolve(payload, {
+      ignoreKeys: [INTENT]
+    }),
+    error: {}
+  };
+  var intent = parseIntent(submission.intent);
+  if (intent && intent.type === 'list') {
+    setValue(submission.payload, intent.payload.name, list => {
+      if (typeof list !== 'undefined' && !Array.isArray(list)) {
+        throw new Error('The list intent can only be applied to a list');
+      }
+      return updateList(list !== null && list !== void 0 ? list : [], intent.payload);
+    });
+  }
+  if (typeof (options === null || options === void 0 ? void 0 : options.resolve) === 'undefined') {
+    return submission;
+  }
+  var result = options.resolve(submission.payload, submission.intent);
+  var mergeResolveResult = resolved => {
+    return _objectSpread2(_objectSpread2({}, submission), resolved);
+  };
+  if (result instanceof Promise) {
+    return result.then(mergeResolveResult);
+  }
+  return mergeResolveResult(result);
+}
+
+export { VALIDATION_SKIPPED, VALIDATION_UNDEFINED, parse };

package/rollup.config.js

@@ -0,0 +1,100 @@
+import path from 'node:path';
+import babel from '@rollup/plugin-babel';
+import nodeResolve from '@rollup/plugin-node-resolve';
+import copy from 'rollup-plugin-copy';
+
+/** @returns {import("rollup").RollupOptions[]} */
+function configurePackage() {
+	let sourceDir = '.';
+	let outputDir = sourceDir;
+
+	/** @type {import("rollup").RollupOptions} */
+	let ESM = {
+		external(id) {
+			return !id.startsWith('.') && !path.isAbsolute(id);
+		},
+		input: `${sourceDir}/index.ts`,
+		output: {
+			dir: outputDir,
+			format: 'esm',
+			preserveModules: true,
+			entryFileNames: '[name].mjs',
+		},
+		plugins: [
+			babel({
+				babelrc: false,
+				configFile: false,
+				presets: [
+					[
+						'@babel/preset-env',
+						{
+							targets: {
+								node: '16',
+								esmodules: true,
+							},
+						},
+					],
+					'@babel/preset-typescript',
+				],
+				plugins: [],
+				babelHelpers: 'bundled',
+				exclude: /node_modules/,
+				extensions: ['.ts', '.tsx'],
+			}),
+			nodeResolve({
+				extensions: ['.ts', '.tsx'],
+			}),
+			copy({
+				targets: [
+					{ src: `../../README`, dest: sourceDir },
+					{ src: `../../LICENSE`, dest: sourceDir },
+				],
+			}),
+		],
+	};
+
+	/** @type {import("rollup").RollupOptions} */
+	let CJS = {
+		external(id) {
+			return !id.startsWith('.') && !path.isAbsolute(id);
+		},
+		input: `${sourceDir}/index.ts`,
+		output: {
+			dir: outputDir,
+			format: 'cjs',
+			preserveModules: true,
+			exports: 'auto',
+		},
+		plugins: [
+			babel({
+				babelrc: false,
+				configFile: false,
+				presets: [
+					[
+						'@babel/preset-env',
+						{
+							targets: {
+								node: '16',
+								esmodules: true,
+							},
+						},
+					],
+					'@babel/preset-typescript',
+				],
+				plugins: [],
+				babelHelpers: 'bundled',
+				exclude: /node_modules/,
+				extensions: ['.ts', '.tsx'],
+			}),
+			nodeResolve({
+				extensions: ['.ts', '.tsx'],
+			}),
+		],
+	};
+
+	return [ESM, CJS];
+}
+
+export default function rollup() {
+	return configurePackage();
+}

package/submission.d.ts

@@ -84,7 +84,7 @@ export type ResetIntent<Schema = any> = {
         index: Schema extends Array<unknown> ? number : never;
     };
 };
-export type UpdateIntent<Schema = unknown> = {
+export type UpdateIntent<Schema = any> = {
     type: 'update';
     payload: {
         name?: FieldName<Schema>;
@@ -94,18 +94,18 @@ export type UpdateIntent<Schema = unknown> = {
     } | {
         name: FieldName<Schema>;
         index: Schema extends Array<unknown> ? number : never;
-        value?: NonNullable<DefaultValue<Schema extends Array<infer Item> ? Item : unknown>>;
+        value?: Schema extends Array<infer Item> ? NonNullable<DefaultValue<Item>> : never;
         validated?: boolean;
     };
 };
-export type RemoveIntent<Schema extends Array<any> = any> = {
+export type RemoveIntent<Schema = any> = {
     type: 'remove';
     payload: {
         name: FieldName<Schema>;
         index: number;
     };
 };
-export type InsertIntent<Schema extends Array<any> = any> = {
+export type InsertIntent<Schema = any> = {
     type: 'insert';
     payload: {
         name: FieldName<Schema>;
@@ -113,7 +113,7 @@ export type InsertIntent<Schema extends Array<any> = any> = {
         index?: number;
     };
 };
-export type ReorderIntent<Schema extends Array<any> = any> = {
+export type ReorderIntent<Schema = any> = {
     type: 'reorder';
     payload: {
         name: FieldName<Schema>;
@@ -121,7 +121,7 @@ export type ReorderIntent<Schema extends Array<any> = any> = {
         to: number;
     };
 };
-export type Intent<Schema = unknown> = ValidateIntent<Schema> | ResetIntent<Schema> | UpdateIntent<Schema> | ReorderIntent<Schema extends Array<any> ? Schema : any> | RemoveIntent<Schema extends Array<any> ? Schema : any> | InsertIntent<Schema extends Array<any> ? Schema : any>;
+export type Intent<Schema = any> = ValidateIntent<Schema> | ResetIntent<Schema> | UpdateIntent<Schema> | ReorderIntent<Schema> | RemoveIntent<Schema> | InsertIntent<Schema>;
 export declare function getIntent(serializedIntent: string | null | undefined): Intent | null;
 export declare function serializeIntent<Schema>(intent: Intent<Schema>): string;
 export declare function updateList(list: unknown, intent: InsertIntent | RemoveIntent | ReorderIntent): void;
@@ -132,4 +132,4 @@ export declare function setListValue(data: Record<string, unknown>, intent: Inse
 export declare const root: unique symbol;
 export declare function setState(state: Record<string, unknown>, name: string, valueFn: (value: unknown) => unknown): void;
 export declare function setListState(state: Record<string, unknown>, intent: InsertIntent | RemoveIntent | ReorderIntent, getDefaultValue?: (defaultValue: any) => any): void;
-export declare function serialize<Schema>(defaultValue: DefaultValue<Schema>): FormValue<Schema>;
+export declare function serialize<Schema>(defaultValue: Schema): FormValue<Schema>;

package/submission.js

@@ -55,12 +55,11 @@ function parse(payload, options) {
       case 'update':
         {
           var name = formdata.formatName(intent.payload.name, intent.payload.index);
-          var _value = serialize(intent.payload.value);
-          if (typeof _value !== 'undefined') {
+          var _value = intent.payload.value;
+          if (typeof intent.payload.value !== 'undefined') {
             if (name) {
               formdata.setValue(context.payload, name, () => _value);
             } else {
-              // @ts-expect-error FIXME - it must be an object if there is no name
               context.payload = _value;
             }
           }
@@ -77,15 +76,6 @@ function parse(payload, options) {
           break;
         }
       case 'insert':
-        {
-          setListValue(context.payload, {
-            type: intent.type,
-            payload: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, intent.payload), {}, {
-              defaultValue: serialize(intent.payload.defaultValue)
-            })
-          });
-          break;
-        }
       case 'remove':
       case 'reorder':
         {
@@ -166,7 +156,24 @@ function getIntent(serializedIntent) {
   return control;
 }
 function serializeIntent(intent) {
-  return JSON.stringify(intent);
+  switch (intent.type) {
+    case 'insert':
+      return JSON.stringify({
+        type: intent.type,
+        payload: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, intent.payload), {}, {
+          defaultValue: serialize(intent.payload.defaultValue)
+        })
+      });
+    case 'update':
+      return JSON.stringify({
+        type: intent.type,
+        payload: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, intent.payload), {}, {
+          value: serialize(intent.payload.value)
+        })
+      });
+    default:
+      return JSON.stringify(intent);
+  }
 }
 function updateList(list, intent) {
   var _intent$payload$index;
@@ -225,9 +232,7 @@ function setState(state, name, valueFn) {
     _loop2();
   }
   var result = valueFn(formdata.getValue(target, name));
-  Object.assign(state,
-  // @ts-expect-error FIXME flatten should be more flexible
-  formdata.flatten(result, {
+  Object.assign(state, formdata.flatten(result, {
     resolve(data) {
       if (formdata.isPlainObject(data) || Array.isArray(data)) {
         var _data$root;
@@ -263,22 +268,19 @@ function serialize(defaultValue) {
     // @ts-expect-error FIXME
     return Object.entries(defaultValue).reduce((result, _ref) => {
       var [key, value] = _ref;
-      // @ts-ignore-error FIXME
       result[key] = serialize(value);
       return result;
     }, {});
   } else if (Array.isArray(defaultValue)) {
     // @ts-expect-error FIXME
     return defaultValue.map(serialize);
-  } else if (
-  // @ts-ignore-error FIXME
-  defaultValue instanceof Date) {
+  } else if (defaultValue instanceof Date) {
     // @ts-expect-error FIXME
     return defaultValue.toISOString();
   } else if (typeof defaultValue === 'boolean') {
     // @ts-expect-error FIXME
     return defaultValue ? 'on' : undefined;
-  } else if (typeof defaultValue === 'number') {
+  } else if (typeof defaultValue === 'number' || typeof defaultValue === 'bigint') {
     // @ts-expect-error FIXME
     return defaultValue.toString();
   } else {

package/submission.mjs

@@ -51,12 +51,11 @@ function parse(payload, options) {
       case 'update':
         {
           var name = formatName(intent.payload.name, intent.payload.index);
-          var _value = serialize(intent.payload.value);
-          if (typeof _value !== 'undefined') {
+          var _value = intent.payload.value;
+          if (typeof intent.payload.value !== 'undefined') {
             if (name) {
               setValue(context.payload, name, () => _value);
             } else {
-              // @ts-expect-error FIXME - it must be an object if there is no name
               context.payload = _value;
             }
           }
@@ -73,15 +72,6 @@ function parse(payload, options) {
           break;
         }
       case 'insert':
-        {
-          setListValue(context.payload, {
-            type: intent.type,
-            payload: _objectSpread2(_objectSpread2({}, intent.payload), {}, {
-              defaultValue: serialize(intent.payload.defaultValue)
-            })
-          });
-          break;
-        }
       case 'remove':
       case 'reorder':
         {
@@ -162,7 +152,24 @@ function getIntent(serializedIntent) {
   return control;
 }
 function serializeIntent(intent) {
-  return JSON.stringify(intent);
+  switch (intent.type) {
+    case 'insert':
+      return JSON.stringify({
+        type: intent.type,
+        payload: _objectSpread2(_objectSpread2({}, intent.payload), {}, {
+          defaultValue: serialize(intent.payload.defaultValue)
+        })
+      });
+    case 'update':
+      return JSON.stringify({
+        type: intent.type,
+        payload: _objectSpread2(_objectSpread2({}, intent.payload), {}, {
+          value: serialize(intent.payload.value)
+        })
+      });
+    default:
+      return JSON.stringify(intent);
+  }
 }
 function updateList(list, intent) {
   var _intent$payload$index;
@@ -221,9 +228,7 @@ function setState(state, name, valueFn) {
     _loop2();
   }
   var result = valueFn(getValue(target, name));
-  Object.assign(state,
-  // @ts-expect-error FIXME flatten should be more flexible
-  flatten(result, {
+  Object.assign(state, flatten(result, {
     resolve(data) {
       if (isPlainObject(data) || Array.isArray(data)) {
         var _data$root;
@@ -259,22 +264,19 @@ function serialize(defaultValue) {
     // @ts-expect-error FIXME
     return Object.entries(defaultValue).reduce((result, _ref) => {
       var [key, value] = _ref;
-      // @ts-ignore-error FIXME
       result[key] = serialize(value);
       return result;
     }, {});
   } else if (Array.isArray(defaultValue)) {
     // @ts-expect-error FIXME
     return defaultValue.map(serialize);
-  } else if (
-  // @ts-ignore-error FIXME
-  defaultValue instanceof Date) {
+  } else if (defaultValue instanceof Date) {
     // @ts-expect-error FIXME
     return defaultValue.toISOString();
   } else if (typeof defaultValue === 'boolean') {
     // @ts-expect-error FIXME
     return defaultValue ? 'on' : undefined;
-  } else if (typeof defaultValue === 'number') {
+  } else if (typeof defaultValue === 'number' || typeof defaultValue === 'bigint') {
     // @ts-expect-error FIXME
     return defaultValue.toString();
   } else {

package/types.d.ts

@@ -0,0 +1,20 @@
+export type Pretty<T> = {
+    [K in keyof T]: T[K];
+} & {};
+export type FieldConstraint<Schema = any> = {
+    required?: boolean;
+    minLength?: number;
+    maxLength?: number;
+    min?: Schema extends number ? number : string | number;
+    max?: Schema extends number ? number : string | number;
+    step?: Schema extends number ? number : string | number;
+    multiple?: boolean;
+    pattern?: string;
+};
+export type KeysOf<T> = T extends any ? keyof T : never;
+export type ResolveType<T, K extends KeysOf<T>> = T extends {
+    [k in K]?: any;
+} ? T[K] : undefined;
+export type FieldsetConstraint<Schema extends Record<string, any> | undefined> = {
+    [Key in KeysOf<Schema>]?: FieldConstraint<ResolveType<Schema, Key>>;
+};