@rjsf/utils 6.1.0 → 6.1.2

package/dist/index.cjs

@@ -334,7 +334,9 @@ var import_transform = __toESM(require("lodash/transform"), 1);
 var import_merge = __toESM(require("lodash/merge"), 1);
 var import_flattenDeep = __toESM(require("lodash/flattenDeep"), 1);
 var import_uniq = __toESM(require("lodash/uniq"), 1);
-var import_json_schema_merge_allof = __toESM(require("json-schema-merge-allof"), 1);
+var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
+var import_json_schema_merge = require("@x0k/json-schema-merge");
+var import_array = require("@x0k/json-schema-merge/lib/array");
 
 // src/findSchemaDefinition.ts
 var import_jsonpointer = __toESM(require("jsonpointer"), 1);
@@ -599,7 +601,6 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
 }
 
 // src/schema/retrieveSchema.ts
-var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
 function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs = false) {
   return retrieveSchemaInternal(
     validator,
@@ -885,6 +886,15 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
   });
   return schema;
 }
+var { compareSchemaDefinitions, compareSchemaValues } = (0, import_json_schema_merge.createComparator)();
+var { mergeArrayOfSchemaDefinitions } = (0, import_json_schema_merge.createMerger)({
+  intersectJson: (0, import_array.createIntersector)(compareSchemaValues),
+  deduplicateJsonSchemaDef: (0, import_array.createDeduplicator)(compareSchemaDefinitions)
+});
+var shallowAllOfMerge = (0, import_json_schema_merge.createShallowAllOfMerge)(mergeArrayOfSchemaDefinitions);
+function mergeAllOf(schema) {
+  return shallowAllOfMerge(schema);
+}
 function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
   if (!isObject(schema)) {
     return [{}];
@@ -930,12 +940,7 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
         if (withContainsSchemas.length) {
           resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
         }
-        resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : (0, import_json_schema_merge_allof.default)(resolvedSchema, {
-          deep: false,
-          resolvers: {
-            $defs: import_json_schema_merge_allof.default.options.resolvers.definitions
-          }
-        });
+        resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema);
         if (withContainsSchemas.length) {
           resolvedSchema.allOf = withContainsSchemas;
         }