@rjsf/utils 5.8.2 → 5.10.0

package/dist/utils.umd.development.js

@@ -528,11 +528,12 @@
     }, acc);
   }
 
-  var _excluded$1 = ["if", "then", "else"],
-    _excluded2 = ["$ref"],
+  var _excluded$2 = ["if", "then", "else"],
+    _excluded2$1 = ["$ref"],
     _excluded3 = ["allOf"],
-    _excluded4 = ["dependencies"],
-    _excluded5 = ["oneOf"];
+    _excluded4 = ["oneOf", "anyOf"],
+    _excluded5 = ["dependencies"],
+    _excluded6 = ["oneOf"];
   /** Retrieves an expanded schema that has had all of its conditions, additional properties, references and dependencies
    * resolved and merged into the `schema` given a `validator`, `rootSchema` and `rawFormData` that is used to do the
    * potentially recursive resolution.
@@ -565,7 +566,7 @@
     var expression = schema["if"],
       then = schema.then,
       otherwise = schema["else"],
-      resolvedSchemaLessConditional = _objectWithoutPropertiesLoose(schema, _excluded$1);
+      resolvedSchemaLessConditional = _objectWithoutPropertiesLoose(schema, _excluded$2);
     var conditionValue = validator.isValid(expression, formData || {}, rootSchema);
     var resolvedSchemas = [resolvedSchemaLessConditional];
     var schemas = [];
@@ -675,7 +676,7 @@
   function resolveReference(validator, schema, rootSchema, expandAllBranches, formData) {
     // Drop the $ref property of the source schema.
     var $ref = schema.$ref,
-      localSchema = _objectWithoutPropertiesLoose(schema, _excluded2);
+      localSchema = _objectWithoutPropertiesLoose(schema, _excluded2$1);
     // Retrieve the referenced schema definition.
     var refSchema = findSchemaDefinition($ref, rootSchema);
     // Update referenced schema definition with local schema properties.
@@ -757,9 +758,9 @@
       if (IF_KEY in resolvedSchema) {
         return resolveCondition(validator, resolvedSchema, rootSchema, expandAllBranches, rawFormData);
       }
-      if (ALL_OF_KEY in schema) {
+      if (ALL_OF_KEY in resolvedSchema) {
         try {
-          resolvedSchema = mergeAllOf__default["default"](s, {
+          resolvedSchema = mergeAllOf__default["default"](resolvedSchema, {
             deep: false
           });
         } catch (e) {
@@ -794,10 +795,14 @@
    */
   function resolveAnyOrOneOfSchemas(validator, schema, rootSchema, expandAllBranches, rawFormData) {
     var anyOrOneOf;
-    if (Array.isArray(schema.oneOf)) {
-      anyOrOneOf = schema.oneOf;
-    } else if (Array.isArray(schema.anyOf)) {
-      anyOrOneOf = schema.anyOf;
+    var _schema = schema,
+      oneOf = _schema.oneOf,
+      anyOf = _schema.anyOf,
+      remaining = _objectWithoutPropertiesLoose(_schema, _excluded4);
+    if (Array.isArray(oneOf)) {
+      anyOrOneOf = oneOf;
+    } else if (Array.isArray(anyOf)) {
+      anyOrOneOf = anyOf;
     }
     if (anyOrOneOf) {
       // Ensure that during expand all branches we pass an object rather than undefined so that all options are interrogated
@@ -813,9 +818,11 @@
       // Call this to trigger the set of isValid() calls that the schema parser will need
       var option = getFirstMatchingOption(validator, formData, anyOrOneOf, rootSchema, discriminator);
       if (expandAllBranches) {
-        return anyOrOneOf;
+        return anyOrOneOf.map(function (item) {
+          return _extends({}, remaining, item);
+        });
       }
-      schema = anyOrOneOf[option];
+      schema = _extends({}, remaining, anyOrOneOf[option]);
     }
     return [schema];
   }
@@ -833,7 +840,7 @@
   function resolveDependencies(validator, schema, rootSchema, expandAllBranches, formData) {
     // Drop the dependencies from the source schema.
     var dependencies = schema.dependencies,
-      remainingSchema = _objectWithoutPropertiesLoose(schema, _excluded4);
+      remainingSchema = _objectWithoutPropertiesLoose(schema, _excluded5);
     var resolvedSchemas = resolveAnyOrOneOfSchemas(validator, remainingSchema, rootSchema, expandAllBranches, formData);
     return resolvedSchemas.flatMap(function (resolvedSchema) {
       return processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, formData);
@@ -916,7 +923,7 @@
     var dependentSchemas = retrieveSchemaInternal(validator, dependencyValue, rootSchema, formData, expandAllBranches);
     return dependentSchemas.flatMap(function (dependent) {
       var oneOf = dependent.oneOf,
-        dependentSchema = _objectWithoutPropertiesLoose(dependent, _excluded5);
+        dependentSchema = _objectWithoutPropertiesLoose(dependent, _excluded6);
       schema = mergeSchemas(schema, dependentSchema);
       // Since it does not contain oneOf, we return the original schema.
       if (oneOf === undefined) {
@@ -1031,8 +1038,10 @@
             var newSchema = retrieveSchema(validator, value, rootSchema, formValue);
             return score + calculateIndexScore(validator, rootSchema, newSchema, formValue || {});
           }
-          if (has__default["default"](value, ONE_OF_KEY) && formValue) {
-            return score + getClosestMatchingOption(validator, rootSchema, formValue, get__default["default"](value, ONE_OF_KEY));
+          if ((has__default["default"](value, ONE_OF_KEY) || has__default["default"](value, ANY_OF_KEY)) && formValue) {
+            var _key = has__default["default"](value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
+            var discriminator = getDiscriminatorFieldFromSchema(value);
+            return score + getClosestMatchingOption(validator, rootSchema, formValue, get__default["default"](value, _key), -1, discriminator);
           }
           if (value.type === 'object') {
             return score + calculateIndexScore(validator, rootSchema, value, formValue || {});
@@ -1086,8 +1095,15 @@
     if (selectedOption === void 0) {
       selectedOption = -1;
     }
+    // First resolve any refs in the options
+    var resolvedOptions = options.map(function (option) {
+      if (has__default["default"](option, REF_KEY)) {
+        return retrieveSchema(validator, option, rootSchema, formData);
+      }
+      return option;
+    });
     // Reduce the array of options down to a list of the indexes that are considered matching options
-    var allValidIndexes = options.reduce(function (validList, option, index) {
+    var allValidIndexes = resolvedOptions.reduce(function (validList, option, index) {
       var testOptions = [JUNK_OPTION, option];
       var match = getFirstMatchingOption(validator, formData, testOptions, rootSchema, discriminatorField);
       // The match is the real option, so add its index to list of valid indexes
@@ -1102,7 +1118,7 @@
     }
     if (!allValidIndexes.length) {
       // No indexes were valid, so we'll score all the options, add all the indexes
-      times__default["default"](options.length, function (i) {
+      times__default["default"](resolvedOptions.length, function (i) {
         return allValidIndexes.push(i);
       });
     }
@@ -1110,10 +1126,7 @@
     // Score all the options in the list of valid indexes and return the index with the best score
     var _allValidIndexes$redu = allValidIndexes.reduce(function (scoreData, index) {
         var bestScore = scoreData.bestScore;
-        var option = options[index];
-        if (has__default["default"](option, REF_KEY)) {
-          option = retrieveSchema(validator, option, rootSchema, formData);
-        }
+        var option = resolvedOptions[index];
         var score = calculateIndexScore(validator, rootSchema, option, formData);
         scoreCount.add(score);
         if (score > bestScore) {
@@ -1153,29 +1166,38 @@
    * - objects are deeply merged
    * - arrays are merged in such a way that:
    *   - when the array is set in form data, only array entries set in form data
-   *     are deeply merged; additional entries from the defaults are ignored
+   *     are deeply merged; additional entries from the defaults are ignored unless `mergeExtraArrayDefaults` is true, in
+   *     which case the extras are appended onto the end of the form data
    *   - when the array is not set in form data, the default is copied over
    * - scalars are overwritten/set by form data
    *
    * @param [defaults] - The defaults to merge
    * @param [formData] - The form data into which the defaults will be merged
+   * @param [mergeExtraArrayDefaults=false] - If true, any additional default array entries are appended onto the formData
    * @returns - The resulting merged form data with defaults
    */
-  function mergeDefaultsWithFormData(defaults, formData) {
+  function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults) {
+    if (mergeExtraArrayDefaults === void 0) {
+      mergeExtraArrayDefaults = false;
+    }
     if (Array.isArray(formData)) {
       var defaultsArray = Array.isArray(defaults) ? defaults : [];
       var mapped = formData.map(function (value, idx) {
         if (defaultsArray[idx]) {
-          return mergeDefaultsWithFormData(defaultsArray[idx], value);
+          return mergeDefaultsWithFormData(defaultsArray[idx], value, mergeExtraArrayDefaults);
         }
         return value;
       });
+      // Merge any extra defaults when mergeExtraArrayDefaults is true
+      if (mergeExtraArrayDefaults && mapped.length < defaultsArray.length) {
+        mapped.push.apply(mapped, defaultsArray.slice(mapped.length));
+      }
       return mapped;
     }
     if (isObject(formData)) {
       var acc = Object.assign({}, defaults); // Prevent mutation of source object.
       return Object.keys(formData).reduce(function (acc, key) {
-        acc[key] = mergeDefaultsWithFormData(defaults ? get__default["default"](defaults, key) : {}, get__default["default"](formData, key));
+        acc[key] = mergeDefaultsWithFormData(defaults ? get__default["default"](defaults, key) : {}, get__default["default"](formData, key), mergeExtraArrayDefaults);
         return acc;
       }, acc);
     }
@@ -1266,6 +1288,8 @@
     return isSelect(validator, schema.items, rootSchema);
   }
 
+  var _excluded$1 = ["oneOf"],
+    _excluded2 = ["anyOf"];
   /** Enum that indicates how `schema.additionalItems` should be handled by the `getInnerSchemaForArrayItem()` function.
    */
   var AdditionalItemsHandling;
@@ -1344,10 +1368,13 @@
       obj[key] = computedDefault;
     } else if (emptyObjectFields !== 'skipDefaults') {
       if (isObject(computedDefault)) {
+        // If isParentRequired is undefined, then we are at the root level of the schema so defer to the requiredness of
+        // the field key itself in the `requiredField` list
+        var isSelfOrParentRequired = isParentRequired === undefined ? requiredFields.includes(key) : isParentRequired;
         // Store computedDefault if it's a non-empty object(e.g. not {}) and satisfies certain conditions
         // Condition 1: If computedDefault is not empty or if the key is a required field
         // Condition 2: If the parent object is required or emptyObjectFields is not 'populateRequiredDefaults'
-        if ((!isEmpty__default["default"](computedDefault) || requiredFields.includes(key)) && (isParentRequired || emptyObjectFields !== 'populateRequiredDefaults')) {
+        if ((!isEmpty__default["default"](computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== 'populateRequiredDefaults')) {
           obj[key] = computedDefault;
         }
       } else if (
@@ -1388,8 +1415,7 @@
       _recurseList = _ref$_recurseList === void 0 ? [] : _ref$_recurseList,
       _ref$experimental_def = _ref.experimental_defaultFormStateBehavior,
       experimental_defaultFormStateBehavior = _ref$experimental_def === void 0 ? undefined : _ref$experimental_def,
-      _ref$required = _ref.required,
-      required = _ref$required === void 0 ? false : _ref$required;
+      required = _ref.required;
     var formData = isObject(rawFormData) ? rawFormData : {};
     var schema = isObject(rawSchema) ? rawSchema : {};
     // Compute the defaults recursively: give highest priority to deepest nodes.
@@ -1421,21 +1447,28 @@
           _recurseList: _recurseList,
           experimental_defaultFormStateBehavior: experimental_defaultFormStateBehavior,
           parentDefaults: Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined,
-          rawFormData: formData
+          rawFormData: formData,
+          required: required
         });
       });
     } else if (ONE_OF_KEY in schema) {
-      if (schema.oneOf.length === 0) {
+      var oneOf = schema.oneOf,
+        remaining = _objectWithoutPropertiesLoose(schema, _excluded$1);
+      if (oneOf.length === 0) {
         return undefined;
       }
       var discriminator = getDiscriminatorFieldFromSchema(schema);
-      schemaToCompute = schema.oneOf[getClosestMatchingOption(validator, rootSchema, isEmpty__default["default"](formData) ? undefined : formData, schema.oneOf, 0, discriminator)];
+      schemaToCompute = oneOf[getClosestMatchingOption(validator, rootSchema, isEmpty__default["default"](formData) ? undefined : formData, oneOf, 0, discriminator)];
+      schemaToCompute = _extends({}, remaining, schemaToCompute);
     } else if (ANY_OF_KEY in schema) {
-      if (schema.anyOf.length === 0) {
+      var anyOf = schema.anyOf,
+        _remaining = _objectWithoutPropertiesLoose(schema, _excluded2);
+      if (anyOf.length === 0) {
         return undefined;
       }
       var _discriminator = getDiscriminatorFieldFromSchema(schema);
-      schemaToCompute = schema.anyOf[getClosestMatchingOption(validator, rootSchema, isEmpty__default["default"](formData) ? undefined : formData, schema.anyOf, 0, _discriminator)];
+      schemaToCompute = anyOf[getClosestMatchingOption(validator, rootSchema, isEmpty__default["default"](formData) ? undefined : formData, anyOf, 0, _discriminator)];
+      schemaToCompute = _extends({}, _remaining, schemaToCompute);
     }
     if (schemaToCompute) {
       return computeDefaults(validator, schemaToCompute, {
@@ -1444,7 +1477,8 @@
         _recurseList: updatedRecurseList,
         experimental_defaultFormStateBehavior: experimental_defaultFormStateBehavior,
         parentDefaults: defaults,
-        rawFormData: formData
+        rawFormData: formData,
+        required: required
       });
     }
     // No defaults defined for this node, fallback to generic typed ones.
@@ -1511,6 +1545,7 @@
         }
       case 'array':
         {
+          var _experimental_default3;
           // Inject defaults into existing array defaults
           if (Array.isArray(defaults)) {
             defaults = defaults.map(function (item, idx) {
@@ -1519,7 +1554,8 @@
                 rootSchema: rootSchema,
                 _recurseList: _recurseList,
                 experimental_defaultFormStateBehavior: experimental_defaultFormStateBehavior,
-                parentDefaults: item
+                parentDefaults: item,
+                required: required
               });
             });
           }
@@ -1532,11 +1568,12 @@
                 _recurseList: _recurseList,
                 experimental_defaultFormStateBehavior: experimental_defaultFormStateBehavior,
                 rawFormData: item,
-                parentDefaults: get__default["default"](defaults, [idx])
+                parentDefaults: get__default["default"](defaults, [idx]),
+                required: required
               });
             });
           }
-          var ignoreMinItemsFlagSet = (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.arrayMinItems) === 'requiredOnly';
+          var ignoreMinItemsFlagSet = (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : (_experimental_default3 = experimental_defaultFormStateBehavior.arrayMinItems) === null || _experimental_default3 === void 0 ? void 0 : _experimental_default3.populate) === 'requiredOnly';
           if (ignoreMinItemsFlagSet && !required) {
             // If no form data exists or defaults are set leave the field empty/non-existent, otherwise
             // return form data/defaults
@@ -1554,7 +1591,8 @@
             parentDefaults: fillerDefault,
             rootSchema: rootSchema,
             _recurseList: _recurseList,
-            experimental_defaultFormStateBehavior: experimental_defaultFormStateBehavior
+            experimental_defaultFormStateBehavior: experimental_defaultFormStateBehavior,
+            required: required
           }));
           // then fill up the rest with either the item default or empty, up to minItems
           return defaultEntries.concat(fillerEntries);
@@ -1593,11 +1631,13 @@
       // No form data? Use schema defaults.
       return defaults;
     }
+    var _ref2 = (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.arrayMinItems) || {},
+      mergeExtraDefaults = _ref2.mergeExtraDefaults;
     if (isObject(formData)) {
-      return mergeDefaultsWithFormData(defaults, formData);
+      return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults);
     }
     if (Array.isArray(formData)) {
-      return mergeDefaultsWithFormData(defaults, formData);
+      return mergeDefaultsWithFormData(defaults, formData, mergeExtraDefaults);
     }
     return formData;
   }