@rjsf/utils 6.0.0-beta.2 → 6.0.0-beta.21

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/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.get12, 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, get12, 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';
+  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('lodash/keys'), require('lodash/pickBy'), require('lodash/difference'), require('lodash/uniqueId'), require('react'), require('react-is'), require('react/jsx-runtime'), require('lodash/toPath'), 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', 'lodash/keys', 'lodash/pickBy', 'lodash/difference', 'lodash/uniqueId', 'react', 'react-is', 'react/jsx-runtime', 'lodash/toPath', 'lodash/forEach'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject2, global.isEqualWith, global.get13, global.has5, global.isEqual2, global.set, global.times, global.transform, global.merge, global.flattenDeep, global.uniq, global.mergeAllOf, global.jsonpointer, global.omit, global.isObject2, global.isEmpty4, global.UriResolver, global.isString, global.union, global.isNumber, global.reduce, global.isNil, global.cloneDeep, global.setWith, global.keys, global.pickBy, global.difference, global.uniqueId, global.react, global.ReactIs, global.jsxRuntime, global.toPath, global.forEach));
+})(this, (function (exports, isPlainObject2, isEqualWith, get13, has5, isEqual2, set, times, transform, merge, flattenDeep, uniq, mergeAllOf, jsonpointer, omit, isObject2, isEmpty4, UriResolver, isString, union, isNumber, reduce, isNil, cloneDeep, setWith, keys, pickBy, difference, uniqueId, react, ReactIs, jsxRuntime, toPath, forEach) { 'use strict';
 
   // src/isObject.ts
   function isObject(thing) {
@@ -72,6 +72,8 @@
   var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
   var REF_KEY = "$ref";
   var SCHEMA_KEY = "$schema";
+  var DEFAULT_ID_PREFIX = "root";
+  var DEFAULT_ID_SEPARATOR = "_";
   var DISCRIMINATOR_PATH = ["discriminator", "propertyName"];
   var FORM_CONTEXT_NAME = "formContext";
   var LOOKUP_MAP_NAME = "layoutGridLookupMap";
@@ -81,10 +83,14 @@
   var UI_WIDGET_KEY = "ui:widget";
   var UI_OPTIONS_KEY = "ui:options";
   var UI_GLOBAL_OPTIONS_KEY = "ui:globalOptions";
+  var JSON_SCHEMA_DRAFT_2019_09 = "https://json-schema.org/draft/2019-09/schema";
   var JSON_SCHEMA_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
 
   // src/getUiOptions.ts
   function getUiOptions(uiSchema = {}, globalOptions = {}) {
+    if (!uiSchema) {
+      return { ...globalOptions };
+    }
     return Object.keys(uiSchema).filter((key) => key.indexOf("ui:") === 0).reduce(
       (options, key) => {
         const value = uiSchema[key];
@@ -130,7 +136,7 @@
         return { ...acc, [key]: createErrorHandler(value) };
       }, handler);
     }
-    if (isPlainObject4(formData)) {
+    if (isPlainObject2(formData)) {
       const formObject = formData;
       return Object.keys(formObject).reduce((acc, key) => {
         return { ...acc, [key]: createErrorHandler(formObject[key]) };
@@ -151,7 +157,16 @@
       return schema;
     }
     for (const subSchema of Object.values(schema)) {
-      if (isObject3(subSchema)) {
+      if (Array.isArray(subSchema)) {
+        for (const item of subSchema) {
+          if (isObject2(item)) {
+            const result = findEmbeddedSchemaRecursive(item, ref);
+            if (result !== void 0) {
+              return result;
+            }
+          }
+        }
+      } else if (isObject2(subSchema)) {
         const result = findEmbeddedSchemaRecursive(subSchema, ref);
         if (result !== void 0) {
           return result;
@@ -160,12 +175,29 @@
     }
     return void 0;
   }
+  function makeAllReferencesAbsolute(schema, baseURI) {
+    const currentURI = get13(schema, ID_KEY, baseURI);
+    if (REF_KEY in schema) {
+      schema = { ...schema, [REF_KEY]: UriResolver.resolve(currentURI, schema[REF_KEY]) };
+    }
+    for (const [key, subSchema] of Object.entries(schema)) {
+      if (Array.isArray(subSchema)) {
+        schema = {
+          ...schema,
+          [key]: subSchema.map((item) => isObject2(item) ? makeAllReferencesAbsolute(item, currentURI) : item)
+        };
+      } else if (isObject2(subSchema)) {
+        schema = { ...schema, [key]: makeAllReferencesAbsolute(subSchema, currentURI) };
+      }
+    }
+    return schema;
+  }
   function splitKeyElementFromObject(key, object) {
     const value = object[key];
     const remaining = omit(object, [key]);
     return [remaining, value];
   }
-  function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = ID_KEY in rootSchema ? rootSchema[ID_KEY] : void 0) {
+  function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = get13(rootSchema, [ID_KEY])) {
     const ref = $ref || "";
     let current = void 0;
     if (ref.startsWith("#")) {
@@ -184,7 +216,7 @@
       current = findEmbeddedSchemaRecursive(rootSchema, refId.replace(/\/$/, ""));
       if (current !== void 0) {
         baseURI = current[ID_KEY];
-        if (!isEmpty2(refAnchor)) {
+        if (!isEmpty4(refAnchor)) {
           current = jsonpointer.get(current, decodeURIComponent(refAnchor.join("#")));
         }
       }
@@ -205,19 +237,23 @@
       const [remaining, theRef] = splitKeyElementFromObject(REF_KEY, current);
       const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref], baseURI);
       if (Object.keys(remaining).length > 0) {
-        return { ...remaining, ...subSchema };
+        if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2019_09 || rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+          return { [ALL_OF_KEY]: [remaining, subSchema] };
+        } else {
+          return { ...remaining, ...subSchema };
+        }
       }
       return subSchema;
     }
     return current;
   }
-  function findSchemaDefinition($ref, rootSchema = {}, baseURI = ID_KEY in rootSchema ? rootSchema[ID_KEY] : void 0) {
+  function findSchemaDefinition($ref, rootSchema = {}, baseURI = get13(rootSchema, [ID_KEY])) {
     const 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) {
@@ -288,13 +324,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;
         }
@@ -321,8 +357,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;
         }
@@ -355,7 +391,7 @@
     }
     return 0;
   }
-  function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf) {
+  function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs = false) {
     return retrieveSchemaInternal(
       validator,
       schema,
@@ -363,7 +399,8 @@
       rawFormData,
       void 0,
       void 0,
-      experimental_customMergeAllOf
+      experimental_customMergeAllOf,
+      resolveAnyOfOrOneOfRefs
     )[0];
   }
   function resolveCondition(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
@@ -452,14 +489,16 @@
       {}
     );
   }
-  function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
+  function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
     const updatedSchemas = resolveReference(
       validator,
       schema,
       rootSchema,
       expandAllBranches,
       recurseList,
-      formData
+      formData,
+      experimental_customMergeAllOf,
+      resolveAnyOfOrOneOfRefs
     );
     if (updatedSchemas.length > 1 || updatedSchemas[0] !== schema) {
       return updatedSchemas;
@@ -471,7 +510,8 @@
         rootSchema,
         expandAllBranches,
         recurseList,
-        formData
+        formData,
+        experimental_customMergeAllOf
       );
       return resolvedSchemas.flatMap((s) => {
         return retrieveSchemaInternal(
@@ -485,7 +525,7 @@
         );
       });
     }
-    if (ALL_OF_KEY in schema && Array.isArray(schema.allOf)) {
+    if (ALL_OF_KEY in schema && Array.isArray(schema[ALL_OF_KEY])) {
       const allOfSchemaElements = schema.allOf.map(
         (allOfSubschema) => retrieveSchemaInternal(
           validator,
@@ -505,8 +545,8 @@
     }
     return [schema];
   }
-  function resolveReference(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
-    const updatedSchema = resolveAllReferences(schema, rootSchema, recurseList);
+  function resolveReference(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
+    const updatedSchema = resolveAllReferences(schema, rootSchema, recurseList, void 0, resolveAnyOfOrOneOfRefs);
     if (updatedSchema !== schema) {
       return retrieveSchemaInternal(
         validator,
@@ -515,12 +555,13 @@
         formData,
         expandAllBranches,
         recurseList,
-        experimental_customMergeAllOf
+        experimental_customMergeAllOf,
+        resolveAnyOfOrOneOfRefs
       );
     }
     return [schema];
   }
-  function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
+  function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs) {
     if (!isObject(schema)) {
       return schema;
     }
@@ -543,7 +584,7 @@
         resolvedSchema[PROPERTIES_KEY],
         (result, value, key) => {
           const childList = [...recurseList];
-          result[key] = resolveAllReferences(value, rootSchema, childList, baseURI);
+          result[key] = resolveAllReferences(value, rootSchema, childList, baseURI, resolveAnyOfOrOneOfRefs);
           childrenLists.push(childList);
         },
         {}
@@ -554,9 +595,28 @@
     if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
       resolvedSchema = {
         ...resolvedSchema,
-        items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList, baseURI)
+        items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs)
       };
     }
+    if (resolveAnyOfOrOneOfRefs) {
+      let key;
+      let schemas;
+      if (ANY_OF_KEY in schema && Array.isArray(schema[ANY_OF_KEY])) {
+        key = ANY_OF_KEY;
+        schemas = resolvedSchema[ANY_OF_KEY];
+      } else if (ONE_OF_KEY in schema && Array.isArray(schema[ONE_OF_KEY])) {
+        key = ONE_OF_KEY;
+        schemas = resolvedSchema[ONE_OF_KEY];
+      }
+      if (key && schemas) {
+        resolvedSchema = {
+          ...resolvedSchema,
+          [key]: schemas.map(
+            (s) => resolveAllReferences(s, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs)
+          )
+        };
+      }
+    }
     return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
   }
   function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFormData, experimental_customMergeAllOf) {
@@ -571,12 +631,12 @@
       }
       if (PATTERN_PROPERTIES_KEY in schema) {
         const matchingProperties = getMatchingPatternProperties(schema, key);
-        if (!isEmpty2(matchingProperties)) {
+        if (!isEmpty4(matchingProperties)) {
           schema.properties[key] = retrieveSchema(
             validator,
-            { allOf: Object.values(matchingProperties) },
+            { [ALL_OF_KEY]: Object.values(matchingProperties) },
             rootSchema,
-            formData,
+            get13(formData, [key]),
             experimental_customMergeAllOf
           );
           set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -584,12 +644,12 @@
         }
       }
       if (ADDITIONAL_PROPERTIES_KEY in schema && schema.additionalProperties !== false) {
-        let additionalProperties = {};
+        let additionalProperties;
         if (typeof schema.additionalProperties !== "boolean") {
           if (REF_KEY in schema.additionalProperties) {
             additionalProperties = retrieveSchema(
               validator,
-              { $ref: get12(schema.additionalProperties, [REF_KEY]) },
+              { [REF_KEY]: get13(schema.additionalProperties, [REF_KEY]) },
               rootSchema,
               formData,
               experimental_customMergeAllOf
@@ -602,10 +662,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);
@@ -616,7 +676,7 @@
     });
     return schema;
   }
-  function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf) {
+  function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
     if (!isObject(schema)) {
       return [{}];
     }
@@ -627,7 +687,8 @@
       expandAllBranches,
       recurseList,
       rawFormData,
-      experimental_customMergeAllOf
+      experimental_customMergeAllOf,
+      resolveAnyOfOrOneOfRefs
     );
     return resolvedSchemas.flatMap((s) => {
       let resolvedSchema = s;
@@ -679,12 +740,12 @@
         resolvedSchema = Object.keys(resolvedSchema.properties).reduce(
           (schema2, key) => {
             const matchingProperties = getMatchingPatternProperties(schema2, key);
-            if (!isEmpty2(matchingProperties)) {
+            if (!isEmpty4(matchingProperties)) {
               schema2.properties[key] = retrieveSchema(
                 validator,
                 { allOf: [schema2.properties[key], ...Object.values(matchingProperties)] },
                 rootSchema,
-                rawFormData,
+                get13(rawFormData, [key]),
                 experimental_customMergeAllOf
               );
             }
@@ -756,7 +817,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)) {
@@ -887,11 +948,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])),
+          return isEqual2(
+            get13(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get13(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
             data
           );
         });
@@ -904,13 +965,13 @@
     if (has5(schema, REF_KEY)) {
       fieldSchema = retrieveSchema(validator, schema, rootSchema, void 0, experimental_customMergeAllOf);
     }
-    if (isEmpty2(path)) {
+    if (isEmpty4(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,
@@ -952,7 +1013,7 @@
             parentField,
             fieldName,
             ONE_OF_KEY,
-            get12(formData, subPath),
+            get13(formData, subPath),
             experimental_customMergeAllOf
           );
         } else if (has5(parentField, ANY_OF_KEY)) {
@@ -962,7 +1023,7 @@
             parentField,
             fieldName,
             ANY_OF_KEY,
-            get12(formData, subPath),
+            get13(formData, subPath),
             experimental_customMergeAllOf
           );
         }
@@ -1026,11 +1087,11 @@
   function calculateIndexScore(validator, rootSchema, schema, formData, experimental_customMergeAllOf) {
     let totalScore = 0;
     if (schema) {
-      if (isObject3(schema.properties)) {
+      if (isObject2(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;
             }
@@ -1057,14 +1118,14 @@
                 validator,
                 rootSchema,
                 formValue,
-                get12(value, key2),
+                get13(value, key2),
                 -1,
                 discriminator,
                 experimental_customMergeAllOf
               );
             }
             if (value.type === "object") {
-              if (isObject3(formValue)) {
+              if (isObject2(formValue)) {
                 score += 1;
               }
               return score + calculateIndexScore(validator, rootSchema, value, formValue, experimental_customMergeAllOf);
@@ -1159,11 +1220,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,
@@ -1174,7 +1246,7 @@
         return acc2;
       }, acc);
     }
-    if (defaultSupercedesUndefined && (!isNil(defaults) && isNil(formData) || typeof formData === "number" && isNaN(formData)) || overrideFormDataWithDefaults && !isNil(formData)) {
+    if (defaultSupercedesUndefined && (!(defaults === void 0) && isNil(formData) || typeof formData === "number" && isNaN(formData)) || overrideFormDataWithDefaults && !isNil(formData)) {
       return defaults;
     }
     return formData;
@@ -1282,8 +1354,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);
@@ -1315,18 +1387,27 @@
     }
     return {};
   }
+  function computeDefaultBasedOnSchemaTypeAndDefaults(schema, computedDefault) {
+    const { default: schemaDefault, type } = schema;
+    const shouldReturnNullAsDefault = Array.isArray(type) && type.includes("null") && isEmpty4(computedDefault) && schemaDefault === null;
+    return shouldReturnNullAsDefault ? null : computedDefault;
+  }
   function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false) {
     const { emptyObjectFields = "populateAllDefaults" } = experimental_defaultFormStateBehavior;
-    if (includeUndefinedValues || isConst) {
+    if (includeUndefinedValues === true || isConst) {
       obj[key] = computedDefault;
+    } else if (includeUndefinedValues === "excludeObjectChildren") {
+      if (!isObject(computedDefault) || !isEmpty4(computedDefault)) {
+        obj[key] = computedDefault;
+      }
     } else if (emptyObjectFields !== "skipDefaults") {
       const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
       if (isObject(computedDefault)) {
         if (emptyObjectFields === "skipEmptyDefaults") {
-          if (!isEmpty2(computedDefault)) {
+          if (!isEmpty4(computedDefault)) {
             obj[key] = computedDefault;
           }
-        } else if ((!isEmpty2(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
+        } else if ((!isEmpty4(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
           obj[key] = computedDefault;
         }
       } else if (
@@ -1350,15 +1431,16 @@
       experimental_defaultFormStateBehavior = void 0,
       experimental_customMergeAllOf = void 0,
       required,
-      shouldMergeDefaultsIntoFormData = false
+      shouldMergeDefaultsIntoFormData = false,
+      initialDefaultsGenerated
     } = 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);
@@ -1373,6 +1455,9 @@
       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),
@@ -1450,9 +1535,10 @@
         experimental_defaultFormStateBehavior: experimental_dfsb_to_compute,
         experimental_customMergeAllOf,
         parentDefaults: defaults,
-        rawFormData: formData,
+        rawFormData: rawFormData ?? formData,
         required,
-        shouldMergeDefaultsIntoFormData
+        shouldMergeDefaultsIntoFormData,
+        initialDefaultsGenerated
       });
     }
     if (defaults === void 0) {
@@ -1504,7 +1590,8 @@
     experimental_defaultFormStateBehavior = void 0,
     experimental_customMergeAllOf = void 0,
     required,
-    shouldMergeDefaultsIntoFormData
+    shouldMergeDefaultsIntoFormData,
+    initialDefaultsGenerated
   } = {}, defaults) {
     {
       const formData = isObject(rawFormData) ? rawFormData : {};
@@ -1513,7 +1600,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, {
@@ -1522,10 +1609,11 @@
             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
+            shouldMergeDefaultsIntoFormData,
+            initialDefaultsGenerated
           });
           maybeAddDefaultToObject(
             acc,
@@ -1541,7 +1629,7 @@
         },
         {}
       );
-      if (retrievedSchema.additionalProperties) {
+      if (retrievedSchema.additionalProperties && !initialDefaultsGenerated) {
         const additionalPropertiesSchema = isObject(retrievedSchema.additionalProperties) ? retrievedSchema.additionalProperties : {};
         const keys2 = /* @__PURE__ */ new Set();
         if (isObject(defaults)) {
@@ -1559,10 +1647,11 @@
             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
+            shouldMergeDefaultsIntoFormData,
+            initialDefaultsGenerated
           });
           maybeAddDefaultToObject(
             objectDefaults,
@@ -1574,7 +1663,7 @@
           );
         });
       }
-      return objectDefaults;
+      return computeDefaultBasedOnSchemaTypeAndDefaults(rawSchema, objectDefaults);
     }
   }
   function getArrayDefaults(validator, rawSchema, {
@@ -1584,7 +1673,9 @@
     experimental_defaultFormStateBehavior = void 0,
     experimental_customMergeAllOf = void 0,
     required,
-    shouldMergeDefaultsIntoFormData
+    requiredAsRoot = false,
+    shouldMergeDefaultsIntoFormData,
+    initialDefaultsGenerated
   } = {}, defaults) {
     const schema = rawSchema;
     const arrayMinItemsStateBehavior = experimental_defaultFormStateBehavior?.arrayMinItems ?? {};
@@ -1605,7 +1696,8 @@
           experimental_customMergeAllOf,
           parentDefaults: item,
           required,
-          shouldMergeDefaultsIntoFormData
+          shouldMergeDefaultsIntoFormData,
+          initialDefaultsGenerated
         });
       });
     }
@@ -1621,9 +1713,10 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             rawFormData: item,
-            parentDefaults: get12(defaults, [idx]),
+            parentDefaults: get13(defaults, [idx]),
             required,
-            shouldMergeDefaultsIntoFormData
+            shouldMergeDefaultsIntoFormData,
+            initialDefaultsGenerated
           });
         });
         const mergeExtraDefaults = (ignoreMinItemsFlagSet && required || isPopulateAll) && arrayMergeExtraDefaults;
@@ -1639,25 +1732,29 @@
         return defaults ? defaults : void 0;
       }
     }
+    let arrayDefault;
     const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
     if (!schema.minItems || isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || computeSkipPopulate(validator, schema, rootSchema) || schema.minItems <= defaultsLength) {
-      return defaults ? defaults : emptyDefault;
-    }
-    const defaultEntries = defaults || [];
-    const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
-    const fillerDefault = fillerSchema.default;
-    const fillerEntries = new Array(schema.minItems - defaultsLength).fill(
-      computeDefaults(validator, fillerSchema, {
-        parentDefaults: fillerDefault,
-        rootSchema,
-        _recurseList,
-        experimental_defaultFormStateBehavior,
-        experimental_customMergeAllOf,
-        required,
-        shouldMergeDefaultsIntoFormData
-      })
-    );
-    return defaultEntries.concat(fillerEntries);
+      arrayDefault = defaults || !required && !requiredAsRoot ? defaults : emptyDefault;
+    } else {
+      const defaultEntries = defaults || [];
+      const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
+      const fillerDefault = fillerSchema.default;
+      const fillerEntries = Array.from(
+        { length: schema.minItems - defaultsLength },
+        () => computeDefaults(validator, fillerSchema, {
+          parentDefaults: fillerDefault,
+          rootSchema,
+          _recurseList,
+          experimental_defaultFormStateBehavior,
+          experimental_customMergeAllOf,
+          required,
+          shouldMergeDefaultsIntoFormData
+        })
+      );
+      arrayDefault = defaultEntries.concat(fillerEntries);
+    }
+    return computeDefaultBasedOnSchemaTypeAndDefaults(rawSchema, arrayDefault);
   }
   function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefaultsProps = {}, defaults) {
     switch (getSchemaType(rawSchema)) {
@@ -1670,7 +1767,7 @@
       }
     }
   }
-  function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
+  function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior, experimental_customMergeAllOf, initialDefaultsGenerated) {
     if (!isObject(theSchema)) {
       throw new Error("Invalid schema: " + theSchema);
     }
@@ -1681,8 +1778,16 @@
       experimental_defaultFormStateBehavior,
       experimental_customMergeAllOf,
       rawFormData: formData,
-      shouldMergeDefaultsIntoFormData: true
+      shouldMergeDefaultsIntoFormData: true,
+      initialDefaultsGenerated,
+      requiredAsRoot: 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";
@@ -1739,10 +1844,10 @@
     if (schemaType === "object") {
       displayLabel = false;
     }
-    if (schemaType === "boolean" && !uiSchema[UI_WIDGET_KEY]) {
+    if (schemaType === "boolean" && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
       displayLabel = false;
     }
-    if (uiSchema[UI_FIELD_KEY]) {
+    if (uiSchema && uiSchema[UI_FIELD_KEY]) {
       displayLabel = false;
     }
     return displayLabel;
@@ -1753,19 +1858,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,
@@ -1784,8 +1889,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];
@@ -1803,17 +1908,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;
             }
@@ -1825,9 +1930,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(
@@ -1847,10 +1952,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(
@@ -1876,75 +1981,6 @@
     }
     return newFormData;
   }
-  function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
-    const $id = id || idPrefix;
-    const idSchema = { $id };
-    if (typeof schema === "object") {
-      if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
-        const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
-        const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
-        if (sameSchemaIndex === -1) {
-          return toIdSchemaInternal(
-            validator,
-            _schema,
-            idPrefix,
-            idSeparator,
-            id,
-            rootSchema,
-            formData,
-            _recurseList.concat(_schema),
-            experimental_customMergeAllOf
-          );
-        }
-      }
-      if (ITEMS_KEY in schema && !get12(schema, [ITEMS_KEY, REF_KEY])) {
-        return toIdSchemaInternal(
-          validator,
-          get12(schema, ITEMS_KEY),
-          idPrefix,
-          idSeparator,
-          id,
-          rootSchema,
-          formData,
-          _recurseList,
-          experimental_customMergeAllOf
-        );
-      }
-      if (getSchemaType(schema) === "object" && PROPERTIES_KEY in schema) {
-        for (const name in schema.properties) {
-          const field = schema[PROPERTIES_KEY][name];
-          const fieldId = idSchema[ID_KEY] + idSeparator + name;
-          idSchema[name] = toIdSchemaInternal(
-            validator,
-            field,
-            idPrefix,
-            idSeparator,
-            fieldId,
-            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]),
-            _recurseList,
-            experimental_customMergeAllOf
-          );
-        }
-      }
-    }
-    return idSchema;
-  }
-  function toIdSchema(validator, schema, id, rootSchema, formData, idPrefix = "root", idSeparator = "_", experimental_customMergeAllOf) {
-    return toIdSchemaInternal(
-      validator,
-      schema,
-      idPrefix,
-      idSeparator,
-      id,
-      rootSchema,
-      formData,
-      void 0,
-      experimental_customMergeAllOf
-    );
-  }
   function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
     if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
       const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
@@ -2036,7 +2072,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,
@@ -2044,7 +2080,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
         );
@@ -2055,8 +2091,6 @@
   function toPathSchema(validator, schema, name = "", rootSchema, formData, experimental_customMergeAllOf) {
     return toPathSchemaInternal(validator, schema, name, rootSchema, formData, void 0, experimental_customMergeAllOf);
   }
-
-  // src/createSchemaUtils.ts
   var SchemaUtils = class {
     /** Constructs the `SchemaUtils` instance with the given `validator` and `rootSchema` stored as instance variables
      *
@@ -2066,11 +2100,22 @@
      * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
      */
     constructor(validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
-      this.rootSchema = rootSchema;
+      if (rootSchema && rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+        this.rootSchema = makeAllReferencesAbsolute(rootSchema, get13(rootSchema, ID_KEY, "#"));
+      } else {
+        this.rootSchema = rootSchema;
+      }
       this.validator = validator;
       this.experimental_defaultFormStateBehavior = experimental_defaultFormStateBehavior;
       this.experimental_customMergeAllOf = experimental_customMergeAllOf;
     }
+    /** Returns the `rootSchema` in the `SchemaUtilsType`
+     *
+     * @returns - The `rootSchema`
+     */
+    getRootSchema() {
+      return this.rootSchema;
+    }
     /** Returns the `ValidatorType` in the `SchemaUtilsType`
      *
      * @returns - The `ValidatorType`
@@ -2143,9 +2188,10 @@
      * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults.
      *          If "excludeObjectChildren", pass `includeUndefinedValues` as false when computing defaults for any nested
      *          object properties.
+     * @param initialDefaultsGenerated - Indicates whether or not initial defaults have been generated
      * @returns - The resulting `formData` with all the defaults provided
      */
-    getDefaultFormState(schema, formData, includeUndefinedValues = false) {
+    getDefaultFormState(schema, formData, includeUndefinedValues = false, initialDefaultsGenerated) {
       return getDefaultFormState(
         this.validator,
         schema,
@@ -2153,7 +2199,8 @@
         this.rootSchema,
         includeUndefinedValues,
         this.experimental_defaultFormStateBehavior,
-        this.experimental_customMergeAllOf
+        this.experimental_customMergeAllOf,
+        initialDefaultsGenerated
       );
     }
     /** Determines whether the combination of `schema` and `uiSchema` properties indicates that the label for the `schema`
@@ -2252,15 +2299,17 @@
      *
      * @param schema - The schema for which retrieving a schema is desired
      * @param [rawFormData] - The current formData, if any, to assist retrieving a schema
+     * @param [resolveAnyOfOrOneOfRefs] - Optional flag indicating whether to resolved refs in anyOf/oneOf lists
      * @returns - The schema having its conditions, additional properties, references and dependencies resolved
      */
-    retrieveSchema(schema, rawFormData) {
+    retrieveSchema(schema, rawFormData, resolveAnyOfOrOneOfRefs) {
       return retrieveSchema(
         this.validator,
         schema,
         this.rootSchema,
         rawFormData,
-        this.experimental_customMergeAllOf
+        this.experimental_customMergeAllOf,
+        resolveAnyOfOrOneOfRefs
       );
     }
     /** Sanitize the `data` associated with the `oldSchema` so it is considered appropriate for the `newSchema`. If the
@@ -2284,27 +2333,6 @@
         this.experimental_customMergeAllOf
       );
     }
-    /** Generates an `IdSchema` object for the `schema`, recursively
-     *
-     * @param schema - The schema for which the display label flag is desired
-     * @param [id] - The base id for the schema
-     * @param [formData] - The current formData, if any, onto which to provide any missing defaults
-     * @param [idPrefix='root'] - The prefix to use for the id
-     * @param [idSeparator='_'] - The separator to use for the path segments in the id
-     * @returns - The `IdSchema` object for the `schema`
-     */
-    toIdSchema(schema, id, formData, idPrefix = "root", idSeparator = "_") {
-      return toIdSchema(
-        this.validator,
-        schema,
-        id,
-        this.rootSchema,
-        formData,
-        idPrefix,
-        idSeparator,
-        this.experimental_customMergeAllOf
-      );
-    }
     /** Generates an `PathSchema` object for the `schema`, recursively
      *
      * @param schema - The schema for which the display label flag is desired
@@ -2390,6 +2418,31 @@
     return options;
   }
 
+  // src/shallowEquals.ts
+  function shallowEquals(a, b) {
+    if (Object.is(a, b)) {
+      return true;
+    }
+    if (a == null || b == null) {
+      return false;
+    }
+    if (typeof a !== "object" || typeof b !== "object") {
+      return false;
+    }
+    const keysA = Object.keys(a);
+    const keysB = Object.keys(b);
+    if (keysA.length !== keysB.length) {
+      return false;
+    }
+    for (let i = 0; i < keysA.length; i++) {
+      const key = keysA[i];
+      if (!Object.prototype.hasOwnProperty.call(b, key) || !Object.is(a[key], b[key])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   // src/replaceStringParameters.ts
   function replaceStringParameters(inputString, params) {
     let output = inputString;
@@ -2482,7 +2535,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);
@@ -2508,7 +2561,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;
@@ -2547,6 +2600,22 @@
       return this;
     }
   };
+  function getChangedFields(a, b) {
+    const aIsPlainObject = isPlainObject2(a);
+    const bIsPlainObject = isPlainObject2(b);
+    if (a === b || !aIsPlainObject && !bIsPlainObject) {
+      return [];
+    }
+    if (aIsPlainObject && !bIsPlainObject) {
+      return keys(a);
+    } else if (!aIsPlainObject && bIsPlainObject) {
+      return keys(b);
+    } else {
+      const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get13(b, key))));
+      const diffFields = difference(keys(b), keys(a));
+      return [...unequalFields, ...diffFields];
+    }
+  }
 
   // src/getDateElementProps.ts
   function getDateElementProps(date, time, yearRange = [1900, (/* @__PURE__ */ new Date()).getFullYear() + 2], format = "YMD") {
@@ -2655,7 +2724,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();
@@ -2664,7 +2733,7 @@
       {
         get(_obj, prop) {
           if (!ids.has(prop)) {
-            ids.set(prop, nanoid.nanoid());
+            ids.set(prop, uniqueId("test-id-"));
           }
           return ids.get(prop);
         }
@@ -2724,7 +2793,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 }) => {
@@ -2740,7 +2809,7 @@
       return mergeWidgetOptions(widget);
     }
     if (typeof widget !== "string") {
-      throw new Error(`Unsupported widget definition: ${typeof widget}`);
+      throw new Error(`Unsupported widget definition: ${typeof widget} in schema: ${JSON.stringify(schema)}`);
     }
     if (widget in registeredWidgets) {
       const registeredWidget = registeredWidgets[widget];
@@ -2748,14 +2817,14 @@
     }
     if (typeof type === "string") {
       if (!(type in widgetMap)) {
-        throw new Error(`No widget for type '${type}'`);
+        throw new Error(`No widget for type '${type}' in schema: ${JSON.stringify(schema)}`);
       }
       if (widget in widgetMap[type]) {
         const registeredWidget = registeredWidgets[widgetMap[type][widget]];
         return getWidget(schema, registeredWidget, registeredWidgets);
       }
     }
-    throw new Error(`No widget '${widget}' for type '${type}'`);
+    throw new Error(`No widget '${widget}' for type '${type}' in schema: ${JSON.stringify(schema)}`);
   }
 
   // src/hashForSchema.ts
@@ -2822,6 +2891,23 @@
   function buttonId(id, btn) {
     return idGenerator(id, btn);
   }
+  function optionalControlsId(id, element) {
+    return idGenerator(id, `optional${element}`);
+  }
+  function isFormDataAvailable(formData) {
+    return !isNil(formData) && (!isObject2(formData) || Array.isArray(formData) || !isEmpty4(formData));
+  }
+  function isRootSchema(registry, schemaToCompare) {
+    const { rootSchema, schemaUtils } = registry;
+    if (isEqual2(schemaToCompare, rootSchema)) {
+      return true;
+    }
+    if (REF_KEY in rootSchema) {
+      const resolvedSchema = schemaUtils.retrieveSchema(rootSchema);
+      return isEqual2(schemaToCompare, resolvedSchema);
+    }
+    return false;
+  }
 
   // src/labelValue.ts
   function labelValue(label, hideLabel, fallback) {
@@ -2837,7 +2923,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
@@ -2918,10 +3004,35 @@
   }
 
   // src/shouldRender.ts
-  function shouldRender(component, nextProps, nextState) {
+  function shouldRender(component, nextProps, nextState, updateStrategy = "customDeep") {
+    if (updateStrategy === "always") {
+      return true;
+    }
+    if (updateStrategy === "shallow") {
+      const { props: props2, state: state2 } = component;
+      return !shallowEquals(props2, nextProps) || !shallowEquals(state2, nextState);
+    }
     const { props, state } = component;
     return !deepEquals(props, nextProps) || !deepEquals(state, nextState);
   }
+  function getSchemaTypesForXxxOf(schemas) {
+    const allTypes = uniq(
+      schemas.map((s) => isObject2(s) ? getSchemaType(s) : void 0).flat().filter((t) => t !== void 0)
+    );
+    return allTypes.length === 1 ? allTypes[0] : allTypes;
+  }
+  function shouldRenderOptionalField(registry, schema, required, uiSchema) {
+    const { enableOptionalDataFieldForType = [] } = getUiOptions(uiSchema, registry.globalUiOptions);
+    let schemaType;
+    if (ANY_OF_KEY in schema && Array.isArray(schema[ANY_OF_KEY])) {
+      schemaType = getSchemaTypesForXxxOf(schema[ANY_OF_KEY]);
+    } else if (ONE_OF_KEY in schema && Array.isArray(schema[ONE_OF_KEY])) {
+      schemaType = getSchemaTypesForXxxOf(schema[ONE_OF_KEY]);
+    } else {
+      schemaType = getSchemaType(schema);
+    }
+    return !isRootSchema(registry, schema) && !required && !!schemaType && !Array.isArray(schemaType) && !!enableOptionalDataFieldForType.find((val) => val === schemaType);
+  }
 
   // src/toDateString.ts
   function toDateString(dateObject, time = true) {
@@ -2950,7 +3061,7 @@
     return Object.keys(errorSchema).reduce((acc, key) => {
       if (key !== ERRORS_KEY) {
         const childSchema = errorSchema[key];
-        if (isPlainObject4(childSchema)) {
+        if (isPlainObject2(childSchema)) {
           acc = acc.concat(toErrorList(childSchema, [...fieldPath, key]));
         }
       }
@@ -2973,13 +3084,22 @@
     }
     return builder.ErrorSchema;
   }
+
+  // src/toFieldPathId.ts
+  function toFieldPathId(fieldPath, globalFormOptions, parentPath) {
+    const basePath = Array.isArray(parentPath) ? parentPath : parentPath?.path;
+    const childPath = fieldPath === "" ? [] : [fieldPath];
+    const path = basePath ? basePath.concat(...childPath) : childPath;
+    const id = [globalFormOptions.idPrefix, ...path].join(globalFormOptions.idSeparator);
+    return { path, [ID_KEY]: id };
+  }
   function unwrapErrorHandler(errorHandler) {
     return Object.keys(errorHandler).reduce((acc, key) => {
       if (key === "addError") {
         return acc;
       } else {
         const childSchema = errorHandler[key];
-        if (isPlainObject4(childSchema)) {
+        if (isPlainObject2(childSchema)) {
           return {
             ...acc,
             [key]: unwrapErrorHandler(childSchema)
@@ -3005,15 +3125,19 @@
     const SSS = pad(date.getMilliseconds(), 3);
     return `${yyyy}-${MM}-${dd}T${hh}:${mm}:${ss}.${SSS}`;
   }
-  function validationDataMerge(validationData, additionalErrorSchema) {
+  function validationDataMerge(validationData, additionalErrorSchema, preventDuplicates = false) {
     if (!additionalErrorSchema) {
       return validationData;
     }
     const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
     let errors = toErrorList(additionalErrorSchema);
     let errorSchema = additionalErrorSchema;
-    if (!isEmpty2(oldErrorSchema)) {
-      errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
+    if (!isEmpty4(oldErrorSchema)) {
+      errorSchema = mergeObjects(
+        oldErrorSchema,
+        additionalErrorSchema,
+        preventDuplicates ? "preventDuplicates" : true
+      );
       errors = [...oldErrors].concat(errors);
     }
     return { errorSchema, errors };
@@ -3040,27 +3164,11 @@
     if (Array.isArray(schemaNode)) {
       return withIdRefPrefixArray([...schemaNode]);
     }
-    if (isObject3(schemaNode)) {
+    if (isObject2(schemaNode)) {
       return withIdRefPrefixObject({ ...schemaNode });
     }
     return schemaNode;
   }
-  function getChangedFields(a, b) {
-    const aIsPlainObject = isPlainObject4(a);
-    const bIsPlainObject = isPlainObject4(b);
-    if (a === b || !aIsPlainObject && !bIsPlainObject) {
-      return [];
-    }
-    if (aIsPlainObject && !bIsPlainObject) {
-      return keys(a);
-    } else if (!aIsPlainObject && bIsPlainObject) {
-      return keys(b);
-    } else {
-      const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get12(b, key))));
-      const diffFields = difference(keys(b), keys(a));
-      return [...unequalFields, ...diffFields];
-    }
-  }
 
   // src/enums.ts
   var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
@@ -3084,6 +3192,9 @@
     TranslatableString2["PreviewLabel"] = "Preview";
     TranslatableString2["DecrementAriaLabel"] = "Decrease value by 1";
     TranslatableString2["IncrementAriaLabel"] = "Increase value by 1";
+    TranslatableString2["OptionalObjectAdd"] = "Add data for optional field";
+    TranslatableString2["OptionalObjectRemove"] = "Remove data for optional field";
+    TranslatableString2["OptionalObjectEmptyMsg"] = "No data for optional field";
     TranslatableString2["UnknownFieldType"] = "Unknown field type %1";
     TranslatableString2["OptionPrefix"] = "Option %1";
     TranslatableString2["TitleOptionPrefix"] = "%1 option %2";
@@ -3121,7 +3232,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) {
@@ -3217,6 +3328,8 @@
   exports.ALL_OF_KEY = ALL_OF_KEY;
   exports.ANY_OF_KEY = ANY_OF_KEY;
   exports.CONST_KEY = CONST_KEY;
+  exports.DEFAULT_ID_PREFIX = DEFAULT_ID_PREFIX;
+  exports.DEFAULT_ID_SEPARATOR = DEFAULT_ID_SEPARATOR;
   exports.DEFAULT_KEY = DEFAULT_KEY;
   exports.DEFINITIONS_KEY = DEFINITIONS_KEY;
   exports.DEPENDENCIES_KEY = DEPENDENCIES_KEY;
@@ -3228,6 +3341,7 @@
   exports.ID_KEY = ID_KEY;
   exports.IF_KEY = IF_KEY;
   exports.ITEMS_KEY = ITEMS_KEY;
+  exports.JSON_SCHEMA_DRAFT_2019_09 = JSON_SCHEMA_DRAFT_2019_09;
   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;
@@ -3295,8 +3409,10 @@
   exports.isCustomWidget = isCustomWidget;
   exports.isFilesArray = isFilesArray;
   exports.isFixedItems = isFixedItems;
+  exports.isFormDataAvailable = isFormDataAvailable;
   exports.isMultiSelect = isMultiSelect;
   exports.isObject = isObject;
+  exports.isRootSchema = isRootSchema;
   exports.isSelect = isSelect;
   exports.labelValue = labelValue;
   exports.localToUTC = localToUTC;
@@ -3305,6 +3421,7 @@
   exports.mergeObjects = mergeObjects;
   exports.mergeSchemas = mergeSchemas;
   exports.optionId = optionId;
+  exports.optionalControlsId = optionalControlsId;
   exports.optionsList = optionsList;
   exports.orderProperties = orderProperties;
   exports.pad = pad;
@@ -3315,14 +3432,16 @@
   exports.sanitizeDataForNewSchema = sanitizeDataForNewSchema;
   exports.schemaParser = schemaParser;
   exports.schemaRequiresTrueValue = schemaRequiresTrueValue;
+  exports.shallowEquals = shallowEquals;
   exports.shouldRender = shouldRender;
+  exports.shouldRenderOptionalField = shouldRenderOptionalField;
   exports.sortedJSONStringify = sortedJSONStringify;
   exports.titleId = titleId;
   exports.toConstant = toConstant;
   exports.toDateString = toDateString;
   exports.toErrorList = toErrorList;
   exports.toErrorSchema = toErrorSchema;
-  exports.toIdSchema = toIdSchema;
+  exports.toFieldPathId = toFieldPathId;
   exports.toPathSchema = toPathSchema;
   exports.unwrapErrorHandler = unwrapErrorHandler;
   exports.utcToLocal = utcToLocal;