@rjsf/utils 6.1.0 → 6.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/utils",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "main": "dist/index.js",
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -65,8 +65,8 @@
     "react": ">=18"
   },
   "dependencies": {
+    "@x0k/json-schema-merge": "^1.0.2",
     "fast-uri": "^3.1.0",
-    "json-schema-merge-allof": "^0.8.1",
     "jsonpointer": "^5.0.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
@@ -74,7 +74,6 @@
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.15",
-    "@types/json-schema-merge-allof": "^0.6.5",
     "@types/react-is": "^18.3.1",
     "deep-freeze-es6": "^4.0.1",
     "eslint": "^8.57.1"

package/src/schema/retrieveSchema.ts

@@ -5,7 +5,9 @@ import transform from 'lodash/transform';
 import merge from 'lodash/merge';
 import flattenDeep from 'lodash/flattenDeep';
 import uniq from 'lodash/uniq';
-import mergeAllOf, { Options } from 'json-schema-merge-allof';
+import isEmpty from 'lodash/isEmpty';
+import { createComparator, createMerger, createShallowAllOfMerge } from '@x0k/json-schema-merge';
+import { createDeduplicator, createIntersector } from '@x0k/json-schema-merge/lib/array';
 
 import {
   ADDITIONAL_PROPERTIES_KEY,
@@ -36,7 +38,6 @@ import {
 } from '../types';
 import getFirstMatchingOption from './getFirstMatchingOption';
 import deepEquals from '../deepEquals';
-import isEmpty from 'lodash/isEmpty';
 
 /** Retrieves an expanded schema that has had all of its conditions, additional properties, references and dependencies
  * resolved and merged into the `schema` given a `validator`, `rootSchema` and `rawFormData` that is used to do the
@@ -512,6 +513,24 @@ export function stubExistingAdditionalProperties<
   return schema;
 }
 
+// Set up @x0k/json-schema-merge utilities
+const { compareSchemaDefinitions, compareSchemaValues } = createComparator();
+const { mergeArrayOfSchemaDefinitions } = createMerger({
+  intersectJson: createIntersector(compareSchemaValues),
+  deduplicateJsonSchemaDef: createDeduplicator(compareSchemaDefinitions),
+});
+
+const shallowAllOfMerge = createShallowAllOfMerge(mergeArrayOfSchemaDefinitions);
+
+/**
+ * Internal helper that merges allOf schemas using @x0k/json-schema-merge's shallow allOf merge
+ * @param schema - The schema containing an `allOf` keyword
+ * @returns The schema with allOf schemas merged
+ */
+function mergeAllOf<S extends StrictRJSFSchema = RJSFSchema>(schema: S): S {
+  return shallowAllOfMerge(schema) as S;
+}
+
 /** Internal handler that retrieves an expanded schema that has had all of its conditions, additional properties,
  * references and dependencies resolved and merged into the `schema` given a `validator`, `rootSchema` and `rawFormData`
  * that is used to do the potentially recursive resolution. If `expandAllBranches` is true, then all possible branches
@@ -590,12 +609,7 @@ export function retrieveSchemaInternal<
         }
         resolvedSchema = experimental_customMergeAllOf
           ? experimental_customMergeAllOf(resolvedSchema)
-          : (mergeAllOf(resolvedSchema, {
-              deep: false,
-              resolvers: {
-                $defs: mergeAllOf.options.resolvers.definitions,
-              },
-            } as Options) as S);
+          : mergeAllOf(resolvedSchema);
         if (withContainsSchemas.length) {
           resolvedSchema.allOf = withContainsSchemas;
         }