@rjsf/utils 6.0.0-beta.1 → 6.0.0-beta.11

package/dist/utils.esm.js

@@ -65,6 +65,7 @@ var READONLY_KEY = "readonly";
 var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
+var SCHEMA_KEY = "$schema";
 var DISCRIMINATOR_PATH = ["discriminator", "propertyName"];
 var FORM_CONTEXT_NAME = "formContext";
 var LOOKUP_MAP_NAME = "layoutGridLookupMap";
@@ -74,6 +75,7 @@ var UI_FIELD_KEY = "ui:field";
 var UI_WIDGET_KEY = "ui:widget";
 var UI_OPTIONS_KEY = "ui:options";
 var UI_GLOBAL_OPTIONS_KEY = "ui:globalOptions";
+var JSON_SCHEMA_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
 
 // src/getUiOptions.ts
 function getUiOptions(uiSchema = {}, globalOptions = {}) {
@@ -146,15 +148,15 @@ function deepEquals(a, b) {
 }
 
 // src/schema/findFieldInSchema.ts
-import get7 from "lodash/get";
+import get8 from "lodash/get";
 import has3 from "lodash/has";
 
 // src/schema/findSelectedOptionInXxxOf.ts
-import get5 from "lodash/get";
+import get6 from "lodash/get";
 import isEqual from "lodash/isEqual";
 
 // src/schema/retrieveSchema.ts
-import get4 from "lodash/get";
+import get5 from "lodash/get";
 import set from "lodash/set";
 import times from "lodash/times";
 import transform from "lodash/transform";
@@ -166,20 +168,53 @@ import mergeAllOf from "json-schema-merge-allof";
 // src/findSchemaDefinition.ts
 import jsonpointer from "jsonpointer";
 import omit from "lodash/omit";
+import isObject2 from "lodash/isObject";
+import isEmpty from "lodash/isEmpty";
+import UriResolver from "fast-uri";
+import get from "lodash/get";
+function findEmbeddedSchemaRecursive(schema, ref) {
+  if (ID_KEY in schema && UriResolver.equal(schema[ID_KEY], ref)) {
+    return schema;
+  }
+  for (const subSchema of Object.values(schema)) {
+    if (isObject2(subSchema)) {
+      const result = findEmbeddedSchemaRecursive(subSchema, ref);
+      if (result !== void 0) {
+        return result;
+      }
+    }
+  }
+  return void 0;
+}
 function splitKeyElementFromObject(key, object) {
   const value = object[key];
   const remaining = omit(object, [key]);
   return [remaining, value];
 }
-function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = []) {
+function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = get(rootSchema, [ID_KEY])) {
   const ref = $ref || "";
-  let decodedRef;
+  let current = void 0;
   if (ref.startsWith("#")) {
-    decodedRef = decodeURIComponent(ref.substring(1));
-  } else {
-    throw new Error(`Could not find a definition for ${$ref}.`);
+    const decodedRef = decodeURIComponent(ref.substring(1));
+    if (baseURI === void 0 || ID_KEY in rootSchema && rootSchema[ID_KEY] === baseURI) {
+      current = jsonpointer.get(rootSchema, decodedRef);
+    } else if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+      current = findEmbeddedSchemaRecursive(rootSchema, baseURI.replace(/\/$/, ""));
+      if (current !== void 0) {
+        current = jsonpointer.get(current, decodedRef);
+      }
+    }
+  } else if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+    const resolvedRef = baseURI ? UriResolver.resolve(baseURI, ref) : ref;
+    const [refId, ...refAnchor] = resolvedRef.replace(/#\/?$/, "").split("#");
+    current = findEmbeddedSchemaRecursive(rootSchema, refId.replace(/\/$/, ""));
+    if (current !== void 0) {
+      baseURI = current[ID_KEY];
+      if (!isEmpty(refAnchor)) {
+        current = jsonpointer.get(current, decodeURIComponent(refAnchor.join("#")));
+      }
+    }
   }
-  const current = jsonpointer.get(rootSchema, decodedRef);
   if (current === void 0) {
     throw new Error(`Could not find a definition for ${$ref}.`);
   }
@@ -194,7 +229,7 @@ function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [])
       throw new Error(`Definition for ${firstRef} contains a circular reference through ${circularPath}`);
     }
     const [remaining, theRef] = splitKeyElementFromObject(REF_KEY, current);
-    const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref]);
+    const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref], baseURI);
     if (Object.keys(remaining).length > 0) {
       return { ...remaining, ...subSchema };
     }
@@ -202,17 +237,17 @@ function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [])
   }
   return current;
 }
-function findSchemaDefinition($ref, rootSchema = {}) {
+function findSchemaDefinition($ref, rootSchema = {}, baseURI = get(rootSchema, [ID_KEY])) {
   const recurseList = [];
-  return findSchemaDefinitionRecursive($ref, rootSchema, recurseList);
+  return findSchemaDefinitionRecursive($ref, rootSchema, recurseList, baseURI);
 }
 
 // src/getDiscriminatorFieldFromSchema.ts
-import get from "lodash/get";
+import get2 from "lodash/get";
 import isString from "lodash/isString";
 function getDiscriminatorFieldFromSchema(schema) {
   let discriminator;
-  const maybeString = get(schema, DISCRIMINATOR_PATH);
+  const maybeString = get2(schema, DISCRIMINATOR_PATH);
   if (isString(maybeString)) {
     discriminator = maybeString;
   } else if (maybeString !== void 0) {
@@ -286,21 +321,21 @@ function mergeSchemas(obj1, obj2) {
 }
 
 // src/schema/getFirstMatchingOption.ts
-import get3 from "lodash/get";
+import get4 from "lodash/get";
 import has from "lodash/has";
 import isNumber from "lodash/isNumber";
 
 // src/getOptionMatchingSimpleDiscriminator.ts
-import get2 from "lodash/get";
+import get3 from "lodash/get";
 function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
   if (formData && discriminatorField) {
-    const value = get2(formData, discriminatorField);
+    const value = get3(formData, discriminatorField);
     if (value === void 0) {
       return;
     }
     for (let i = 0; i < options.length; i++) {
       const option = options[i];
-      const discriminator = get2(option, [PROPERTIES_KEY, discriminatorField], {});
+      const discriminator = get3(option, [PROPERTIES_KEY, discriminatorField], {});
       if (discriminator.type === "object" || discriminator.type === "array") {
         continue;
       }
@@ -327,8 +362,8 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
   for (let i = 0; i < options.length; i++) {
     const option = options[i];
     if (discriminatorField && has(option, [PROPERTIES_KEY, discriminatorField])) {
-      const value = get3(formData, discriminatorField);
-      const discriminator = get3(option, [PROPERTIES_KEY, discriminatorField], {});
+      const value = get4(formData, discriminatorField);
+      const discriminator = get4(option, [PROPERTIES_KEY, discriminatorField], {});
       if (validator.isValid(discriminator, value, rootSchema)) {
         return i;
       }
@@ -363,7 +398,7 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
 }
 
 // src/schema/retrieveSchema.ts
-import isEmpty from "lodash/isEmpty";
+import isEmpty2 from "lodash/isEmpty";
 function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf) {
   return retrieveSchemaInternal(
     validator,
@@ -529,7 +564,7 @@ function resolveReference(validator, schema, rootSchema, expandAllBranches, recu
   }
   return [schema];
 }
-function resolveAllReferences(schema, rootSchema, recurseList) {
+function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
   if (!isObject(schema)) {
     return schema;
   }
@@ -540,8 +575,11 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       return resolvedSchema;
     }
     recurseList.push($ref);
-    const refSchema = findSchemaDefinition($ref, rootSchema);
+    const refSchema = findSchemaDefinition($ref, rootSchema, baseURI);
     resolvedSchema = { ...refSchema, ...localSchema };
+    if (ID_KEY in resolvedSchema) {
+      baseURI = resolvedSchema[ID_KEY];
+    }
   }
   if (PROPERTIES_KEY in resolvedSchema) {
     const childrenLists = [];
@@ -549,7 +587,7 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       resolvedSchema[PROPERTIES_KEY],
       (result, value, key) => {
         const childList = [...recurseList];
-        result[key] = resolveAllReferences(value, rootSchema, childList);
+        result[key] = resolveAllReferences(value, rootSchema, childList, baseURI);
         childrenLists.push(childList);
       },
       {}
@@ -560,7 +598,7 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
   if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
     resolvedSchema = {
       ...resolvedSchema,
-      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList)
+      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList, baseURI)
     };
   }
   return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
@@ -577,12 +615,12 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
     }
     if (PATTERN_PROPERTIES_KEY in schema) {
       const matchingProperties = getMatchingPatternProperties(schema, key);
-      if (!isEmpty(matchingProperties)) {
+      if (!isEmpty2(matchingProperties)) {
         schema.properties[key] = retrieveSchema(
           validator,
           { allOf: Object.values(matchingProperties) },
           rootSchema,
-          formData,
+          get5(formData, [key]),
           experimental_customMergeAllOf
         );
         set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -595,7 +633,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
         if (REF_KEY in schema.additionalProperties) {
           additionalProperties = retrieveSchema(
             validator,
-            { $ref: get4(schema.additionalProperties, [REF_KEY]) },
+            { $ref: get5(schema.additionalProperties, [REF_KEY]) },
             rootSchema,
             formData,
             experimental_customMergeAllOf
@@ -608,10 +646,10 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
             ...schema.additionalProperties
           };
         } else {
-          additionalProperties = { type: guessType(get4(formData, [key])) };
+          additionalProperties = { type: guessType(get5(formData, [key])) };
         }
       } else {
-        additionalProperties = { type: guessType(get4(formData, [key])) };
+        additionalProperties = { type: guessType(get5(formData, [key])) };
       }
       schema.properties[key] = additionalProperties;
       set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -667,7 +705,10 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
           resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
         }
         resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema, {
-          deep: false
+          deep: false,
+          resolvers: {
+            $defs: mergeAllOf.options.resolvers.definitions
+          }
         });
         if (withContainsSchemas.length) {
           resolvedSchema.allOf = withContainsSchemas;
@@ -682,12 +723,12 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
       resolvedSchema = Object.keys(resolvedSchema.properties).reduce(
         (schema2, key) => {
           const matchingProperties = getMatchingPatternProperties(schema2, key);
-          if (!isEmpty(matchingProperties)) {
+          if (!isEmpty2(matchingProperties)) {
             schema2.properties[key] = retrieveSchema(
               validator,
               { allOf: [schema2.properties[key], ...Object.values(matchingProperties)] },
               rootSchema,
-              rawFormData,
+              get5(rawFormData, [key]),
               experimental_customMergeAllOf
             );
           }
@@ -759,7 +800,7 @@ function resolveDependencies(validator, schema, rootSchema, expandAllBranches, r
 function processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   let schemas = [resolvedSchema];
   for (const dependencyKey in dependencies) {
-    if (!expandAllBranches && get4(formData, [dependencyKey]) === void 0) {
+    if (!expandAllBranches && get5(formData, [dependencyKey]) === void 0) {
       continue;
     }
     if (resolvedSchema.properties && !(dependencyKey in resolvedSchema.properties)) {
@@ -890,11 +931,11 @@ function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField,
     const xxxOfs = schema[xxx].map(
       (xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf)
     );
-    const data = get5(formData, selectorField);
+    const data = get6(formData, selectorField);
     if (data !== void 0) {
       return xxxOfs.find((xxx2) => {
         return isEqual(
-          get5(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get5(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
+          get6(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get6(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
           data
         );
       });
@@ -904,21 +945,21 @@ function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField,
 }
 
 // src/schema/getFromSchema.ts
-import get6 from "lodash/get";
+import get7 from "lodash/get";
 import has2 from "lodash/has";
-import isEmpty2 from "lodash/isEmpty";
+import isEmpty3 from "lodash/isEmpty";
 function getFromSchemaInternal(validator, rootSchema, schema, path, experimental_customMergeAllOf) {
   let fieldSchema = schema;
   if (has2(schema, REF_KEY)) {
     fieldSchema = retrieveSchema(validator, schema, rootSchema, void 0, experimental_customMergeAllOf);
   }
-  if (isEmpty2(path)) {
+  if (isEmpty3(path)) {
     return fieldSchema;
   }
   const pathList = Array.isArray(path) ? path : path.split(".");
   const [part, ...nestedPath] = pathList;
   if (part && has2(fieldSchema, part)) {
-    fieldSchema = get6(fieldSchema, part);
+    fieldSchema = get7(fieldSchema, part);
     return getFromSchemaInternal(
       validator,
       rootSchema,
@@ -960,7 +1001,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
           parentField,
           fieldName,
           ONE_OF_KEY,
-          get7(formData, subPath),
+          get8(formData, subPath),
           experimental_customMergeAllOf
         );
       } else if (has3(parentField, ANY_OF_KEY)) {
@@ -970,7 +1011,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
           parentField,
           fieldName,
           ANY_OF_KEY,
-          get7(formData, subPath),
+          get8(formData, subPath),
           experimental_customMergeAllOf
         );
       }
@@ -1024,14 +1065,14 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
 }
 
 // src/schema/getDefaultFormState.ts
-import get11 from "lodash/get";
-import isEmpty3 from "lodash/isEmpty";
+import get12 from "lodash/get";
+import isEmpty4 from "lodash/isEmpty";
 
 // src/schema/getClosestMatchingOption.ts
-import get8 from "lodash/get";
+import get9 from "lodash/get";
 import has4 from "lodash/has";
 import isNumber2 from "lodash/isNumber";
-import isObject2 from "lodash/isObject";
+import isObject3 from "lodash/isObject";
 import isString2 from "lodash/isString";
 import reduce from "lodash/reduce";
 import times2 from "lodash/times";
@@ -1047,11 +1088,11 @@ var JUNK_OPTION = {
 function calculateIndexScore(validator, rootSchema, schema, formData, experimental_customMergeAllOf) {
   let totalScore = 0;
   if (schema) {
-    if (isObject2(schema.properties)) {
+    if (isObject3(schema.properties)) {
       totalScore += reduce(
         schema.properties,
         (score, value, key) => {
-          const formValue = get8(formData, key);
+          const formValue = get9(formData, key);
           if (typeof value === "boolean") {
             return score;
           }
@@ -1078,14 +1119,14 @@ function calculateIndexScore(validator, rootSchema, schema, formData, experiment
               validator,
               rootSchema,
               formValue,
-              get8(value, key2),
+              get9(value, key2),
               -1,
               discriminator,
               experimental_customMergeAllOf
             );
           }
           if (value.type === "object") {
-            if (isObject2(formValue)) {
+            if (isObject3(formValue)) {
               score += 1;
             }
             return score + calculateIndexScore(validator, rootSchema, value, formValue, experimental_customMergeAllOf);
@@ -1157,7 +1198,7 @@ function isFixedItems(schema) {
 }
 
 // src/mergeDefaultsWithFormData.ts
-import get9 from "lodash/get";
+import get10 from "lodash/get";
 import isNil from "lodash/isNil";
 function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false, defaultSupercedesUndefined = false, overrideFormDataWithDefaults = false) {
   if (Array.isArray(formData)) {
@@ -1184,11 +1225,22 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
   if (isObject(formData)) {
     const acc = Object.assign({}, defaults);
     return Object.keys(formData).reduce((acc2, key) => {
-      const keyValue = get9(formData, key);
+      const keyValue = get10(formData, key);
       const keyExistsInDefaults = isObject(defaults) && key in defaults;
       const keyExistsInFormData = key in formData;
+      const keyDefault = get10(defaults, key) ?? {};
+      const defaultValueIsNestedObject = keyExistsInDefaults && Object.entries(keyDefault).some(([, v]) => isObject(v));
+      const keyDefaultIsObject = keyExistsInDefaults && isObject(get10(defaults, key));
+      const keyHasFormDataObject = keyExistsInFormData && isObject(keyValue);
+      if (keyDefaultIsObject && keyHasFormDataObject && !defaultValueIsNestedObject) {
+        acc2[key] = {
+          ...get10(defaults, key),
+          ...keyValue
+        };
+        return acc2;
+      }
       acc2[key] = mergeDefaultsWithFormData(
-        defaults ? get9(defaults, key) : {},
+        get10(defaults, key) ?? {},
         keyValue,
         mergeExtraArrayDefaults,
         defaultSupercedesUndefined,
@@ -1267,7 +1319,7 @@ function constIsAjvDataReference(schema) {
 }
 
 // src/optionsList.ts
-import get10 from "lodash/get";
+import get11 from "lodash/get";
 
 // src/toConstant.ts
 function toConstant(schema) {
@@ -1313,8 +1365,8 @@ function optionsList(schema, uiSchema) {
     let value;
     let label = title;
     if (selectorField) {
-      const innerSchema = get10(aSchema, [PROPERTIES_KEY, selectorField], {});
-      value = get10(innerSchema, DEFAULT_KEY, get10(innerSchema, CONST_KEY));
+      const innerSchema = get11(aSchema, [PROPERTIES_KEY, selectorField], {});
+      value = get11(innerSchema, DEFAULT_KEY, get11(innerSchema, CONST_KEY));
       label = label || innerSchema?.title || aSchema.title || String(value);
     } else {
       value = toConstant(aSchema);
@@ -1354,10 +1406,10 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
     const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
     if (isObject(computedDefault)) {
       if (emptyObjectFields === "skipEmptyDefaults") {
-        if (!isEmpty3(computedDefault)) {
+        if (!isEmpty4(computedDefault)) {
           obj[key] = computedDefault;
         }
-      } else if ((!isEmpty3(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
+      } else if ((!isEmpty4(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
         obj[key] = computedDefault;
       }
     } else if (
@@ -1383,17 +1435,17 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
     required,
     shouldMergeDefaultsIntoFormData = false
   } = computeDefaultsProps;
-  const formData = isObject(rawFormData) ? rawFormData : {};
+  let formData = isObject(rawFormData) ? rawFormData : {};
   const schema = isObject(rawSchema) ? rawSchema : {};
   let defaults = parentDefaults;
   let schemaToCompute = null;
   let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
   let updatedRecurseList = _recurseList;
-  if (schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
+  if (schema[CONST_KEY] !== void 0 && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
     defaults = schema[CONST_KEY];
   } else if (isObject(defaults) && isObject(schema.default)) {
     defaults = mergeObjects(defaults, schema.default);
-  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY]) {
+  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
     defaults = schema.default;
   } else if (REF_KEY in schema) {
     const refName = schema[REF_KEY];
@@ -1401,6 +1453,12 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       updatedRecurseList = _recurseList.concat(refName);
       schemaToCompute = findSchemaDefinition(refName, rootSchema);
     }
+    if (schemaToCompute && !defaults) {
+      defaults = schema.default;
+    }
+    if (shouldMergeDefaultsIntoFormData && schemaToCompute && !isObject(rawFormData)) {
+      formData = rawFormData;
+    }
   } else if (DEPENDENCIES_KEY in schema) {
     const defaultFormData = {
       ...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults),
@@ -1478,7 +1536,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       experimental_defaultFormStateBehavior: experimental_dfsb_to_compute,
       experimental_customMergeAllOf,
       parentDefaults: defaults,
-      rawFormData: formData,
+      rawFormData: rawFormData ?? formData,
       required,
       shouldMergeDefaultsIntoFormData
     });
@@ -1541,7 +1599,7 @@ function getObjectDefaults(validator, rawSchema, {
     const parentConst = retrievedSchema[CONST_KEY];
     const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
       (acc, key) => {
-        const propertySchema = get11(retrievedSchema, [PROPERTIES_KEY, key], {});
+        const propertySchema = get12(retrievedSchema, [PROPERTIES_KEY, key], {});
         const hasParentConst = isObject(parentConst) && parentConst[key] !== void 0;
         const hasConst = (isObject(propertySchema) && CONST_KEY in propertySchema || hasParentConst) && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(propertySchema);
         const computedDefault = computeDefaults(validator, propertySchema, {
@@ -1550,8 +1608,8 @@ function getObjectDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: get11(defaults, [key]),
-          rawFormData: get11(formData, [key]),
+          parentDefaults: get12(defaults, [key]),
+          rawFormData: get12(formData, [key]),
           required: retrievedSchema.required?.includes(key),
           shouldMergeDefaultsIntoFormData
         });
@@ -1587,8 +1645,8 @@ function getObjectDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: get11(defaults, [key]),
-          rawFormData: get11(formData, [key]),
+          parentDefaults: get12(defaults, [key]),
+          rawFormData: get12(formData, [key]),
           required: retrievedSchema.required?.includes(key),
           shouldMergeDefaultsIntoFormData
         });
@@ -1649,7 +1707,7 @@ function getArrayDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           rawFormData: item,
-          parentDefaults: get11(defaults, [idx]),
+          parentDefaults: get12(defaults, [idx]),
           required,
           shouldMergeDefaultsIntoFormData
         });
@@ -1711,6 +1769,12 @@ function getDefaultFormState(validator, theSchema, formData, rootSchema, include
     rawFormData: formData,
     shouldMergeDefaultsIntoFormData: true
   });
+  if (schema.type !== "object" && isObject(schema.default)) {
+    return {
+      ...defaults,
+      ...formData
+    };
+  }
   if (isObject(formData) || Array.isArray(formData)) {
     const { mergeDefaultsIntoFormData } = experimental_defaultFormStateBehavior || {};
     const defaultSupercedesUndefined = mergeDefaultsIntoFormData === "useDefaultIfFormDataUndefined";
@@ -1777,7 +1841,7 @@ function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOpt
 }
 
 // src/schema/sanitizeDataForNewSchema.ts
-import get12 from "lodash/get";
+import get13 from "lodash/get";
 import has5 from "lodash/has";
 var NO_VALUE = Symbol("no Value");
 function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}, experimental_customMergeAllOf) {
@@ -1785,19 +1849,19 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
   if (has5(newSchema, PROPERTIES_KEY)) {
     const removeOldSchemaData = {};
     if (has5(oldSchema, PROPERTIES_KEY)) {
-      const properties = get12(oldSchema, PROPERTIES_KEY, {});
+      const properties = get13(oldSchema, PROPERTIES_KEY, {});
       Object.keys(properties).forEach((key) => {
         if (has5(data, key)) {
           removeOldSchemaData[key] = void 0;
         }
       });
     }
-    const keys2 = Object.keys(get12(newSchema, PROPERTIES_KEY, {}));
+    const keys2 = Object.keys(get13(newSchema, PROPERTIES_KEY, {}));
     const nestedData = {};
     keys2.forEach((key) => {
-      const formValue = get12(data, key);
-      let oldKeyedSchema = get12(oldSchema, [PROPERTIES_KEY, key], {});
-      let newKeyedSchema = get12(newSchema, [PROPERTIES_KEY, key], {});
+      const formValue = get13(data, key);
+      let oldKeyedSchema = get13(oldSchema, [PROPERTIES_KEY, key], {});
+      let newKeyedSchema = get13(newSchema, [PROPERTIES_KEY, key], {});
       if (has5(oldKeyedSchema, REF_KEY)) {
         oldKeyedSchema = retrieveSchema(
           validator,
@@ -1816,8 +1880,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaTypeForKey = get12(oldKeyedSchema, "type");
-      const newSchemaTypeForKey = get12(newKeyedSchema, "type");
+      const oldSchemaTypeForKey = get13(oldKeyedSchema, "type");
+      const newSchemaTypeForKey = get13(newKeyedSchema, "type");
       if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
         if (has5(removeOldSchemaData, key)) {
           delete removeOldSchemaData[key];
@@ -1835,17 +1899,17 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
             nestedData[key] = itemData;
           }
         } else {
-          const newOptionDefault = get12(newKeyedSchema, "default", NO_VALUE);
-          const oldOptionDefault = get12(oldKeyedSchema, "default", NO_VALUE);
+          const newOptionDefault = get13(newKeyedSchema, "default", NO_VALUE);
+          const oldOptionDefault = get13(oldKeyedSchema, "default", NO_VALUE);
           if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
             if (oldOptionDefault === formValue) {
               removeOldSchemaData[key] = newOptionDefault;
-            } else if (get12(newKeyedSchema, "readOnly") === true) {
+            } else if (get13(newKeyedSchema, "readOnly") === true) {
               removeOldSchemaData[key] = void 0;
             }
           }
-          const newOptionConst = get12(newKeyedSchema, "const", NO_VALUE);
-          const oldOptionConst = get12(oldKeyedSchema, "const", NO_VALUE);
+          const newOptionConst = get13(newKeyedSchema, "const", NO_VALUE);
+          const oldOptionConst = get13(oldKeyedSchema, "const", NO_VALUE);
           if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
             removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
           }
@@ -1857,9 +1921,9 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
       ...removeOldSchemaData,
       ...nestedData
     };
-  } else if (get12(oldSchema, "type") === "array" && get12(newSchema, "type") === "array" && Array.isArray(data)) {
-    let oldSchemaItems = get12(oldSchema, "items");
-    let newSchemaItems = get12(newSchema, "items");
+  } else if (get13(oldSchema, "type") === "array" && get13(newSchema, "type") === "array" && Array.isArray(data)) {
+    let oldSchemaItems = get13(oldSchema, "items");
+    let newSchemaItems = get13(newSchema, "items");
     if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
       if (has5(oldSchemaItems, REF_KEY)) {
         oldSchemaItems = retrieveSchema(
@@ -1879,10 +1943,10 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaType = get12(oldSchemaItems, "type");
-      const newSchemaType = get12(newSchemaItems, "type");
+      const oldSchemaType = get13(oldSchemaItems, "type");
+      const newSchemaType = get13(newSchemaItems, "type");
       if (!oldSchemaType || oldSchemaType === newSchemaType) {
-        const maxItems = get12(newSchema, "maxItems", -1);
+        const maxItems = get13(newSchema, "maxItems", -1);
         if (newSchemaType === "object") {
           newFormData = data.reduce((newValue, aValue) => {
             const itemValue = sanitizeDataForNewSchema(
@@ -1910,7 +1974,7 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
 }
 
 // src/schema/toIdSchema.ts
-import get13 from "lodash/get";
+import get14 from "lodash/get";
 function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   const $id = id || idPrefix;
   const idSchema = { $id };
@@ -1932,10 +1996,10 @@ function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSc
         );
       }
     }
-    if (ITEMS_KEY in schema && !get13(schema, [ITEMS_KEY, REF_KEY])) {
+    if (ITEMS_KEY in schema && !get14(schema, [ITEMS_KEY, REF_KEY])) {
       return toIdSchemaInternal(
         validator,
-        get13(schema, ITEMS_KEY),
+        get14(schema, ITEMS_KEY),
         idPrefix,
         idSeparator,
         id,
@@ -1958,7 +2022,7 @@ function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSc
           rootSchema,
           // It's possible that formData is not an object -- this can happen if an
           // array item has just been added, but not populated with data yet
-          get13(formData, [name]),
+          get14(formData, [name]),
           _recurseList,
           experimental_customMergeAllOf
         );
@@ -1982,7 +2046,7 @@ function toIdSchema(validator, schema, id, rootSchema, formData, idPrefix = "roo
 }
 
 // src/schema/toPathSchema.ts
-import get14 from "lodash/get";
+import get15 from "lodash/get";
 import set2 from "lodash/set";
 function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
@@ -2075,7 +2139,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = get14(schema, [PROPERTIES_KEY, property], {});
+      const field = get15(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2083,7 +2147,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
         rootSchema,
         // It's possible that formData is not an object -- this can happen if an
         // array item has just been added, but not populated with data yet
-        get14(formData, [property]),
+        get15(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2501,7 +2565,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 import cloneDeep from "lodash/cloneDeep";
-import get15 from "lodash/get";
+import get16 from "lodash/get";
 import set3 from "lodash/set";
 import setWith from "lodash/setWith";
 var ErrorSchemaBuilder = class {
@@ -2530,7 +2594,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? get15(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? get16(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2556,7 +2620,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = get15(errorBlock, ERRORS_KEY);
+    let errorsList = get16(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -2705,9 +2769,9 @@ function getTemplate(name, registry, uiOptions = {}) {
 
 // src/getTestIds.ts
 import { nanoid } from "nanoid";
-import get16 from "lodash/get";
+import get17 from "lodash/get";
 function getTestIds() {
-  if (typeof process === "undefined" || get16(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || get17(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -2727,7 +2791,7 @@ function getTestIds() {
 // src/getWidget.tsx
 import { createElement } from "react";
 import ReactIs from "react-is";
-import get17 from "lodash/get";
+import get18 from "lodash/get";
 import set4 from "lodash/set";
 import { jsx } from "react/jsx-runtime";
 var widgetMap = {
@@ -2783,7 +2847,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = get17(AWidget, "MergedWidget");
+  let MergedWidget = get18(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -2896,14 +2960,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-import get18 from "lodash/get";
+import get19 from "lodash/get";
 import has6 from "lodash/has";
 function lookupFromFormContext(regOrFc, toLookup, fallback) {
   const lookupPath = [LOOKUP_MAP_NAME];
   if (has6(regOrFc, FORM_CONTEXT_NAME)) {
     lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return get18(regOrFc, [...lookupPath, toLookup], fallback);
+  return get19(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3082,7 +3146,7 @@ function utcToLocal(jsonDate) {
 }
 
 // src/validationDataMerge.ts
-import isEmpty4 from "lodash/isEmpty";
+import isEmpty5 from "lodash/isEmpty";
 function validationDataMerge(validationData, additionalErrorSchema) {
   if (!additionalErrorSchema) {
     return validationData;
@@ -3090,7 +3154,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
   const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
   let errors = toErrorList(additionalErrorSchema);
   let errorSchema = additionalErrorSchema;
-  if (!isEmpty4(oldErrorSchema)) {
+  if (!isEmpty5(oldErrorSchema)) {
     errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
     errors = [...oldErrors].concat(errors);
   }
@@ -3098,7 +3162,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
 }
 
 // src/withIdRefPrefix.ts
-import isObject3 from "lodash/isObject";
+import isObject4 from "lodash/isObject";
 function withIdRefPrefixObject(node) {
   for (const key in node) {
     const realObj = node;
@@ -3121,7 +3185,7 @@ function withIdRefPrefix(schemaNode) {
   if (Array.isArray(schemaNode)) {
     return withIdRefPrefixArray([...schemaNode]);
   }
-  if (isObject3(schemaNode)) {
+  if (isObject4(schemaNode)) {
     return withIdRefPrefixObject({ ...schemaNode });
   }
   return schemaNode;
@@ -3131,7 +3195,7 @@ function withIdRefPrefix(schemaNode) {
 import keys from "lodash/keys";
 import pickBy from "lodash/pickBy";
 import isPlainObject4 from "lodash/isPlainObject";
-import get19 from "lodash/get";
+import get20 from "lodash/get";
 import difference from "lodash/difference";
 function getChangedFields(a, b) {
   const aIsPlainObject = isPlainObject4(a);
@@ -3144,7 +3208,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return keys(b);
   } else {
-    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get19(b, key))));
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get20(b, key))));
     const diffFields = difference(keys(b), keys(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3189,7 +3253,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 import forEach from "lodash/forEach";
 
 // src/parser/ParserValidator.ts
-import get20 from "lodash/get";
+import get21 from "lodash/get";
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3215,7 +3279,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = get20(schema, ID_KEY, hash);
+    const key = get21(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {
@@ -3322,6 +3386,7 @@ export {
   ID_KEY,
   IF_KEY,
   ITEMS_KEY,
+  JSON_SCHEMA_DRAFT_2020_12,
   JUNK_OPTION_ID,
   LOOKUP_MAP_NAME,
   NAME_KEY,
@@ -3333,6 +3398,7 @@ export {
   REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG,
   ROOT_SCHEMA_PREFIX,
+  SCHEMA_KEY,
   SUBMIT_BTN_OPTIONS_KEY,
   TranslatableString,
   UI_FIELD_KEY,