@conform-to/dom 0.7.4 → 0.8.0-pre.0

package/formdata.d.ts

@@ -24,18 +24,17 @@ export declare function formatPaths(paths: Array<string | number>): string;
 /**
  * Assign a value to a target object by following the paths on the name
  */
-export declare function setValue(target: any, name: string, valueFn: (prev?: unknown) => any): void;
+export declare function setValue(target: Record<string, any>, name: string, valueFn: (prev?: unknown) => any): void;
 /**
  * Resolves the payload into a plain object based on the JS syntax convention
  */
 export declare function resolve(payload: FormData | URLSearchParams, options?: {
     ignoreKeys?: string[];
-    stripEmptyValue?: boolean;
 }): {};
 /**
  * Format the error messages into a validation message
  */
-export declare function getValidationMessage(errors?: string | string[]): string;
+export declare function getValidationMessage(errors?: string[]): string;
 /**
  * Retrieve the error messages from the validation message
  */

package/formdata.js

@@ -25,20 +25,20 @@ function getFormData(form, submitter) {
  * ```
  */
 function getPaths(name) {
-  var pattern = /(\w*)\[(\d+)\]/;
   if (!name) {
     return [];
   }
-  return name.split('.').flatMap(key => {
-    var matches = pattern.exec(key);
-    if (!matches) {
-      return key;
-    }
-    if (matches[1] === '') {
-      return Number(matches[2]);
+  return name.split(/\.|(\[\d*\])/).reduce((result, segment) => {
+    if (typeof segment !== 'undefined' && segment !== '') {
+      if (segment.startsWith('[') && segment.endsWith(']')) {
+        var index = segment.slice(1, -1);
+        result.push(Number(index));
+      } else {
+        result.push(segment);
+      }
     }
-    return [matches[1], Number(matches[2])];
-  });
+    return result;
+  }, []);
 }
 
 /**
@@ -72,8 +72,8 @@ function setValue(target, name, valueFn) {
   while (pointer != null && ++index < length) {
     var _pointer$key;
     var key = paths[index];
-    var next = paths[index + 1];
-    var newValue = index != lastIndex ? (_pointer$key = pointer[key]) !== null && _pointer$key !== void 0 ? _pointer$key : typeof next === 'number' ? [] : {} : valueFn(pointer[key]);
+    var nextKey = paths[index + 1];
+    var newValue = index != lastIndex ? (_pointer$key = pointer[key]) !== null && _pointer$key !== void 0 ? _pointer$key : typeof nextKey === 'number' ? [] : {} : valueFn(pointer[key]);
     pointer[key] = newValue;
     pointer = pointer[key];
   }
@@ -85,31 +85,23 @@ function setValue(target, name, valueFn) {
 function resolve(payload) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var data = {};
-  var _loop = function _loop() {
+  var _loop = function _loop(value) {
     var _options$ignoreKeys;
     if ((_options$ignoreKeys = options.ignoreKeys) !== null && _options$ignoreKeys !== void 0 && _options$ignoreKeys.includes(key)) {
       return "continue";
     }
-    var next = value;
-    if (options.stripEmptyValue && (typeof next === 'string' ? next === '' : next.name === '' && next.size === 0)) {
-      // Set the value to undefined instead of skipping it
-      // to maintain the data structure
-      next = undefined;
-    }
     setValue(data, key, prev => {
       if (!prev) {
-        return next;
-      } else if (!next) {
-        return prev;
+        return value;
       } else if (Array.isArray(prev)) {
-        return prev.concat(next);
+        return prev.concat(value);
       } else {
-        return [prev, next];
+        return [prev, value];
       }
     });
   };
   for (var [key, value] of payload.entries()) {
-    var _ret = _loop();
+    var _ret = _loop(value);
     if (_ret === "continue") continue;
   }
   return data;
@@ -119,17 +111,16 @@ function resolve(payload) {
  * Format the error messages into a validation message
  */
 function getValidationMessage(errors) {
-  return [].concat(errors !== null && errors !== void 0 ? errors : []).join(String.fromCharCode(31));
+  var _errors$join;
+  return (_errors$join = errors === null || errors === void 0 ? void 0 : errors.join(String.fromCharCode(31))) !== null && _errors$join !== void 0 ? _errors$join : '';
 }
 
 /**
  * Retrieve the error messages from the validation message
  */
 function getErrors(validationMessage) {
-  if (!validationMessage) {
-    return [];
-  }
-  return validationMessage.split(String.fromCharCode(31));
+  var _validationMessage$sp;
+  return (_validationMessage$sp = validationMessage === null || validationMessage === void 0 ? void 0 : validationMessage.split(String.fromCharCode(31))) !== null && _validationMessage$sp !== void 0 ? _validationMessage$sp : [];
 }
 
 exports.formatPaths = formatPaths;

package/formdata.mjs

@@ -21,20 +21,20 @@ function getFormData(form, submitter) {
  * ```
  */
 function getPaths(name) {
-  var pattern = /(\w*)\[(\d+)\]/;
   if (!name) {
     return [];
   }
-  return name.split('.').flatMap(key => {
-    var matches = pattern.exec(key);
-    if (!matches) {
-      return key;
-    }
-    if (matches[1] === '') {
-      return Number(matches[2]);
+  return name.split(/\.|(\[\d*\])/).reduce((result, segment) => {
+    if (typeof segment !== 'undefined' && segment !== '') {
+      if (segment.startsWith('[') && segment.endsWith(']')) {
+        var index = segment.slice(1, -1);
+        result.push(Number(index));
+      } else {
+        result.push(segment);
+      }
     }
-    return [matches[1], Number(matches[2])];
-  });
+    return result;
+  }, []);
 }
 
 /**
@@ -68,8 +68,8 @@ function setValue(target, name, valueFn) {
   while (pointer != null && ++index < length) {
     var _pointer$key;
     var key = paths[index];
-    var next = paths[index + 1];
-    var newValue = index != lastIndex ? (_pointer$key = pointer[key]) !== null && _pointer$key !== void 0 ? _pointer$key : typeof next === 'number' ? [] : {} : valueFn(pointer[key]);
+    var nextKey = paths[index + 1];
+    var newValue = index != lastIndex ? (_pointer$key = pointer[key]) !== null && _pointer$key !== void 0 ? _pointer$key : typeof nextKey === 'number' ? [] : {} : valueFn(pointer[key]);
     pointer[key] = newValue;
     pointer = pointer[key];
   }
@@ -81,31 +81,23 @@ function setValue(target, name, valueFn) {
 function resolve(payload) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var data = {};
-  var _loop = function _loop() {
+  var _loop = function _loop(value) {
     var _options$ignoreKeys;
     if ((_options$ignoreKeys = options.ignoreKeys) !== null && _options$ignoreKeys !== void 0 && _options$ignoreKeys.includes(key)) {
       return "continue";
     }
-    var next = value;
-    if (options.stripEmptyValue && (typeof next === 'string' ? next === '' : next.name === '' && next.size === 0)) {
-      // Set the value to undefined instead of skipping it
-      // to maintain the data structure
-      next = undefined;
-    }
     setValue(data, key, prev => {
       if (!prev) {
-        return next;
-      } else if (!next) {
-        return prev;
+        return value;
       } else if (Array.isArray(prev)) {
-        return prev.concat(next);
+        return prev.concat(value);
       } else {
-        return [prev, next];
+        return [prev, value];
       }
     });
   };
   for (var [key, value] of payload.entries()) {
-    var _ret = _loop();
+    var _ret = _loop(value);
     if (_ret === "continue") continue;
   }
   return data;
@@ -115,17 +107,16 @@ function resolve(payload) {
  * Format the error messages into a validation message
  */
 function getValidationMessage(errors) {
-  return [].concat(errors !== null && errors !== void 0 ? errors : []).join(String.fromCharCode(31));
+  var _errors$join;
+  return (_errors$join = errors === null || errors === void 0 ? void 0 : errors.join(String.fromCharCode(31))) !== null && _errors$join !== void 0 ? _errors$join : '';
 }
 
 /**
  * Retrieve the error messages from the validation message
  */
 function getErrors(validationMessage) {
-  if (!validationMessage) {
-    return [];
-  }
-  return validationMessage.split(String.fromCharCode(31));
+  var _validationMessage$sp;
+  return (_validationMessage$sp = validationMessage === null || validationMessage === void 0 ? void 0 : validationMessage.split(String.fromCharCode(31))) !== null && _validationMessage$sp !== void 0 ? _validationMessage$sp : [];
 }
 
 export { formatPaths, getErrors, getFormData, getPaths, getValidationMessage, resolve, setValue };

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": "0.7.4",
+	"version": "0.8.0-pre.0",
 	"main": "index.js",
 	"module": "index.mjs",
 	"types": "index.d.ts",

package/parse.d.ts

@@ -1,7 +1,7 @@
 export type Submission<Schema = any> = {
     intent: string;
     payload: Record<string, any>;
-    error: Record<string, string | string[]>;
+    error: Record<string, string[]>;
     value?: Schema | null;
 };
 export declare const VALIDATION_UNDEFINED = "__undefined__";
@@ -10,24 +10,21 @@ 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 | string[]>;
+        error?: Record<string, string[]>;
     };
-    stripEmptyValue?: boolean;
 }): 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 | string[]>;
+        error?: Record<string, string[]>;
     }>;
-    stripEmptyValue?: boolean;
 }): 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 | string[]>;
+        error?: Record<string, string[]>;
     } | Promise<{
         value?: Schema;
-        error?: Record<string, string | string[]>;
+        error?: Record<string, string[]>;
     }>;
-    stripEmptyValue?: boolean;
 }): Submission<Schema> | Promise<Submission<Schema>>;

package/parse.js

@@ -12,8 +12,7 @@ function parse(payload, options) {
   var submission = {
     intent: intent.getIntent(payload),
     payload: formdata.resolve(payload, {
-      ignoreKeys: [intent.INTENT],
-      stripEmptyValue: options === null || options === void 0 ? void 0 : options.stripEmptyValue
+      ignoreKeys: [intent.INTENT]
     }),
     error: {}
   };

package/parse.mjs

@@ -1,6 +1,6 @@
 import { objectSpread2 as _objectSpread2 } from './_virtual/_rollupPluginBabelHelpers.mjs';
 import { resolve, setValue } from './formdata.mjs';
-import { getIntent, INTENT, parseIntent, updateList } from './intent.mjs';
+import { getIntent, parseIntent, updateList, INTENT } from './intent.mjs';
 
 var VALIDATION_UNDEFINED = '__undefined__';
 var VALIDATION_SKIPPED = '__skipped__';
@@ -8,8 +8,7 @@ function parse(payload, options) {
   var submission = {
     intent: getIntent(payload),
     payload: resolve(payload, {
-      ignoreKeys: [INTENT],
-      stripEmptyValue: options === null || options === void 0 ? void 0 : options.stripEmptyValue
+      ignoreKeys: [INTENT]
     }),
     error: {}
   };