@rjsf/utils 5.7.2 → 5.8.0

package/dist/index.d.ts

@@ -1317,7 +1317,8 @@ declare function getWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
  */
 declare function guessType(value: any): "array" | "string" | "null" | "boolean" | "number" | "object";
 
-/** 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
@@ -1645,6 +1646,7 @@ declare const ERRORS_KEY = "__errors";
 declare const ID_KEY = "$id";
 declare const IF_KEY = "if";
 declare const ITEMS_KEY = "items";
+declare const JUNK_OPTION_ID = "_$junk_option_schema_id$_";
 declare const NAME_KEY = "$name";
 declare const ONE_OF_KEY = "oneOf";
 declare const PROPERTIES_KEY = "properties";
@@ -1877,4 +1879,4 @@ declare function toIdSchema<T = any, S extends StrictRJSFSchema = RJSFSchema, F
  */
 declare function toPathSchema<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, schema: S, name?: string, rootSchema?: S, formData?: T): PathSchema<T>;
 
-export { ADDITIONAL_PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, ALL_OF_KEY, ANY_OF_KEY, ArrayFieldDescriptionProps, ArrayFieldTemplateItemType, ArrayFieldTemplateProps, ArrayFieldTitleProps, BaseInputTemplateProps, CONST_KEY, CustomValidator, DEFAULT_KEY, DEFINITIONS_KEY, DEPENDENCIES_KEY, DateObject, DescriptionFieldProps, ENUM_KEY, ERRORS_KEY, EnumOptionsType, ErrorListProps, ErrorSchema, ErrorSchemaBuilder, ErrorTransformer, Experimental_DefaultFormStateBehavior, Field, FieldError, FieldErrorProps, FieldErrors, FieldHelpProps, FieldId, FieldPath, FieldProps, FieldTemplateProps, FieldValidation, FormContextType, FormValidation, GenericObjectType, GlobalUISchemaOptions, ID_KEY, IF_KEY, ITEMS_KEY, IconButtonProps, IdSchema, InputPropsType, NAME_KEY, ONE_OF_KEY, ObjectFieldTemplatePropertyType, ObjectFieldTemplateProps, PROPERTIES_KEY, PathSchema, REF_KEY, REQUIRED_KEY, RJSFSchema, RJSFValidationError, RJSF_ADDITONAL_PROPERTIES_FLAG, ROOT_SCHEMA_PREFIX, RangeSpecType, Registry, RegistryFieldsType, RegistryWidgetsType, SUBMIT_BTN_OPTIONS_KEY, SchemaMap, SchemaUtilsType, StrictRJSFSchema, SubmitButtonProps, TemplatesType, TitleFieldProps, TranslatableString, UIOptionsType, UISchemaSubmitButtonOptions, UI_FIELD_KEY, UI_GLOBAL_OPTIONS_KEY, UI_OPTIONS_KEY, UI_WIDGET_KEY, UiSchema, UnsupportedFieldProps, ValidationData, ValidatorType, Widget, WidgetProps, WrapIfAdditionalTemplateProps, allowAdditionalItems, ariaDescribedByIds, asNumber, canExpand, createErrorHandler, createSchemaUtils, dataURItoBlob, deepEquals, descriptionId, englishStringTranslator, enumOptionsDeselectValue, enumOptionsIndexForValue, enumOptionsIsSelected, enumOptionsSelectValue, enumOptionsValueForIndex, errorId, examplesId, findSchemaDefinition, getClosestMatchingOption, getDefaultFormState, getDiscriminatorFieldFromSchema, getDisplayLabel, getFirstMatchingOption, getInputProps, getMatchingOption, getSchemaType, getSubmitButtonOptions, getTemplate, getUiOptions, getWidget, guessType, hasWidget, hashForSchema, helpId, isConstant, isCustomWidget, isFilesArray, isFixedItems, isMultiSelect, isObject, isSelect, labelValue, localToUTC, mergeDefaultsWithFormData, mergeObjects, mergeSchemas, mergeValidationData, optionId, optionsList, orderProperties, pad, parseDateString, rangeSpec, replaceStringParameters, retrieveSchema, sanitizeDataForNewSchema, schemaParser, schemaRequiresTrueValue, shouldRender, titleId, toConstant, toDateString, toErrorList, toErrorSchema, toIdSchema, toPathSchema, unwrapErrorHandler, utcToLocal, validationDataMerge, withIdRefPrefix };
+export { ADDITIONAL_PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, ALL_OF_KEY, ANY_OF_KEY, ArrayFieldDescriptionProps, ArrayFieldTemplateItemType, ArrayFieldTemplateProps, ArrayFieldTitleProps, BaseInputTemplateProps, CONST_KEY, CustomValidator, DEFAULT_KEY, DEFINITIONS_KEY, DEPENDENCIES_KEY, DateObject, DescriptionFieldProps, ENUM_KEY, ERRORS_KEY, EnumOptionsType, ErrorListProps, ErrorSchema, ErrorSchemaBuilder, ErrorTransformer, Experimental_DefaultFormStateBehavior, Field, FieldError, FieldErrorProps, FieldErrors, FieldHelpProps, FieldId, FieldPath, FieldProps, FieldTemplateProps, FieldValidation, FormContextType, FormValidation, GenericObjectType, GlobalUISchemaOptions, ID_KEY, IF_KEY, ITEMS_KEY, IconButtonProps, IdSchema, InputPropsType, JUNK_OPTION_ID, NAME_KEY, ONE_OF_KEY, ObjectFieldTemplatePropertyType, ObjectFieldTemplateProps, PROPERTIES_KEY, PathSchema, REF_KEY, REQUIRED_KEY, RJSFSchema, RJSFValidationError, RJSF_ADDITONAL_PROPERTIES_FLAG, ROOT_SCHEMA_PREFIX, RangeSpecType, Registry, RegistryFieldsType, RegistryWidgetsType, SUBMIT_BTN_OPTIONS_KEY, SchemaMap, SchemaUtilsType, StrictRJSFSchema, SubmitButtonProps, TemplatesType, TitleFieldProps, TranslatableString, UIOptionsType, UISchemaSubmitButtonOptions, UI_FIELD_KEY, UI_GLOBAL_OPTIONS_KEY, UI_OPTIONS_KEY, UI_WIDGET_KEY, UiSchema, UnsupportedFieldProps, ValidationData, ValidatorType, Widget, WidgetProps, WrapIfAdditionalTemplateProps, allowAdditionalItems, ariaDescribedByIds, asNumber, canExpand, createErrorHandler, createSchemaUtils, dataURItoBlob, deepEquals, descriptionId, englishStringTranslator, enumOptionsDeselectValue, enumOptionsIndexForValue, enumOptionsIsSelected, enumOptionsSelectValue, enumOptionsValueForIndex, errorId, examplesId, findSchemaDefinition, getClosestMatchingOption, getDefaultFormState, getDiscriminatorFieldFromSchema, getDisplayLabel, getFirstMatchingOption, getInputProps, getMatchingOption, getSchemaType, getSubmitButtonOptions, getTemplate, getUiOptions, getWidget, guessType, hasWidget, hashForSchema, helpId, isConstant, isCustomWidget, isFilesArray, isFixedItems, isMultiSelect, isObject, isSelect, labelValue, localToUTC, mergeDefaultsWithFormData, mergeObjects, mergeSchemas, mergeValidationData, optionId, optionsList, orderProperties, pad, parseDateString, rangeSpec, replaceStringParameters, retrieveSchema, sanitizeDataForNewSchema, schemaParser, schemaRequiresTrueValue, shouldRender, titleId, toConstant, toDateString, toErrorList, toErrorSchema, toIdSchema, toPathSchema, unwrapErrorHandler, utcToLocal, validationDataMerge, withIdRefPrefix };

package/dist/utils.cjs.development.js

@@ -17,6 +17,7 @@ var set = require('lodash/set');
 var mergeAllOf = require('json-schema-merge-allof');
 var union = require('lodash/union');
 var isEqual = require('lodash/isEqual');
+var lodash = require('lodash');
 var cloneDeep = require('lodash/cloneDeep');
 var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
@@ -190,6 +191,7 @@ var ERRORS_KEY = '__errors';
 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';
@@ -585,7 +587,7 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, form
     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) {
@@ -784,7 +786,11 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
       } 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;
       }
     }
@@ -1003,6 +1009,7 @@ function withExactlyOneSubschema(validator, schema, rootSchema, dependencyKey, o
  */
 var JUNK_OPTION = {
   type: 'object',
+  $id: JUNK_OPTION_ID,
   properties: {
     __not_really_there__: {
       type: 'number'
@@ -1120,6 +1127,7 @@ function getClosestMatchingOption(validator, rootSchema, formData, options, sele
       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;
@@ -1128,6 +1136,7 @@ function getClosestMatchingOption(validator, rootSchema, formData, options, sele
         option = retrieveSchema(validator, option, rootSchema, formData);
       }
       var score = calculateIndexScore(validator, rootSchema, option, formData);
+      scoreCount.add(score);
       if (score > bestScore) {
         return {
           bestIndex: index,
@@ -1140,6 +1149,10 @@ function getClosestMatchingOption(validator, rootSchema, formData, options, sele
       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;
 }
 
@@ -2430,7 +2443,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions) {
     allEnumOptions = [];
   }
   var value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
-  if (value) {
+  if (!lodash.isNil(value)) {
     var index = allEnumOptions.findIndex(function (opt) {
       return value === opt.value;
     });
@@ -2800,13 +2813,19 @@ function hashString(string) {
 
   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
@@ -3531,6 +3550,9 @@ function parseSchema(validator, recurseList, rootSchema, schema) {
           });
         }
       });
+      if (ITEMS_KEY in schema && !Array.isArray(schema.items) && typeof schema.items !== 'boolean') {
+        parseSchema(validator, recurseList, rootSchema, schema.items);
+      }
     }
   });
 }
@@ -3561,6 +3583,7 @@ exports.ErrorSchemaBuilder = ErrorSchemaBuilder;
 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;