@rjsf/utils 5.14.2 → 5.15.0

package/dist/utils.esm.js

@@ -268,6 +268,9 @@ import isEqual from "lodash/isEqual";
 import set from "lodash/set";
 import times from "lodash/times";
 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";
 
 // src/getDiscriminatorFieldFromSchema.ts
@@ -474,13 +477,17 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
     resolvedSchema = { ...refSchema, ...localSchema };
   }
   if (PROPERTIES_KEY in resolvedSchema) {
+    const childrenLists = [];
     const updatedProps = transform(
       resolvedSchema[PROPERTIES_KEY],
       (result, value, key) => {
-        result[key] = resolveAllReferences(value, rootSchema, recurseList);
+        const childList = [...recurseList];
+        result[key] = resolveAllReferences(value, rootSchema, childList);
+        childrenLists.push(childList);
       },
       {}
     );
+    merge(recurseList, uniq(flattenDeep(childrenLists)));
     resolvedSchema = { ...resolvedSchema, [PROPERTIES_KEY]: updatedProps };
   }
   if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
@@ -1047,35 +1054,39 @@ function computeDefaults(validator, rawSchema, {
   }
   switch (getSchemaType(schema)) {
     case "object": {
-      const objectDefaults = Object.keys(schema.properties || {}).reduce((acc, key) => {
-        const computedDefault = computeDefaults(validator, get7(schema, [PROPERTIES_KEY, key]), {
-          rootSchema,
-          _recurseList,
-          experimental_defaultFormStateBehavior,
-          includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: get7(defaults, [key]),
-          rawFormData: get7(formData, [key]),
-          required: schema.required?.includes(key)
-        });
-        maybeAddDefaultToObject(
-          acc,
-          key,
-          computedDefault,
-          includeUndefinedValues,
-          required,
-          schema.required,
-          experimental_defaultFormStateBehavior
-        );
-        return acc;
-      }, {});
-      if (schema.additionalProperties) {
-        const additionalPropertiesSchema = isObject(schema.additionalProperties) ? schema.additionalProperties : {};
+      const retrievedSchema = experimental_defaultFormStateBehavior?.allOf === "populateDefaults" && ALL_OF_KEY in schema ? retrieveSchema(validator, schema, rootSchema, formData) : schema;
+      const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
+        (acc, key) => {
+          const computedDefault = computeDefaults(validator, get7(retrievedSchema, [PROPERTIES_KEY, key]), {
+            rootSchema,
+            _recurseList,
+            experimental_defaultFormStateBehavior,
+            includeUndefinedValues: includeUndefinedValues === true,
+            parentDefaults: get7(defaults, [key]),
+            rawFormData: get7(formData, [key]),
+            required: retrievedSchema.required?.includes(key)
+          });
+          maybeAddDefaultToObject(
+            acc,
+            key,
+            computedDefault,
+            includeUndefinedValues,
+            required,
+            retrievedSchema.required,
+            experimental_defaultFormStateBehavior
+          );
+          return acc;
+        },
+        {}
+      );
+      if (retrievedSchema.additionalProperties) {
+        const additionalPropertiesSchema = isObject(retrievedSchema.additionalProperties) ? retrievedSchema.additionalProperties : {};
         const keys = /* @__PURE__ */ new Set();
         if (isObject(defaults)) {
-          Object.keys(defaults).filter((key) => !schema.properties || !schema.properties[key]).forEach((key) => keys.add(key));
+          Object.keys(defaults).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => keys.add(key));
         }
         const formDataRequired = [];
-        Object.keys(formData).filter((key) => !schema.properties || !schema.properties[key]).forEach((key) => {
+        Object.keys(formData).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => {
           keys.add(key);
           formDataRequired.push(key);
         });
@@ -1087,7 +1098,7 @@ function computeDefaults(validator, rawSchema, {
             includeUndefinedValues: includeUndefinedValues === true,
             parentDefaults: get7(defaults, [key]),
             rawFormData: get7(formData, [key]),
-            required: schema.required?.includes(key)
+            required: retrievedSchema.required?.includes(key)
           });
           maybeAddDefaultToObject(
             objectDefaults,
@@ -1795,7 +1806,7 @@ function enumOptionsIndexForValue(value, allEnumOptions = [], multiple = false)
 }
 
 // src/enumOptionsSelectValue.ts
-import { isNil } from "lodash";
+import isNil from "lodash/isNil";
 function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
   const value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
   if (!isNil(value)) {