@rjsf/utils 5.24.2 → 5.24.4

package/dist/utils.esm.js

@@ -131,20 +131,15 @@ function createErrorHandler(formData) {
 }
 
 // src/deepEquals.ts
-import { createCustomEqual } from "fast-equals";
-var deepEquals = createCustomEqual({
-  createCustomConfig: () => ({
-    // Assume all functions are equivalent
-    // see https://github.com/rjsf-team/react-jsonschema-form/issues/255
-    //
-    // Performance improvement: knowing that typeof a === function, so, only needs to check if typeof b === function.
-    // https://github.com/planttheidea/fast-equals/blob/c633c4e653cacf8fd5cbb309b6841df62322d74c/src/comparator.ts#L99
-    areFunctionsEqual(_a, b) {
-      return typeof b === "function";
-    }
-  })
-});
-var deepEquals_default = deepEquals;
+import isEqualWith from "lodash/isEqualWith";
+function deepEquals(a, b) {
+  return isEqualWith(a, b, (obj, other) => {
+    if (typeof obj === "function" && typeof other === "function") {
+      return true;
+    }
+    return void 0;
+  });
+}
 
 // src/schema/getDefaultFormState.ts
 import get7 from "lodash/get";
@@ -564,7 +559,7 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList)
     };
   }
-  return deepEquals_default(schema, resolvedSchema) ? schema : resolvedSchema;
+  return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
 }
 function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFormData, experimental_customMergeAllOf) {
   const schema = {
@@ -1295,7 +1290,8 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       schema,
       rootSchema,
       rawFormData,
-      experimental_defaultFormStateBehavior
+      experimental_defaultFormStateBehavior,
+      experimental_customMergeAllOf
     );
     if (!isObject(rawFormData)) {
       defaultsWithFormData = mergeDefaultsWithFormData(
@@ -1308,12 +1304,12 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
   }
   return defaultsWithFormData;
 }
-function ensureFormDataMatchingSchema(validator, schema, rootSchema, formData, experimental_defaultFormStateBehavior) {
-  const isSelectField = !isConstant(schema) && isSelect(validator, schema, rootSchema);
+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_default(option.value, formData));
+    const isValid = getOptionsList?.some((option) => deepEquals(option.value, formData));
     validFormData = isValid ? formData : void 0;
   }
   const constTakesPrecedence = schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults === "always";
@@ -1727,7 +1723,7 @@ import get9 from "lodash/get";
 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, experimental_customMergeAllOf);
-    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals_default(item, _schema));
+    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
     if (sameSchemaIndex === -1) {
       return toIdSchemaInternal(
         validator,
@@ -1798,7 +1794,7 @@ import set2 from "lodash/set";
 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, experimental_customMergeAllOf);
-    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals_default(item, _schema));
+    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
     if (sameSchemaIndex === -1) {
       return toPathSchemaInternal(
         validator,
@@ -1942,7 +1938,7 @@ var SchemaUtils = class {
     if (!validator || !rootSchema) {
       return false;
     }
-    return this.validator !== validator || !deepEquals_default(this.rootSchema, rootSchema) || !deepEquals_default(this.experimental_defaultFormStateBehavior, experimental_defaultFormStateBehavior) || this.experimental_customMergeAllOf !== experimental_customMergeAllOf;
+    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`.
@@ -2250,17 +2246,17 @@ function enumOptionsValueForIndex(valueIndex, allEnumOptions = [], emptyValue) {
 function enumOptionsDeselectValue(valueIndex, selected, allEnumOptions = []) {
   const value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
   if (Array.isArray(selected)) {
-    return selected.filter((v) => !deepEquals_default(v, value));
+    return selected.filter((v) => !deepEquals(v, value));
   }
-  return deepEquals_default(value, selected) ? void 0 : selected;
+  return deepEquals(value, selected) ? void 0 : selected;
 }
 
 // src/enumOptionsIsSelected.ts
 function enumOptionsIsSelected(value, selected) {
   if (Array.isArray(selected)) {
-    return selected.some((sel) => deepEquals_default(sel, value));
+    return selected.some((sel) => deepEquals(sel, value));
   }
-  return deepEquals_default(selected, value);
+  return deepEquals(selected, value);
 }
 
 // src/enumOptionsIndexForValue.ts
@@ -2727,7 +2723,7 @@ function schemaRequiresTrueValue(schema) {
 // src/shouldRender.ts
 function shouldRender(component, nextProps, nextState) {
   const { props, state } = component;
-  return !deepEquals_default(props, nextProps) || !deepEquals_default(state, nextState);
+  return !deepEquals(props, nextProps) || !deepEquals(state, nextState);
 }
 
 // src/toDateString.ts
@@ -2885,7 +2881,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return keys(b);
   } else {
-    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals_default(value, get13(b, key))));
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get13(b, key))));
     const diffFields = difference(keys(b), keys(a));
     return [...unequalFields, ...diffFields];
   }
@@ -2960,7 +2956,7 @@ var ParserValidator = class {
     const existing = this.schemaMap[key];
     if (!existing) {
       this.schemaMap[key] = identifiedSchema;
-    } else if (!deepEquals_default(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(
@@ -2982,7 +2978,7 @@ var ParserValidator = class {
    * @throws - Error when the given `rootSchema` differs from the root schema provided during construction
    */
   isValid(schema, _formData, rootSchema) {
-    if (!deepEquals_default(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));
@@ -3022,7 +3018,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) => deepEquals_default(item, schema2));
+    const sameSchemaIndex = recurseList.findIndex((item) => deepEquals(item, schema2));
     if (sameSchemaIndex === -1) {
       recurseList.push(schema2);
       const allOptions = resolveAnyOrOneOfSchemas(validator, schema2, rootSchema, true);
@@ -3083,7 +3079,7 @@ export {
   createSchemaUtils,
   dataURItoBlob,
   dateRangeOptions,
-  deepEquals_default as deepEquals,
+  deepEquals,
   descriptionId,
   englishStringTranslator,
   enumOptionsDeselectValue,