@rjsf/utils 5.7.2 → 5.8.0

package/dist/utils.umd.development.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash-es/isPlainObject'), require('lodash-es/isEqualWith'), require('lodash-es/get'), require('lodash-es/isEmpty'), require('jsonpointer'), require('lodash-es/omit'), require('lodash-es/has'), require('lodash-es/isObject'), require('lodash-es/isString'), require('lodash-es/reduce'), require('lodash-es/times'), require('lodash-es/set'), require('json-schema-merge-allof'), require('lodash-es/union'), require('lodash-es/isEqual'), require('lodash-es/cloneDeep'), require('react/jsx-runtime'), require('react'), require('react-is'), require('lodash-es/toPath'), require('lodash-es/forEach')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'lodash-es/isPlainObject', 'lodash-es/isEqualWith', 'lodash-es/get', 'lodash-es/isEmpty', 'jsonpointer', 'lodash-es/omit', 'lodash-es/has', 'lodash-es/isObject', 'lodash-es/isString', 'lodash-es/reduce', 'lodash-es/times', 'lodash-es/set', 'json-schema-merge-allof', 'lodash-es/union', 'lodash-es/isEqual', 'lodash-es/cloneDeep', 'react/jsx-runtime', 'react', 'react-is', 'lodash-es/toPath', 'lodash-es/forEach'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject, global.isEqualWith, global.get, global.isEmpty, global.jsonpointer, global.omit, global.has, global.isObject$1, global.isString, global.reduce, global.times, global.set, global.mergeAllOf, global.union, global.isEqual, global.cloneDeep, global.jsxRuntime, global.React, global.ReactIs, global.toPath, global.forEach));
-})(this, (function (exports, isPlainObject, isEqualWith, get, isEmpty, jsonpointer, omit, has, isObject$1, isString, reduce, times, set, mergeAllOf, union, isEqual, cloneDeep, jsxRuntime, react, ReactIs, toPath, forEach) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash-es/isPlainObject'), require('lodash-es/isEqualWith'), require('lodash-es/get'), require('lodash-es/isEmpty'), require('jsonpointer'), require('lodash-es/omit'), require('lodash-es/has'), require('lodash-es/isObject'), require('lodash-es/isString'), require('lodash-es/reduce'), require('lodash-es/times'), require('lodash-es/set'), require('json-schema-merge-allof'), require('lodash-es/union'), require('lodash-es/isEqual'), require('lodash-es'), require('lodash-es/cloneDeep'), require('react/jsx-runtime'), require('react'), require('react-is'), require('lodash-es/toPath'), require('lodash-es/forEach')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'lodash-es/isPlainObject', 'lodash-es/isEqualWith', 'lodash-es/get', 'lodash-es/isEmpty', 'jsonpointer', 'lodash-es/omit', 'lodash-es/has', 'lodash-es/isObject', 'lodash-es/isString', 'lodash-es/reduce', 'lodash-es/times', 'lodash-es/set', 'json-schema-merge-allof', 'lodash-es/union', 'lodash-es/isEqual', 'lodash-es', 'lodash-es/cloneDeep', 'react/jsx-runtime', 'react', 'react-is', 'lodash-es/toPath', 'lodash-es/forEach'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject, global.isEqualWith, global.get, global.isEmpty, global.jsonpointer, global.omit, global.has, global.isObject$1, global.isString, global.reduce, global.times, global.set, global.mergeAllOf, global.union, global.isEqual, global.lodashEs, global.cloneDeep, global.jsxRuntime, global.React, global.ReactIs, global.toPath, global.forEach));
+})(this, (function (exports, isPlainObject, isEqualWith, get, isEmpty, jsonpointer, omit, has, isObject$1, isString, reduce, times, set, mergeAllOf, union, isEqual, lodashEs, cloneDeep, jsxRuntime, react, ReactIs, toPath, forEach) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -170,6 +170,7 @@
   var ID_KEY = '$id';
   var IF_KEY = 'if';
   var ITEMS_KEY = 'items';
+  var JUNK_OPTION_ID = '_$junk_option_schema_id$_';
   var NAME_KEY = '$name';
   var ONE_OF_KEY = 'oneOf';
   var PROPERTIES_KEY = 'properties';
@@ -565,7 +566,7 @@
       then = schema.then,
       otherwise = schema["else"],
       resolvedSchemaLessConditional = _objectWithoutPropertiesLoose(schema, _excluded$1);
-    var conditionValue = validator.isValid(expression, formData, rootSchema);
+    var conditionValue = validator.isValid(expression, formData || {}, rootSchema);
     var resolvedSchemas = [resolvedSchemaLessConditional];
     var schemas = [];
     if (expandAllBranches) {
@@ -764,7 +765,11 @@
         } catch (e) {
           console.warn('could not merge subschemas in allOf:\n', e);
           var _resolvedSchema = resolvedSchema,
+            allOf = _resolvedSchema.allOf,
             resolvedSchemaWithoutAllOf = _objectWithoutPropertiesLoose(_resolvedSchema, _excluded3);
+          if (expandAllBranches && allOf) {
+            return [resolvedSchemaWithoutAllOf].concat(allOf);
+          }
           return resolvedSchemaWithoutAllOf;
         }
       }
@@ -983,6 +988,7 @@
    */
   var JUNK_OPTION = {
     type: 'object',
+    $id: JUNK_OPTION_ID,
     properties: {
       __not_really_there__: {
         type: 'number'
@@ -1100,6 +1106,7 @@
         return allValidIndexes.push(i);
       });
     }
+    var scoreCount = new Set();
     // 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;
@@ -1108,6 +1115,7 @@
           option = retrieveSchema(validator, option, rootSchema, formData);
         }
         var score = calculateIndexScore(validator, rootSchema, option, formData);
+        scoreCount.add(score);
         if (score > bestScore) {
           return {
             bestIndex: index,
@@ -1120,6 +1128,10 @@
         bestScore: 0
       }),
       bestIndex = _allValidIndexes$redu.bestIndex;
+    // if all scores are the same go with selectedOption
+    if (scoreCount.size === 1 && selectedOption >= 0) {
+      return selectedOption;
+    }
     return bestIndex;
   }
 
@@ -2410,7 +2422,7 @@
       allEnumOptions = [];
     }
     var value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
-    if (value) {
+    if (!lodashEs.isNil(value)) {
       var index = allEnumOptions.findIndex(function (opt) {
         return value === opt.value;
       });
@@ -2780,13 +2792,19 @@
 
     return hash.toString(16);
   }
-  /** Stringifies the schema and returns the hash of the resulting string.
+  /** Stringifies the schema and returns the hash of the resulting string. Sorts schema fields
+   * in consistent order before stringify to prevent different hash ids for the same schema.
    *
    * @param schema - The schema for which the hash is desired
    * @returns - The string obtained from the hash of the stringified schema
    */
   function hashForSchema(schema) {
-    return hashString(JSON.stringify(schema));
+    var allKeys = new Set();
+    // solution source: https://stackoverflow.com/questions/16167581/sort-object-properties-and-json-stringify/53593328#53593328
+    JSON.stringify(schema, function (key, value) {
+      return allKeys.add(key), value;
+    });
+    return hashString(JSON.stringify(schema, Array.from(allKeys).sort()));
   }
 
   /** Detects whether the `widget` exists for the `schema` with the associated `registryWidgets` and returns true if it
@@ -3511,6 +3529,9 @@
             });
           }
         });
+        if (ITEMS_KEY in schema && !Array.isArray(schema.items) && typeof schema.items !== 'boolean') {
+          parseSchema(validator, recurseList, rootSchema, schema.items);
+        }
       }
     });
   }
@@ -3541,6 +3562,7 @@
   exports.ID_KEY = ID_KEY;
   exports.IF_KEY = IF_KEY;
   exports.ITEMS_KEY = ITEMS_KEY;
+  exports.JUNK_OPTION_ID = JUNK_OPTION_ID;
   exports.NAME_KEY = NAME_KEY;
   exports.ONE_OF_KEY = ONE_OF_KEY;
   exports.PROPERTIES_KEY = PROPERTIES_KEY;