@rjsf/utils 6.0.0-alpha.0 → 6.0.0-beta.1

package/dist/utils.esm.js

@@ -1,12 +1,15 @@
 // src/isObject.ts
 function isObject(thing) {
-  if (typeof File !== "undefined" && thing instanceof File) {
+  if (typeof thing !== "object" || thing === null) {
     return false;
   }
-  if (typeof Date !== "undefined" && thing instanceof Date) {
+  if (typeof thing.lastModified === "number" && typeof File !== "undefined" && thing instanceof File) {
     return false;
   }
-  return typeof thing === "object" && thing !== null && !Array.isArray(thing);
+  if (typeof thing.getMonth === "function" && typeof Date !== "undefined" && thing instanceof Date) {
+    return false;
+  }
+  return !Array.isArray(thing);
 }
 
 // src/allowAdditionalItems.ts
@@ -56,11 +59,15 @@ var ITEMS_KEY = "items";
 var JUNK_OPTION_ID = "_$junk_option_schema_id$_";
 var NAME_KEY = "$name";
 var ONE_OF_KEY = "oneOf";
+var PATTERN_PROPERTIES_KEY = "patternProperties";
 var PROPERTIES_KEY = "properties";
+var READONLY_KEY = "readonly";
 var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
-var RJSF_ADDITONAL_PROPERTIES_FLAG = "__rjsf_additionalProperties";
+var DISCRIMINATOR_PATH = ["discriminator", "propertyName"];
+var FORM_CONTEXT_NAME = "formContext";
+var LOOKUP_MAP_NAME = "layoutGridLookupMap";
 var RJSF_ADDITIONAL_PROPERTIES_FLAG = "__rjsf_additionalProperties";
 var ROOT_SCHEMA_PREFIX = "__rjsf_rootSchema";
 var UI_FIELD_KEY = "ui:field";
@@ -88,7 +95,7 @@ function getUiOptions(uiSchema = {}, globalOptions = {}) {
 
 // src/canExpand.ts
 function canExpand(schema, uiSchema = {}, formData) {
-  if (!schema.additionalProperties) {
+  if (!(schema.additionalProperties || schema.patternProperties)) {
     return false;
   }
   const { expandable = true } = getUiOptions(uiSchema);
@@ -138,9 +145,23 @@ function deepEquals(a, b) {
   });
 }
 
-// src/schema/getDefaultFormState.ts
+// src/schema/findFieldInSchema.ts
 import get7 from "lodash/get";
-import isEmpty from "lodash/isEmpty";
+import has3 from "lodash/has";
+
+// src/schema/findSelectedOptionInXxxOf.ts
+import get5 from "lodash/get";
+import isEqual from "lodash/isEqual";
+
+// src/schema/retrieveSchema.ts
+import get4 from "lodash/get";
+import set from "lodash/set";
+import times from "lodash/times";
+import transform from "lodash/transform";
+import merge from "lodash/merge";
+import flattenDeep from "lodash/flattenDeep";
+import uniq from "lodash/uniq";
+import mergeAllOf from "json-schema-merge-allof";
 
 // src/findSchemaDefinition.ts
 import jsonpointer from "jsonpointer";
@@ -186,114 +207,12 @@ function findSchemaDefinition($ref, rootSchema = {}) {
   return findSchemaDefinitionRecursive($ref, rootSchema, recurseList);
 }
 
-// src/schema/getClosestMatchingOption.ts
-import get5 from "lodash/get";
-import has2 from "lodash/has";
-import isNumber2 from "lodash/isNumber";
-import isObject2 from "lodash/isObject";
-import isString2 from "lodash/isString";
-import reduce from "lodash/reduce";
-import times2 from "lodash/times";
-
-// src/schema/getMatchingOption.ts
-import get2 from "lodash/get";
-import has from "lodash/has";
-import isNumber from "lodash/isNumber";
-
-// src/getOptionMatchingSimpleDiscriminator.ts
-import get from "lodash/get";
-function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
-  if (formData && discriminatorField) {
-    const value = get(formData, discriminatorField);
-    if (value === void 0) {
-      return;
-    }
-    for (let i = 0; i < options.length; i++) {
-      const option = options[i];
-      const discriminator = get(option, [PROPERTIES_KEY, discriminatorField], {});
-      if (discriminator.type === "object" || discriminator.type === "array") {
-        continue;
-      }
-      if (discriminator.const === value) {
-        return i;
-      }
-      if (discriminator.enum?.includes(value)) {
-        return i;
-      }
-    }
-  }
-  return;
-}
-
-// src/schema/getMatchingOption.ts
-function getMatchingOption(validator, formData, options, rootSchema, discriminatorField) {
-  if (formData === void 0) {
-    return 0;
-  }
-  const simpleDiscriminatorMatch = getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField);
-  if (isNumber(simpleDiscriminatorMatch)) {
-    return simpleDiscriminatorMatch;
-  }
-  for (let i = 0; i < options.length; i++) {
-    const option = options[i];
-    if (discriminatorField && has(option, [PROPERTIES_KEY, discriminatorField])) {
-      const value = get2(formData, discriminatorField);
-      const discriminator = get2(option, [PROPERTIES_KEY, discriminatorField], {});
-      if (validator.isValid(discriminator, value, rootSchema)) {
-        return i;
-      }
-    } else if (option[PROPERTIES_KEY]) {
-      const requiresAnyOf = {
-        anyOf: Object.keys(option[PROPERTIES_KEY]).map((key) => ({
-          required: [key]
-        }))
-      };
-      let augmentedSchema;
-      if (option.anyOf) {
-        const { ...shallowClone } = option;
-        if (!shallowClone.allOf) {
-          shallowClone.allOf = [];
-        } else {
-          shallowClone.allOf = shallowClone.allOf.slice();
-        }
-        shallowClone.allOf.push(requiresAnyOf);
-        augmentedSchema = shallowClone;
-      } else {
-        augmentedSchema = Object.assign({}, option, requiresAnyOf);
-      }
-      delete augmentedSchema.required;
-      if (validator.isValid(augmentedSchema, formData, rootSchema)) {
-        return i;
-      }
-    } else if (validator.isValid(option, formData, rootSchema)) {
-      return i;
-    }
-  }
-  return 0;
-}
-
-// src/schema/getFirstMatchingOption.ts
-function getFirstMatchingOption(validator, formData, options, rootSchema, discriminatorField) {
-  return getMatchingOption(validator, formData, options, rootSchema, discriminatorField);
-}
-
-// src/schema/retrieveSchema.ts
-import get4 from "lodash/get";
-import isEqual from "lodash/isEqual";
-import set from "lodash/set";
-import times from "lodash/times";
-import transform from "lodash/transform";
-import merge from "lodash/merge";
-import flattenDeep from "lodash/flattenDeep";
-import uniq from "lodash/uniq";
-import mergeAllOf from "json-schema-merge-allof";
-
 // src/getDiscriminatorFieldFromSchema.ts
-import get3 from "lodash/get";
+import get from "lodash/get";
 import isString from "lodash/isString";
 function getDiscriminatorFieldFromSchema(schema) {
   let discriminator;
-  const maybeString = get3(schema, "discriminator.propertyName", void 0);
+  const maybeString = get(schema, DISCRIMINATOR_PATH);
   if (isString(maybeString)) {
     discriminator = maybeString;
   } else if (maybeString !== void 0) {
@@ -337,7 +256,7 @@ function getSchemaType(schema) {
   if (!type && schema.enum) {
     return "string";
   }
-  if (!type && (schema.properties || schema.additionalProperties)) {
+  if (!type && (schema.properties || schema.additionalProperties || schema.patternProperties)) {
     return "object";
   }
   if (Array.isArray(type)) {
@@ -366,11 +285,97 @@ function mergeSchemas(obj1, obj2) {
   }, acc);
 }
 
+// src/schema/getFirstMatchingOption.ts
+import get3 from "lodash/get";
+import has from "lodash/has";
+import isNumber from "lodash/isNumber";
+
+// src/getOptionMatchingSimpleDiscriminator.ts
+import get2 from "lodash/get";
+function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
+  if (formData && discriminatorField) {
+    const value = get2(formData, discriminatorField);
+    if (value === void 0) {
+      return;
+    }
+    for (let i = 0; i < options.length; i++) {
+      const option = options[i];
+      const discriminator = get2(option, [PROPERTIES_KEY, discriminatorField], {});
+      if (discriminator.type === "object" || discriminator.type === "array") {
+        continue;
+      }
+      if (discriminator.const === value) {
+        return i;
+      }
+      if (discriminator.enum?.includes(value)) {
+        return i;
+      }
+    }
+  }
+  return;
+}
+
+// src/schema/getFirstMatchingOption.ts
+function getFirstMatchingOption(validator, formData, options, rootSchema, discriminatorField) {
+  if (formData === void 0) {
+    return 0;
+  }
+  const simpleDiscriminatorMatch = getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField);
+  if (isNumber(simpleDiscriminatorMatch)) {
+    return simpleDiscriminatorMatch;
+  }
+  for (let i = 0; i < options.length; i++) {
+    const option = options[i];
+    if (discriminatorField && has(option, [PROPERTIES_KEY, discriminatorField])) {
+      const value = get3(formData, discriminatorField);
+      const discriminator = get3(option, [PROPERTIES_KEY, discriminatorField], {});
+      if (validator.isValid(discriminator, value, rootSchema)) {
+        return i;
+      }
+    } else if (option[PROPERTIES_KEY]) {
+      const requiresAnyOf = {
+        anyOf: Object.keys(option[PROPERTIES_KEY]).map((key) => ({
+          required: [key]
+        }))
+      };
+      let augmentedSchema;
+      if (option.anyOf) {
+        const { ...shallowClone } = option;
+        if (!shallowClone.allOf) {
+          shallowClone.allOf = [];
+        } else {
+          shallowClone.allOf = shallowClone.allOf.slice();
+        }
+        shallowClone.allOf.push(requiresAnyOf);
+        augmentedSchema = shallowClone;
+      } else {
+        augmentedSchema = Object.assign({}, option, requiresAnyOf);
+      }
+      delete augmentedSchema.required;
+      if (validator.isValid(augmentedSchema, formData, rootSchema)) {
+        return i;
+      }
+    } else if (validator.isValid(option, formData, rootSchema)) {
+      return i;
+    }
+  }
+  return 0;
+}
+
 // src/schema/retrieveSchema.ts
-function retrieveSchema(validator, schema, rootSchema = {}, rawFormData) {
-  return retrieveSchemaInternal(validator, schema, rootSchema, rawFormData)[0];
+import isEmpty from "lodash/isEmpty";
+function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf) {
+  return retrieveSchemaInternal(
+    validator,
+    schema,
+    rootSchema,
+    rawFormData,
+    void 0,
+    void 0,
+    experimental_customMergeAllOf
+  )[0];
 }
-function resolveCondition(validator, schema, rootSchema, expandAllBranches, recurseList, formData) {
+function resolveCondition(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const { if: expression, then, else: otherwise, ...resolvedSchemaLessConditional } = schema;
   const conditionValue = validator.isValid(expression, formData || {}, rootSchema);
   let resolvedSchemas = [resolvedSchemaLessConditional];
@@ -378,12 +383,28 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, recu
   if (expandAllBranches) {
     if (then && typeof then !== "boolean") {
       schemas = schemas.concat(
-        retrieveSchemaInternal(validator, then, rootSchema, formData, expandAllBranches, recurseList)
+        retrieveSchemaInternal(
+          validator,
+          then,
+          rootSchema,
+          formData,
+          expandAllBranches,
+          recurseList,
+          experimental_customMergeAllOf
+        )
       );
     }
     if (otherwise && typeof otherwise !== "boolean") {
       schemas = schemas.concat(
-        retrieveSchemaInternal(validator, otherwise, rootSchema, formData, expandAllBranches, recurseList)
+        retrieveSchemaInternal(
+          validator,
+          otherwise,
+          rootSchema,
+          formData,
+          expandAllBranches,
+          recurseList,
+          experimental_customMergeAllOf
+        )
       );
     }
   } else {
@@ -396,7 +417,8 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, recu
           rootSchema,
           formData,
           expandAllBranches,
-          recurseList
+          recurseList,
+          experimental_customMergeAllOf
         )
       );
     }
@@ -405,7 +427,15 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, recu
     resolvedSchemas = schemas.map((s) => mergeSchemas(resolvedSchemaLessConditional, s));
   }
   return resolvedSchemas.flatMap(
-    (s) => retrieveSchemaInternal(validator, s, rootSchema, formData, expandAllBranches, recurseList)
+    (s) => retrieveSchemaInternal(
+      validator,
+      s,
+      rootSchema,
+      formData,
+      expandAllBranches,
+      recurseList,
+      experimental_customMergeAllOf
+    )
   );
 }
 function getAllPermutationsOfXxxOf(listOfLists) {
@@ -422,7 +452,16 @@ function getAllPermutationsOfXxxOf(listOfLists) {
   );
   return allPermutations;
 }
-function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData) {
+function getMatchingPatternProperties(schema, key) {
+  return Object.keys(schema.patternProperties).filter((pattern) => RegExp(pattern).test(key)).reduce(
+    (obj, pattern) => {
+      set(obj, [pattern], schema.patternProperties[pattern]);
+      return obj;
+    },
+    {}
+  );
+}
+function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const updatedSchemas = resolveReference(
     validator,
     schema,
@@ -444,7 +483,15 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
       formData
     );
     return resolvedSchemas.flatMap((s) => {
-      return retrieveSchemaInternal(validator, s, rootSchema, formData, expandAllBranches, recurseList);
+      return retrieveSchemaInternal(
+        validator,
+        s,
+        rootSchema,
+        formData,
+        expandAllBranches,
+        recurseList,
+        experimental_customMergeAllOf
+      );
     });
   }
   if (ALL_OF_KEY in schema && Array.isArray(schema.allOf)) {
@@ -455,15 +502,19 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
         rootSchema,
         formData,
         expandAllBranches,
-        recurseList
+        recurseList,
+        experimental_customMergeAllOf
       )
     );
     const allPermutations = getAllPermutationsOfXxxOf(allOfSchemaElements);
-    return allPermutations.map((permutation) => ({ ...schema, allOf: permutation }));
+    return allPermutations.map((permutation) => ({
+      ...schema,
+      allOf: permutation
+    }));
   }
   return [schema];
 }
-function resolveReference(validator, schema, rootSchema, expandAllBranches, recurseList, formData) {
+function resolveReference(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const updatedSchema = resolveAllReferences(schema, rootSchema, recurseList);
   if (updatedSchema !== schema) {
     return retrieveSchemaInternal(
@@ -472,7 +523,8 @@ function resolveReference(validator, schema, rootSchema, expandAllBranches, recu
       rootSchema,
       formData,
       expandAllBranches,
-      recurseList
+      recurseList,
+      experimental_customMergeAllOf
     );
   }
   return [schema];
@@ -511,9 +563,9 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList)
     };
   }
-  return isEqual(schema, resolvedSchema) ? schema : resolvedSchema;
+  return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
 }
-function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFormData) {
+function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFormData, experimental_customMergeAllOf) {
   const schema = {
     ...theSchema,
     properties: { ...theSchema.properties }
@@ -523,34 +575,54 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
     if (key in schema.properties) {
       return;
     }
-    let additionalProperties = {};
-    if (typeof schema.additionalProperties !== "boolean") {
-      if (REF_KEY in schema.additionalProperties) {
-        additionalProperties = retrieveSchema(
+    if (PATTERN_PROPERTIES_KEY in schema) {
+      const matchingProperties = getMatchingPatternProperties(schema, key);
+      if (!isEmpty(matchingProperties)) {
+        schema.properties[key] = retrieveSchema(
           validator,
-          { $ref: get4(schema.additionalProperties, [REF_KEY]) },
+          { allOf: Object.values(matchingProperties) },
           rootSchema,
-          formData
+          formData,
+          experimental_customMergeAllOf
         );
-      } else if ("type" in schema.additionalProperties) {
-        additionalProperties = { ...schema.additionalProperties };
-      } else if (ANY_OF_KEY in schema.additionalProperties || ONE_OF_KEY in schema.additionalProperties) {
-        additionalProperties = {
-          type: "object",
-          ...schema.additionalProperties
-        };
+        set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
+        return;
+      }
+    }
+    if (ADDITIONAL_PROPERTIES_KEY in schema && schema.additionalProperties !== false) {
+      let additionalProperties = {};
+      if (typeof schema.additionalProperties !== "boolean") {
+        if (REF_KEY in schema.additionalProperties) {
+          additionalProperties = retrieveSchema(
+            validator,
+            { $ref: get4(schema.additionalProperties, [REF_KEY]) },
+            rootSchema,
+            formData,
+            experimental_customMergeAllOf
+          );
+        } else if ("type" in schema.additionalProperties) {
+          additionalProperties = { ...schema.additionalProperties };
+        } else if (ANY_OF_KEY in schema.additionalProperties || ONE_OF_KEY in schema.additionalProperties) {
+          additionalProperties = {
+            type: "object",
+            ...schema.additionalProperties
+          };
+        } else {
+          additionalProperties = { type: guessType(get4(formData, [key])) };
+        }
       } else {
         additionalProperties = { type: guessType(get4(formData, [key])) };
       }
+      schema.properties[key] = additionalProperties;
+      set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
     } else {
-      additionalProperties = { type: guessType(get4(formData, [key])) };
+      schema.properties[key] = { type: "null" };
+      set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
     }
-    schema.properties[key] = additionalProperties;
-    set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
   });
   return schema;
 }
-function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = []) {
+function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf) {
   if (!isObject(schema)) {
     return [{}];
   }
@@ -560,7 +632,8 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
     rootSchema,
     expandAllBranches,
     recurseList,
-    rawFormData
+    rawFormData,
+    experimental_customMergeAllOf
   );
   return resolvedSchemas.flatMap((s) => {
     let resolvedSchema = s;
@@ -571,7 +644,8 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
         rootSchema,
         expandAllBranches,
         recurseList,
-        rawFormData
+        rawFormData,
+        experimental_customMergeAllOf
       );
     }
     if (ALL_OF_KEY in resolvedSchema) {
@@ -580,18 +654,60 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
         return [...allOf, restOfSchema];
       }
       try {
-        resolvedSchema = mergeAllOf(resolvedSchema, {
+        const withContainsSchemas = [];
+        const withoutContainsSchemas = [];
+        resolvedSchema.allOf?.forEach((s2) => {
+          if (typeof s2 === "object" && s2.contains) {
+            withContainsSchemas.push(s2);
+          } else {
+            withoutContainsSchemas.push(s2);
+          }
+        });
+        if (withContainsSchemas.length) {
+          resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
+        }
+        resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema, {
           deep: false
         });
+        if (withContainsSchemas.length) {
+          resolvedSchema.allOf = withContainsSchemas;
+        }
       } catch (e) {
         console.warn("could not merge subschemas in allOf:\n", e);
         const { allOf, ...resolvedSchemaWithoutAllOf } = resolvedSchema;
         return resolvedSchemaWithoutAllOf;
       }
     }
-    const hasAdditionalProperties = ADDITIONAL_PROPERTIES_KEY in resolvedSchema && resolvedSchema.additionalProperties !== false;
+    if (PROPERTIES_KEY in resolvedSchema && PATTERN_PROPERTIES_KEY in resolvedSchema) {
+      resolvedSchema = Object.keys(resolvedSchema.properties).reduce(
+        (schema2, key) => {
+          const matchingProperties = getMatchingPatternProperties(schema2, key);
+          if (!isEmpty(matchingProperties)) {
+            schema2.properties[key] = retrieveSchema(
+              validator,
+              { allOf: [schema2.properties[key], ...Object.values(matchingProperties)] },
+              rootSchema,
+              rawFormData,
+              experimental_customMergeAllOf
+            );
+          }
+          return schema2;
+        },
+        {
+          ...resolvedSchema,
+          properties: { ...resolvedSchema.properties }
+        }
+      );
+    }
+    const hasAdditionalProperties = PATTERN_PROPERTIES_KEY in resolvedSchema || ADDITIONAL_PROPERTIES_KEY in resolvedSchema && resolvedSchema.additionalProperties !== false;
     if (hasAdditionalProperties) {
-      return stubExistingAdditionalProperties(validator, resolvedSchema, rootSchema, rawFormData);
+      return stubExistingAdditionalProperties(
+        validator,
+        resolvedSchema,
+        rootSchema,
+        rawFormData,
+        experimental_customMergeAllOf
+      );
     }
     return resolvedSchema;
   });
@@ -618,7 +734,7 @@ function resolveAnyOrOneOfSchemas(validator, schema, rootSchema, expandAllBranch
   }
   return [schema];
 }
-function resolveDependencies(validator, schema, rootSchema, expandAllBranches, recurseList, formData) {
+function resolveDependencies(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const { dependencies, ...remainingSchema } = schema;
   const resolvedSchemas = resolveAnyOrOneOfSchemas(
     validator,
@@ -635,11 +751,12 @@ function resolveDependencies(validator, schema, rootSchema, expandAllBranches, r
       rootSchema,
       expandAllBranches,
       recurseList,
-      formData
+      formData,
+      experimental_customMergeAllOf
     )
   );
 }
-function processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, recurseList, formData) {
+function processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   let schemas = [resolvedSchema];
   for (const dependencyKey in dependencies) {
     if (!expandAllBranches && get4(formData, [dependencyKey]) === void 0) {
@@ -663,7 +780,8 @@ function processDependencies(validator, dependencies, resolvedSchema, rootSchema
         dependencyValue,
         expandAllBranches,
         recurseList,
-        formData
+        formData,
+        experimental_customMergeAllOf
       );
     }
     return schemas.flatMap(
@@ -674,7 +792,8 @@ function processDependencies(validator, dependencies, resolvedSchema, rootSchema
         rootSchema,
         expandAllBranches,
         recurseList,
-        formData
+        formData,
+        experimental_customMergeAllOf
       )
     );
   }
@@ -687,14 +806,15 @@ function withDependentProperties(schema, additionallyRequired) {
   const required = Array.isArray(schema.required) ? Array.from(/* @__PURE__ */ new Set([...schema.required, ...additionallyRequired])) : additionallyRequired;
   return { ...schema, required };
 }
-function withDependentSchema(validator, schema, rootSchema, dependencyKey, dependencyValue, expandAllBranches, recurseList, formData) {
+function withDependentSchema(validator, schema, rootSchema, dependencyKey, dependencyValue, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const dependentSchemas = retrieveSchemaInternal(
     validator,
     dependencyValue,
     rootSchema,
     formData,
     expandAllBranches,
-    recurseList
+    recurseList,
+    experimental_customMergeAllOf
   );
   return dependentSchemas.flatMap((dependent) => {
     const { oneOf, ...dependentSchema } = dependent;
@@ -718,12 +838,13 @@ function withDependentSchema(validator, schema, rootSchema, dependencyKey, depen
         resolvedOneOf,
         expandAllBranches,
         recurseList,
-        formData
+        formData,
+        experimental_customMergeAllOf
       )
     );
   });
 }
-function withExactlyOneSubschema(validator, schema, rootSchema, dependencyKey, oneOf, expandAllBranches, recurseList, formData) {
+function withExactlyOneSubschema(validator, schema, rootSchema, dependencyKey, oneOf, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const validSubschemas = oneOf.filter((subschema) => {
     if (typeof subschema === "boolean" || !subschema || !subschema.properties) {
       return false;
@@ -754,13 +875,166 @@ function withExactlyOneSubschema(validator, schema, rootSchema, dependencyKey, o
       rootSchema,
       formData,
       expandAllBranches,
-      recurseList
+      recurseList,
+      experimental_customMergeAllOf
     );
     return schemas.map((s2) => mergeSchemas(schema, s2));
   });
 }
 
+// src/schema/findSelectedOptionInXxxOf.ts
+function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField, xxx, formData = {}, experimental_customMergeAllOf) {
+  if (Array.isArray(schema[xxx])) {
+    const discriminator = getDiscriminatorFieldFromSchema(schema);
+    const selectorField = discriminator || fallbackField;
+    const xxxOfs = schema[xxx].map(
+      (xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf)
+    );
+    const data = get5(formData, selectorField);
+    if (data !== void 0) {
+      return xxxOfs.find((xxx2) => {
+        return isEqual(
+          get5(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get5(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
+          data
+        );
+      });
+    }
+  }
+  return void 0;
+}
+
+// src/schema/getFromSchema.ts
+import get6 from "lodash/get";
+import has2 from "lodash/has";
+import isEmpty2 from "lodash/isEmpty";
+function getFromSchemaInternal(validator, rootSchema, schema, path, experimental_customMergeAllOf) {
+  let fieldSchema = schema;
+  if (has2(schema, REF_KEY)) {
+    fieldSchema = retrieveSchema(validator, schema, rootSchema, void 0, experimental_customMergeAllOf);
+  }
+  if (isEmpty2(path)) {
+    return fieldSchema;
+  }
+  const pathList = Array.isArray(path) ? path : path.split(".");
+  const [part, ...nestedPath] = pathList;
+  if (part && has2(fieldSchema, part)) {
+    fieldSchema = get6(fieldSchema, part);
+    return getFromSchemaInternal(
+      validator,
+      rootSchema,
+      fieldSchema,
+      nestedPath,
+      experimental_customMergeAllOf
+    );
+  }
+  return void 0;
+}
+function getFromSchema(validator, rootSchema, schema, path, defaultValue, experimental_customMergeAllOf) {
+  const result = getFromSchemaInternal(validator, rootSchema, schema, path, experimental_customMergeAllOf);
+  if (result === void 0) {
+    return defaultValue;
+  }
+  return result;
+}
+
+// src/schema/findFieldInSchema.ts
+var NOT_FOUND_SCHEMA = { title: "!@#$_UNKNOWN_$#@!" };
+function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, experimental_customMergeAllOf) {
+  const pathList = Array.isArray(path) ? [...path] : path.split(".");
+  let parentField = schema;
+  const fieldName = pathList.pop();
+  if (pathList.length) {
+    pathList.forEach((subPath) => {
+      parentField = getFromSchema(
+        validator,
+        rootSchema,
+        parentField,
+        [PROPERTIES_KEY, subPath],
+        {},
+        experimental_customMergeAllOf
+      );
+      if (has3(parentField, ONE_OF_KEY)) {
+        parentField = findSelectedOptionInXxxOf(
+          validator,
+          rootSchema,
+          parentField,
+          fieldName,
+          ONE_OF_KEY,
+          get7(formData, subPath),
+          experimental_customMergeAllOf
+        );
+      } else if (has3(parentField, ANY_OF_KEY)) {
+        parentField = findSelectedOptionInXxxOf(
+          validator,
+          rootSchema,
+          parentField,
+          fieldName,
+          ANY_OF_KEY,
+          get7(formData, subPath),
+          experimental_customMergeAllOf
+        );
+      }
+    });
+  }
+  if (has3(parentField, ONE_OF_KEY)) {
+    parentField = findSelectedOptionInXxxOf(
+      validator,
+      rootSchema,
+      parentField,
+      fieldName,
+      ONE_OF_KEY,
+      formData,
+      experimental_customMergeAllOf
+    );
+  } else if (has3(parentField, ANY_OF_KEY)) {
+    parentField = findSelectedOptionInXxxOf(
+      validator,
+      rootSchema,
+      parentField,
+      fieldName,
+      ANY_OF_KEY,
+      formData,
+      experimental_customMergeAllOf
+    );
+  }
+  let field = getFromSchema(
+    validator,
+    rootSchema,
+    parentField,
+    [PROPERTIES_KEY, fieldName],
+    NOT_FOUND_SCHEMA,
+    experimental_customMergeAllOf
+  );
+  if (field === NOT_FOUND_SCHEMA) {
+    field = void 0;
+  }
+  const requiredArray = getFromSchema(
+    validator,
+    rootSchema,
+    parentField,
+    REQUIRED_KEY,
+    [],
+    experimental_customMergeAllOf
+  );
+  let isRequired;
+  if (field && Array.isArray(requiredArray)) {
+    isRequired = requiredArray.includes(fieldName);
+  }
+  return { field, isRequired };
+}
+
+// src/schema/getDefaultFormState.ts
+import get11 from "lodash/get";
+import isEmpty3 from "lodash/isEmpty";
+
 // src/schema/getClosestMatchingOption.ts
+import get8 from "lodash/get";
+import has4 from "lodash/has";
+import isNumber2 from "lodash/isNumber";
+import isObject2 from "lodash/isObject";
+import isString2 from "lodash/isString";
+import reduce from "lodash/reduce";
+import times2 from "lodash/times";
 var JUNK_OPTION = {
   type: "object",
   $id: JUNK_OPTION_ID,
@@ -770,35 +1044,51 @@ var JUNK_OPTION = {
     }
   }
 };
-function calculateIndexScore(validator, rootSchema, schema, formData = {}) {
+function calculateIndexScore(validator, rootSchema, schema, formData, experimental_customMergeAllOf) {
   let totalScore = 0;
   if (schema) {
     if (isObject2(schema.properties)) {
       totalScore += reduce(
         schema.properties,
         (score, value, key) => {
-          const formValue = get5(formData, key);
+          const formValue = get8(formData, key);
           if (typeof value === "boolean") {
             return score;
           }
-          if (has2(value, REF_KEY)) {
-            const newSchema = retrieveSchema(validator, value, rootSchema, formValue);
-            return score + calculateIndexScore(validator, rootSchema, newSchema, formValue || {});
+          if (has4(value, REF_KEY)) {
+            const newSchema = retrieveSchema(
+              validator,
+              value,
+              rootSchema,
+              formValue,
+              experimental_customMergeAllOf
+            );
+            return score + calculateIndexScore(
+              validator,
+              rootSchema,
+              newSchema,
+              formValue || {},
+              experimental_customMergeAllOf
+            );
           }
-          if ((has2(value, ONE_OF_KEY) || has2(value, ANY_OF_KEY)) && formValue) {
-            const key2 = has2(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
+          if ((has4(value, ONE_OF_KEY) || has4(value, ANY_OF_KEY)) && formValue) {
+            const key2 = has4(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
             const discriminator = getDiscriminatorFieldFromSchema(value);
             return score + getClosestMatchingOption(
               validator,
               rootSchema,
               formValue,
-              get5(value, key2),
+              get8(value, key2),
               -1,
-              discriminator
+              discriminator,
+              experimental_customMergeAllOf
             );
           }
           if (value.type === "object") {
-            return score + calculateIndexScore(validator, rootSchema, value, formValue || {});
+            if (isObject2(formValue)) {
+              score += 1;
+            }
+            return score + calculateIndexScore(validator, rootSchema, value, formValue, experimental_customMergeAllOf);
           }
           if (value.type === guessType(formValue)) {
             let newScore = score + 1;
@@ -819,7 +1109,7 @@ function calculateIndexScore(validator, rootSchema, schema, formData = {}) {
   }
   return totalScore;
 }
-function getClosestMatchingOption(validator, rootSchema, formData, options, selectedOption = -1, discriminatorField) {
+function getClosestMatchingOption(validator, rootSchema, formData, options, selectedOption = -1, discriminatorField, experimental_customMergeAllOf) {
   const resolvedOptions = options.map((option) => {
     return resolveAllReferences(option, rootSchema, []);
   });
@@ -846,7 +1136,7 @@ function getClosestMatchingOption(validator, rootSchema, formData, options, sele
     (scoreData, index) => {
       const { bestScore } = scoreData;
       const option = resolvedOptions[index];
-      const score = calculateIndexScore(validator, rootSchema, option, formData);
+      const score = calculateIndexScore(validator, rootSchema, option, formData, experimental_customMergeAllOf);
       scoreCount.add(score);
       if (score > bestScore) {
         return { bestIndex: index, bestScore: score };
@@ -867,57 +1157,79 @@ function isFixedItems(schema) {
 }
 
 // src/mergeDefaultsWithFormData.ts
-import get6 from "lodash/get";
-function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false) {
+import get9 from "lodash/get";
+import isNil from "lodash/isNil";
+function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false, defaultSupercedesUndefined = false, overrideFormDataWithDefaults = false) {
   if (Array.isArray(formData)) {
     const defaultsArray = Array.isArray(defaults) ? defaults : [];
-    const mapped = formData.map((value, idx) => {
-      if (defaultsArray[idx]) {
-        return mergeDefaultsWithFormData(defaultsArray[idx], value, mergeExtraArrayDefaults);
+    const overrideArray = overrideFormDataWithDefaults ? defaultsArray : formData;
+    const overrideOppositeArray = overrideFormDataWithDefaults ? formData : defaultsArray;
+    const mapped = overrideArray.map((value, idx) => {
+      if (overrideOppositeArray[idx] !== void 0) {
+        return mergeDefaultsWithFormData(
+          defaultsArray[idx],
+          formData[idx],
+          mergeExtraArrayDefaults,
+          defaultSupercedesUndefined,
+          overrideFormDataWithDefaults
+        );
       }
       return value;
     });
-    if (mergeExtraArrayDefaults && mapped.length < defaultsArray.length) {
-      mapped.push(...defaultsArray.slice(mapped.length));
+    if ((mergeExtraArrayDefaults || overrideFormDataWithDefaults) && mapped.length < overrideOppositeArray.length) {
+      mapped.push(...overrideOppositeArray.slice(mapped.length));
     }
     return mapped;
   }
   if (isObject(formData)) {
     const acc = Object.assign({}, defaults);
     return Object.keys(formData).reduce((acc2, key) => {
+      const keyValue = get9(formData, key);
+      const keyExistsInDefaults = isObject(defaults) && key in defaults;
+      const keyExistsInFormData = key in formData;
       acc2[key] = mergeDefaultsWithFormData(
-        defaults ? get6(defaults, key) : {},
-        get6(formData, key),
-        mergeExtraArrayDefaults
+        defaults ? get9(defaults, key) : {},
+        keyValue,
+        mergeExtraArrayDefaults,
+        defaultSupercedesUndefined,
+        // overrideFormDataWithDefaults can be true only when the key value exists in defaults
+        // Or if the key value doesn't exist in formData
+        overrideFormDataWithDefaults && (keyExistsInDefaults || !keyExistsInFormData)
       );
       return acc2;
     }, acc);
   }
+  if (defaultSupercedesUndefined && (!isNil(defaults) && isNil(formData) || typeof formData === "number" && isNaN(formData)) || overrideFormDataWithDefaults && !isNil(formData)) {
+    return defaults;
+  }
   return formData;
 }
 
 // src/mergeObjects.ts
 function mergeObjects(obj1, obj2, concatArrays = false) {
-  return Object.keys(obj2).reduce((acc, key) => {
-    const left = obj1 ? obj1[key] : {}, right = obj2[key];
-    if (obj1 && key in obj1 && isObject(right)) {
-      acc[key] = mergeObjects(left, right, concatArrays);
-    } else if (concatArrays && Array.isArray(left) && Array.isArray(right)) {
-      let toMerge = right;
-      if (concatArrays === "preventDuplicates") {
-        toMerge = right.reduce((result, value) => {
-          if (!left.includes(value)) {
-            result.push(value);
-          }
-          return result;
-        }, []);
+  return Object.keys(obj2).reduce(
+    (acc, key) => {
+      const left = obj1 ? obj1[key] : {}, right = obj2[key];
+      if (obj1 && key in obj1 && isObject(right)) {
+        acc[key] = mergeObjects(left, right, concatArrays);
+      } else if (concatArrays && Array.isArray(left) && Array.isArray(right)) {
+        let toMerge = right;
+        if (concatArrays === "preventDuplicates") {
+          toMerge = right.reduce((result, value) => {
+            if (!left.includes(value)) {
+              result.push(value);
+            }
+            return result;
+          }, []);
+        }
+        acc[key] = left.concat(toMerge);
+      } else {
+        acc[key] = right;
       }
-      acc[key] = left.concat(toMerge);
-    } else {
-      acc[key] = right;
-    }
-    return acc;
-  }, Object.assign({}, obj1));
+      return acc;
+    },
+    Object.assign({}, obj1)
+  );
 }
 
 // src/isConstant.ts
@@ -926,8 +1238,8 @@ function isConstant(schema) {
 }
 
 // src/schema/isSelect.ts
-function isSelect(validator, theSchema, rootSchema = {}) {
-  const schema = retrieveSchema(validator, theSchema, rootSchema, void 0);
+function isSelect(validator, theSchema, rootSchema = {}, experimental_customMergeAllOf) {
+  const schema = retrieveSchema(validator, theSchema, rootSchema, void 0, experimental_customMergeAllOf);
   const altSchemas = schema.oneOf || schema.anyOf;
   if (Array.isArray(schema.enum)) {
     return true;
@@ -939,14 +1251,85 @@ function isSelect(validator, theSchema, rootSchema = {}) {
 }
 
 // src/schema/isMultiSelect.ts
-function isMultiSelect(validator, schema, rootSchema) {
+function isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) {
   if (!schema.uniqueItems || !schema.items || typeof schema.items === "boolean") {
     return false;
   }
-  return isSelect(validator, schema.items, rootSchema);
+  return isSelect(validator, schema.items, rootSchema, experimental_customMergeAllOf);
+}
+
+// src/constIsAjvDataReference.ts
+import isString3 from "lodash/isString";
+function constIsAjvDataReference(schema) {
+  const schemaConst = schema[CONST_KEY];
+  const schemaType = getSchemaType(schema);
+  return isObject(schemaConst) && isString3(schemaConst?.$data) && schemaType !== "object" && schemaType !== "array";
+}
+
+// src/optionsList.ts
+import get10 from "lodash/get";
+
+// src/toConstant.ts
+function toConstant(schema) {
+  if (ENUM_KEY in schema && Array.isArray(schema.enum) && schema.enum.length === 1) {
+    return schema.enum[0];
+  }
+  if (CONST_KEY in schema) {
+    return schema.const;
+  }
+  throw new Error("schema cannot be inferred as a constant");
+}
+
+// src/optionsList.ts
+function optionsList(schema, uiSchema) {
+  if (schema.enum) {
+    let enumNames;
+    if (uiSchema) {
+      const { enumNames: uiEnumNames } = getUiOptions(uiSchema);
+      enumNames = uiEnumNames;
+    }
+    return schema.enum.map((value, i) => {
+      const label = enumNames?.[i] || String(value);
+      return { label, value };
+    });
+  }
+  let altSchemas = void 0;
+  let altUiSchemas = void 0;
+  if (schema.anyOf) {
+    altSchemas = schema.anyOf;
+    altUiSchemas = uiSchema?.anyOf;
+  } else if (schema.oneOf) {
+    altSchemas = schema.oneOf;
+    altUiSchemas = uiSchema?.oneOf;
+  }
+  let selectorField = getDiscriminatorFieldFromSchema(schema);
+  if (uiSchema) {
+    const { optionsSchemaSelector = selectorField } = getUiOptions(uiSchema);
+    selectorField = optionsSchemaSelector;
+  }
+  return altSchemas && altSchemas.map((aSchemaDef, index) => {
+    const { title } = getUiOptions(altUiSchemas?.[index]);
+    const aSchema = aSchemaDef;
+    let value;
+    let label = title;
+    if (selectorField) {
+      const innerSchema = get10(aSchema, [PROPERTIES_KEY, selectorField], {});
+      value = get10(innerSchema, DEFAULT_KEY, get10(innerSchema, CONST_KEY));
+      label = label || innerSchema?.title || aSchema.title || String(value);
+    } else {
+      value = toConstant(aSchema);
+      label = label || aSchema.title || String(value);
+    }
+    return {
+      schema: aSchema,
+      label,
+      value
+    };
+  });
 }
 
 // src/schema/getDefaultFormState.ts
+var PRIMITIVE_TYPES = ["string", "number", "integer", "boolean", "null"];
 function getInnerSchemaForArrayItem(schema, additionalItems = 0 /* Ignore */, idx = -1) {
   if (idx >= 0) {
     if (Array.isArray(schema.items) && idx < schema.items.length) {
@@ -963,47 +1346,54 @@ function getInnerSchemaForArrayItem(schema, additionalItems = 0 /* Ignore */, id
   }
   return {};
 }
-function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}) {
+function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false) {
   const { emptyObjectFields = "populateAllDefaults" } = experimental_defaultFormStateBehavior;
-  if (includeUndefinedValues) {
+  if (includeUndefinedValues || isConst) {
     obj[key] = computedDefault;
   } else if (emptyObjectFields !== "skipDefaults") {
+    const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
     if (isObject(computedDefault)) {
-      const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
       if (emptyObjectFields === "skipEmptyDefaults") {
-        if (!isEmpty(computedDefault)) {
+        if (!isEmpty3(computedDefault)) {
           obj[key] = computedDefault;
         }
-      } else if ((!isEmpty(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
+      } else if ((!isEmpty3(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
         obj[key] = computedDefault;
       }
     } else if (
       // Store computedDefault if it's a defined primitive (e.g., true) and satisfies certain conditions
       // Condition 1: computedDefault is not undefined
-      // Condition 2: If emptyObjectFields is 'populateAllDefaults' or 'skipEmptyDefaults) or if the key is a required field
-      computedDefault !== void 0 && (emptyObjectFields === "populateAllDefaults" || emptyObjectFields === "skipEmptyDefaults" || requiredFields.includes(key))
+      // Condition 2: If emptyObjectFields is 'populateAllDefaults' or 'skipEmptyDefaults)
+      // Or if isSelfOrParentRequired is 'true' and the key is a required field
+      computedDefault !== void 0 && (emptyObjectFields === "populateAllDefaults" || emptyObjectFields === "skipEmptyDefaults" || isSelfOrParentRequired && requiredFields.includes(key))
     ) {
       obj[key] = computedDefault;
     }
   }
 }
-function computeDefaults(validator, rawSchema, {
-  parentDefaults,
-  rawFormData,
-  rootSchema = {},
-  includeUndefinedValues = false,
-  _recurseList = [],
-  experimental_defaultFormStateBehavior = void 0,
-  required
-} = {}) {
+function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
+  const {
+    parentDefaults,
+    rawFormData,
+    rootSchema = {},
+    includeUndefinedValues = false,
+    _recurseList = [],
+    experimental_defaultFormStateBehavior = void 0,
+    experimental_customMergeAllOf = void 0,
+    required,
+    shouldMergeDefaultsIntoFormData = false
+  } = computeDefaultsProps;
   const formData = isObject(rawFormData) ? rawFormData : {};
   const schema = isObject(rawSchema) ? rawSchema : {};
   let defaults = parentDefaults;
   let schemaToCompute = null;
+  let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
   let updatedRecurseList = _recurseList;
-  if (isObject(defaults) && isObject(schema.default)) {
+  if (schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
+    defaults = schema[CONST_KEY];
+  } else if (isObject(defaults) && isObject(schema.default)) {
     defaults = mergeObjects(defaults, schema.default);
-  } else if (DEFAULT_KEY in schema) {
+  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY]) {
     defaults = schema.default;
   } else if (REF_KEY in schema) {
     const refName = schema[REF_KEY];
@@ -1012,7 +1402,19 @@ function computeDefaults(validator, rawSchema, {
       schemaToCompute = findSchemaDefinition(refName, rootSchema);
     }
   } else if (DEPENDENCIES_KEY in schema) {
-    const resolvedSchema = resolveDependencies(validator, schema, rootSchema, false, [], formData);
+    const defaultFormData = {
+      ...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults),
+      ...formData
+    };
+    const resolvedSchema = resolveDependencies(
+      validator,
+      schema,
+      rootSchema,
+      false,
+      [],
+      defaultFormData,
+      experimental_customMergeAllOf
+    );
     schemaToCompute = resolvedSchema[0];
   } else if (isFixedItems(schema)) {
     defaults = schema.items.map(
@@ -1021,9 +1423,11 @@ function computeDefaults(validator, rawSchema, {
         includeUndefinedValues,
         _recurseList,
         experimental_defaultFormStateBehavior,
+        experimental_customMergeAllOf,
         parentDefaults: Array.isArray(parentDefaults) ? parentDefaults[idx] : void 0,
         rawFormData: formData,
-        required
+        required,
+        shouldMergeDefaultsIntoFormData
       })
     );
   } else if (ONE_OF_KEY in schema) {
@@ -1032,13 +1436,21 @@ function computeDefaults(validator, rawSchema, {
       return void 0;
     }
     const discriminator = getDiscriminatorFieldFromSchema(schema);
+    const { type = "null" } = remaining;
+    if (!Array.isArray(type) && PRIMITIVE_TYPES.includes(type) && experimental_dfsb_to_compute?.constAsDefaults === "skipOneOf") {
+      experimental_dfsb_to_compute = {
+        ...experimental_dfsb_to_compute,
+        constAsDefaults: "never"
+      };
+    }
     schemaToCompute = oneOf[getClosestMatchingOption(
       validator,
       rootSchema,
-      isEmpty(formData) ? void 0 : formData,
+      rawFormData ?? schema.default,
       oneOf,
       0,
-      discriminator
+      discriminator,
+      experimental_customMergeAllOf
     )];
     schemaToCompute = mergeSchemas(remaining, schemaToCompute);
   } else if (ANY_OF_KEY in schema) {
@@ -1050,10 +1462,11 @@ function computeDefaults(validator, rawSchema, {
     schemaToCompute = anyOf[getClosestMatchingOption(
       validator,
       rootSchema,
-      isEmpty(formData) ? void 0 : formData,
+      rawFormData ?? schema.default,
       anyOf,
       0,
-      discriminator
+      discriminator,
+      experimental_customMergeAllOf
     )];
     schemaToCompute = mergeSchemas(remaining, schemaToCompute);
   }
@@ -1062,159 +1475,257 @@ function computeDefaults(validator, rawSchema, {
       rootSchema,
       includeUndefinedValues,
       _recurseList: updatedRecurseList,
-      experimental_defaultFormStateBehavior,
+      experimental_defaultFormStateBehavior: experimental_dfsb_to_compute,
+      experimental_customMergeAllOf,
       parentDefaults: defaults,
       rawFormData: formData,
-      required
+      required,
+      shouldMergeDefaultsIntoFormData
     });
   }
   if (defaults === void 0) {
     defaults = schema.default;
   }
-  switch (getSchemaType(schema)) {
-    case "object": {
-      const retrievedSchema = experimental_defaultFormStateBehavior?.allOf === "populateDefaults" && ALL_OF_KEY in schema ? retrieveSchema(validator, schema, rootSchema, formData) : schema;
-      const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
-        (acc, key) => {
-          const computedDefault = computeDefaults(validator, get7(retrievedSchema, [PROPERTIES_KEY, key]), {
-            rootSchema,
-            _recurseList,
-            experimental_defaultFormStateBehavior,
-            includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get7(defaults, [key]),
-            rawFormData: get7(formData, [key]),
-            required: retrievedSchema.required?.includes(key)
-          });
-          maybeAddDefaultToObject(
-            acc,
-            key,
-            computedDefault,
-            includeUndefinedValues,
-            required,
-            retrievedSchema.required,
-            experimental_defaultFormStateBehavior
-          );
-          return acc;
-        },
-        {}
+  const defaultBasedOnSchemaType = getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults);
+  let defaultsWithFormData = defaultBasedOnSchemaType ?? defaults;
+  if (shouldMergeDefaultsIntoFormData) {
+    const { arrayMinItems = {} } = experimental_defaultFormStateBehavior || {};
+    const { mergeExtraDefaults } = arrayMinItems;
+    const matchingFormData = ensureFormDataMatchingSchema(
+      validator,
+      schema,
+      rootSchema,
+      rawFormData,
+      experimental_defaultFormStateBehavior,
+      experimental_customMergeAllOf
+    );
+    if (!isObject(rawFormData) || ALL_OF_KEY in schema) {
+      defaultsWithFormData = mergeDefaultsWithFormData(
+        defaultsWithFormData,
+        matchingFormData,
+        mergeExtraDefaults,
+        true
       );
-      if (retrievedSchema.additionalProperties) {
-        const additionalPropertiesSchema = isObject(retrievedSchema.additionalProperties) ? retrievedSchema.additionalProperties : {};
-        const keys = /* @__PURE__ */ new Set();
-        if (isObject(defaults)) {
-          Object.keys(defaults).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => keys.add(key));
-        }
-        const formDataRequired = [];
-        Object.keys(formData).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => {
-          keys.add(key);
-          formDataRequired.push(key);
-        });
-        keys.forEach((key) => {
-          const computedDefault = computeDefaults(validator, additionalPropertiesSchema, {
-            rootSchema,
-            _recurseList,
-            experimental_defaultFormStateBehavior,
-            includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get7(defaults, [key]),
-            rawFormData: get7(formData, [key]),
-            required: retrievedSchema.required?.includes(key)
-          });
-          maybeAddDefaultToObject(
-            objectDefaults,
-            key,
-            computedDefault,
-            includeUndefinedValues,
-            required,
-            formDataRequired
-          );
-        });
-      }
-      return objectDefaults;
     }
-    case "array": {
-      const neverPopulate = experimental_defaultFormStateBehavior?.arrayMinItems?.populate === "never";
-      const ignoreMinItemsFlagSet = experimental_defaultFormStateBehavior?.arrayMinItems?.populate === "requiredOnly";
-      const isSkipEmptyDefaults = experimental_defaultFormStateBehavior?.emptyObjectFields === "skipEmptyDefaults";
-      const computeSkipPopulate = experimental_defaultFormStateBehavior?.arrayMinItems?.computeSkipPopulate ?? (() => false);
-      const emptyDefault = isSkipEmptyDefaults ? void 0 : [];
-      if (Array.isArray(defaults)) {
-        defaults = defaults.map((item, idx) => {
-          const schemaItem = getInnerSchemaForArrayItem(schema, 2 /* Fallback */, idx);
-          return computeDefaults(validator, schemaItem, {
-            rootSchema,
-            _recurseList,
-            experimental_defaultFormStateBehavior,
-            parentDefaults: item,
-            required
-          });
+  }
+  return defaultsWithFormData;
+}
+function ensureFormDataMatchingSchema(validator, schema, rootSchema, formData, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
+  const isSelectField = !isConstant(schema) && isSelect(validator, schema, rootSchema, experimental_customMergeAllOf);
+  let validFormData = formData;
+  if (isSelectField) {
+    const getOptionsList = optionsList(schema);
+    const isValid = getOptionsList?.some((option) => deepEquals(option.value, formData));
+    validFormData = isValid ? formData : void 0;
+  }
+  const constTakesPrecedence = schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults === "always";
+  if (constTakesPrecedence) {
+    validFormData = schema.const;
+  }
+  return validFormData;
+}
+function getObjectDefaults(validator, rawSchema, {
+  rawFormData,
+  rootSchema = {},
+  includeUndefinedValues = false,
+  _recurseList = [],
+  experimental_defaultFormStateBehavior = void 0,
+  experimental_customMergeAllOf = void 0,
+  required,
+  shouldMergeDefaultsIntoFormData
+} = {}, defaults) {
+  {
+    const formData = isObject(rawFormData) ? rawFormData : {};
+    const schema = rawSchema;
+    const retrievedSchema = experimental_defaultFormStateBehavior?.allOf === "populateDefaults" && ALL_OF_KEY in schema ? retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf) : schema;
+    const parentConst = retrievedSchema[CONST_KEY];
+    const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
+      (acc, key) => {
+        const propertySchema = get11(retrievedSchema, [PROPERTIES_KEY, key], {});
+        const hasParentConst = isObject(parentConst) && parentConst[key] !== void 0;
+        const hasConst = (isObject(propertySchema) && CONST_KEY in propertySchema || hasParentConst) && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(propertySchema);
+        const computedDefault = computeDefaults(validator, propertySchema, {
+          rootSchema,
+          _recurseList,
+          experimental_defaultFormStateBehavior,
+          experimental_customMergeAllOf,
+          includeUndefinedValues: includeUndefinedValues === true,
+          parentDefaults: get11(defaults, [key]),
+          rawFormData: get11(formData, [key]),
+          required: retrievedSchema.required?.includes(key),
+          shouldMergeDefaultsIntoFormData
         });
+        maybeAddDefaultToObject(
+          acc,
+          key,
+          computedDefault,
+          includeUndefinedValues,
+          required,
+          retrievedSchema.required,
+          experimental_defaultFormStateBehavior,
+          hasConst
+        );
+        return acc;
+      },
+      {}
+    );
+    if (retrievedSchema.additionalProperties) {
+      const additionalPropertiesSchema = isObject(retrievedSchema.additionalProperties) ? retrievedSchema.additionalProperties : {};
+      const keys2 = /* @__PURE__ */ new Set();
+      if (isObject(defaults)) {
+        Object.keys(defaults).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => keys2.add(key));
       }
-      if (Array.isArray(rawFormData)) {
-        const schemaItem = getInnerSchemaForArrayItem(schema);
-        if (neverPopulate) {
-          defaults = rawFormData;
-        } else {
-          defaults = rawFormData.map((item, idx) => {
-            return computeDefaults(validator, schemaItem, {
-              rootSchema,
-              _recurseList,
-              experimental_defaultFormStateBehavior,
-              rawFormData: item,
-              parentDefaults: get7(defaults, [idx]),
-              required
-            });
-          });
-        }
-      }
-      if (neverPopulate) {
-        return defaults ?? emptyDefault;
-      }
-      if (ignoreMinItemsFlagSet && !required) {
-        return defaults ? defaults : void 0;
-      }
-      const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
-      if (!schema.minItems || isMultiSelect(validator, schema, rootSchema) || computeSkipPopulate(validator, schema, rootSchema) || schema.minItems <= defaultsLength) {
-        return defaults ? defaults : emptyDefault;
-      }
-      const defaultEntries = defaults || [];
-      const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
-      const fillerDefault = fillerSchema.default;
-      const fillerEntries = new Array(schema.minItems - defaultsLength).fill(
-        computeDefaults(validator, fillerSchema, {
-          parentDefaults: fillerDefault,
+      const formDataRequired = [];
+      Object.keys(formData).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => {
+        keys2.add(key);
+        formDataRequired.push(key);
+      });
+      keys2.forEach((key) => {
+        const computedDefault = computeDefaults(validator, additionalPropertiesSchema, {
+          rootSchema,
+          _recurseList,
+          experimental_defaultFormStateBehavior,
+          experimental_customMergeAllOf,
+          includeUndefinedValues: includeUndefinedValues === true,
+          parentDefaults: get11(defaults, [key]),
+          rawFormData: get11(formData, [key]),
+          required: retrievedSchema.required?.includes(key),
+          shouldMergeDefaultsIntoFormData
+        });
+        maybeAddDefaultToObject(
+          objectDefaults,
+          key,
+          computedDefault,
+          includeUndefinedValues,
+          required,
+          formDataRequired
+        );
+      });
+    }
+    return objectDefaults;
+  }
+}
+function getArrayDefaults(validator, rawSchema, {
+  rawFormData,
+  rootSchema = {},
+  _recurseList = [],
+  experimental_defaultFormStateBehavior = void 0,
+  experimental_customMergeAllOf = void 0,
+  required,
+  shouldMergeDefaultsIntoFormData
+} = {}, defaults) {
+  const schema = rawSchema;
+  const arrayMinItemsStateBehavior = experimental_defaultFormStateBehavior?.arrayMinItems ?? {};
+  const { populate: arrayMinItemsPopulate, mergeExtraDefaults: arrayMergeExtraDefaults } = arrayMinItemsStateBehavior;
+  const neverPopulate = arrayMinItemsPopulate === "never";
+  const ignoreMinItemsFlagSet = arrayMinItemsPopulate === "requiredOnly";
+  const isPopulateAll = arrayMinItemsPopulate === "all" || !neverPopulate && !ignoreMinItemsFlagSet;
+  const computeSkipPopulate = arrayMinItemsStateBehavior?.computeSkipPopulate ?? (() => false);
+  const isSkipEmptyDefaults = experimental_defaultFormStateBehavior?.emptyObjectFields === "skipEmptyDefaults";
+  const emptyDefault = isSkipEmptyDefaults ? void 0 : [];
+  if (Array.isArray(defaults)) {
+    defaults = defaults.map((item, idx) => {
+      const schemaItem = getInnerSchemaForArrayItem(schema, 2 /* Fallback */, idx);
+      return computeDefaults(validator, schemaItem, {
+        rootSchema,
+        _recurseList,
+        experimental_defaultFormStateBehavior,
+        experimental_customMergeAllOf,
+        parentDefaults: item,
+        required,
+        shouldMergeDefaultsIntoFormData
+      });
+    });
+  }
+  if (Array.isArray(rawFormData)) {
+    const schemaItem = getInnerSchemaForArrayItem(schema);
+    if (neverPopulate) {
+      defaults = rawFormData;
+    } else {
+      const itemDefaults = rawFormData.map((item, idx) => {
+        return computeDefaults(validator, schemaItem, {
           rootSchema,
           _recurseList,
           experimental_defaultFormStateBehavior,
-          required
-        })
-      );
-      return defaultEntries.concat(fillerEntries);
+          experimental_customMergeAllOf,
+          rawFormData: item,
+          parentDefaults: get11(defaults, [idx]),
+          required,
+          shouldMergeDefaultsIntoFormData
+        });
+      });
+      const mergeExtraDefaults = (ignoreMinItemsFlagSet && required || isPopulateAll) && arrayMergeExtraDefaults;
+      defaults = mergeDefaultsWithFormData(defaults, itemDefaults, mergeExtraDefaults);
+    }
+  }
+  const hasConst = isObject(schema) && CONST_KEY in schema && experimental_defaultFormStateBehavior?.constAsDefaults !== "never";
+  if (hasConst === false) {
+    if (neverPopulate) {
+      return defaults ?? emptyDefault;
+    }
+    if (ignoreMinItemsFlagSet && !required) {
+      return defaults ? defaults : void 0;
+    }
+  }
+  const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
+  if (!schema.minItems || isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || computeSkipPopulate(validator, schema, rootSchema) || schema.minItems <= defaultsLength) {
+    return defaults ? defaults : emptyDefault;
+  }
+  const defaultEntries = defaults || [];
+  const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
+  const fillerDefault = fillerSchema.default;
+  const fillerEntries = new Array(schema.minItems - defaultsLength).fill(
+    computeDefaults(validator, fillerSchema, {
+      parentDefaults: fillerDefault,
+      rootSchema,
+      _recurseList,
+      experimental_defaultFormStateBehavior,
+      experimental_customMergeAllOf,
+      required,
+      shouldMergeDefaultsIntoFormData
+    })
+  );
+  return defaultEntries.concat(fillerEntries);
+}
+function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefaultsProps = {}, defaults) {
+  switch (getSchemaType(rawSchema)) {
+    // We need to recurse for object schema inner default values.
+    case "object": {
+      return getObjectDefaults(validator, rawSchema, computeDefaultsProps, defaults);
+    }
+    case "array": {
+      return getArrayDefaults(validator, rawSchema, computeDefaultsProps, defaults);
     }
   }
-  return defaults;
 }
-function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior) {
+function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
   if (!isObject(theSchema)) {
     throw new Error("Invalid schema: " + theSchema);
   }
-  const schema = retrieveSchema(validator, theSchema, rootSchema, formData);
+  const schema = retrieveSchema(validator, theSchema, rootSchema, formData, experimental_customMergeAllOf);
   const defaults = computeDefaults(validator, schema, {
     rootSchema,
     includeUndefinedValues,
     experimental_defaultFormStateBehavior,
-    rawFormData: formData
+    experimental_customMergeAllOf,
+    rawFormData: formData,
+    shouldMergeDefaultsIntoFormData: true
   });
-  if (formData === void 0 || formData === null || typeof formData === "number" && isNaN(formData)) {
-    return defaults;
-  }
-  const { mergeExtraDefaults } = experimental_defaultFormStateBehavior?.arrayMinItems || {};
-  if (isObject(formData)) {
-    return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults);
-  }
-  if (Array.isArray(formData)) {
-    return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults);
+  if (isObject(formData) || Array.isArray(formData)) {
+    const { mergeDefaultsIntoFormData } = experimental_defaultFormStateBehavior || {};
+    const defaultSupercedesUndefined = mergeDefaultsIntoFormData === "useDefaultIfFormDataUndefined";
+    const result = mergeDefaultsWithFormData(
+      defaults,
+      formData,
+      true,
+      // set to true to add any additional default array entries.
+      defaultSupercedesUndefined,
+      true
+      // set to true to override formData with defaults if they exist.
+    );
+    return result;
   }
-  return formData;
+  return defaults;
 }
 
 // src/isCustomWidget.ts
@@ -1227,25 +1738,31 @@ function isCustomWidget(uiSchema = {}) {
 }
 
 // src/schema/isFilesArray.ts
-function isFilesArray(validator, schema, uiSchema = {}, rootSchema) {
+function isFilesArray(validator, schema, uiSchema = {}, rootSchema, experimental_customMergeAllOf) {
   if (uiSchema[UI_WIDGET_KEY] === "files") {
     return true;
   }
   if (schema.items) {
-    const itemsSchema = retrieveSchema(validator, schema.items, rootSchema);
+    const itemsSchema = retrieveSchema(
+      validator,
+      schema.items,
+      rootSchema,
+      void 0,
+      experimental_customMergeAllOf
+    );
     return itemsSchema.type === "string" && itemsSchema.format === "data-url";
   }
   return false;
 }
 
 // src/schema/getDisplayLabel.ts
-function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOptions) {
+function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOptions, experimental_customMergeAllOf) {
   const uiOptions = getUiOptions(uiSchema, globalOptions);
   const { label = true } = uiOptions;
   let displayLabel = !!label;
   const schemaType = getSchemaType(schema);
   if (schemaType === "array") {
-    displayLabel = isMultiSelect(validator, schema, rootSchema) || isFilesArray(validator, schema, uiSchema, rootSchema) || isCustomWidget(uiSchema);
+    displayLabel = isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || isFilesArray(validator, schema, uiSchema, rootSchema, experimental_customMergeAllOf) || isCustomWidget(uiSchema);
   }
   if (schemaType === "object") {
     displayLabel = false;
@@ -1259,54 +1776,50 @@ function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOpt
   return displayLabel;
 }
 
-// src/schema/mergeValidationData.ts
-import isEmpty2 from "lodash/isEmpty";
-function mergeValidationData(validator, validationData, additionalErrorSchema) {
-  if (!additionalErrorSchema) {
-    return validationData;
-  }
-  const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
-  let errors = validator.toErrorList(additionalErrorSchema);
-  let errorSchema = additionalErrorSchema;
-  if (!isEmpty2(oldErrorSchema)) {
-    errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
-    errors = [...oldErrors].concat(errors);
-  }
-  return { errorSchema, errors };
-}
-
 // src/schema/sanitizeDataForNewSchema.ts
-import get8 from "lodash/get";
-import has3 from "lodash/has";
+import get12 from "lodash/get";
+import has5 from "lodash/has";
 var NO_VALUE = Symbol("no Value");
-function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}) {
+function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}, experimental_customMergeAllOf) {
   let newFormData;
-  if (has3(newSchema, PROPERTIES_KEY)) {
+  if (has5(newSchema, PROPERTIES_KEY)) {
     const removeOldSchemaData = {};
-    if (has3(oldSchema, PROPERTIES_KEY)) {
-      const properties = get8(oldSchema, PROPERTIES_KEY, {});
+    if (has5(oldSchema, PROPERTIES_KEY)) {
+      const properties = get12(oldSchema, PROPERTIES_KEY, {});
       Object.keys(properties).forEach((key) => {
-        if (has3(data, key)) {
+        if (has5(data, key)) {
           removeOldSchemaData[key] = void 0;
         }
       });
     }
-    const keys = Object.keys(get8(newSchema, PROPERTIES_KEY, {}));
+    const keys2 = Object.keys(get12(newSchema, PROPERTIES_KEY, {}));
     const nestedData = {};
-    keys.forEach((key) => {
-      const formValue = get8(data, key);
-      let oldKeyedSchema = get8(oldSchema, [PROPERTIES_KEY, key], {});
-      let newKeyedSchema = get8(newSchema, [PROPERTIES_KEY, key], {});
-      if (has3(oldKeyedSchema, REF_KEY)) {
-        oldKeyedSchema = retrieveSchema(validator, oldKeyedSchema, rootSchema, formValue);
+    keys2.forEach((key) => {
+      const formValue = get12(data, key);
+      let oldKeyedSchema = get12(oldSchema, [PROPERTIES_KEY, key], {});
+      let newKeyedSchema = get12(newSchema, [PROPERTIES_KEY, key], {});
+      if (has5(oldKeyedSchema, REF_KEY)) {
+        oldKeyedSchema = retrieveSchema(
+          validator,
+          oldKeyedSchema,
+          rootSchema,
+          formValue,
+          experimental_customMergeAllOf
+        );
       }
-      if (has3(newKeyedSchema, REF_KEY)) {
-        newKeyedSchema = retrieveSchema(validator, newKeyedSchema, rootSchema, formValue);
+      if (has5(newKeyedSchema, REF_KEY)) {
+        newKeyedSchema = retrieveSchema(
+          validator,
+          newKeyedSchema,
+          rootSchema,
+          formValue,
+          experimental_customMergeAllOf
+        );
       }
-      const oldSchemaTypeForKey = get8(oldKeyedSchema, "type");
-      const newSchemaTypeForKey = get8(newKeyedSchema, "type");
+      const oldSchemaTypeForKey = get12(oldKeyedSchema, "type");
+      const newSchemaTypeForKey = get12(newKeyedSchema, "type");
       if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
-        if (has3(removeOldSchemaData, key)) {
+        if (has5(removeOldSchemaData, key)) {
           delete removeOldSchemaData[key];
         }
         if (newSchemaTypeForKey === "object" || newSchemaTypeForKey === "array" && Array.isArray(formValue)) {
@@ -1315,23 +1828,24 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
             rootSchema,
             newKeyedSchema,
             oldKeyedSchema,
-            formValue
+            formValue,
+            experimental_customMergeAllOf
           );
           if (itemData !== void 0 || newSchemaTypeForKey === "array") {
             nestedData[key] = itemData;
           }
         } else {
-          const newOptionDefault = get8(newKeyedSchema, "default", NO_VALUE);
-          const oldOptionDefault = get8(oldKeyedSchema, "default", NO_VALUE);
+          const newOptionDefault = get12(newKeyedSchema, "default", NO_VALUE);
+          const oldOptionDefault = get12(oldKeyedSchema, "default", NO_VALUE);
           if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
             if (oldOptionDefault === formValue) {
               removeOldSchemaData[key] = newOptionDefault;
-            } else if (get8(newKeyedSchema, "readOnly") === true) {
+            } else if (get12(newKeyedSchema, "readOnly") === true) {
               removeOldSchemaData[key] = void 0;
             }
           }
-          const newOptionConst = get8(newKeyedSchema, "const", NO_VALUE);
-          const oldOptionConst = get8(oldKeyedSchema, "const", NO_VALUE);
+          const newOptionConst = get12(newKeyedSchema, "const", NO_VALUE);
+          const oldOptionConst = get12(oldKeyedSchema, "const", NO_VALUE);
           if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
             removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
           }
@@ -1343,20 +1857,32 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
       ...removeOldSchemaData,
       ...nestedData
     };
-  } else if (get8(oldSchema, "type") === "array" && get8(newSchema, "type") === "array" && Array.isArray(data)) {
-    let oldSchemaItems = get8(oldSchema, "items");
-    let newSchemaItems = get8(newSchema, "items");
+  } else if (get12(oldSchema, "type") === "array" && get12(newSchema, "type") === "array" && Array.isArray(data)) {
+    let oldSchemaItems = get12(oldSchema, "items");
+    let newSchemaItems = get12(newSchema, "items");
     if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
-      if (has3(oldSchemaItems, REF_KEY)) {
-        oldSchemaItems = retrieveSchema(validator, oldSchemaItems, rootSchema, data);
+      if (has5(oldSchemaItems, REF_KEY)) {
+        oldSchemaItems = retrieveSchema(
+          validator,
+          oldSchemaItems,
+          rootSchema,
+          data,
+          experimental_customMergeAllOf
+        );
       }
-      if (has3(newSchemaItems, REF_KEY)) {
-        newSchemaItems = retrieveSchema(validator, newSchemaItems, rootSchema, data);
+      if (has5(newSchemaItems, REF_KEY)) {
+        newSchemaItems = retrieveSchema(
+          validator,
+          newSchemaItems,
+          rootSchema,
+          data,
+          experimental_customMergeAllOf
+        );
       }
-      const oldSchemaType = get8(oldSchemaItems, "type");
-      const newSchemaType = get8(newSchemaItems, "type");
+      const oldSchemaType = get12(oldSchemaItems, "type");
+      const newSchemaType = get12(newSchemaItems, "type");
       if (!oldSchemaType || oldSchemaType === newSchemaType) {
-        const maxItems = get8(newSchema, "maxItems", -1);
+        const maxItems = get12(newSchema, "maxItems", -1);
         if (newSchemaType === "object") {
           newFormData = data.reduce((newValue, aValue) => {
             const itemValue = sanitizeDataForNewSchema(
@@ -1364,7 +1890,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
               rootSchema,
               newSchemaItems,
               oldSchemaItems,
-              aValue
+              aValue,
+              experimental_customMergeAllOf
             );
             if (itemValue !== void 0 && (maxItems < 0 || newValue.length < maxItems)) {
               newValue.push(itemValue);
@@ -1383,71 +1910,84 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
 }
 
 // src/schema/toIdSchema.ts
-import get9 from "lodash/get";
-import isEqual2 from "lodash/isEqual";
-function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData, _recurseList = []) {
-  if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
-    const _schema = retrieveSchema(validator, schema, rootSchema, formData);
-    const sameSchemaIndex = _recurseList.findIndex((item) => isEqual2(item, _schema));
-    if (sameSchemaIndex === -1) {
+import get13 from "lodash/get";
+function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
+  const $id = id || idPrefix;
+  const idSchema = { $id };
+  if (typeof schema === "object") {
+    if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
+      const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
+      const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
+      if (sameSchemaIndex === -1) {
+        return toIdSchemaInternal(
+          validator,
+          _schema,
+          idPrefix,
+          idSeparator,
+          id,
+          rootSchema,
+          formData,
+          _recurseList.concat(_schema),
+          experimental_customMergeAllOf
+        );
+      }
+    }
+    if (ITEMS_KEY in schema && !get13(schema, [ITEMS_KEY, REF_KEY])) {
       return toIdSchemaInternal(
         validator,
-        _schema,
+        get13(schema, ITEMS_KEY),
         idPrefix,
         idSeparator,
         id,
         rootSchema,
         formData,
-        _recurseList.concat(_schema)
+        _recurseList,
+        experimental_customMergeAllOf
       );
     }
-  }
-  if (ITEMS_KEY in schema && !get9(schema, [ITEMS_KEY, REF_KEY])) {
-    return toIdSchemaInternal(
-      validator,
-      get9(schema, ITEMS_KEY),
-      idPrefix,
-      idSeparator,
-      id,
-      rootSchema,
-      formData,
-      _recurseList
-    );
-  }
-  const $id = id || idPrefix;
-  const idSchema = { $id };
-  if (getSchemaType(schema) === "object" && PROPERTIES_KEY in schema) {
-    for (const name in schema.properties) {
-      const field = get9(schema, [PROPERTIES_KEY, name]);
-      const fieldId = idSchema[ID_KEY] + idSeparator + name;
-      idSchema[name] = toIdSchemaInternal(
-        validator,
-        isObject(field) ? field : {},
-        idPrefix,
-        idSeparator,
-        fieldId,
-        rootSchema,
-        // It's possible that formData is not an object -- this can happen if an
-        // array item has just been added, but not populated with data yet
-        get9(formData, [name]),
-        _recurseList
-      );
+    if (getSchemaType(schema) === "object" && PROPERTIES_KEY in schema) {
+      for (const name in schema.properties) {
+        const field = schema[PROPERTIES_KEY][name];
+        const fieldId = idSchema[ID_KEY] + idSeparator + name;
+        idSchema[name] = toIdSchemaInternal(
+          validator,
+          field,
+          idPrefix,
+          idSeparator,
+          fieldId,
+          rootSchema,
+          // It's possible that formData is not an object -- this can happen if an
+          // array item has just been added, but not populated with data yet
+          get13(formData, [name]),
+          _recurseList,
+          experimental_customMergeAllOf
+        );
+      }
     }
   }
   return idSchema;
 }
-function toIdSchema(validator, schema, id, rootSchema, formData, idPrefix = "root", idSeparator = "_") {
-  return toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData);
+function toIdSchema(validator, schema, id, rootSchema, formData, idPrefix = "root", idSeparator = "_", experimental_customMergeAllOf) {
+  return toIdSchemaInternal(
+    validator,
+    schema,
+    idPrefix,
+    idSeparator,
+    id,
+    rootSchema,
+    formData,
+    void 0,
+    experimental_customMergeAllOf
+  );
 }
 
 // src/schema/toPathSchema.ts
-import get10 from "lodash/get";
-import isEqual3 from "lodash/isEqual";
+import get14 from "lodash/get";
 import set2 from "lodash/set";
-function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = []) {
+function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
-    const _schema = retrieveSchema(validator, schema, rootSchema, formData);
-    const sameSchemaIndex = _recurseList.findIndex((item) => isEqual3(item, _schema));
+    const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
+    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
     if (sameSchemaIndex === -1) {
       return toPathSchemaInternal(
         validator,
@@ -1455,7 +1995,8 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
         name,
         rootSchema,
         formData,
-        _recurseList.concat(_schema)
+        _recurseList.concat(_schema),
+        experimental_customMergeAllOf
       );
     }
   }
@@ -1465,11 +2006,27 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
   if (ONE_OF_KEY in schema || ANY_OF_KEY in schema) {
     const xxxOf = ONE_OF_KEY in schema ? schema.oneOf : schema.anyOf;
     const discriminator = getDiscriminatorFieldFromSchema(schema);
-    const index = getClosestMatchingOption(validator, rootSchema, formData, xxxOf, 0, discriminator);
+    const index = getClosestMatchingOption(
+      validator,
+      rootSchema,
+      formData,
+      xxxOf,
+      0,
+      discriminator,
+      experimental_customMergeAllOf
+    );
     const _schema = xxxOf[index];
     pathSchema = {
       ...pathSchema,
-      ...toPathSchemaInternal(validator, _schema, name, rootSchema, formData, _recurseList)
+      ...toPathSchemaInternal(
+        validator,
+        _schema,
+        name,
+        rootSchema,
+        formData,
+        _recurseList,
+        experimental_customMergeAllOf
+      )
     };
   }
   if (ADDITIONAL_PROPERTIES_KEY in schema && schema[ADDITIONAL_PROPERTIES_KEY] !== false) {
@@ -1486,7 +2043,8 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
             `${name}.${i}`,
             rootSchema,
             element,
-            _recurseList
+            _recurseList,
+            experimental_customMergeAllOf
           );
         } else if (schemaAdditionalItems) {
           pathSchema[i] = toPathSchemaInternal(
@@ -1495,7 +2053,8 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
             `${name}.${i}`,
             rootSchema,
             element,
-            _recurseList
+            _recurseList,
+            experimental_customMergeAllOf
           );
         } else {
           console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
@@ -1509,13 +2068,14 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
           `${name}.${i}`,
           rootSchema,
           element,
-          _recurseList
+          _recurseList,
+          experimental_customMergeAllOf
         );
       });
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = get10(schema, [PROPERTIES_KEY, property]);
+      const field = get14(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -1523,15 +2083,16 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
         rootSchema,
         // It's possible that formData is not an object -- this can happen if an
         // array item has just been added, but not populated with data yet
-        get10(formData, [property]),
-        _recurseList
+        get14(formData, [property]),
+        _recurseList,
+        experimental_customMergeAllOf
       );
     }
   }
   return pathSchema;
 }
-function toPathSchema(validator, schema, name = "", rootSchema, formData) {
-  return toPathSchemaInternal(validator, schema, name, rootSchema, formData);
+function toPathSchema(validator, schema, name = "", rootSchema, formData, experimental_customMergeAllOf) {
+  return toPathSchemaInternal(validator, schema, name, rootSchema, formData, void 0, experimental_customMergeAllOf);
 }
 
 // src/createSchemaUtils.ts
@@ -1541,11 +2102,13 @@ var SchemaUtils = class {
    * @param validator - An implementation of the `ValidatorType` interface that will be forwarded to all the APIs
    * @param rootSchema - The root schema that will be forwarded to all the APIs
    * @param experimental_defaultFormStateBehavior - Configuration flags to allow users to override default form state behavior
+   * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
    */
-  constructor(validator, rootSchema, experimental_defaultFormStateBehavior) {
+  constructor(validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
     this.rootSchema = rootSchema;
     this.validator = validator;
     this.experimental_defaultFormStateBehavior = experimental_defaultFormStateBehavior;
+    this.experimental_customMergeAllOf = experimental_customMergeAllOf;
   }
   /** Returns the `ValidatorType` in the `SchemaUtilsType`
    *
@@ -1561,13 +2124,55 @@ var SchemaUtils = class {
    * @param validator - An implementation of the `ValidatorType` interface that will be compared against the current one
    * @param rootSchema - The root schema that will be compared against the current one
    * @param [experimental_defaultFormStateBehavior] Optional configuration object, if provided, allows users to override default form state behavior
+   * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
    * @returns - True if the `SchemaUtilsType` differs from the given `validator` or `rootSchema`
    */
-  doesSchemaUtilsDiffer(validator, rootSchema, experimental_defaultFormStateBehavior = {}) {
+  doesSchemaUtilsDiffer(validator, rootSchema, experimental_defaultFormStateBehavior = {}, experimental_customMergeAllOf) {
     if (!validator || !rootSchema) {
       return false;
     }
-    return this.validator !== validator || !deepEquals(this.rootSchema, rootSchema) || !deepEquals(this.experimental_defaultFormStateBehavior, experimental_defaultFormStateBehavior);
+    return this.validator !== validator || !deepEquals(this.rootSchema, rootSchema) || !deepEquals(this.experimental_defaultFormStateBehavior, experimental_defaultFormStateBehavior) || this.experimental_customMergeAllOf !== experimental_customMergeAllOf;
+  }
+  /** Finds the field specified by the `path` within the root or recursed `schema`. If there is no field for the specified
+   * `path`, then the default `{ field: undefined, isRequired: undefined }` is returned. It determines whether a leaf
+   * field is in the `required` list for its parent and if so, it is marked as required on return.
+   *
+   * @param schema - The current node within the JSON schema
+   * @param path - The remaining keys in the path to the desired field
+   * @param [formData] - The form data that is used to determine which oneOf option
+   * @returns - An object that contains the field and its required state. If no field can be found then
+   *            `{ field: undefined, isRequired: undefined }` is returned.
+   */
+  findFieldInSchema(schema, path, formData) {
+    return findFieldInSchema(
+      this.validator,
+      this.rootSchema,
+      schema,
+      path,
+      formData,
+      this.experimental_customMergeAllOf
+    );
+  }
+  /** Finds the oneOf option inside the `schema['any/oneOf']` list which has the `properties[selectorField].default` that
+   * matches the `formData[selectorField]` value. For the purposes of this function, `selectorField` is either
+   * `schema.discriminator.propertyName` or `fallbackField`.
+   *
+   * @param schema - The schema element in which to search for the selected oneOf option
+   * @param fallbackField - The field to use as a backup selector field if the schema does not have a required field
+   * @param xxx - Either `oneOf` or `anyOf`, defines which value is being sought
+   * @param [formData={}] - The form data that is used to determine which oneOf option
+   * @returns - The anyOf/oneOf option that matches the selector field in the schema or undefined if nothing is selected
+   */
+  findSelectedOptionInXxxOf(schema, fallbackField, xxx, formData) {
+    return findSelectedOptionInXxxOf(
+      this.validator,
+      this.rootSchema,
+      schema,
+      fallbackField,
+      xxx,
+      formData,
+      this.experimental_customMergeAllOf
+    );
   }
   /** Returns the superset of `formData` that includes the given set updated to include any missing fields that have
    * computed to have defaults provided in the `schema`.
@@ -1586,7 +2191,8 @@ var SchemaUtils = class {
       formData,
       this.rootSchema,
       includeUndefinedValues,
-      this.experimental_defaultFormStateBehavior
+      this.experimental_defaultFormStateBehavior,
+      this.experimental_customMergeAllOf
     );
   }
   /** Determines whether the combination of `schema` and `uiSchema` properties indicates that the label for the `schema`
@@ -1598,7 +2204,14 @@ var SchemaUtils = class {
    * @returns - True if the label should be displayed or false if it should not
    */
   getDisplayLabel(schema, uiSchema, globalOptions) {
-    return getDisplayLabel(this.validator, schema, uiSchema, this.rootSchema, globalOptions);
+    return getDisplayLabel(
+      this.validator,
+      schema,
+      uiSchema,
+      this.rootSchema,
+      globalOptions,
+      this.experimental_customMergeAllOf
+    );
   }
   /** Determines which of the given `options` provided most closely matches the `formData`.
    * Returns the index of the option that is valid and is the closest match, or 0 if there is no match.
@@ -1620,7 +2233,8 @@ var SchemaUtils = class {
       formData,
       options,
       selectedOption,
-      discriminatorField
+      discriminatorField,
+      this.experimental_customMergeAllOf
     );
   }
   /** Given the `formData` and list of `options`, attempts to find the index of the first option that matches the data.
@@ -1635,18 +2249,16 @@ var SchemaUtils = class {
   getFirstMatchingOption(formData, options, discriminatorField) {
     return getFirstMatchingOption(this.validator, formData, options, this.rootSchema, discriminatorField);
   }
-  /** Given the `formData` and list of `options`, attempts to find the index of the option that best matches the data.
-   * Deprecated, use `getFirstMatchingOption()` instead.
-   *
-   * @param formData - The current formData, if any, onto which to provide any missing defaults
-   * @param options - The list of options to find a matching options from
-   * @param [discriminatorField] - The optional name of the field within the options object whose value is used to
-   *          determine which option is selected
-   * @returns - The index of the matched option or 0 if none is available
-   * @deprecated
-   */
-  getMatchingOption(formData, options, discriminatorField) {
-    return getMatchingOption(this.validator, formData, options, this.rootSchema, discriminatorField);
+  getFromSchema(schema, path, defaultValue) {
+    return getFromSchema(
+      this.validator,
+      this.rootSchema,
+      schema,
+      path,
+      // @ts-expect-error TS2769: No overload matches this call
+      defaultValue,
+      this.experimental_customMergeAllOf
+    );
   }
   /** Checks to see if the `schema` and `uiSchema` combination represents an array of files
    *
@@ -1655,7 +2267,7 @@ var SchemaUtils = class {
    * @returns - True if schema/uiSchema contains an array of files, otherwise false
    */
   isFilesArray(schema, uiSchema) {
-    return isFilesArray(this.validator, schema, uiSchema, this.rootSchema);
+    return isFilesArray(this.validator, schema, uiSchema, this.rootSchema, this.experimental_customMergeAllOf);
   }
   /** Checks to see if the `schema` combination represents a multi-select
    *
@@ -1663,7 +2275,7 @@ var SchemaUtils = class {
    * @returns - True if schema contains a multi-select, otherwise false
    */
   isMultiSelect(schema) {
-    return isMultiSelect(this.validator, schema, this.rootSchema);
+    return isMultiSelect(this.validator, schema, this.rootSchema, this.experimental_customMergeAllOf);
   }
   /** Checks to see if the `schema` combination represents a select
    *
@@ -1671,21 +2283,7 @@ var SchemaUtils = class {
    * @returns - True if schema contains a select, otherwise false
    */
   isSelect(schema) {
-    return isSelect(this.validator, schema, this.rootSchema);
-  }
-  /** Merges the errors in `additionalErrorSchema` into the existing `validationData` by combining the hierarchies in
-   * the two `ErrorSchema`s and then appending the error list from the `additionalErrorSchema` obtained by calling
-   * `getValidator().toErrorList()` onto the `errors` in the `validationData`. If no `additionalErrorSchema` is passed,
-   * then `validationData` is returned.
-   *
-   * @param validationData - The current `ValidationData` into which to merge the additional errors
-   * @param [additionalErrorSchema] - The additional set of errors
-   * @returns - The `validationData` with the additional errors from `additionalErrorSchema` merged into it, if provided.
-   * @deprecated - Use the `validationDataMerge()` function exported from `@rjsf/utils` instead. This function will be
-   *        removed in the next major release.
-   */
-  mergeValidationData(validationData, additionalErrorSchema) {
-    return mergeValidationData(this.validator, validationData, additionalErrorSchema);
+    return isSelect(this.validator, schema, this.rootSchema, this.experimental_customMergeAllOf);
   }
   /** Retrieves an expanded schema that has had all of its conditions, additional properties, references and
    * dependencies resolved and merged into the `schema` given a `rawFormData` that is used to do the potentially
@@ -1696,7 +2294,13 @@ var SchemaUtils = class {
    * @returns - The schema having its conditions, additional properties, references and dependencies resolved
    */
   retrieveSchema(schema, rawFormData) {
-    return retrieveSchema(this.validator, schema, this.rootSchema, rawFormData);
+    return retrieveSchema(
+      this.validator,
+      schema,
+      this.rootSchema,
+      rawFormData,
+      this.experimental_customMergeAllOf
+    );
   }
   /** Sanitize the `data` associated with the `oldSchema` so it is considered appropriate for the `newSchema`. If the
    * new schema does not contain any properties, then `undefined` is returned to clear all the form data. Due to the
@@ -1710,7 +2314,14 @@ var SchemaUtils = class {
    *      to `undefined`. Will return `undefined` if the new schema is not an object containing properties.
    */
   sanitizeDataForNewSchema(newSchema, oldSchema, data) {
-    return sanitizeDataForNewSchema(this.validator, this.rootSchema, newSchema, oldSchema, data);
+    return sanitizeDataForNewSchema(
+      this.validator,
+      this.rootSchema,
+      newSchema,
+      oldSchema,
+      data,
+      this.experimental_customMergeAllOf
+    );
   }
   /** Generates an `IdSchema` object for the `schema`, recursively
    *
@@ -1722,7 +2333,16 @@ var SchemaUtils = class {
    * @returns - The `IdSchema` object for the `schema`
    */
   toIdSchema(schema, id, formData, idPrefix = "root", idSeparator = "_") {
-    return toIdSchema(this.validator, schema, id, this.rootSchema, formData, idPrefix, idSeparator);
+    return toIdSchema(
+      this.validator,
+      schema,
+      id,
+      this.rootSchema,
+      formData,
+      idPrefix,
+      idSeparator,
+      this.experimental_customMergeAllOf
+    );
   }
   /** Generates an `PathSchema` object for the `schema`, recursively
    *
@@ -1732,11 +2352,23 @@ var SchemaUtils = class {
    * @returns - The `PathSchema` object for the `schema`
    */
   toPathSchema(schema, name, formData) {
-    return toPathSchema(this.validator, schema, name, this.rootSchema, formData);
+    return toPathSchema(
+      this.validator,
+      schema,
+      name,
+      this.rootSchema,
+      formData,
+      this.experimental_customMergeAllOf
+    );
   }
 };
-function createSchemaUtils(validator, rootSchema, experimental_defaultFormStateBehavior = {}) {
-  return new SchemaUtils(validator, rootSchema, experimental_defaultFormStateBehavior);
+function createSchemaUtils(validator, rootSchema, experimental_defaultFormStateBehavior = {}, experimental_customMergeAllOf) {
+  return new SchemaUtils(
+    validator,
+    rootSchema,
+    experimental_defaultFormStateBehavior,
+    experimental_customMergeAllOf
+  );
 }
 
 // src/dataURItoBlob.ts
@@ -1818,9 +2450,6 @@ function englishStringTranslator(stringToTranslate, params) {
   return replaceStringParameters(stringToTranslate, params);
 }
 
-// src/enumOptionsDeselectValue.ts
-import isEqual4 from "lodash/isEqual";
-
 // src/enumOptionsValueForIndex.ts
 function enumOptionsValueForIndex(valueIndex, allEnumOptions = [], emptyValue) {
   if (Array.isArray(valueIndex)) {
@@ -1835,18 +2464,17 @@ function enumOptionsValueForIndex(valueIndex, allEnumOptions = [], emptyValue) {
 function enumOptionsDeselectValue(valueIndex, selected, allEnumOptions = []) {
   const value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
   if (Array.isArray(selected)) {
-    return selected.filter((v) => !isEqual4(v, value));
+    return selected.filter((v) => !deepEquals(v, value));
   }
-  return isEqual4(value, selected) ? void 0 : selected;
+  return deepEquals(value, selected) ? void 0 : selected;
 }
 
 // src/enumOptionsIsSelected.ts
-import isEqual5 from "lodash/isEqual";
 function enumOptionsIsSelected(value, selected) {
   if (Array.isArray(selected)) {
-    return selected.some((sel) => isEqual5(sel, value));
+    return selected.some((sel) => deepEquals(sel, value));
   }
-  return isEqual5(selected, value);
+  return deepEquals(selected, value);
 }
 
 // src/enumOptionsIndexForValue.ts
@@ -1859,10 +2487,10 @@ function enumOptionsIndexForValue(value, allEnumOptions = [], multiple = false)
 }
 
 // src/enumOptionsSelectValue.ts
-import isNil from "lodash/isNil";
+import isNil2 from "lodash/isNil";
 function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
   const value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
-  if (!isNil(value)) {
+  if (!isNil2(value)) {
     const index = allEnumOptions.findIndex((opt) => value === opt.value);
     const all = allEnumOptions.map(({ value: val }) => val);
     const updated = selected.slice(0, index).concat(value, selected.slice(index));
@@ -1873,8 +2501,9 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 import cloneDeep from "lodash/cloneDeep";
-import get11 from "lodash/get";
+import get15 from "lodash/get";
 import set3 from "lodash/set";
+import setWith from "lodash/setWith";
 var ErrorSchemaBuilder = class {
   /** Construct an `ErrorSchemaBuilder` with an optional initial set of errors in an `ErrorSchema`.
    *
@@ -1901,10 +2530,10 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? get11(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? get15(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
-      set3(this.errorSchema, pathOfError, errorBlock);
+      setWith(this.errorSchema, pathOfError, errorBlock, Object);
     }
     return errorBlock;
   }
@@ -1927,15 +2556,15 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = get11(errorBlock, ERRORS_KEY);
+    let errorsList = get15(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
     }
     if (Array.isArray(errorOrList)) {
-      errorsList.push(...errorOrList);
+      set3(errorBlock, ERRORS_KEY, [.../* @__PURE__ */ new Set([...errorsList, ...errorOrList])]);
     } else {
-      errorsList.push(errorOrList);
+      set3(errorBlock, ERRORS_KEY, [.../* @__PURE__ */ new Set([...errorsList, errorOrList])]);
     }
     return this;
   }
@@ -1949,7 +2578,7 @@ var ErrorSchemaBuilder = class {
    */
   setErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    const listToAdd = Array.isArray(errorOrList) ? [...errorOrList] : [errorOrList];
+    const listToAdd = Array.isArray(errorOrList) ? [.../* @__PURE__ */ new Set([...errorOrList])] : [errorOrList];
     set3(errorBlock, ERRORS_KEY, listToAdd);
     return this;
   }
@@ -2034,6 +2663,9 @@ function getInputProps(schema, defaultType, options = {}, autoDefaultStepAny = t
   if (options.autocomplete) {
     inputProps.autoComplete = options.autocomplete;
   }
+  if (options.accept) {
+    inputProps.accept = options.accept;
+  }
   return inputProps;
 }
 
@@ -2060,6 +2692,10 @@ function getTemplate(name, registry, uiOptions = {}) {
   if (name === "ButtonTemplates") {
     return templates[name];
   }
+  if (Object.hasOwn(uiOptions, name) && typeof uiOptions[name] === "string" && Object.hasOwn(templates, uiOptions[name])) {
+    const key = uiOptions[name];
+    return templates[key];
+  }
   return (
     // Evaluating uiOptions[name] results in TS2590: Expression produces a union type that is too complex to represent
     // To avoid that, we cast uiOptions to `any` before accessing the name field
@@ -2067,10 +2703,31 @@ function getTemplate(name, registry, uiOptions = {}) {
   );
 }
 
+// src/getTestIds.ts
+import { nanoid } from "nanoid";
+import get16 from "lodash/get";
+function getTestIds() {
+  if (typeof process === "undefined" || get16(process, "env.NODE_ENV") !== "test") {
+    return {};
+  }
+  const ids = /* @__PURE__ */ new Map();
+  return new Proxy(
+    {},
+    {
+      get(_obj, prop) {
+        if (!ids.has(prop)) {
+          ids.set(prop, nanoid());
+        }
+        return ids.get(prop);
+      }
+    }
+  );
+}
+
 // src/getWidget.tsx
 import { createElement } from "react";
 import ReactIs from "react-is";
-import get12 from "lodash/get";
+import get17 from "lodash/get";
 import set4 from "lodash/set";
 import { jsx } from "react/jsx-runtime";
 var widgetMap = {
@@ -2126,7 +2783,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = get12(AWidget, "MergedWidget");
+  let MergedWidget = get17(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -2170,10 +2827,16 @@ function hashString(string) {
   }
   return hash.toString(16);
 }
-function hashForSchema(schema) {
+function sortedJSONStringify(object) {
   const allKeys = /* @__PURE__ */ new Set();
-  JSON.stringify(schema, (key, value) => (allKeys.add(key), value));
-  return hashString(JSON.stringify(schema, Array.from(allKeys).sort()));
+  JSON.stringify(object, (key, value) => (allKeys.add(key), value));
+  return JSON.stringify(object, Array.from(allKeys).sort());
+}
+function hashObject(object) {
+  return hashString(sortedJSONStringify(object));
+}
+function hashForSchema(schema) {
+  return hashObject(schema);
 }
 
 // src/hasWidget.ts
@@ -2191,9 +2854,9 @@ function hasWidget(schema, widget, registeredWidgets = {}) {
 }
 
 // src/idGenerators.ts
-import isString3 from "lodash/isString";
+import isString4 from "lodash/isString";
 function idGenerator(id, suffix) {
-  const theId = isString3(id) ? id : id[ID_KEY];
+  const theId = isString4(id) ? id : id[ID_KEY];
   return `${theId}__${suffix}`;
 }
 function descriptionId(id) {
@@ -2218,6 +2881,9 @@ function ariaDescribedByIds(id, includeExamples = false) {
 function optionId(id, optionIndex) {
   return `${id}-${optionIndex}`;
 }
+function buttonId(id, btn) {
+  return idGenerator(id, btn);
+}
 
 // src/labelValue.ts
 function labelValue(label, hideLabel, fallback) {
@@ -2229,59 +2895,15 @@ function localToUTC(dateString) {
   return dateString ? new Date(dateString).toJSON() : void 0;
 }
 
-// src/toConstant.ts
-function toConstant(schema) {
-  if (ENUM_KEY in schema && Array.isArray(schema.enum) && schema.enum.length === 1) {
-    return schema.enum[0];
-  }
-  if (CONST_KEY in schema) {
-    return schema.const;
-  }
-  throw new Error("schema cannot be inferred as a constant");
-}
-
-// src/optionsList.ts
-function optionsList(schema, uiSchema) {
-  const schemaWithEnumNames = schema;
-  if (schema.enum) {
-    let enumNames;
-    if (uiSchema) {
-      const { enumNames: uiEnumNames } = getUiOptions(uiSchema);
-      enumNames = uiEnumNames;
-    }
-    if (!enumNames && schemaWithEnumNames.enumNames) {
-      if (true) {
-        console.warn(
-          'The "enumNames" property in the schema is deprecated and will be removed in a future major release. Use the "ui:enumNames" property in the uiSchema instead.'
-        );
-      }
-      enumNames = schemaWithEnumNames.enumNames;
-    }
-    return schema.enum.map((value, i) => {
-      const label = enumNames?.[i] || String(value);
-      return { label, value };
-    });
-  }
-  let altSchemas = void 0;
-  let altUiSchemas = void 0;
-  if (schema.anyOf) {
-    altSchemas = schema.anyOf;
-    altUiSchemas = uiSchema?.anyOf;
-  } else if (schema.oneOf) {
-    altSchemas = schema.oneOf;
-    altUiSchemas = uiSchema?.oneOf;
+// src/lookupFromFormContext.ts
+import get18 from "lodash/get";
+import has6 from "lodash/has";
+function lookupFromFormContext(regOrFc, toLookup, fallback) {
+  const lookupPath = [LOOKUP_MAP_NAME];
+  if (has6(regOrFc, FORM_CONTEXT_NAME)) {
+    lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return altSchemas && altSchemas.map((aSchemaDef, index) => {
-    const { title } = getUiOptions(altUiSchemas?.[index]);
-    const aSchema = aSchemaDef;
-    const value = toConstant(aSchema);
-    const label = title || aSchema.title || String(value);
-    return {
-      schema: aSchema,
-      label,
-      value
-    };
-  });
+  return get18(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -2460,7 +3082,7 @@ function utcToLocal(jsonDate) {
 }
 
 // src/validationDataMerge.ts
-import isEmpty3 from "lodash/isEmpty";
+import isEmpty4 from "lodash/isEmpty";
 function validationDataMerge(validationData, additionalErrorSchema) {
   if (!additionalErrorSchema) {
     return validationData;
@@ -2468,7 +3090,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
   const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
   let errors = toErrorList(additionalErrorSchema);
   let errorSchema = additionalErrorSchema;
-  if (!isEmpty3(oldErrorSchema)) {
+  if (!isEmpty4(oldErrorSchema)) {
     errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
     errors = [...oldErrors].concat(errors);
   }
@@ -2505,10 +3127,34 @@ function withIdRefPrefix(schemaNode) {
   return schemaNode;
 }
 
+// src/getChangedFields.ts
+import keys from "lodash/keys";
+import pickBy from "lodash/pickBy";
+import isPlainObject4 from "lodash/isPlainObject";
+import get19 from "lodash/get";
+import difference from "lodash/difference";
+function getChangedFields(a, b) {
+  const aIsPlainObject = isPlainObject4(a);
+  const bIsPlainObject = isPlainObject4(b);
+  if (a === b || !aIsPlainObject && !bIsPlainObject) {
+    return [];
+  }
+  if (aIsPlainObject && !bIsPlainObject) {
+    return keys(a);
+  } else if (!aIsPlainObject && bIsPlainObject) {
+    return keys(b);
+  } else {
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get19(b, key))));
+    const diffFields = difference(keys(b), keys(a));
+    return [...unequalFields, ...diffFields];
+  }
+}
+
 // src/enums.ts
 var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
   TranslatableString2["ArrayItemTitle"] = "Item";
   TranslatableString2["MissingItems"] = "Missing items definition";
+  TranslatableString2["EmptyArray"] = "No items yet. Use the button below to add some.";
   TranslatableString2["YesLabel"] = "Yes";
   TranslatableString2["NoLabel"] = "No";
   TranslatableString2["CloseLabel"] = "Close";
@@ -2541,11 +3187,9 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 
 // src/parser/schemaParser.ts
 import forEach from "lodash/forEach";
-import isEqual7 from "lodash/isEqual";
 
 // src/parser/ParserValidator.ts
-import get13 from "lodash/get";
-import isEqual6 from "lodash/isEqual";
+import get20 from "lodash/get";
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -2571,12 +3215,12 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = get13(schema, ID_KEY, hash);
+    const key = get20(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {
       this.schemaMap[key] = identifiedSchema;
-    } else if (!isEqual6(existing, identifiedSchema)) {
+    } else if (!deepEquals(existing, identifiedSchema)) {
       console.error("existing schema:", JSON.stringify(existing, null, 2));
       console.error("new schema:", JSON.stringify(identifiedSchema, null, 2));
       throw new Error(
@@ -2598,7 +3242,7 @@ var ParserValidator = class {
    * @throws - Error when the given `rootSchema` differs from the root schema provided during construction
    */
   isValid(schema, _formData, rootSchema) {
-    if (!isEqual6(rootSchema, this.rootSchema)) {
+    if (!deepEquals(rootSchema, this.rootSchema)) {
       throw new Error("Unexpectedly calling isValid() with a rootSchema that differs from the construction rootSchema");
     }
     this.addSchema(schema, hashForSchema(schema));
@@ -2638,7 +3282,7 @@ var ParserValidator = class {
 function parseSchema(validator, recurseList, rootSchema, schema) {
   const schemas = retrieveSchemaInternal(validator, schema, rootSchema, void 0, true);
   schemas.forEach((schema2) => {
-    const sameSchemaIndex = recurseList.findIndex((item) => isEqual7(item, schema2));
+    const sameSchemaIndex = recurseList.findIndex((item) => deepEquals(item, schema2));
     if (sameSchemaIndex === -1) {
       recurseList.push(schema2);
       const allOptions = resolveAnyOrOneOfSchemas(validator, schema2, rootSchema, true);
@@ -2670,20 +3314,24 @@ export {
   DEFAULT_KEY,
   DEFINITIONS_KEY,
   DEPENDENCIES_KEY,
+  DISCRIMINATOR_PATH,
   ENUM_KEY,
   ERRORS_KEY,
   ErrorSchemaBuilder,
+  FORM_CONTEXT_NAME,
   ID_KEY,
   IF_KEY,
   ITEMS_KEY,
   JUNK_OPTION_ID,
+  LOOKUP_MAP_NAME,
   NAME_KEY,
   ONE_OF_KEY,
+  PATTERN_PROPERTIES_KEY,
   PROPERTIES_KEY,
+  READONLY_KEY,
   REF_KEY,
   REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG,
-  RJSF_ADDITONAL_PROPERTIES_FLAG,
   ROOT_SCHEMA_PREFIX,
   SUBMIT_BTN_OPTIONS_KEY,
   TranslatableString,
@@ -2694,6 +3342,7 @@ export {
   allowAdditionalItems,
   ariaDescribedByIds,
   asNumber,
+  buttonId,
   canExpand,
   createErrorHandler,
   createSchemaUtils,
@@ -2709,24 +3358,30 @@ export {
   enumOptionsValueForIndex,
   errorId,
   examplesId,
+  findFieldInSchema,
   findSchemaDefinition,
+  findSelectedOptionInXxxOf,
+  getChangedFields,
   getClosestMatchingOption,
   getDateElementProps,
   getDefaultFormState,
   getDiscriminatorFieldFromSchema,
   getDisplayLabel,
   getFirstMatchingOption,
+  getFromSchema,
   getInputProps,
-  getMatchingOption,
   getOptionMatchingSimpleDiscriminator,
   getSchemaType,
   getSubmitButtonOptions,
   getTemplate,
+  getTestIds,
   getUiOptions,
   getWidget,
   guessType,
   hasWidget,
   hashForSchema,
+  hashObject,
+  hashString,
   helpId,
   isConstant,
   isCustomWidget,
@@ -2737,10 +3392,10 @@ export {
   isSelect,
   labelValue,
   localToUTC,
+  lookupFromFormContext,
   mergeDefaultsWithFormData,
   mergeObjects,
   mergeSchemas,
-  mergeValidationData,
   optionId,
   optionsList,
   orderProperties,
@@ -2753,6 +3408,7 @@ export {
   schemaParser,
   schemaRequiresTrueValue,
   shouldRender,
+  sortedJSONStringify,
   titleId,
   toConstant,
   toDateString,