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

package/formdata.d.ts

@@ -24,15 +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, ignoreKeys?: string[]): {};
+export declare function resolve(payload: FormData | URLSearchParams, options?: {
+    ignoreKeys?: string[];
+}): {};
 /**
  * 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];
   }
@@ -82,10 +82,12 @@ function setValue(target, name, valueFn) {
 /**
  * Resolves the payload into a plain object based on the JS syntax convention
  */
-function resolve(payload, ignoreKeys) {
+function resolve(payload) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var data = {};
   var _loop = function _loop(value) {
-    if (ignoreKeys !== null && ignoreKeys !== void 0 && ignoreKeys.includes(key)) {
+    var _options$ignoreKeys;
+    if ((_options$ignoreKeys = options.ignoreKeys) !== null && _options$ignoreKeys !== void 0 && _options$ignoreKeys.includes(key)) {
       return "continue";
     }
     setValue(data, key, prev => {
@@ -109,17 +111,16 @@ function resolve(payload, ignoreKeys) {
  * 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];
   }
@@ -78,10 +78,12 @@ function setValue(target, name, valueFn) {
 /**
  * Resolves the payload into a plain object based on the JS syntax convention
  */
-function resolve(payload, ignoreKeys) {
+function resolve(payload) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var data = {};
   var _loop = function _loop(value) {
-    if (ignoreKeys !== null && ignoreKeys !== void 0 && ignoreKeys.includes(key)) {
+    var _options$ignoreKeys;
+    if ((_options$ignoreKeys = options.ignoreKeys) !== null && _options$ignoreKeys !== void 0 && _options$ignoreKeys.includes(key)) {
       return "continue";
     }
     setValue(data, key, prev => {
@@ -105,17 +107,16 @@ function resolve(payload, ignoreKeys) {
  * 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.3",
+	"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,21 +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[]>;
     };
 }): 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[]>;
     }>;
 }): 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[]>;
     }>;
 }): Submission<Schema> | Promise<Submission<Schema>>;

package/parse.js

@@ -11,7 +11,9 @@ var VALIDATION_SKIPPED = '__skipped__';
 function parse(payload, options) {
   var submission = {
     intent: intent.getIntent(payload),
-    payload: formdata.resolve(payload, [intent.INTENT]),
+    payload: formdata.resolve(payload, {
+      ignoreKeys: [intent.INTENT]
+    }),
     error: {}
   };
   var intent$1 = intent.parseIntent(submission.intent);

package/parse.mjs

@@ -7,7 +7,9 @@ var VALIDATION_SKIPPED = '__skipped__';
 function parse(payload, options) {
   var submission = {
     intent: getIntent(payload),
-    payload: resolve(payload, [INTENT]),
+    payload: resolve(payload, {
+      ignoreKeys: [INTENT]
+    }),
     error: {}
   };
   var intent = parseIntent(submission.intent);