@rjsf/utils 5.14.3 → 5.15.1

package/dist/index.js

@@ -402,6 +402,9 @@ var import_isEqual = __toESM(require("lodash/isEqual"));
 var import_set = __toESM(require("lodash/set"));
 var import_times = __toESM(require("lodash/times"));
 var import_transform = __toESM(require("lodash/transform"));
+var import_merge = __toESM(require("lodash/merge"));
+var import_flattenDeep = __toESM(require("lodash/flattenDeep"));
+var import_uniq = __toESM(require("lodash/uniq"));
 var import_json_schema_merge_allof = __toESM(require("json-schema-merge-allof"));
 
 // src/getDiscriminatorFieldFromSchema.ts
@@ -608,13 +611,17 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
     resolvedSchema = { ...refSchema, ...localSchema };
   }
   if (PROPERTIES_KEY in resolvedSchema) {
+    const childrenLists = [];
     const updatedProps = (0, import_transform.default)(
       resolvedSchema[PROPERTIES_KEY],
       (result, value, key) => {
-        result[key] = resolveAllReferences(value, rootSchema, recurseList);
+        const childList = [...recurseList];
+        result[key] = resolveAllReferences(value, rootSchema, childList);
+        childrenLists.push(childList);
       },
       {}
     );
+    (0, import_merge.default)(recurseList, (0, import_uniq.default)((0, import_flattenDeep.default)(childrenLists)));
     resolvedSchema = { ...resolvedSchema, [PROPERTIES_KEY]: updatedProps };
   }
   if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
@@ -1181,35 +1188,39 @@ function computeDefaults(validator, rawSchema, {
   }
   switch (getSchemaType(schema)) {
     case "object": {
-      const objectDefaults = Object.keys(schema.properties || {}).reduce((acc, key) => {
-        const computedDefault = computeDefaults(validator, (0, import_get7.default)(schema, [PROPERTIES_KEY, key]), {
-          rootSchema,
-          _recurseList,
-          experimental_defaultFormStateBehavior,
-          includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: (0, import_get7.default)(defaults, [key]),
-          rawFormData: (0, import_get7.default)(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, (0, import_get7.default)(retrievedSchema, [PROPERTIES_KEY, key]), {
+            rootSchema,
+            _recurseList,
+            experimental_defaultFormStateBehavior,
+            includeUndefinedValues: includeUndefinedValues === true,
+            parentDefaults: (0, import_get7.default)(defaults, [key]),
+            rawFormData: (0, import_get7.default)(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);
         });
@@ -1221,7 +1232,7 @@ function computeDefaults(validator, rawSchema, {
             includeUndefinedValues: includeUndefinedValues === true,
             parentDefaults: (0, import_get7.default)(defaults, [key]),
             rawFormData: (0, import_get7.default)(formData, [key]),
-            required: schema.required?.includes(key)
+            required: retrievedSchema.required?.includes(key)
           });
           maybeAddDefaultToObject(
             objectDefaults,