@rjsf/utils 6.5.1 → 6.5.3

package/dist/utils.esm.js

@@ -145,15 +145,16 @@ function createErrorHandler(formData) {
 }
 
 // src/deepEquals.ts
-import isEqualWith from "lodash/isEqualWith";
-function deepEquals(a, b) {
-  return isEqualWith(a, b, (obj, other) => {
-    if (typeof obj === "function" && typeof other === "function") {
-      return true;
+import { createCustomEqual } from "fast-equals";
+var deepEquals = createCustomEqual({
+  circular: true,
+  createCustomConfig: () => ({
+    areFunctionsEqual(_a, b) {
+      return typeof b === "function";
     }
-    return void 0;
-  });
-}
+  })
+});
+var deepEquals_default = deepEquals;
 
 // src/schema/findFieldInSchema.ts
 import get8 from "lodash/get";
@@ -161,7 +162,6 @@ import has3 from "lodash/has";
 
 // src/schema/findSelectedOptionInXxxOf.ts
 import get6 from "lodash/get";
-import isEqual from "lodash/isEqual";
 
 // src/schema/retrieveSchema.ts
 import get5 from "lodash/get";
@@ -664,7 +664,7 @@ function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveA
       };
     }
   }
-  return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
+  return deepEquals_default(schema, resolvedSchema) ? schema : resolvedSchema;
 }
 function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFormData, experimental_customMergeAllOf) {
   const schema = {
@@ -1002,7 +1002,7 @@ function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField,
     const data = get6(formData, selectorField);
     if (data !== void 0) {
       return xxxOfs.find((xxx2) => {
-        return isEqual(
+        return deepEquals_default(
           get6(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get6(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
           data
         );
@@ -1024,9 +1024,9 @@ function getFromSchemaInternal(validator, rootSchema, schema, path, experimental
   if (isEmpty3(path)) {
     return fieldSchema;
   }
-  const pathList = Array.isArray(path) ? path : path.split(".");
+  const pathList = Array.isArray(path) ? [...path] : path.split(".");
   const [part, ...nestedPath] = pathList;
-  if (part && has2(fieldSchema, part)) {
+  if (part !== void 0 && part !== "" && has2(fieldSchema, part)) {
     fieldSchema = get7(fieldSchema, part);
     return getFromSchemaInternal(
       validator,
@@ -1052,6 +1052,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
   const pathList = Array.isArray(path) ? [...path] : path.split(".");
   let parentField = schema;
   const fieldName = pathList.pop();
+  const fieldNameKey = String(fieldName);
   if (pathList.length) {
     pathList.forEach((subPath) => {
       parentField = getFromSchema(
@@ -1067,7 +1068,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
           validator,
           rootSchema,
           parentField,
-          fieldName,
+          fieldNameKey,
           ONE_OF_KEY,
           get8(formData, subPath),
           experimental_customMergeAllOf
@@ -1077,7 +1078,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
           validator,
           rootSchema,
           parentField,
-          fieldName,
+          fieldNameKey,
           ANY_OF_KEY,
           get8(formData, subPath),
           experimental_customMergeAllOf
@@ -1090,7 +1091,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
       validator,
       rootSchema,
       parentField,
-      fieldName,
+      fieldNameKey,
       ONE_OF_KEY,
       formData,
       experimental_customMergeAllOf
@@ -1100,7 +1101,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
       validator,
       rootSchema,
       parentField,
-      fieldName,
+      fieldNameKey,
       ANY_OF_KEY,
       formData,
       experimental_customMergeAllOf
@@ -1127,7 +1128,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
   );
   let isRequired;
   if (field && Array.isArray(requiredArray)) {
-    isRequired = requiredArray.includes(fieldName);
+    isRequired = requiredArray.includes(fieldNameKey);
   }
   return { field, isRequired };
 }
@@ -1297,7 +1298,7 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
       const keyExistsInDefaults = isObject(defaults) && key in defaults;
       const keyExistsInFormData = key in formData;
       const keyDefault = get10(defaults, key) ?? {};
-      const defaultValueIsNestedObject = keyExistsInDefaults && Object.entries(keyDefault).some(([, v]) => isObject(v));
+      const defaultValueIsNestedObject = keyExistsInDefaults && isObject(keyDefault) && Object.values(keyDefault).some((v) => isObject(v));
       const keyDefaultIsObject = keyExistsInDefaults && isObject(get10(defaults, key));
       const keyHasFormDataObject = keyExistsInFormData && isObject(keyValue);
       if (keyDefaultIsObject && keyHasFormDataObject && !defaultValueIsNestedObject) {
@@ -1671,7 +1672,7 @@ function ensureFormDataMatchingSchema(validator, schema, rootSchema, formData, e
   let validFormData = formData;
   if (isSelectField) {
     const getOptionsList = optionsList(schema);
-    const isValid = getOptionsList?.some((option) => deepEquals(option.value, formData));
+    const isValid = getOptionsList?.some((option) => deepEquals_default(option.value, formData));
     validFormData = isValid ? formData : void 0;
   }
   const constTakesPrecedence = schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults === "always";
@@ -1732,14 +1733,14 @@ function getObjectDefaults(validator, rawSchema, {
     if (retrievedSchema.additionalProperties && !initialDefaultsGenerated) {
       const additionalPropertiesSchema = isObject(retrievedSchema.additionalProperties) ? retrievedSchema.additionalProperties : {};
       const keys2 = /* @__PURE__ */ new Set();
-      if (isObject(defaults)) {
-        Object.keys(defaults).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => keys2.add(key));
-      }
       const formDataRequired = [];
       Object.keys(formData).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => {
         keys2.add(key);
         formDataRequired.push(key);
       });
+      if (isObject(defaults) && formDataRequired.length === 0) {
+        Object.keys(defaults).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => keys2.add(key));
+      }
       keys2.forEach((key) => {
         const computedDefault = computeDefaults(validator, additionalPropertiesSchema, {
           rootSchema,
@@ -1973,7 +1974,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 || IF_KEY in schema) {
     const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
-    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
+    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals_default(item, _schema));
     if (sameSchemaIndex === -1) {
       return toPathSchemaInternal(
         validator,
@@ -2325,7 +2326,7 @@ var SchemaUtils = class {
     if (!validator || !rootSchema) {
       return false;
     }
-    return this.validator !== validator || !deepEquals(this.rootSchema, rootSchema) || !deepEquals(this.experimental_defaultFormStateBehavior, experimental_defaultFormStateBehavior) || this.experimental_customMergeAllOf !== experimental_customMergeAllOf;
+    return this.validator !== validator || !deepEquals_default(this.rootSchema, rootSchema) || !deepEquals_default(this.experimental_defaultFormStateBehavior, experimental_defaultFormStateBehavior) || this.experimental_customMergeAllOf !== experimental_customMergeAllOf;
   }
   /** Finds the field specified by the `path` within the root or recursed `schema`. If there is no field for the specified
    * `path`, then the default `{ field: undefined, isRequired: undefined }` is returned. It determines whether a leaf
@@ -2667,9 +2668,9 @@ function englishStringTranslator(stringToTranslate, params) {
 // src/enumOptionsIsSelected.ts
 function enumOptionsIsSelected(value, selected) {
   if (Array.isArray(selected)) {
-    return selected.some((sel) => deepEquals(sel, value));
+    return selected.some((sel) => deepEquals_default(sel, value));
   }
-  return deepEquals(selected, value);
+  return deepEquals_default(selected, value);
 }
 
 // src/enumOptionsIndexForValue.ts
@@ -2748,9 +2749,9 @@ function enumOptionValueEncoder(value, index, format = "indexed") {
 function enumOptionsDeselectValue(valueIndex, selected, allEnumOptions = []) {
   const value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
   if (Array.isArray(selected)) {
-    return selected.filter((v) => !deepEquals(v, value));
+    return selected.filter((v) => !deepEquals_default(v, value));
   }
-  return deepEquals(value, selected) ? void 0 : selected;
+  return deepEquals_default(value, selected) ? void 0 : selected;
 }
 
 // src/enumOptionsSelectValue.ts
@@ -2880,7 +2881,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return keys(b);
   } else {
-    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get19(b, key))));
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals_default(value, get19(b, key))));
     const diffFields = difference(keys(b), keys(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3200,16 +3201,15 @@ function isFormDataAvailable(formData) {
 }
 
 // src/isRootSchema.ts
-import isEqual2 from "lodash/isEqual";
 import omit2 from "lodash/omit";
 function isRootSchema(registry, schemaToCompare) {
   const { rootSchema, schemaUtils } = registry;
-  if (isEqual2(schemaToCompare, rootSchema)) {
+  if (deepEquals_default(schemaToCompare, rootSchema)) {
     return true;
   }
   if (REF_KEY in rootSchema) {
     const resolvedSchema = schemaUtils.retrieveSchema(rootSchema);
-    return isEqual2(schemaToCompare, omit2(resolvedSchema, RJSF_REF_KEY));
+    return deepEquals_default(schemaToCompare, omit2(resolvedSchema, RJSF_REF_KEY));
   }
   return false;
 }
@@ -3446,7 +3446,7 @@ function shouldRender(component, nextProps, nextState, updateStrategy = "customD
     return !shallowEquals(props2, nextProps) || !shallowEquals(state2, nextState);
   }
   const { props, state } = component;
-  return !deepEquals(props, nextProps) || !deepEquals(state, nextState);
+  return !deepEquals_default(props, nextProps) || !deepEquals_default(state, nextState);
 }
 
 // src/shouldRenderOptionalField.ts
@@ -3662,10 +3662,9 @@ function useAltDateWidgetProps(props) {
 
 // src/useDeepCompareMemo.ts
 import { useRef } from "react";
-import isEqual3 from "lodash/isEqual";
 function useDeepCompareMemo(newValue) {
   const valueRef = useRef(newValue);
-  if (!isEqual3(newValue, valueRef.current)) {
+  if (!deepEquals_default(newValue, valueRef.current)) {
     valueRef.current = newValue;
   }
   return valueRef.current;
@@ -3881,6 +3880,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
   TranslatableString2["OptionPrefix"] = "Option %1";
   TranslatableString2["TitleOptionPrefix"] = "%1 option %2";
   TranslatableString2["KeyLabel"] = "%1 Key";
+  TranslatableString2["DeprecatedLabel"] = "%1 (deprecated)";
   TranslatableString2["InvalidObjectField"] = 'Invalid "%1" object field configuration: _%2_.';
   TranslatableString2["UnsupportedField"] = "Unsupported field schema.";
   TranslatableString2["UnsupportedFieldWithId"] = "Unsupported field schema for field `%1`.";
@@ -3925,7 +3925,7 @@ var ParserValidator = class {
     const existing = this.schemaMap[key];
     if (!existing) {
       this.schemaMap[key] = identifiedSchema;
-    } else if (!deepEquals(existing, identifiedSchema)) {
+    } else if (!deepEquals_default(existing, identifiedSchema)) {
       console.error("existing schema:", JSON.stringify(existing, null, 2));
       console.error("new schema:", JSON.stringify(identifiedSchema, null, 2));
       throw new Error(
@@ -3947,7 +3947,7 @@ var ParserValidator = class {
    * @throws - Error when the given `rootSchema` differs from the root schema provided during construction
    */
   isValid(schema, _formData, rootSchema) {
-    if (!deepEquals(rootSchema, this.rootSchema)) {
+    if (!deepEquals_default(rootSchema, this.rootSchema)) {
       throw new Error("Unexpectedly calling isValid() with a rootSchema that differs from the construction rootSchema");
     }
     this.addSchema(schema, hashForSchema(schema));
@@ -3987,7 +3987,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(item, schema2));
+    const sameSchemaIndex = recurseList.findIndex((item) => deepEquals_default(item, schema2));
     if (sameSchemaIndex === -1) {
       recurseList.push(schema2);
       const allOptions = resolveAnyOrOneOfSchemas(validator, schema2, rootSchema, true);
@@ -4062,7 +4062,7 @@ export {
   createSchemaUtils,
   dataURItoBlob,
   dateRangeOptions,
-  deepEquals,
+  deepEquals_default as deepEquals,
   descriptionId,
   dotNotationNameGenerator,
   englishStringTranslator,