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

package/dist/index.js

@@ -46,6 +46,7 @@ __export(index_exports, {
   ID_KEY: () => ID_KEY,
   IF_KEY: () => IF_KEY,
   ITEMS_KEY: () => ITEMS_KEY,
+  JSON_SCHEMA_DRAFT_2020_12: () => JSON_SCHEMA_DRAFT_2020_12,
   JUNK_OPTION_ID: () => JUNK_OPTION_ID,
   LOOKUP_MAP_NAME: () => LOOKUP_MAP_NAME,
   NAME_KEY: () => NAME_KEY,
@@ -57,6 +58,7 @@ __export(index_exports, {
   REQUIRED_KEY: () => REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG: () => RJSF_ADDITIONAL_PROPERTIES_FLAG,
   ROOT_SCHEMA_PREFIX: () => ROOT_SCHEMA_PREFIX,
+  SCHEMA_KEY: () => SCHEMA_KEY,
   SUBMIT_BTN_OPTIONS_KEY: () => SUBMIT_BTN_OPTIONS_KEY,
   TranslatableString: () => TranslatableString,
   UI_FIELD_KEY: () => UI_FIELD_KEY,
@@ -214,6 +216,7 @@ var READONLY_KEY = "readonly";
 var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
+var SCHEMA_KEY = "$schema";
 var DISCRIMINATOR_PATH = ["discriminator", "propertyName"];
 var FORM_CONTEXT_NAME = "formContext";
 var LOOKUP_MAP_NAME = "layoutGridLookupMap";
@@ -223,6 +226,7 @@ var UI_FIELD_KEY = "ui:field";
 var UI_WIDGET_KEY = "ui:widget";
 var UI_OPTIONS_KEY = "ui:options";
 var UI_GLOBAL_OPTIONS_KEY = "ui:globalOptions";
+var JSON_SCHEMA_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
 
 // src/getUiOptions.ts
 function getUiOptions(uiSchema = {}, globalOptions = {}) {
@@ -295,15 +299,15 @@ function deepEquals(a, b) {
 }
 
 // src/schema/findFieldInSchema.ts
-var import_get7 = __toESM(require("lodash/get"), 1);
+var import_get8 = __toESM(require("lodash/get"), 1);
 var import_has3 = __toESM(require("lodash/has"), 1);
 
 // src/schema/findSelectedOptionInXxxOf.ts
-var import_get5 = __toESM(require("lodash/get"), 1);
+var import_get6 = __toESM(require("lodash/get"), 1);
 var import_isEqual = __toESM(require("lodash/isEqual"), 1);
 
 // src/schema/retrieveSchema.ts
-var import_get4 = __toESM(require("lodash/get"), 1);
+var import_get5 = __toESM(require("lodash/get"), 1);
 var import_set = __toESM(require("lodash/set"), 1);
 var import_times = __toESM(require("lodash/times"), 1);
 var import_transform = __toESM(require("lodash/transform"), 1);
@@ -315,20 +319,53 @@ var import_json_schema_merge_allof = __toESM(require("json-schema-merge-allof"),
 // src/findSchemaDefinition.ts
 var import_jsonpointer = __toESM(require("jsonpointer"), 1);
 var import_omit = __toESM(require("lodash/omit"), 1);
+var import_isObject3 = __toESM(require("lodash/isObject"), 1);
+var import_isEmpty = __toESM(require("lodash/isEmpty"), 1);
+var import_fast_uri = __toESM(require("fast-uri"), 1);
+var import_get = __toESM(require("lodash/get"), 1);
+function findEmbeddedSchemaRecursive(schema, ref) {
+  if (ID_KEY in schema && import_fast_uri.default.equal(schema[ID_KEY], ref)) {
+    return schema;
+  }
+  for (const subSchema of Object.values(schema)) {
+    if ((0, import_isObject3.default)(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 = (0, import_omit.default)(object, [key]);
   return [remaining, value];
 }
-function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = []) {
+function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = (0, import_get.default)(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 = import_jsonpointer.default.get(rootSchema, decodedRef);
+    } else if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+      current = findEmbeddedSchemaRecursive(rootSchema, baseURI.replace(/\/$/, ""));
+      if (current !== void 0) {
+        current = import_jsonpointer.default.get(current, decodedRef);
+      }
+    }
+  } else if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+    const resolvedRef = baseURI ? import_fast_uri.default.resolve(baseURI, ref) : ref;
+    const [refId, ...refAnchor] = resolvedRef.replace(/#\/?$/, "").split("#");
+    current = findEmbeddedSchemaRecursive(rootSchema, refId.replace(/\/$/, ""));
+    if (current !== void 0) {
+      baseURI = current[ID_KEY];
+      if (!(0, import_isEmpty.default)(refAnchor)) {
+        current = import_jsonpointer.default.get(current, decodeURIComponent(refAnchor.join("#")));
+      }
+    }
   }
-  const current = import_jsonpointer.default.get(rootSchema, decodedRef);
   if (current === void 0) {
     throw new Error(`Could not find a definition for ${$ref}.`);
   }
@@ -343,7 +380,7 @@ function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [])
       throw new Error(`Definition for ${firstRef} contains a circular reference through ${circularPath}`);
     }
     const [remaining, theRef] = splitKeyElementFromObject(REF_KEY, current);
-    const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref]);
+    const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref], baseURI);
     if (Object.keys(remaining).length > 0) {
       return { ...remaining, ...subSchema };
     }
@@ -351,17 +388,17 @@ function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [])
   }
   return current;
 }
-function findSchemaDefinition($ref, rootSchema = {}) {
+function findSchemaDefinition($ref, rootSchema = {}, baseURI = (0, import_get.default)(rootSchema, [ID_KEY])) {
   const recurseList = [];
-  return findSchemaDefinitionRecursive($ref, rootSchema, recurseList);
+  return findSchemaDefinitionRecursive($ref, rootSchema, recurseList, baseURI);
 }
 
 // src/getDiscriminatorFieldFromSchema.ts
-var import_get = __toESM(require("lodash/get"), 1);
+var import_get2 = __toESM(require("lodash/get"), 1);
 var import_isString = __toESM(require("lodash/isString"), 1);
 function getDiscriminatorFieldFromSchema(schema) {
   let discriminator;
-  const maybeString = (0, import_get.default)(schema, DISCRIMINATOR_PATH);
+  const maybeString = (0, import_get2.default)(schema, DISCRIMINATOR_PATH);
   if ((0, import_isString.default)(maybeString)) {
     discriminator = maybeString;
   } else if (maybeString !== void 0) {
@@ -435,21 +472,21 @@ function mergeSchemas(obj1, obj2) {
 }
 
 // src/schema/getFirstMatchingOption.ts
-var import_get3 = __toESM(require("lodash/get"), 1);
+var import_get4 = __toESM(require("lodash/get"), 1);
 var import_has = __toESM(require("lodash/has"), 1);
 var import_isNumber = __toESM(require("lodash/isNumber"), 1);
 
 // src/getOptionMatchingSimpleDiscriminator.ts
-var import_get2 = __toESM(require("lodash/get"), 1);
+var import_get3 = __toESM(require("lodash/get"), 1);
 function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
   if (formData && discriminatorField) {
-    const value = (0, import_get2.default)(formData, discriminatorField);
+    const value = (0, import_get3.default)(formData, discriminatorField);
     if (value === void 0) {
       return;
     }
     for (let i = 0; i < options.length; i++) {
       const option = options[i];
-      const discriminator = (0, import_get2.default)(option, [PROPERTIES_KEY, discriminatorField], {});
+      const discriminator = (0, import_get3.default)(option, [PROPERTIES_KEY, discriminatorField], {});
       if (discriminator.type === "object" || discriminator.type === "array") {
         continue;
       }
@@ -476,8 +513,8 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
   for (let i = 0; i < options.length; i++) {
     const option = options[i];
     if (discriminatorField && (0, import_has.default)(option, [PROPERTIES_KEY, discriminatorField])) {
-      const value = (0, import_get3.default)(formData, discriminatorField);
-      const discriminator = (0, import_get3.default)(option, [PROPERTIES_KEY, discriminatorField], {});
+      const value = (0, import_get4.default)(formData, discriminatorField);
+      const discriminator = (0, import_get4.default)(option, [PROPERTIES_KEY, discriminatorField], {});
       if (validator.isValid(discriminator, value, rootSchema)) {
         return i;
       }
@@ -512,7 +549,7 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
 }
 
 // src/schema/retrieveSchema.ts
-var import_isEmpty = __toESM(require("lodash/isEmpty"), 1);
+var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
 function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf) {
   return retrieveSchemaInternal(
     validator,
@@ -678,7 +715,7 @@ function resolveReference(validator, schema, rootSchema, expandAllBranches, recu
   }
   return [schema];
 }
-function resolveAllReferences(schema, rootSchema, recurseList) {
+function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
   if (!isObject(schema)) {
     return schema;
   }
@@ -689,8 +726,11 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       return resolvedSchema;
     }
     recurseList.push($ref);
-    const refSchema = findSchemaDefinition($ref, rootSchema);
+    const refSchema = findSchemaDefinition($ref, rootSchema, baseURI);
     resolvedSchema = { ...refSchema, ...localSchema };
+    if (ID_KEY in resolvedSchema) {
+      baseURI = resolvedSchema[ID_KEY];
+    }
   }
   if (PROPERTIES_KEY in resolvedSchema) {
     const childrenLists = [];
@@ -698,7 +738,7 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       resolvedSchema[PROPERTIES_KEY],
       (result, value, key) => {
         const childList = [...recurseList];
-        result[key] = resolveAllReferences(value, rootSchema, childList);
+        result[key] = resolveAllReferences(value, rootSchema, childList, baseURI);
         childrenLists.push(childList);
       },
       {}
@@ -709,7 +749,7 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
   if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
     resolvedSchema = {
       ...resolvedSchema,
-      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList)
+      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList, baseURI)
     };
   }
   return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
@@ -726,12 +766,12 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
     }
     if (PATTERN_PROPERTIES_KEY in schema) {
       const matchingProperties = getMatchingPatternProperties(schema, key);
-      if (!(0, import_isEmpty.default)(matchingProperties)) {
+      if (!(0, import_isEmpty2.default)(matchingProperties)) {
         schema.properties[key] = retrieveSchema(
           validator,
           { allOf: Object.values(matchingProperties) },
           rootSchema,
-          formData,
+          (0, import_get5.default)(formData, [key]),
           experimental_customMergeAllOf
         );
         (0, import_set.default)(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -744,7 +784,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
         if (REF_KEY in schema.additionalProperties) {
           additionalProperties = retrieveSchema(
             validator,
-            { $ref: (0, import_get4.default)(schema.additionalProperties, [REF_KEY]) },
+            { $ref: (0, import_get5.default)(schema.additionalProperties, [REF_KEY]) },
             rootSchema,
             formData,
             experimental_customMergeAllOf
@@ -757,10 +797,10 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
             ...schema.additionalProperties
           };
         } else {
-          additionalProperties = { type: guessType((0, import_get4.default)(formData, [key])) };
+          additionalProperties = { type: guessType((0, import_get5.default)(formData, [key])) };
         }
       } else {
-        additionalProperties = { type: guessType((0, import_get4.default)(formData, [key])) };
+        additionalProperties = { type: guessType((0, import_get5.default)(formData, [key])) };
       }
       schema.properties[key] = additionalProperties;
       (0, import_set.default)(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -816,7 +856,10 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
           resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
         }
         resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : (0, import_json_schema_merge_allof.default)(resolvedSchema, {
-          deep: false
+          deep: false,
+          resolvers: {
+            $defs: import_json_schema_merge_allof.default.options.resolvers.definitions
+          }
         });
         if (withContainsSchemas.length) {
           resolvedSchema.allOf = withContainsSchemas;
@@ -831,12 +874,12 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
       resolvedSchema = Object.keys(resolvedSchema.properties).reduce(
         (schema2, key) => {
           const matchingProperties = getMatchingPatternProperties(schema2, key);
-          if (!(0, import_isEmpty.default)(matchingProperties)) {
+          if (!(0, import_isEmpty2.default)(matchingProperties)) {
             schema2.properties[key] = retrieveSchema(
               validator,
               { allOf: [schema2.properties[key], ...Object.values(matchingProperties)] },
               rootSchema,
-              rawFormData,
+              (0, import_get5.default)(rawFormData, [key]),
               experimental_customMergeAllOf
             );
           }
@@ -908,7 +951,7 @@ function resolveDependencies(validator, schema, rootSchema, expandAllBranches, r
 function processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   let schemas = [resolvedSchema];
   for (const dependencyKey in dependencies) {
-    if (!expandAllBranches && (0, import_get4.default)(formData, [dependencyKey]) === void 0) {
+    if (!expandAllBranches && (0, import_get5.default)(formData, [dependencyKey]) === void 0) {
       continue;
     }
     if (resolvedSchema.properties && !(dependencyKey in resolvedSchema.properties)) {
@@ -1039,11 +1082,11 @@ function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField,
     const xxxOfs = schema[xxx].map(
       (xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf)
     );
-    const data = (0, import_get5.default)(formData, selectorField);
+    const data = (0, import_get6.default)(formData, selectorField);
     if (data !== void 0) {
       return xxxOfs.find((xxx2) => {
         return (0, import_isEqual.default)(
-          (0, import_get5.default)(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], (0, import_get5.default)(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
+          (0, import_get6.default)(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], (0, import_get6.default)(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
           data
         );
       });
@@ -1053,21 +1096,21 @@ function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField,
 }
 
 // src/schema/getFromSchema.ts
-var import_get6 = __toESM(require("lodash/get"), 1);
+var import_get7 = __toESM(require("lodash/get"), 1);
 var import_has2 = __toESM(require("lodash/has"), 1);
-var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
+var import_isEmpty3 = __toESM(require("lodash/isEmpty"), 1);
 function getFromSchemaInternal(validator, rootSchema, schema, path, experimental_customMergeAllOf) {
   let fieldSchema = schema;
   if ((0, import_has2.default)(schema, REF_KEY)) {
     fieldSchema = retrieveSchema(validator, schema, rootSchema, void 0, experimental_customMergeAllOf);
   }
-  if ((0, import_isEmpty2.default)(path)) {
+  if ((0, import_isEmpty3.default)(path)) {
     return fieldSchema;
   }
   const pathList = Array.isArray(path) ? path : path.split(".");
   const [part, ...nestedPath] = pathList;
   if (part && (0, import_has2.default)(fieldSchema, part)) {
-    fieldSchema = (0, import_get6.default)(fieldSchema, part);
+    fieldSchema = (0, import_get7.default)(fieldSchema, part);
     return getFromSchemaInternal(
       validator,
       rootSchema,
@@ -1109,7 +1152,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
           parentField,
           fieldName,
           ONE_OF_KEY,
-          (0, import_get7.default)(formData, subPath),
+          (0, import_get8.default)(formData, subPath),
           experimental_customMergeAllOf
         );
       } else if ((0, import_has3.default)(parentField, ANY_OF_KEY)) {
@@ -1119,7 +1162,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
           parentField,
           fieldName,
           ANY_OF_KEY,
-          (0, import_get7.default)(formData, subPath),
+          (0, import_get8.default)(formData, subPath),
           experimental_customMergeAllOf
         );
       }
@@ -1173,14 +1216,14 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
 }
 
 // src/schema/getDefaultFormState.ts
-var import_get11 = __toESM(require("lodash/get"), 1);
-var import_isEmpty3 = __toESM(require("lodash/isEmpty"), 1);
+var import_get12 = __toESM(require("lodash/get"), 1);
+var import_isEmpty4 = __toESM(require("lodash/isEmpty"), 1);
 
 // src/schema/getClosestMatchingOption.ts
-var import_get8 = __toESM(require("lodash/get"), 1);
+var import_get9 = __toESM(require("lodash/get"), 1);
 var import_has4 = __toESM(require("lodash/has"), 1);
 var import_isNumber2 = __toESM(require("lodash/isNumber"), 1);
-var import_isObject5 = __toESM(require("lodash/isObject"), 1);
+var import_isObject6 = __toESM(require("lodash/isObject"), 1);
 var import_isString2 = __toESM(require("lodash/isString"), 1);
 var import_reduce = __toESM(require("lodash/reduce"), 1);
 var import_times2 = __toESM(require("lodash/times"), 1);
@@ -1196,11 +1239,11 @@ var JUNK_OPTION = {
 function calculateIndexScore(validator, rootSchema, schema, formData, experimental_customMergeAllOf) {
   let totalScore = 0;
   if (schema) {
-    if ((0, import_isObject5.default)(schema.properties)) {
+    if ((0, import_isObject6.default)(schema.properties)) {
       totalScore += (0, import_reduce.default)(
         schema.properties,
         (score, value, key) => {
-          const formValue = (0, import_get8.default)(formData, key);
+          const formValue = (0, import_get9.default)(formData, key);
           if (typeof value === "boolean") {
             return score;
           }
@@ -1227,14 +1270,14 @@ function calculateIndexScore(validator, rootSchema, schema, formData, experiment
               validator,
               rootSchema,
               formValue,
-              (0, import_get8.default)(value, key2),
+              (0, import_get9.default)(value, key2),
               -1,
               discriminator,
               experimental_customMergeAllOf
             );
           }
           if (value.type === "object") {
-            if ((0, import_isObject5.default)(formValue)) {
+            if ((0, import_isObject6.default)(formValue)) {
               score += 1;
             }
             return score + calculateIndexScore(validator, rootSchema, value, formValue, experimental_customMergeAllOf);
@@ -1306,7 +1349,7 @@ function isFixedItems(schema) {
 }
 
 // src/mergeDefaultsWithFormData.ts
-var import_get9 = __toESM(require("lodash/get"), 1);
+var import_get10 = __toESM(require("lodash/get"), 1);
 var import_isNil = __toESM(require("lodash/isNil"), 1);
 function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false, defaultSupercedesUndefined = false, overrideFormDataWithDefaults = false) {
   if (Array.isArray(formData)) {
@@ -1333,11 +1376,22 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
   if (isObject(formData)) {
     const acc = Object.assign({}, defaults);
     return Object.keys(formData).reduce((acc2, key) => {
-      const keyValue = (0, import_get9.default)(formData, key);
+      const keyValue = (0, import_get10.default)(formData, key);
       const keyExistsInDefaults = isObject(defaults) && key in defaults;
       const keyExistsInFormData = key in formData;
+      const keyDefault = (0, import_get10.default)(defaults, key) ?? {};
+      const defaultValueIsNestedObject = keyExistsInDefaults && Object.entries(keyDefault).some(([, v]) => isObject(v));
+      const keyDefaultIsObject = keyExistsInDefaults && isObject((0, import_get10.default)(defaults, key));
+      const keyHasFormDataObject = keyExistsInFormData && isObject(keyValue);
+      if (keyDefaultIsObject && keyHasFormDataObject && !defaultValueIsNestedObject) {
+        acc2[key] = {
+          ...(0, import_get10.default)(defaults, key),
+          ...keyValue
+        };
+        return acc2;
+      }
       acc2[key] = mergeDefaultsWithFormData(
-        defaults ? (0, import_get9.default)(defaults, key) : {},
+        (0, import_get10.default)(defaults, key) ?? {},
         keyValue,
         mergeExtraArrayDefaults,
         defaultSupercedesUndefined,
@@ -1416,7 +1470,7 @@ function constIsAjvDataReference(schema) {
 }
 
 // src/optionsList.ts
-var import_get10 = __toESM(require("lodash/get"), 1);
+var import_get11 = __toESM(require("lodash/get"), 1);
 
 // src/toConstant.ts
 function toConstant(schema) {
@@ -1462,8 +1516,8 @@ function optionsList(schema, uiSchema) {
     let value;
     let label = title;
     if (selectorField) {
-      const innerSchema = (0, import_get10.default)(aSchema, [PROPERTIES_KEY, selectorField], {});
-      value = (0, import_get10.default)(innerSchema, DEFAULT_KEY, (0, import_get10.default)(innerSchema, CONST_KEY));
+      const innerSchema = (0, import_get11.default)(aSchema, [PROPERTIES_KEY, selectorField], {});
+      value = (0, import_get11.default)(innerSchema, DEFAULT_KEY, (0, import_get11.default)(innerSchema, CONST_KEY));
       label = label || innerSchema?.title || aSchema.title || String(value);
     } else {
       value = toConstant(aSchema);
@@ -1503,10 +1557,10 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
     const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
     if (isObject(computedDefault)) {
       if (emptyObjectFields === "skipEmptyDefaults") {
-        if (!(0, import_isEmpty3.default)(computedDefault)) {
+        if (!(0, import_isEmpty4.default)(computedDefault)) {
           obj[key] = computedDefault;
         }
-      } else if ((!(0, import_isEmpty3.default)(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
+      } else if ((!(0, import_isEmpty4.default)(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
         obj[key] = computedDefault;
       }
     } else if (
@@ -1532,17 +1586,17 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
     required,
     shouldMergeDefaultsIntoFormData = false
   } = computeDefaultsProps;
-  const formData = isObject(rawFormData) ? rawFormData : {};
+  let formData = isObject(rawFormData) ? rawFormData : {};
   const schema = isObject(rawSchema) ? rawSchema : {};
   let defaults = parentDefaults;
   let schemaToCompute = null;
   let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
   let updatedRecurseList = _recurseList;
-  if (schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
+  if (schema[CONST_KEY] !== void 0 && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
     defaults = schema[CONST_KEY];
   } else if (isObject(defaults) && isObject(schema.default)) {
     defaults = mergeObjects(defaults, schema.default);
-  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY]) {
+  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
     defaults = schema.default;
   } else if (REF_KEY in schema) {
     const refName = schema[REF_KEY];
@@ -1550,6 +1604,12 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       updatedRecurseList = _recurseList.concat(refName);
       schemaToCompute = findSchemaDefinition(refName, rootSchema);
     }
+    if (schemaToCompute && !defaults) {
+      defaults = schema.default;
+    }
+    if (shouldMergeDefaultsIntoFormData && schemaToCompute && !isObject(rawFormData)) {
+      formData = rawFormData;
+    }
   } else if (DEPENDENCIES_KEY in schema) {
     const defaultFormData = {
       ...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults),
@@ -1627,7 +1687,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       experimental_defaultFormStateBehavior: experimental_dfsb_to_compute,
       experimental_customMergeAllOf,
       parentDefaults: defaults,
-      rawFormData: formData,
+      rawFormData: rawFormData ?? formData,
       required,
       shouldMergeDefaultsIntoFormData
     });
@@ -1690,7 +1750,7 @@ function getObjectDefaults(validator, rawSchema, {
     const parentConst = retrievedSchema[CONST_KEY];
     const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
       (acc, key) => {
-        const propertySchema = (0, import_get11.default)(retrievedSchema, [PROPERTIES_KEY, key], {});
+        const propertySchema = (0, import_get12.default)(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, {
@@ -1699,8 +1759,8 @@ function getObjectDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: (0, import_get11.default)(defaults, [key]),
-          rawFormData: (0, import_get11.default)(formData, [key]),
+          parentDefaults: (0, import_get12.default)(defaults, [key]),
+          rawFormData: (0, import_get12.default)(formData, [key]),
           required: retrievedSchema.required?.includes(key),
           shouldMergeDefaultsIntoFormData
         });
@@ -1736,8 +1796,8 @@ function getObjectDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: (0, import_get11.default)(defaults, [key]),
-          rawFormData: (0, import_get11.default)(formData, [key]),
+          parentDefaults: (0, import_get12.default)(defaults, [key]),
+          rawFormData: (0, import_get12.default)(formData, [key]),
           required: retrievedSchema.required?.includes(key),
           shouldMergeDefaultsIntoFormData
         });
@@ -1798,7 +1858,7 @@ function getArrayDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           rawFormData: item,
-          parentDefaults: (0, import_get11.default)(defaults, [idx]),
+          parentDefaults: (0, import_get12.default)(defaults, [idx]),
           required,
           shouldMergeDefaultsIntoFormData
         });
@@ -1860,6 +1920,12 @@ function getDefaultFormState(validator, theSchema, formData, rootSchema, include
     rawFormData: formData,
     shouldMergeDefaultsIntoFormData: true
   });
+  if (schema.type !== "object" && isObject(schema.default)) {
+    return {
+      ...defaults,
+      ...formData
+    };
+  }
   if (isObject(formData) || Array.isArray(formData)) {
     const { mergeDefaultsIntoFormData } = experimental_defaultFormStateBehavior || {};
     const defaultSupercedesUndefined = mergeDefaultsIntoFormData === "useDefaultIfFormDataUndefined";
@@ -1926,7 +1992,7 @@ function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOpt
 }
 
 // src/schema/sanitizeDataForNewSchema.ts
-var import_get12 = __toESM(require("lodash/get"), 1);
+var import_get13 = __toESM(require("lodash/get"), 1);
 var import_has5 = __toESM(require("lodash/has"), 1);
 var NO_VALUE = Symbol("no Value");
 function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}, experimental_customMergeAllOf) {
@@ -1934,19 +2000,19 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
   if ((0, import_has5.default)(newSchema, PROPERTIES_KEY)) {
     const removeOldSchemaData = {};
     if ((0, import_has5.default)(oldSchema, PROPERTIES_KEY)) {
-      const properties = (0, import_get12.default)(oldSchema, PROPERTIES_KEY, {});
+      const properties = (0, import_get13.default)(oldSchema, PROPERTIES_KEY, {});
       Object.keys(properties).forEach((key) => {
         if ((0, import_has5.default)(data, key)) {
           removeOldSchemaData[key] = void 0;
         }
       });
     }
-    const keys2 = Object.keys((0, import_get12.default)(newSchema, PROPERTIES_KEY, {}));
+    const keys2 = Object.keys((0, import_get13.default)(newSchema, PROPERTIES_KEY, {}));
     const nestedData = {};
     keys2.forEach((key) => {
-      const formValue = (0, import_get12.default)(data, key);
-      let oldKeyedSchema = (0, import_get12.default)(oldSchema, [PROPERTIES_KEY, key], {});
-      let newKeyedSchema = (0, import_get12.default)(newSchema, [PROPERTIES_KEY, key], {});
+      const formValue = (0, import_get13.default)(data, key);
+      let oldKeyedSchema = (0, import_get13.default)(oldSchema, [PROPERTIES_KEY, key], {});
+      let newKeyedSchema = (0, import_get13.default)(newSchema, [PROPERTIES_KEY, key], {});
       if ((0, import_has5.default)(oldKeyedSchema, REF_KEY)) {
         oldKeyedSchema = retrieveSchema(
           validator,
@@ -1965,8 +2031,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaTypeForKey = (0, import_get12.default)(oldKeyedSchema, "type");
-      const newSchemaTypeForKey = (0, import_get12.default)(newKeyedSchema, "type");
+      const oldSchemaTypeForKey = (0, import_get13.default)(oldKeyedSchema, "type");
+      const newSchemaTypeForKey = (0, import_get13.default)(newKeyedSchema, "type");
       if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
         if ((0, import_has5.default)(removeOldSchemaData, key)) {
           delete removeOldSchemaData[key];
@@ -1984,17 +2050,17 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
             nestedData[key] = itemData;
           }
         } else {
-          const newOptionDefault = (0, import_get12.default)(newKeyedSchema, "default", NO_VALUE);
-          const oldOptionDefault = (0, import_get12.default)(oldKeyedSchema, "default", NO_VALUE);
+          const newOptionDefault = (0, import_get13.default)(newKeyedSchema, "default", NO_VALUE);
+          const oldOptionDefault = (0, import_get13.default)(oldKeyedSchema, "default", NO_VALUE);
           if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
             if (oldOptionDefault === formValue) {
               removeOldSchemaData[key] = newOptionDefault;
-            } else if ((0, import_get12.default)(newKeyedSchema, "readOnly") === true) {
+            } else if ((0, import_get13.default)(newKeyedSchema, "readOnly") === true) {
               removeOldSchemaData[key] = void 0;
             }
           }
-          const newOptionConst = (0, import_get12.default)(newKeyedSchema, "const", NO_VALUE);
-          const oldOptionConst = (0, import_get12.default)(oldKeyedSchema, "const", NO_VALUE);
+          const newOptionConst = (0, import_get13.default)(newKeyedSchema, "const", NO_VALUE);
+          const oldOptionConst = (0, import_get13.default)(oldKeyedSchema, "const", NO_VALUE);
           if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
             removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
           }
@@ -2006,9 +2072,9 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
       ...removeOldSchemaData,
       ...nestedData
     };
-  } else if ((0, import_get12.default)(oldSchema, "type") === "array" && (0, import_get12.default)(newSchema, "type") === "array" && Array.isArray(data)) {
-    let oldSchemaItems = (0, import_get12.default)(oldSchema, "items");
-    let newSchemaItems = (0, import_get12.default)(newSchema, "items");
+  } else if ((0, import_get13.default)(oldSchema, "type") === "array" && (0, import_get13.default)(newSchema, "type") === "array" && Array.isArray(data)) {
+    let oldSchemaItems = (0, import_get13.default)(oldSchema, "items");
+    let newSchemaItems = (0, import_get13.default)(newSchema, "items");
     if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
       if ((0, import_has5.default)(oldSchemaItems, REF_KEY)) {
         oldSchemaItems = retrieveSchema(
@@ -2028,10 +2094,10 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaType = (0, import_get12.default)(oldSchemaItems, "type");
-      const newSchemaType = (0, import_get12.default)(newSchemaItems, "type");
+      const oldSchemaType = (0, import_get13.default)(oldSchemaItems, "type");
+      const newSchemaType = (0, import_get13.default)(newSchemaItems, "type");
       if (!oldSchemaType || oldSchemaType === newSchemaType) {
-        const maxItems = (0, import_get12.default)(newSchema, "maxItems", -1);
+        const maxItems = (0, import_get13.default)(newSchema, "maxItems", -1);
         if (newSchemaType === "object") {
           newFormData = data.reduce((newValue, aValue) => {
             const itemValue = sanitizeDataForNewSchema(
@@ -2059,7 +2125,7 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
 }
 
 // src/schema/toIdSchema.ts
-var import_get13 = __toESM(require("lodash/get"), 1);
+var import_get14 = __toESM(require("lodash/get"), 1);
 function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   const $id = id || idPrefix;
   const idSchema = { $id };
@@ -2081,10 +2147,10 @@ function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSc
         );
       }
     }
-    if (ITEMS_KEY in schema && !(0, import_get13.default)(schema, [ITEMS_KEY, REF_KEY])) {
+    if (ITEMS_KEY in schema && !(0, import_get14.default)(schema, [ITEMS_KEY, REF_KEY])) {
       return toIdSchemaInternal(
         validator,
-        (0, import_get13.default)(schema, ITEMS_KEY),
+        (0, import_get14.default)(schema, ITEMS_KEY),
         idPrefix,
         idSeparator,
         id,
@@ -2107,7 +2173,7 @@ function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSc
           rootSchema,
           // It's possible that formData is not an object -- this can happen if an
           // array item has just been added, but not populated with data yet
-          (0, import_get13.default)(formData, [name]),
+          (0, import_get14.default)(formData, [name]),
           _recurseList,
           experimental_customMergeAllOf
         );
@@ -2131,7 +2197,7 @@ function toIdSchema(validator, schema, id, rootSchema, formData, idPrefix = "roo
 }
 
 // src/schema/toPathSchema.ts
-var import_get14 = __toESM(require("lodash/get"), 1);
+var import_get15 = __toESM(require("lodash/get"), 1);
 var import_set2 = __toESM(require("lodash/set"), 1);
 function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
@@ -2224,7 +2290,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = (0, import_get14.default)(schema, [PROPERTIES_KEY, property], {});
+      const field = (0, import_get15.default)(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2232,7 +2298,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
         rootSchema,
         // It's possible that formData is not an object -- this can happen if an
         // array item has just been added, but not populated with data yet
-        (0, import_get14.default)(formData, [property]),
+        (0, import_get15.default)(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2650,7 +2716,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"), 1);
-var import_get15 = __toESM(require("lodash/get"), 1);
+var import_get16 = __toESM(require("lodash/get"), 1);
 var import_set3 = __toESM(require("lodash/set"), 1);
 var import_setWith = __toESM(require("lodash/setWith"), 1);
 var ErrorSchemaBuilder = class {
@@ -2679,7 +2745,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? (0, import_get15.default)(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? (0, import_get16.default)(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       (0, import_setWith.default)(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2705,7 +2771,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = (0, import_get15.default)(errorBlock, ERRORS_KEY);
+    let errorsList = (0, import_get16.default)(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -2854,9 +2920,9 @@ function getTemplate(name, registry, uiOptions = {}) {
 
 // src/getTestIds.ts
 var import_nanoid = require("nanoid");
-var import_get16 = __toESM(require("lodash/get"), 1);
+var import_get17 = __toESM(require("lodash/get"), 1);
 function getTestIds() {
-  if (typeof process === "undefined" || (0, import_get16.default)(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || (0, import_get17.default)(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -2876,7 +2942,7 @@ function getTestIds() {
 // src/getWidget.tsx
 var import_react = require("react");
 var import_react_is = __toESM(require("react-is"), 1);
-var import_get17 = __toESM(require("lodash/get"), 1);
+var import_get18 = __toESM(require("lodash/get"), 1);
 var import_set4 = __toESM(require("lodash/set"), 1);
 var import_jsx_runtime = require("react/jsx-runtime");
 var widgetMap = {
@@ -2932,7 +2998,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = (0, import_get17.default)(AWidget, "MergedWidget");
+  let MergedWidget = (0, import_get18.default)(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -3045,14 +3111,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-var import_get18 = __toESM(require("lodash/get"), 1);
+var import_get19 = __toESM(require("lodash/get"), 1);
 var import_has6 = __toESM(require("lodash/has"), 1);
 function lookupFromFormContext(regOrFc, toLookup, fallback) {
   const lookupPath = [LOOKUP_MAP_NAME];
   if ((0, import_has6.default)(regOrFc, FORM_CONTEXT_NAME)) {
     lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return (0, import_get18.default)(regOrFc, [...lookupPath, toLookup], fallback);
+  return (0, import_get19.default)(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3231,7 +3297,7 @@ function utcToLocal(jsonDate) {
 }
 
 // src/validationDataMerge.ts
-var import_isEmpty4 = __toESM(require("lodash/isEmpty"), 1);
+var import_isEmpty5 = __toESM(require("lodash/isEmpty"), 1);
 function validationDataMerge(validationData, additionalErrorSchema) {
   if (!additionalErrorSchema) {
     return validationData;
@@ -3239,7 +3305,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
   const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
   let errors = toErrorList(additionalErrorSchema);
   let errorSchema = additionalErrorSchema;
-  if (!(0, import_isEmpty4.default)(oldErrorSchema)) {
+  if (!(0, import_isEmpty5.default)(oldErrorSchema)) {
     errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
     errors = [...oldErrors].concat(errors);
   }
@@ -3247,7 +3313,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
 }
 
 // src/withIdRefPrefix.ts
-var import_isObject10 = __toESM(require("lodash/isObject"), 1);
+var import_isObject11 = __toESM(require("lodash/isObject"), 1);
 function withIdRefPrefixObject(node) {
   for (const key in node) {
     const realObj = node;
@@ -3270,7 +3336,7 @@ function withIdRefPrefix(schemaNode) {
   if (Array.isArray(schemaNode)) {
     return withIdRefPrefixArray([...schemaNode]);
   }
-  if ((0, import_isObject10.default)(schemaNode)) {
+  if ((0, import_isObject11.default)(schemaNode)) {
     return withIdRefPrefixObject({ ...schemaNode });
   }
   return schemaNode;
@@ -3280,7 +3346,7 @@ function withIdRefPrefix(schemaNode) {
 var import_keys = __toESM(require("lodash/keys"), 1);
 var import_pickBy = __toESM(require("lodash/pickBy"), 1);
 var import_isPlainObject4 = __toESM(require("lodash/isPlainObject"), 1);
-var import_get19 = __toESM(require("lodash/get"), 1);
+var import_get20 = __toESM(require("lodash/get"), 1);
 var import_difference = __toESM(require("lodash/difference"), 1);
 function getChangedFields(a, b) {
   const aIsPlainObject = (0, import_isPlainObject4.default)(a);
@@ -3293,7 +3359,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return (0, import_keys.default)(b);
   } else {
-    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get19.default)(b, key))));
+    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get20.default)(b, key))));
     const diffFields = (0, import_difference.default)((0, import_keys.default)(b), (0, import_keys.default)(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3338,7 +3404,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 var import_forEach = __toESM(require("lodash/forEach"), 1);
 
 // src/parser/ParserValidator.ts
-var import_get20 = __toESM(require("lodash/get"), 1);
+var import_get21 = __toESM(require("lodash/get"), 1);
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3364,7 +3430,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = (0, import_get20.default)(schema, ID_KEY, hash);
+    const key = (0, import_get21.default)(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {