@rjsf/utils 5.20.1 → 5.21.1

package/dist/index.js

@@ -1124,15 +1124,16 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
     }
   }
 }
-function computeDefaults(validator, rawSchema, {
-  parentDefaults,
-  rawFormData,
-  rootSchema = {},
-  includeUndefinedValues = false,
-  _recurseList = [],
-  experimental_defaultFormStateBehavior = void 0,
-  required
-} = {}) {
+function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
+  const {
+    parentDefaults,
+    rawFormData,
+    rootSchema = {},
+    includeUndefinedValues = false,
+    _recurseList = [],
+    experimental_defaultFormStateBehavior = void 0,
+    required
+  } = computeDefaultsProps;
   const formData = isObject(rawFormData) ? rawFormData : {};
   const schema = isObject(rawSchema) ? rawSchema : {};
   let defaults = parentDefaults;
@@ -1149,7 +1150,11 @@ function computeDefaults(validator, rawSchema, {
       schemaToCompute = findSchemaDefinition(refName, rootSchema);
     }
   } else if (DEPENDENCIES_KEY in schema) {
-    const resolvedSchema = resolveDependencies(validator, schema, rootSchema, false, [], formData);
+    const defaultFormData = {
+      ...formData,
+      ...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults)
+    };
+    const resolvedSchema = resolveDependencies(validator, schema, rootSchema, false, [], defaultFormData);
     schemaToCompute = resolvedSchema[0];
   } else if (isFixedItems(schema)) {
     defaults = schema.items.map(
@@ -1208,127 +1213,154 @@ function computeDefaults(validator, rawSchema, {
   if (defaults === void 0) {
     defaults = schema.default;
   }
-  switch (getSchemaType(schema)) {
-    case "object": {
-      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) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => keys.add(key));
-        }
-        const formDataRequired = [];
-        Object.keys(formData).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => {
-          keys.add(key);
-          formDataRequired.push(key);
-        });
-        keys.forEach((key) => {
-          const computedDefault = computeDefaults(validator, additionalPropertiesSchema, {
-            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(
-            objectDefaults,
-            key,
-            computedDefault,
-            includeUndefinedValues,
-            required,
-            formDataRequired
-          );
+  const defaultBasedOnSchemaType = getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults);
+  return defaultBasedOnSchemaType ?? defaults;
+}
+function getObjectDefaults(validator, rawSchema, {
+  rawFormData,
+  rootSchema = {},
+  includeUndefinedValues = false,
+  _recurseList = [],
+  experimental_defaultFormStateBehavior = void 0,
+  required
+} = {}, defaults) {
+  {
+    const formData = isObject(rawFormData) ? rawFormData : {};
+    const schema = rawSchema;
+    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) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => keys.add(key));
       }
-      return objectDefaults;
-    }
-    case "array": {
-      const neverPopulate = experimental_defaultFormStateBehavior?.arrayMinItems?.populate === "never";
-      const ignoreMinItemsFlagSet = experimental_defaultFormStateBehavior?.arrayMinItems?.populate === "requiredOnly";
-      const isSkipEmptyDefaults = experimental_defaultFormStateBehavior?.emptyObjectFields === "skipEmptyDefaults";
-      const computeSkipPopulate = experimental_defaultFormStateBehavior?.arrayMinItems?.computeSkipPopulate ?? (() => false);
-      const emptyDefault = isSkipEmptyDefaults ? void 0 : [];
-      if (Array.isArray(defaults)) {
-        defaults = defaults.map((item, idx) => {
-          const schemaItem = getInnerSchemaForArrayItem(schema, 2 /* Fallback */, idx);
-          return computeDefaults(validator, schemaItem, {
-            rootSchema,
-            _recurseList,
-            experimental_defaultFormStateBehavior,
-            parentDefaults: item,
-            required
-          });
+      const formDataRequired = [];
+      Object.keys(formData).filter((key) => !retrievedSchema.properties || !retrievedSchema.properties[key]).forEach((key) => {
+        keys.add(key);
+        formDataRequired.push(key);
+      });
+      keys.forEach((key) => {
+        const computedDefault = computeDefaults(validator, additionalPropertiesSchema, {
+          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)
         });
-      }
-      if (Array.isArray(rawFormData)) {
-        const schemaItem = getInnerSchemaForArrayItem(schema);
-        if (neverPopulate) {
-          defaults = rawFormData;
-        } else {
-          defaults = rawFormData.map((item, idx) => {
-            return computeDefaults(validator, schemaItem, {
-              rootSchema,
-              _recurseList,
-              experimental_defaultFormStateBehavior,
-              rawFormData: item,
-              parentDefaults: (0, import_get7.default)(defaults, [idx]),
-              required
-            });
-          });
-        }
-      }
-      if (neverPopulate) {
-        return defaults ?? emptyDefault;
-      }
-      if (ignoreMinItemsFlagSet && !required) {
-        return defaults ? defaults : void 0;
-      }
-      const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
-      if (!schema.minItems || isMultiSelect(validator, schema, rootSchema) || computeSkipPopulate(validator, schema, rootSchema) || schema.minItems <= defaultsLength) {
-        return defaults ? defaults : emptyDefault;
-      }
-      const defaultEntries = defaults || [];
-      const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
-      const fillerDefault = fillerSchema.default;
-      const fillerEntries = new Array(schema.minItems - defaultsLength).fill(
-        computeDefaults(validator, fillerSchema, {
-          parentDefaults: fillerDefault,
+        maybeAddDefaultToObject(
+          objectDefaults,
+          key,
+          computedDefault,
+          includeUndefinedValues,
+          required,
+          formDataRequired
+        );
+      });
+    }
+    return objectDefaults;
+  }
+}
+function getArrayDefaults(validator, rawSchema, {
+  rawFormData,
+  rootSchema = {},
+  _recurseList = [],
+  experimental_defaultFormStateBehavior = void 0,
+  required
+} = {}, defaults) {
+  const schema = rawSchema;
+  const neverPopulate = experimental_defaultFormStateBehavior?.arrayMinItems?.populate === "never";
+  const ignoreMinItemsFlagSet = experimental_defaultFormStateBehavior?.arrayMinItems?.populate === "requiredOnly";
+  const isSkipEmptyDefaults = experimental_defaultFormStateBehavior?.emptyObjectFields === "skipEmptyDefaults";
+  const computeSkipPopulate = experimental_defaultFormStateBehavior?.arrayMinItems?.computeSkipPopulate ?? (() => false);
+  const emptyDefault = isSkipEmptyDefaults ? void 0 : [];
+  if (Array.isArray(defaults)) {
+    defaults = defaults.map((item, idx) => {
+      const schemaItem = getInnerSchemaForArrayItem(schema, 2 /* Fallback */, idx);
+      return computeDefaults(validator, schemaItem, {
+        rootSchema,
+        _recurseList,
+        experimental_defaultFormStateBehavior,
+        parentDefaults: item,
+        required
+      });
+    });
+  }
+  if (Array.isArray(rawFormData)) {
+    const schemaItem = getInnerSchemaForArrayItem(schema);
+    if (neverPopulate) {
+      defaults = rawFormData;
+    } else {
+      defaults = rawFormData.map((item, idx) => {
+        return computeDefaults(validator, schemaItem, {
           rootSchema,
           _recurseList,
           experimental_defaultFormStateBehavior,
+          rawFormData: item,
+          parentDefaults: (0, import_get7.default)(defaults, [idx]),
           required
-        })
-      );
-      return defaultEntries.concat(fillerEntries);
+        });
+      });
+    }
+  }
+  if (neverPopulate) {
+    return defaults ?? emptyDefault;
+  }
+  if (ignoreMinItemsFlagSet && !required) {
+    return defaults ? defaults : void 0;
+  }
+  const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
+  if (!schema.minItems || isMultiSelect(validator, schema, rootSchema) || computeSkipPopulate(validator, schema, rootSchema) || schema.minItems <= defaultsLength) {
+    return defaults ? defaults : emptyDefault;
+  }
+  const defaultEntries = defaults || [];
+  const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
+  const fillerDefault = fillerSchema.default;
+  const fillerEntries = new Array(schema.minItems - defaultsLength).fill(
+    computeDefaults(validator, fillerSchema, {
+      parentDefaults: fillerDefault,
+      rootSchema,
+      _recurseList,
+      experimental_defaultFormStateBehavior,
+      required
+    })
+  );
+  return defaultEntries.concat(fillerEntries);
+}
+function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefaultsProps = {}, defaults) {
+  switch (getSchemaType(rawSchema)) {
+    case "object": {
+      return getObjectDefaults(validator, rawSchema, computeDefaultsProps, defaults);
+    }
+    case "array": {
+      return getArrayDefaults(validator, rawSchema, computeDefaultsProps, defaults);
     }
   }
-  return defaults;
 }
 function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior) {
   if (!isObject(theSchema)) {