@rjsf/utils 6.1.0 → 6.1.2

package/dist/utils.esm.js

@@ -169,7 +169,9 @@ 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";
+import isEmpty2 from "lodash/isEmpty";
+import { createComparator, createMerger, createShallowAllOfMerge } from "@x0k/json-schema-merge";
+import { createDeduplicator, createIntersector } from "@x0k/json-schema-merge/lib/array";
 
 // src/findSchemaDefinition.ts
 import jsonpointer from "jsonpointer";
@@ -434,7 +436,6 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
 }
 
 // src/schema/retrieveSchema.ts
-import isEmpty2 from "lodash/isEmpty";
 function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs = false) {
   return retrieveSchemaInternal(
     validator,
@@ -720,6 +721,15 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
   });
   return schema;
 }
+var { compareSchemaDefinitions, compareSchemaValues } = createComparator();
+var { mergeArrayOfSchemaDefinitions } = createMerger({
+  intersectJson: createIntersector(compareSchemaValues),
+  deduplicateJsonSchemaDef: createDeduplicator(compareSchemaDefinitions)
+});
+var shallowAllOfMerge = createShallowAllOfMerge(mergeArrayOfSchemaDefinitions);
+function mergeAllOf(schema) {
+  return shallowAllOfMerge(schema);
+}
 function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
   if (!isObject(schema)) {
     return [{}];
@@ -765,12 +775,7 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
         if (withContainsSchemas.length) {
           resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
         }
-        resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema, {
-          deep: false,
-          resolvers: {
-            $defs: mergeAllOf.options.resolvers.definitions
-          }
-        });
+        resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema);
         if (withContainsSchemas.length) {
           resolvedSchema.allOf = withContainsSchemas;
         }