@conform-to/dom 1.1.2 → 1.1.3

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;
@@ -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;
@@ -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.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];
   }

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];
   }

package/package.json

@@ -3,7 +3,7 @@
 	"description": "A set of opinionated helpers built on top of the Constraint Validation API",
 	"homepage": "https://conform.guide",
 	"license": "MIT",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"main": "index.js",
 	"module": "index.mjs",
 	"types": "index.d.ts",
@@ -16,6 +16,15 @@
 			"default": "./index.mjs"
 		}
 	},
+	"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:.*/\"",
+		"prepare": "pnpm run build"
+	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/edmundhung/conform",
@@ -38,5 +47,14 @@
 		"validation",
 		"dom"
 	],
-	"sideEffects": false
+	"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"
+	}
 }

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>;
@@ -98,14 +98,14 @@ export type UpdateIntent<Schema = unknown> = {
         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;