@conform-to/react 1.15.0 → 1.16.0

package/dist/future/state.js

@@ -241,7 +241,8 @@ function getConstraint(context, name) {
   return constraint;
 }
 function getFormMetadata(context, options) {
-  return {
+  var _options$extendFormMe, _options$extendFormMe2;
+  var metadata = {
     key: context.state.resetKey,
     id: context.formId,
     errorId: "".concat(context.formId, "-form-error"),
@@ -274,31 +275,41 @@ function getFormMetadata(context, options) {
       return getField(context, {
         name,
         serialize: options === null || options === void 0 ? void 0 : options.serialize,
-        customize: options === null || options === void 0 ? void 0 : options.customize
+        extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
       });
     },
     getFieldset(name) {
       return getFieldset(context, {
         name,
         serialize: options === null || options === void 0 ? void 0 : options.serialize,
-        customize: options === null || options === void 0 ? void 0 : options.customize
+        extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
       });
     },
     getFieldList(name) {
       return getFieldList(context, {
         name,
         serialize: options === null || options === void 0 ? void 0 : options.serialize,
-        customize: options === null || options === void 0 ? void 0 : options.customize
+        extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
       });
     }
   };
+  var customMetadata = (_options$extendFormMe = options === null || options === void 0 || (_options$extendFormMe2 = options.extendFormMetadata) === null || _options$extendFormMe2 === void 0 ? void 0 : _options$extendFormMe2.call(options, metadata)) !== null && _options$extendFormMe !== void 0 ? _options$extendFormMe : {};
+  var descriptors = Object.getOwnPropertyDescriptors(customMetadata);
+  var extended = Object.create(metadata);
+  Object.defineProperties(extended, descriptors);
+  return extended;
 }
 function getField(context, options) {
+  var _extendFieldMetadata;
   var {
     key,
     name,
     serialize = future.serialize,
-    customize
+    extendFieldMetadata,
+    form = getFormMetadata(context, {
+      serialize,
+      extendFieldMetadata
+    })
   } = options;
   var id = "".concat(context.formId, "-field-").concat(name.replace(/[^a-zA-Z0-9._-]/g, '_'));
   var constraint = getConstraint(context, name);
@@ -351,40 +362,27 @@ function getField(context, options) {
       return getFieldset(context, {
         name: name,
         serialize,
-        customize
+        extendFieldMetadata
       });
     },
+    // @ts-expect-error The return type includes CustomFieldMetadata which BaseFieldMetadata
+    // doesn't account for. This is a type-level limitation; runtime behavior is correct.
     getFieldList() {
       return getFieldList(context, {
-        name: name,
+        name,
         serialize,
-        customize
+        extendFieldMetadata
       });
     }
   };
-  if (typeof customize !== 'function') {
-    return metadata;
-  }
-  var customMetadata = null;
-  return new Proxy(metadata, {
-    get(target, prop, receiver) {
-      var _customMetadata;
-      if (Reflect.has(target, prop)) {
-        return Reflect.get(target, prop, receiver);
-      }
-      (_customMetadata = customMetadata) !== null && _customMetadata !== void 0 ? _customMetadata : customMetadata = customize(metadata);
-      if (Reflect.has(customMetadata, prop)) {
-        return Reflect.get(customMetadata, prop, receiver);
-      }
-
-      // Allow React DevTools to inspect the object
-      // without throwing errors for internal properties
-      if (typeof prop === 'symbol' || prop === '$$typeof') {
-        return undefined;
-      }
-      throw new Error("Property \"".concat(String(prop), "\" does not exist on field metadata. ") + "If you have defined the CustomMetadata interface to include \"".concat(String(prop), "\", make sure to also implement it through the \"defineCustomMetadata\" property on <FormOptionsProvider />."));
-    }
-  });
+  var customMetadata = (_extendFieldMetadata = extendFieldMetadata === null || extendFieldMetadata === void 0 ? void 0 : extendFieldMetadata(metadata, {
+    form,
+    when: util.when
+  })) !== null && _extendFieldMetadata !== void 0 ? _extendFieldMetadata : {};
+  var descriptors = Object.getOwnPropertyDescriptors(customMetadata);
+  var extended = Object.create(metadata);
+  Object.defineProperties(extended, descriptors);
+  return extended;
 }
 
 /**
@@ -394,10 +392,16 @@ function getFieldset(context, options) {
   return new Proxy({}, {
     get(target, name, receiver) {
       if (typeof name === 'string') {
+        var _options$form;
+        (_options$form = options.form) !== null && _options$form !== void 0 ? _options$form : options.form = getFormMetadata(context, {
+          serialize: options === null || options === void 0 ? void 0 : options.serialize,
+          extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
+        });
         return getField(context, {
           name: future.appendPathSegment(options === null || options === void 0 ? void 0 : options.name, name),
           serialize: options.serialize,
-          customize: options.customize
+          extendFieldMetadata: options.extendFieldMetadata,
+          form: options.form
         });
       }
       return Reflect.get(target, name, receiver);
@@ -414,7 +418,7 @@ function getFieldList(context, options) {
     return getField(context, {
       name: future.appendPathSegment(options.name, index),
       serialize: options.serialize,
-      customize: options.customize,
+      extendFieldMetadata: options.extendFieldMetadata,
       key
     });
   });

package/dist/future/state.mjs

@@ -1,6 +1,6 @@
 import { objectSpread2 as _objectSpread2 } from '../_virtual/_rollupPluginBabelHelpers.mjs';
-import { getPathSegments, getRelativePath, appendPathSegment, deepEqual, getValueAtPath, formatPathSegments, serialize } from '@conform-to/dom/future';
-import { generateUniqueKey, merge, getArrayAtPath } from './util.mjs';
+import { getPathSegments, getRelativePath, serialize, appendPathSegment, deepEqual, getValueAtPath, formatPathSegments } from '@conform-to/dom/future';
+import { when, generateUniqueKey, merge, getArrayAtPath } from './util.mjs';
 
 function initializeState(options) {
   var _options$resetKey, _options$defaultValue;
@@ -237,7 +237,8 @@ function getConstraint(context, name) {
   return constraint;
 }
 function getFormMetadata(context, options) {
-  return {
+  var _options$extendFormMe, _options$extendFormMe2;
+  var metadata = {
     key: context.state.resetKey,
     id: context.formId,
     errorId: "".concat(context.formId, "-form-error"),
@@ -270,31 +271,41 @@ function getFormMetadata(context, options) {
       return getField(context, {
         name,
         serialize: options === null || options === void 0 ? void 0 : options.serialize,
-        customize: options === null || options === void 0 ? void 0 : options.customize
+        extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
       });
     },
     getFieldset(name) {
       return getFieldset(context, {
         name,
         serialize: options === null || options === void 0 ? void 0 : options.serialize,
-        customize: options === null || options === void 0 ? void 0 : options.customize
+        extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
       });
     },
     getFieldList(name) {
       return getFieldList(context, {
         name,
         serialize: options === null || options === void 0 ? void 0 : options.serialize,
-        customize: options === null || options === void 0 ? void 0 : options.customize
+        extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
       });
     }
   };
+  var customMetadata = (_options$extendFormMe = options === null || options === void 0 || (_options$extendFormMe2 = options.extendFormMetadata) === null || _options$extendFormMe2 === void 0 ? void 0 : _options$extendFormMe2.call(options, metadata)) !== null && _options$extendFormMe !== void 0 ? _options$extendFormMe : {};
+  var descriptors = Object.getOwnPropertyDescriptors(customMetadata);
+  var extended = Object.create(metadata);
+  Object.defineProperties(extended, descriptors);
+  return extended;
 }
 function getField(context, options) {
+  var _extendFieldMetadata;
   var {
     key,
     name,
     serialize: serialize$1 = serialize,
-    customize
+    extendFieldMetadata,
+    form = getFormMetadata(context, {
+      serialize: serialize$1,
+      extendFieldMetadata
+    })
   } = options;
   var id = "".concat(context.formId, "-field-").concat(name.replace(/[^a-zA-Z0-9._-]/g, '_'));
   var constraint = getConstraint(context, name);
@@ -347,40 +358,27 @@ function getField(context, options) {
       return getFieldset(context, {
         name: name,
         serialize: serialize$1,
-        customize
+        extendFieldMetadata
       });
     },
+    // @ts-expect-error The return type includes CustomFieldMetadata which BaseFieldMetadata
+    // doesn't account for. This is a type-level limitation; runtime behavior is correct.
     getFieldList() {
       return getFieldList(context, {
-        name: name,
+        name,
         serialize: serialize$1,
-        customize
+        extendFieldMetadata
       });
     }
   };
-  if (typeof customize !== 'function') {
-    return metadata;
-  }
-  var customMetadata = null;
-  return new Proxy(metadata, {
-    get(target, prop, receiver) {
-      var _customMetadata;
-      if (Reflect.has(target, prop)) {
-        return Reflect.get(target, prop, receiver);
-      }
-      (_customMetadata = customMetadata) !== null && _customMetadata !== void 0 ? _customMetadata : customMetadata = customize(metadata);
-      if (Reflect.has(customMetadata, prop)) {
-        return Reflect.get(customMetadata, prop, receiver);
-      }
-
-      // Allow React DevTools to inspect the object
-      // without throwing errors for internal properties
-      if (typeof prop === 'symbol' || prop === '$$typeof') {
-        return undefined;
-      }
-      throw new Error("Property \"".concat(String(prop), "\" does not exist on field metadata. ") + "If you have defined the CustomMetadata interface to include \"".concat(String(prop), "\", make sure to also implement it through the \"defineCustomMetadata\" property on <FormOptionsProvider />."));
-    }
-  });
+  var customMetadata = (_extendFieldMetadata = extendFieldMetadata === null || extendFieldMetadata === void 0 ? void 0 : extendFieldMetadata(metadata, {
+    form,
+    when
+  })) !== null && _extendFieldMetadata !== void 0 ? _extendFieldMetadata : {};
+  var descriptors = Object.getOwnPropertyDescriptors(customMetadata);
+  var extended = Object.create(metadata);
+  Object.defineProperties(extended, descriptors);
+  return extended;
 }
 
 /**
@@ -390,10 +388,16 @@ function getFieldset(context, options) {
   return new Proxy({}, {
     get(target, name, receiver) {
       if (typeof name === 'string') {
+        var _options$form;
+        (_options$form = options.form) !== null && _options$form !== void 0 ? _options$form : options.form = getFormMetadata(context, {
+          serialize: options === null || options === void 0 ? void 0 : options.serialize,
+          extendFieldMetadata: options === null || options === void 0 ? void 0 : options.extendFieldMetadata
+        });
         return getField(context, {
           name: appendPathSegment(options === null || options === void 0 ? void 0 : options.name, name),
           serialize: options.serialize,
-          customize: options.customize
+          extendFieldMetadata: options.extendFieldMetadata,
+          form: options.form
         });
       }
       return Reflect.get(target, name, receiver);
@@ -410,7 +414,7 @@ function getFieldList(context, options) {
     return getField(context, {
       name: appendPathSegment(options.name, index),
       serialize: options.serialize,
-      customize: options.customize,
+      extendFieldMetadata: options.extendFieldMetadata,
       key
     });
   });