@rjsf/utils 5.21.1 → 5.22.0

package/dist/utils.esm.js

@@ -367,10 +367,18 @@ function mergeSchemas(obj1, obj2) {
 }
 
 // src/schema/retrieveSchema.ts
-function retrieveSchema(validator, schema, rootSchema = {}, rawFormData) {
-  return retrieveSchemaInternal(validator, schema, rootSchema, rawFormData)[0];
+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 +386,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 +420,8 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, recu
           rootSchema,
           formData,
           expandAllBranches,
-          recurseList
+          recurseList,
+          experimental_customMergeAllOf
         )
       );
     }
@@ -405,7 +430,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 +455,7 @@ function getAllPermutationsOfXxxOf(listOfLists) {
   );
   return allPermutations;
 }
-function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData) {
+function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const updatedSchemas = resolveReference(
     validator,
     schema,
@@ -444,7 +477,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,7 +496,8 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
         rootSchema,
         formData,
         expandAllBranches,
-        recurseList
+        recurseList,
+        experimental_customMergeAllOf
       )
     );
     const allPermutations = getAllPermutationsOfXxxOf(allOfSchemaElements);
@@ -463,7 +505,7 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
   }
   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 +514,8 @@ function resolveReference(validator, schema, rootSchema, expandAllBranches, recu
       rootSchema,
       formData,
       expandAllBranches,
-      recurseList
+      recurseList,
+      experimental_customMergeAllOf
     );
   }
   return [schema];
@@ -550,7 +593,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
   });
   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 [{}];
   }
@@ -571,7 +614,8 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
         rootSchema,
         expandAllBranches,
         recurseList,
-        rawFormData
+        rawFormData,
+        experimental_customMergeAllOf
       );
     }
     if (ALL_OF_KEY in resolvedSchema) {
@@ -580,9 +624,24 @@ 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;
@@ -618,7 +677,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 +694,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 +723,8 @@ function processDependencies(validator, dependencies, resolvedSchema, rootSchema
         dependencyValue,
         expandAllBranches,
         recurseList,
-        formData
+        formData,
+        experimental_customMergeAllOf
       );
     }
     return schemas.flatMap(
@@ -674,7 +735,8 @@ function processDependencies(validator, dependencies, resolvedSchema, rootSchema
         rootSchema,
         expandAllBranches,
         recurseList,
-        formData
+        formData,
+        experimental_customMergeAllOf
       )
     );
   }
@@ -687,14 +749,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 +781,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,7 +818,8 @@ function withExactlyOneSubschema(validator, schema, rootSchema, dependencyKey, o
       rootSchema,
       formData,
       expandAllBranches,
-      recurseList
+      recurseList,
+      experimental_customMergeAllOf
     );
     return schemas.map((s2) => mergeSchemas(schema, s2));
   });
@@ -770,7 +835,7 @@ var JUNK_OPTION = {
     }
   }
 };
-function calculateIndexScore(validator, rootSchema, schema, formData = {}) {
+function calculateIndexScore(validator, rootSchema, schema, formData) {
   let totalScore = 0;
   if (schema) {
     if (isObject2(schema.properties)) {
@@ -798,7 +863,10 @@ function calculateIndexScore(validator, rootSchema, schema, formData = {}) {
             );
           }
           if (value.type === "object") {
-            return score + calculateIndexScore(validator, rootSchema, value, formValue || {});
+            if (isObject2(formValue)) {
+              score += 1;
+            }
+            return score + calculateIndexScore(validator, rootSchema, value, formValue);
           }
           if (value.type === guessType(formValue)) {
             let newScore = score + 1;
@@ -868,12 +936,17 @@ function isFixedItems(schema) {
 
 // src/mergeDefaultsWithFormData.ts
 import get6 from "lodash/get";
-function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false) {
+function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false, defaultSupercedesUndefined = 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);
+        return mergeDefaultsWithFormData(
+          defaultsArray[idx],
+          value,
+          mergeExtraArrayDefaults,
+          defaultSupercedesUndefined
+        );
       }
       return value;
     });
@@ -888,11 +961,15 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
       acc2[key] = mergeDefaultsWithFormData(
         defaults ? get6(defaults, key) : {},
         get6(formData, key),
-        mergeExtraArrayDefaults
+        mergeExtraArrayDefaults,
+        defaultSupercedesUndefined
       );
       return acc2;
     }, acc);
   }
+  if (defaultSupercedesUndefined && formData === void 0) {
+    return defaults;
+  }
   return formData;
 }
 
@@ -963,9 +1040,9 @@ 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") {
     if (isObject(computedDefault)) {
@@ -995,6 +1072,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
     includeUndefinedValues = false,
     _recurseList = [],
     experimental_defaultFormStateBehavior = void 0,
+    experimental_customMergeAllOf = void 0,
     required
   } = computeDefaultsProps;
   const formData = isObject(rawFormData) ? rawFormData : {};
@@ -1002,7 +1080,9 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
   let defaults = parentDefaults;
   let schemaToCompute = null;
   let updatedRecurseList = _recurseList;
-  if (isObject(defaults) && isObject(schema.default)) {
+  if (isConstant(schema)) {
+    defaults = schema.const;
+  } else if (isObject(defaults) && isObject(schema.default)) {
     defaults = mergeObjects(defaults, schema.default);
   } else if (DEFAULT_KEY in schema) {
     defaults = schema.default;
@@ -1017,7 +1097,15 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       ...formData,
       ...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults)
     };
-    const resolvedSchema = resolveDependencies(validator, schema, rootSchema, false, [], defaultFormData);
+    const resolvedSchema = resolveDependencies(
+      validator,
+      schema,
+      rootSchema,
+      false,
+      [],
+      defaultFormData,
+      experimental_customMergeAllOf
+    );
     schemaToCompute = resolvedSchema[0];
   } else if (isFixedItems(schema)) {
     defaults = schema.items.map(
@@ -1085,18 +1173,24 @@ function getObjectDefaults(validator, rawSchema, {
   includeUndefinedValues = false,
   _recurseList = [],
   experimental_defaultFormStateBehavior = void 0,
+  experimental_customMergeAllOf = void 0,
   required
 } = {}, 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) : schema;
+    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 computedDefault = computeDefaults(validator, get7(retrievedSchema, [PROPERTIES_KEY, key]), {
+        const propertySchema = get7(retrievedSchema, [PROPERTIES_KEY, key]);
+        const hasParentConst = isObject(parentConst) && parentConst[key] !== void 0;
+        const hasConst = isObject(propertySchema) && CONST_KEY in propertySchema || hasParentConst;
+        const computedDefault = computeDefaults(validator, propertySchema, {
           rootSchema,
           _recurseList,
           experimental_defaultFormStateBehavior,
+          experimental_customMergeAllOf,
           includeUndefinedValues: includeUndefinedValues === true,
           parentDefaults: get7(defaults, [key]),
           rawFormData: get7(formData, [key]),
@@ -1109,7 +1203,8 @@ function getObjectDefaults(validator, rawSchema, {
           includeUndefinedValues,
           required,
           retrievedSchema.required,
-          experimental_defaultFormStateBehavior
+          experimental_defaultFormStateBehavior,
+          hasConst
         );
         return acc;
       },
@@ -1191,11 +1286,14 @@ function getArrayDefaults(validator, rawSchema, {
       });
     }
   }
-  if (neverPopulate) {
-    return defaults ?? emptyDefault;
-  }
-  if (ignoreMinItemsFlagSet && !required) {
-    return defaults ? defaults : void 0;
+  const hasConst = isObject(schema) && CONST_KEY in schema;
+  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) || computeSkipPopulate(validator, schema, rootSchema) || schema.minItems <= defaultsLength) {
@@ -1225,26 +1323,29 @@ function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefaultsProps
     }
   }
 }
-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,
+    experimental_customMergeAllOf,
     rawFormData: formData
   });
   if (formData === void 0 || formData === null || typeof formData === "number" && isNaN(formData)) {
     return defaults;
   }
-  const { mergeExtraDefaults } = experimental_defaultFormStateBehavior?.arrayMinItems || {};
+  const { mergeDefaultsIntoFormData, arrayMinItems = {} } = experimental_defaultFormStateBehavior || {};
+  const { mergeExtraDefaults } = arrayMinItems;
+  const defaultSupercedesUndefined = mergeDefaultsIntoFormData === "useDefaultIfFormDataUndefined";
   if (isObject(formData)) {
-    return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults);
+    return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults, defaultSupercedesUndefined);
   }
   if (Array.isArray(formData)) {
-    return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults);
+    return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults, defaultSupercedesUndefined);
   }
   return formData;
 }
@@ -1417,7 +1518,7 @@ 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 = []) {
+function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, 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) => isEqual2(item, _schema));
@@ -1430,7 +1531,8 @@ function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSc
         id,
         rootSchema,
         formData,
-        _recurseList.concat(_schema)
+        _recurseList.concat(_schema),
+        experimental_customMergeAllOf
       );
     }
   }
@@ -1443,7 +1545,8 @@ function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSc
       id,
       rootSchema,
       formData,
-      _recurseList
+      _recurseList,
+      experimental_customMergeAllOf
     );
   }
   const $id = id || idPrefix;
@@ -1462,14 +1565,25 @@ function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSc
         // 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
+        _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
@@ -1573,11 +1687,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`
    *
@@ -1593,13 +1709,14 @@ 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;
   }
   /** 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`.
@@ -1618,7 +1735,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`
@@ -1728,7 +1846,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
@@ -1754,7 +1878,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
    *
@@ -1767,8 +1900,13 @@ var SchemaUtils = class {
     return toPathSchema(this.validator, schema, name, this.rootSchema, formData);
   }
 };
-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
@@ -1907,6 +2045,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 import cloneDeep from "lodash/cloneDeep";
 import get11 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`.
    *
@@ -1936,7 +2075,7 @@ var ErrorSchemaBuilder = class {
     let errorBlock = hasPath ? get11(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
-      set3(this.errorSchema, pathOfError, errorBlock);
+      setWith(this.errorSchema, pathOfError, errorBlock, Object);
     }
     return errorBlock;
   }