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

package/dist/utils.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash/isPlainObject'), require('lodash/isEqualWith'), require('lodash/get'), require('lodash/has'), require('lodash/isEqual'), require('lodash/set'), require('lodash/times'), require('lodash/transform'), require('lodash/merge'), require('lodash/flattenDeep'), require('lodash/uniq'), require('json-schema-merge-allof'), require('jsonpointer'), require('lodash/omit'), require('lodash/isString'), require('lodash/union'), require('lodash/isNumber'), require('lodash/isEmpty'), require('lodash/isObject'), require('lodash/reduce'), require('lodash/isNil'), require('lodash/cloneDeep'), require('lodash/setWith'), require('nanoid'), require('react'), require('react-is'), require('react/jsx-runtime'), require('lodash/toPath'), require('lodash/keys'), require('lodash/pickBy'), require('lodash/difference'), require('lodash/forEach')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'lodash/isPlainObject', 'lodash/isEqualWith', 'lodash/get', 'lodash/has', 'lodash/isEqual', 'lodash/set', 'lodash/times', 'lodash/transform', 'lodash/merge', 'lodash/flattenDeep', 'lodash/uniq', 'json-schema-merge-allof', 'jsonpointer', 'lodash/omit', 'lodash/isString', 'lodash/union', 'lodash/isNumber', 'lodash/isEmpty', 'lodash/isObject', 'lodash/reduce', 'lodash/isNil', 'lodash/cloneDeep', 'lodash/setWith', 'nanoid', 'react', 'react-is', 'react/jsx-runtime', 'lodash/toPath', 'lodash/keys', 'lodash/pickBy', 'lodash/difference', 'lodash/forEach'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject4, global.isEqualWith, global.get12, global.has5, global.isEqual, global.set, global.times, global.transform, global.merge, global.flattenDeep, global.uniq, global.mergeAllOf, global.jsonpointer, global.omit, global.isString, global.union, global.isNumber, global.isEmpty, global.isObject2, global.reduce, global.isNil, global.cloneDeep, global.setWith, global.nanoid, global.react, global.ReactIs, global.jsxRuntime, global.toPath, global.keys, global.pickBy, global.difference, global.forEach));
-})(this, (function (exports, isPlainObject4, isEqualWith, get12, has5, isEqual, set, times, transform, merge, flattenDeep, uniq, mergeAllOf, jsonpointer, omit, isString, union, isNumber, isEmpty, isObject2, reduce, isNil, cloneDeep, setWith, nanoid, react, ReactIs, jsxRuntime, toPath, keys, pickBy, difference, forEach) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash/isPlainObject'), require('lodash/isEqualWith'), require('lodash/get'), require('lodash/has'), require('lodash/isEqual'), require('lodash/set'), require('lodash/times'), require('lodash/transform'), require('lodash/merge'), require('lodash/flattenDeep'), require('lodash/uniq'), require('json-schema-merge-allof'), require('jsonpointer'), require('lodash/omit'), require('lodash/isObject'), require('lodash/isEmpty'), require('fast-uri'), require('lodash/isString'), require('lodash/union'), require('lodash/isNumber'), require('lodash/reduce'), require('lodash/isNil'), require('lodash/cloneDeep'), require('lodash/setWith'), require('nanoid'), require('react'), require('react-is'), require('react/jsx-runtime'), require('lodash/toPath'), require('lodash/keys'), require('lodash/pickBy'), require('lodash/difference'), require('lodash/forEach')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'lodash/isPlainObject', 'lodash/isEqualWith', 'lodash/get', 'lodash/has', 'lodash/isEqual', 'lodash/set', 'lodash/times', 'lodash/transform', 'lodash/merge', 'lodash/flattenDeep', 'lodash/uniq', 'json-schema-merge-allof', 'jsonpointer', 'lodash/omit', 'lodash/isObject', 'lodash/isEmpty', 'fast-uri', 'lodash/isString', 'lodash/union', 'lodash/isNumber', 'lodash/reduce', 'lodash/isNil', 'lodash/cloneDeep', 'lodash/setWith', 'nanoid', 'react', 'react-is', 'react/jsx-runtime', 'lodash/toPath', 'lodash/keys', 'lodash/pickBy', 'lodash/difference', 'lodash/forEach'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject4, global.isEqualWith, global.get13, global.has5, global.isEqual, global.set, global.times, global.transform, global.merge, global.flattenDeep, global.uniq, global.mergeAllOf, global.jsonpointer, global.omit, global.isObject3, global.isEmpty2, global.UriResolver, global.isString, global.union, global.isNumber, global.reduce, global.isNil, global.cloneDeep, global.setWith, global.nanoid, global.react, global.ReactIs, global.jsxRuntime, global.toPath, global.keys, global.pickBy, global.difference, global.forEach));
+})(this, (function (exports, isPlainObject4, isEqualWith, get13, has5, isEqual, set, times, transform, merge, flattenDeep, uniq, mergeAllOf, jsonpointer, omit, isObject3, isEmpty2, UriResolver, isString, union, isNumber, reduce, isNil, cloneDeep, setWith, nanoid, react, ReactIs, jsxRuntime, toPath, keys, pickBy, difference, forEach) { 'use strict';
 
   // src/isObject.ts
   function isObject(thing) {
@@ -71,6 +71,7 @@
   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";
@@ -80,6 +81,7 @@
   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 = {}) {
@@ -144,20 +146,49 @@
       return void 0;
     });
   }
+  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 (isObject3(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 = get13(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 (!isEmpty2(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}.`);
     }
@@ -172,7 +203,7 @@
         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 };
       }
@@ -180,13 +211,13 @@
     }
     return current;
   }
-  function findSchemaDefinition($ref, rootSchema = {}) {
+  function findSchemaDefinition($ref, rootSchema = {}, baseURI = get13(rootSchema, [ID_KEY])) {
     const recurseList = [];
-    return findSchemaDefinitionRecursive($ref, rootSchema, recurseList);
+    return findSchemaDefinitionRecursive($ref, rootSchema, recurseList, baseURI);
   }
   function getDiscriminatorFieldFromSchema(schema) {
     let discriminator;
-    const maybeString = get12(schema, DISCRIMINATOR_PATH);
+    const maybeString = get13(schema, DISCRIMINATOR_PATH);
     if (isString(maybeString)) {
       discriminator = maybeString;
     } else if (maybeString !== void 0) {
@@ -257,13 +288,13 @@
   }
   function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
     if (formData && discriminatorField) {
-      const value = get12(formData, discriminatorField);
+      const value = get13(formData, discriminatorField);
       if (value === void 0) {
         return;
       }
       for (let i = 0; i < options.length; i++) {
         const option = options[i];
-        const discriminator = get12(option, [PROPERTIES_KEY, discriminatorField], {});
+        const discriminator = get13(option, [PROPERTIES_KEY, discriminatorField], {});
         if (discriminator.type === "object" || discriminator.type === "array") {
           continue;
         }
@@ -290,8 +321,8 @@
     for (let i = 0; i < options.length; i++) {
       const option = options[i];
       if (discriminatorField && has5(option, [PROPERTIES_KEY, discriminatorField])) {
-        const value = get12(formData, discriminatorField);
-        const discriminator = get12(option, [PROPERTIES_KEY, discriminatorField], {});
+        const value = get13(formData, discriminatorField);
+        const discriminator = get13(option, [PROPERTIES_KEY, discriminatorField], {});
         if (validator.isValid(discriminator, value, rootSchema)) {
           return i;
         }
@@ -489,7 +520,7 @@
     }
     return [schema];
   }
-  function resolveAllReferences(schema, rootSchema, recurseList) {
+  function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
     if (!isObject(schema)) {
       return schema;
     }
@@ -500,8 +531,11 @@
         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 = [];
@@ -509,7 +543,7 @@
         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);
         },
         {}
@@ -520,7 +554,7 @@
     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;
@@ -537,12 +571,12 @@
       }
       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,
+            get13(formData, [key]),
             experimental_customMergeAllOf
           );
           set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -555,7 +589,7 @@
           if (REF_KEY in schema.additionalProperties) {
             additionalProperties = retrieveSchema(
               validator,
-              { $ref: get12(schema.additionalProperties, [REF_KEY]) },
+              { $ref: get13(schema.additionalProperties, [REF_KEY]) },
               rootSchema,
               formData,
               experimental_customMergeAllOf
@@ -568,10 +602,10 @@
               ...schema.additionalProperties
             };
           } else {
-            additionalProperties = { type: guessType(get12(formData, [key])) };
+            additionalProperties = { type: guessType(get13(formData, [key])) };
           }
         } else {
-          additionalProperties = { type: guessType(get12(formData, [key])) };
+          additionalProperties = { type: guessType(get13(formData, [key])) };
         }
         schema.properties[key] = additionalProperties;
         set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -627,7 +661,10 @@
             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;
@@ -642,12 +679,12 @@
         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,
+                get13(rawFormData, [key]),
                 experimental_customMergeAllOf
               );
             }
@@ -719,7 +756,7 @@
   function processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
     let schemas = [resolvedSchema];
     for (const dependencyKey in dependencies) {
-      if (!expandAllBranches && get12(formData, [dependencyKey]) === void 0) {
+      if (!expandAllBranches && get13(formData, [dependencyKey]) === void 0) {
         continue;
       }
       if (resolvedSchema.properties && !(dependencyKey in resolvedSchema.properties)) {
@@ -850,11 +887,11 @@
       const xxxOfs = schema[xxx].map(
         (xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf)
       );
-      const data = get12(formData, selectorField);
+      const data = get13(formData, selectorField);
       if (data !== void 0) {
         return xxxOfs.find((xxx2) => {
           return isEqual(
-            get12(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get12(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
+            get13(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get13(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
             data
           );
         });
@@ -867,13 +904,13 @@
     if (has5(schema, REF_KEY)) {
       fieldSchema = retrieveSchema(validator, schema, rootSchema, void 0, experimental_customMergeAllOf);
     }
-    if (isEmpty(path)) {
+    if (isEmpty2(path)) {
       return fieldSchema;
     }
     const pathList = Array.isArray(path) ? path : path.split(".");
     const [part, ...nestedPath] = pathList;
     if (part && has5(fieldSchema, part)) {
-      fieldSchema = get12(fieldSchema, part);
+      fieldSchema = get13(fieldSchema, part);
       return getFromSchemaInternal(
         validator,
         rootSchema,
@@ -915,7 +952,7 @@
             parentField,
             fieldName,
             ONE_OF_KEY,
-            get12(formData, subPath),
+            get13(formData, subPath),
             experimental_customMergeAllOf
           );
         } else if (has5(parentField, ANY_OF_KEY)) {
@@ -925,7 +962,7 @@
             parentField,
             fieldName,
             ANY_OF_KEY,
-            get12(formData, subPath),
+            get13(formData, subPath),
             experimental_customMergeAllOf
           );
         }
@@ -989,11 +1026,11 @@
   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 = get12(formData, key);
+            const formValue = get13(formData, key);
             if (typeof value === "boolean") {
               return score;
             }
@@ -1020,14 +1057,14 @@
                 validator,
                 rootSchema,
                 formValue,
-                get12(value, key2),
+                get13(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);
@@ -1122,11 +1159,22 @@
     if (isObject(formData)) {
       const acc = Object.assign({}, defaults);
       return Object.keys(formData).reduce((acc2, key) => {
-        const keyValue = get12(formData, key);
+        const keyValue = get13(formData, key);
         const keyExistsInDefaults = isObject(defaults) && key in defaults;
         const keyExistsInFormData = key in formData;
+        const keyDefault = get13(defaults, key) ?? {};
+        const defaultValueIsNestedObject = keyExistsInDefaults && Object.entries(keyDefault).some(([, v]) => isObject(v));
+        const keyDefaultIsObject = keyExistsInDefaults && isObject(get13(defaults, key));
+        const keyHasFormDataObject = keyExistsInFormData && isObject(keyValue);
+        if (keyDefaultIsObject && keyHasFormDataObject && !defaultValueIsNestedObject) {
+          acc2[key] = {
+            ...get13(defaults, key),
+            ...keyValue
+          };
+          return acc2;
+        }
         acc2[key] = mergeDefaultsWithFormData(
-          defaults ? get12(defaults, key) : {},
+          get13(defaults, key) ?? {},
           keyValue,
           mergeExtraArrayDefaults,
           defaultSupercedesUndefined,
@@ -1245,8 +1293,8 @@
       let value;
       let label = title;
       if (selectorField) {
-        const innerSchema = get12(aSchema, [PROPERTIES_KEY, selectorField], {});
-        value = get12(innerSchema, DEFAULT_KEY, get12(innerSchema, CONST_KEY));
+        const innerSchema = get13(aSchema, [PROPERTIES_KEY, selectorField], {});
+        value = get13(innerSchema, DEFAULT_KEY, get13(innerSchema, CONST_KEY));
         label = label || innerSchema?.title || aSchema.title || String(value);
       } else {
         value = toConstant(aSchema);
@@ -1286,10 +1334,10 @@
       const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
       if (isObject(computedDefault)) {
         if (emptyObjectFields === "skipEmptyDefaults") {
-          if (!isEmpty(computedDefault)) {
+          if (!isEmpty2(computedDefault)) {
             obj[key] = computedDefault;
           }
-        } else if ((!isEmpty(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
+        } else if ((!isEmpty2(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
           obj[key] = computedDefault;
         }
       } else if (
@@ -1315,17 +1363,17 @@
       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];
@@ -1333,6 +1381,12 @@
         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),
@@ -1410,7 +1464,7 @@
         experimental_defaultFormStateBehavior: experimental_dfsb_to_compute,
         experimental_customMergeAllOf,
         parentDefaults: defaults,
-        rawFormData: formData,
+        rawFormData: rawFormData ?? formData,
         required,
         shouldMergeDefaultsIntoFormData
       });
@@ -1473,7 +1527,7 @@
       const parentConst = retrievedSchema[CONST_KEY];
       const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
         (acc, key) => {
-          const propertySchema = get12(retrievedSchema, [PROPERTIES_KEY, key], {});
+          const propertySchema = get13(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, {
@@ -1482,8 +1536,8 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get12(defaults, [key]),
-            rawFormData: get12(formData, [key]),
+            parentDefaults: get13(defaults, [key]),
+            rawFormData: get13(formData, [key]),
             required: retrievedSchema.required?.includes(key),
             shouldMergeDefaultsIntoFormData
           });
@@ -1519,8 +1573,8 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get12(defaults, [key]),
-            rawFormData: get12(formData, [key]),
+            parentDefaults: get13(defaults, [key]),
+            rawFormData: get13(formData, [key]),
             required: retrievedSchema.required?.includes(key),
             shouldMergeDefaultsIntoFormData
           });
@@ -1581,7 +1635,7 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             rawFormData: item,
-            parentDefaults: get12(defaults, [idx]),
+            parentDefaults: get13(defaults, [idx]),
             required,
             shouldMergeDefaultsIntoFormData
           });
@@ -1643,6 +1697,12 @@
       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";
@@ -1713,19 +1773,19 @@
     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,
@@ -1744,8 +1804,8 @@
             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];
@@ -1763,17 +1823,17 @@
               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;
             }
@@ -1785,9 +1845,9 @@
         ...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(
@@ -1807,10 +1867,10 @@
             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(
@@ -1857,10 +1917,10 @@
           );
         }
       }
-      if (ITEMS_KEY in schema && !get12(schema, [ITEMS_KEY, REF_KEY])) {
+      if (ITEMS_KEY in schema && !get13(schema, [ITEMS_KEY, REF_KEY])) {
         return toIdSchemaInternal(
           validator,
-          get12(schema, ITEMS_KEY),
+          get13(schema, ITEMS_KEY),
           idPrefix,
           idSeparator,
           id,
@@ -1883,7 +1943,7 @@
             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
-            get12(formData, [name]),
+            get13(formData, [name]),
             _recurseList,
             experimental_customMergeAllOf
           );
@@ -1996,7 +2056,7 @@
       }
     } else if (PROPERTIES_KEY in schema) {
       for (const property in schema.properties) {
-        const field = get12(schema, [PROPERTIES_KEY, property], {});
+        const field = get13(schema, [PROPERTIES_KEY, property], {});
         pathSchema[property] = toPathSchemaInternal(
           validator,
           field,
@@ -2004,7 +2064,7 @@
           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
-          get12(formData, [property]),
+          get13(formData, [property]),
           _recurseList,
           experimental_customMergeAllOf
         );
@@ -2442,7 +2502,7 @@
      */
     getOrCreateErrorBlock(pathOfError) {
       const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-      let errorBlock = hasPath ? get12(this.errorSchema, pathOfError) : this.errorSchema;
+      let errorBlock = hasPath ? get13(this.errorSchema, pathOfError) : this.errorSchema;
       if (!errorBlock && pathOfError) {
         errorBlock = {};
         setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2468,7 +2528,7 @@
      */
     addErrors(errorOrList, pathOfError) {
       const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-      let errorsList = get12(errorBlock, ERRORS_KEY);
+      let errorsList = get13(errorBlock, ERRORS_KEY);
       if (!Array.isArray(errorsList)) {
         errorsList = [];
         errorBlock[ERRORS_KEY] = errorsList;
@@ -2615,7 +2675,7 @@
     );
   }
   function getTestIds() {
-    if (typeof process === "undefined" || get12(process, "env.NODE_ENV") !== "test") {
+    if (typeof process === "undefined" || get13(process, "env.NODE_ENV") !== "test") {
       return {};
     }
     const ids = /* @__PURE__ */ new Map();
@@ -2684,7 +2744,7 @@
     }
   };
   function mergeWidgetOptions(AWidget) {
-    let MergedWidget = get12(AWidget, "MergedWidget");
+    let MergedWidget = get13(AWidget, "MergedWidget");
     if (!MergedWidget) {
       const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
       MergedWidget = ({ options, ...props }) => {
@@ -2797,7 +2857,7 @@
     if (has5(regOrFc, FORM_CONTEXT_NAME)) {
       lookupPath.unshift(FORM_CONTEXT_NAME);
     }
-    return get12(regOrFc, [...lookupPath, toLookup], fallback);
+    return get13(regOrFc, [...lookupPath, toLookup], fallback);
   }
 
   // src/orderProperties.ts
@@ -2972,7 +3032,7 @@
     const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
     let errors = toErrorList(additionalErrorSchema);
     let errorSchema = additionalErrorSchema;
-    if (!isEmpty(oldErrorSchema)) {
+    if (!isEmpty2(oldErrorSchema)) {
       errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
       errors = [...oldErrors].concat(errors);
     }
@@ -3000,7 +3060,7 @@
     if (Array.isArray(schemaNode)) {
       return withIdRefPrefixArray([...schemaNode]);
     }
-    if (isObject2(schemaNode)) {
+    if (isObject3(schemaNode)) {
       return withIdRefPrefixObject({ ...schemaNode });
     }
     return schemaNode;
@@ -3016,7 +3076,7 @@
     } else if (!aIsPlainObject && bIsPlainObject) {
       return keys(b);
     } else {
-      const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get12(b, key))));
+      const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get13(b, key))));
       const diffFields = difference(keys(b), keys(a));
       return [...unequalFields, ...diffFields];
     }
@@ -3081,7 +3141,7 @@
      * @param hash - The hash value at which to map the schema
      */
     addSchema(schema, hash) {
-      const key = get12(schema, ID_KEY, hash);
+      const key = get13(schema, ID_KEY, hash);
       const identifiedSchema = { ...schema, [ID_KEY]: key };
       const existing = this.schemaMap[key];
       if (!existing) {
@@ -3188,6 +3248,7 @@
   exports.ID_KEY = ID_KEY;
   exports.IF_KEY = IF_KEY;
   exports.ITEMS_KEY = ITEMS_KEY;
+  exports.JSON_SCHEMA_DRAFT_2020_12 = JSON_SCHEMA_DRAFT_2020_12;
   exports.JUNK_OPTION_ID = JUNK_OPTION_ID;
   exports.LOOKUP_MAP_NAME = LOOKUP_MAP_NAME;
   exports.NAME_KEY = NAME_KEY;
@@ -3199,6 +3260,7 @@
   exports.REQUIRED_KEY = REQUIRED_KEY;
   exports.RJSF_ADDITIONAL_PROPERTIES_FLAG = RJSF_ADDITIONAL_PROPERTIES_FLAG;
   exports.ROOT_SCHEMA_PREFIX = ROOT_SCHEMA_PREFIX;
+  exports.SCHEMA_KEY = SCHEMA_KEY;
   exports.SUBMIT_BTN_OPTIONS_KEY = SUBMIT_BTN_OPTIONS_KEY;
   exports.TranslatableString = TranslatableString;
   exports.UI_FIELD_KEY = UI_FIELD_KEY;