@rjsf/utils 6.7.1 → 6.10.0

package/lib/schema/findFieldInSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"findFieldInSchema.js","sourceRoot":"","sources":["../../src/schema/findFieldInSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"findFieldInSchema.js","sourceRoot":"","sources":["../../src/schema/findFieldInSchema.ts"],"names":[],"mappings":"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"}

package/lib/schema/findSelectedOptionInXxxOf.d.ts

@@ -1,4 +1,4 @@
-import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
+import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.ts';
 /** Finds the option inside the `schema['any/oneOf']` list which has the `properties[selectorField].default` or
  * `properties[selectorField].const` that matches the `formData[selectorField]` value. For the purposes of this
  * function, `selectorField` is either `schema.discriminator.propertyName` or `fallbackField`. The `LayoutGridField`
@@ -14,3 +14,4 @@ import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, Strict
  * @returns - The anyOf/oneOf option that matches the selector field in the schema or undefined if nothing is selected
  */
 export default function findSelectedOptionInXxxOf<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, rootSchema: S, schema: S, fallbackField: string, xxx: 'anyOf' | 'oneOf', formData?: T, experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>): S | undefined;
+//# sourceMappingURL=findSelectedOptionInXxxOf.d.ts.map

package/lib/schema/findSelectedOptionInXxxOf.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findSelectedOptionInXxxOf.d.ts","sourceRoot":"","sources":["../../src/schema/findSelectedOptionInXxxOf.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,6BAA6B,EAC7B,eAAe,EACf,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,aAAa,CAAC;AAGrB;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAC/C,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAE/B,SAAS,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACjC,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,CAAC,EACT,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,OAAO,GAAG,OAAO,EACtB,QAAQ,GAAE,CAAW,EACrB,6BAA6B,CAAC,EAAE,6BAA6B,CAAC,CAAC,CAAC,GAC/D,CAAC,GAAG,SAAS,CAsBf"}

package/lib/schema/findSelectedOptionInXxxOf.js

@@ -1,8 +1,8 @@
-import get from 'lodash-es/get.js';
-import { CONST_KEY, DEFAULT_KEY, PROPERTIES_KEY } from '../constants.js';
-import deepEquals from '../deepEquals.js';
-import getDiscriminatorFieldFromSchema from '../getDiscriminatorFieldFromSchema.js';
-import retrieveSchema from './retrieveSchema.js';
+import { CONST_KEY, DEFAULT_KEY, PROPERTIES_KEY } from "../constants.js";
+import deepEquals from "../deepEquals.js";
+import getDiscriminatorFieldFromSchema from "../getDiscriminatorFieldFromSchema.js";
+import { getByPath } from "../pathUtils.js";
+import retrieveSchema from "./retrieveSchema.js";
 /** Finds the option inside the `schema['any/oneOf']` list which has the `properties[selectorField].default` or
  * `properties[selectorField].const` that matches the `formData[selectorField]` value. For the purposes of this
  * function, `selectorField` is either `schema.discriminator.propertyName` or `fallbackField`. The `LayoutGridField`
@@ -22,9 +22,9 @@ export default function findSelectedOptionInXxxOf(validator, rootSchema, schema,
         const discriminator = getDiscriminatorFieldFromSchema(schema);
         const selectorField = discriminator || fallbackField;
         const xxxOfs = schema[xxx].map((xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf));
-        const data = get(formData, selectorField);
+        const data = getByPath(formData, selectorField);
         if (data !== undefined) {
-            return xxxOfs.find((xxxOfOption) => deepEquals(get(xxxOfOption, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get(xxxOfOption, [PROPERTIES_KEY, selectorField, CONST_KEY])), data));
+            return xxxOfs.find((xxxOfOption) => deepEquals(getByPath(xxxOfOption, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], getByPath(xxxOfOption, [PROPERTIES_KEY, selectorField, CONST_KEY])), data));
         }
     }
     return undefined;

package/lib/schema/findSelectedOptionInXxxOf.js.map

@@ -1 +1 @@
-{"version":3,"file":"findSelectedOptionInXxxOf.js","sourceRoot":"","sources":["../../src/schema/findSelectedOptionInXxxOf.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,+BAA+B,MAAM,oCAAoC,CAAC;AAQjF,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAK/C,SAAiC,EACjC,UAAa,EACb,MAAS,EACT,aAAqB,EACrB,GAAsB,EACtB,WAAc,EAAO,EACrB,6BAAgE;IAEhE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,aAAa,IAAI,aAAa,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACvC,cAAc,CAAU,SAAS,EAAE,KAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CACpG,CAAC;QACF,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC1C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACjC,UAAU,CACR,GAAG,CACD,WAAW,EACX,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,EAC5C,GAAG,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CAC7D,EACD,IAAI,CACL,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"findSelectedOptionInXxxOf.js","sourceRoot":"","sources":["../../src/schema/findSelectedOptionInXxxOf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,+BAA+B,MAAM,uCAAuC,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAK/C,SAAiC,EACjC,UAAa,EACb,MAAS,EACT,aAAqB,EACrB,GAAsB,EACtB,WAAc,EAAO,EACrB,6BAAgE;IAEhE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,aAAa,IAAI,aAAa,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACvC,cAAc,CAAU,SAAS,EAAE,KAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CACpG,CAAC;QACF,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAChD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACjC,UAAU,CACR,SAAS,CACP,WAAW,EACX,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,EAC5C,SAAS,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CACnE,EACD,IAAI,CACL,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/lib/schema/getClosestMatchingOption.d.ts

@@ -1,4 +1,4 @@
-import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
+import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.ts';
 /** A junk option used to determine when the getFirstMatchingOption call really matches an option rather than returning
  * the first item
  */
@@ -49,3 +49,4 @@ export declare function calculateIndexScore<T = any, S extends StrictRJSFSchema
  * @returns - The index of the option that is the closest match to the `formData` or the `selectedOption` if no match
  */
 export default function getClosestMatchingOption<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, rootSchema: S, formData: T | undefined, options: S[], selectedOption?: number, discriminatorField?: string, experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>): number;
+//# sourceMappingURL=getClosestMatchingOption.d.ts.map

package/lib/schema/getClosestMatchingOption.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getClosestMatchingOption.d.ts","sourceRoot":"","sources":["../../src/schema/getClosestMatchingOption.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,6BAA6B,EAC7B,eAAe,EACf,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,aAAa,CAAC;AAIrB;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,gBAQzB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EACnH,SAAS,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACjC,UAAU,EAAE,CAAC,EACb,MAAM,CAAC,EAAE,CAAC,EACV,QAAQ,CAAC,EAAE,GAAG,EACd,6BAA6B,CAAC,EAAE,6BAA6B,CAAC,CAAC,CAAC,GAC/D,MAAM,CA2ER;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAC9C,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAE/B,SAAS,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACjC,UAAU,EAAE,CAAC,EACb,QAAQ,EAAE,CAAC,GAAG,SAAS,EACvB,OAAO,EAAE,CAAC,EAAE,EACZ,cAAc,SAAK,EACnB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,6BAA6B,CAAC,EAAE,6BAA6B,CAAC,CAAC,CAAC,GAC/D,MAAM,CAqDR"}

package/lib/schema/getClosestMatchingOption.js

@@ -1,16 +1,11 @@
-import get from 'lodash-es/get.js';
-import has from 'lodash-es/has.js';
-import isNumber from 'lodash-es/isNumber.js';
-import isObject from 'lodash-es/isObject.js';
-import isString from 'lodash-es/isString.js';
-import reduce from 'lodash-es/reduce.js';
-import times from 'lodash-es/times.js';
-import { ONE_OF_KEY, REF_KEY, JUNK_OPTION_ID, ANY_OF_KEY } from '../constants.js';
-import getDiscriminatorFieldFromSchema from '../getDiscriminatorFieldFromSchema.js';
-import getOptionMatchingSimpleDiscriminator from '../getOptionMatchingSimpleDiscriminator.js';
-import guessType from '../guessType.js';
-import getFirstMatchingOption from './getFirstMatchingOption.js';
-import retrieveSchema, { resolveAllReferences } from './retrieveSchema.js';
+import { ONE_OF_KEY, REF_KEY, JUNK_OPTION_ID, ANY_OF_KEY } from "../constants.js";
+import getDiscriminatorFieldFromSchema from "../getDiscriminatorFieldFromSchema.js";
+import getOptionMatchingSimpleDiscriminator from "../getOptionMatchingSimpleDiscriminator.js";
+import guessType from "../guessType.js";
+import isObject from "../isObject.js";
+import { getByPath, hasByPath } from "../pathUtils.js";
+import getFirstMatchingOption from "./getFirstMatchingOption.js";
+import retrieveSchema, { resolveAllReferences } from "./retrieveSchema.js";
 /** A junk option used to determine when the getFirstMatchingOption call really matches an option rather than returning
  * the first item
  */
@@ -48,25 +43,25 @@ export function calculateIndexScore(validator, rootSchema, schema, formData, exp
     let totalScore = 0;
     if (schema) {
         if (isObject(schema.properties)) {
-            totalScore += reduce(schema.properties, (score, value, key) => {
-                const formValue = get(formData, key);
+            totalScore += Object.entries(schema.properties).reduce((score, [key, value]) => {
+                const formValue = formData?.[key];
                 if (typeof value === 'boolean') {
                     return score;
                 }
-                if (has(value, REF_KEY)) {
+                if (hasByPath(value, REF_KEY)) {
                     const newSchema = retrieveSchema(validator, value, rootSchema, formValue, experimental_customMergeAllOf);
                     return (score +
                         calculateIndexScore(validator, rootSchema, newSchema, formValue || {}, experimental_customMergeAllOf));
                 }
-                if ((has(value, ONE_OF_KEY) || has(value, ANY_OF_KEY)) && formValue) {
-                    const xxxOfKey = has(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
+                if ((hasByPath(value, ONE_OF_KEY) || hasByPath(value, ANY_OF_KEY)) && formValue) {
+                    const xxxOfKey = hasByPath(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
                     const discriminator = getDiscriminatorFieldFromSchema(value);
                     return (score +
-                        getClosestMatchingOption(validator, rootSchema, formValue, get(value, xxxOfKey), -1, discriminator, experimental_customMergeAllOf));
+                        getClosestMatchingOption(validator, rootSchema, formValue, getByPath(value, xxxOfKey), -1, discriminator, experimental_customMergeAllOf));
                 }
                 if (value.type === 'object') {
                     // If the structure is matching then give it a little boost in score
-                    const structureBoost = isObject(formValue) ? 1 : 0;
+                    const structureBoost = typeof formValue === 'object' && formValue !== null ? 1 : 0;
                     return (score +
                         structureBoost +
                         calculateIndexScore(validator, rootSchema, value, formValue, experimental_customMergeAllOf));
@@ -90,7 +85,7 @@ export function calculateIndexScore(validator, rootSchema, schema, formData, exp
                 return score;
             }, 0);
         }
-        else if (isString(schema.type) && schema.type === guessType(formData)) {
+        else if (typeof schema.type === 'string' && schema.type === guessType(formData)) {
             totalScore += 1;
         }
     }
@@ -123,7 +118,7 @@ export default function getClosestMatchingOption(validator, rootSchema, formData
     // First resolve any refs in the options
     const resolvedOptions = options.map((option) => resolveAllReferences(option, rootSchema, []));
     const simpleDiscriminatorMatch = getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField);
-    if (isNumber(simpleDiscriminatorMatch)) {
+    if (typeof simpleDiscriminatorMatch === 'number') {
         return simpleDiscriminatorMatch;
     }
     // Reduce the array of options down to a list of the indexes that are considered matching options
@@ -142,7 +137,7 @@ export default function getClosestMatchingOption(validator, rootSchema, formData
     }
     if (!allValidIndexes.length) {
         // No indexes were valid, so we'll score all the options, add all the indexes
-        times(resolvedOptions.length, (i) => allValidIndexes.push(i));
+        allValidIndexes.push(...resolvedOptions.keys());
     }
     const scoreCount = new Set();
     // Score all the options in the list of valid indexes and return the index with the best score

package/lib/schema/getClosestMatchingOption.js.map

@@ -1 +1 @@
-{"version":3,"file":"getClosestMatchingOption.js","sourceRoot":"","sources":["../../src/schema/getClosestMatchingOption.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getClosestMatchingOption.js","sourceRoot":"","sources":["../../src/schema/getClosestMatchingOption.ts"],"names":[],"mappings":"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"}

package/lib/schema/getDefaultFormState.d.ts

@@ -1,4 +1,4 @@
-import type { Experimental_CustomMergeAllOf, Experimental_DefaultFormStateBehavior, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
+import type { Experimental_CustomMergeAllOf, Experimental_DefaultFormStateBehavior, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.ts';
 /** Enum that indicates how `schema.additionalItems` should be handled by the `getInnerSchemaForArrayItem()` function.
  */
 export declare enum AdditionalItemsHandling {
@@ -125,3 +125,4 @@ export declare function getDefaultBasedOnSchemaType<T = any, S extends StrictRJS
  */
 export default function getDefaultFormState<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, theSchema: S, formData?: T, rootSchema?: S, includeUndefinedValues?: boolean | 'excludeObjectChildren', experimental_defaultFormStateBehavior?: Experimental_DefaultFormStateBehavior, experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>, initialDefaultsGenerated?: boolean): T | T[] | undefined;
 export {};
+//# sourceMappingURL=getDefaultFormState.d.ts.map

package/lib/schema/getDefaultFormState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDefaultFormState.d.ts","sourceRoot":"","sources":["../../src/schema/getDefaultFormState.ts"],"names":[],"mappings":"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"}

package/lib/schema/getDefaultFormState.js

@@ -1,22 +1,22 @@
-import get from 'lodash-es/get.js';
-import isEmpty from 'lodash-es/isEmpty.js';
-import { ALL_OF_KEY, ANY_OF_KEY, CONST_KEY, DEFAULT_KEY, DEPENDENCIES_KEY, IF_KEY, ONE_OF_KEY, PROPERTIES_KEY, REF_KEY, } from '../constants.js';
-import constIsAjvDataReference from '../constIsAjvDataReference.js';
-import deepEquals from '../deepEquals.js';
-import findSchemaDefinition from '../findSchemaDefinition.js';
-import getDiscriminatorFieldFromSchema from '../getDiscriminatorFieldFromSchema.js';
-import getSchemaType from '../getSchemaType.js';
-import isConstant from '../isConstant.js';
-import isFixedItems from '../isFixedItems.js';
-import isObject from '../isObject.js';
-import mergeDefaultsWithFormData from '../mergeDefaultsWithFormData.js';
-import mergeObjects from '../mergeObjects.js';
-import mergeSchemas from '../mergeSchemas.js';
-import optionsList from '../optionsList.js';
-import getClosestMatchingOption from './getClosestMatchingOption.js';
-import isMultiSelect from './isMultiSelect.js';
-import isSelect from './isSelect.js';
-import retrieveSchema, { resolveDependencies } from './retrieveSchema.js';
+import { ALL_OF_KEY, ANY_OF_KEY, CONST_KEY, DEFAULT_KEY, DEPENDENCIES_KEY, IF_KEY, ONE_OF_KEY, REF_KEY, } from "../constants.js";
+import constIsAjvDataReference from "../constIsAjvDataReference.js";
+import deepEquals from "../deepEquals.js";
+import findSchemaDefinition from "../findSchemaDefinition.js";
+import getDiscriminatorFieldFromSchema from "../getDiscriminatorFieldFromSchema.js";
+import getPropertySchema from "../getPropertySchema.js";
+import getSchemaType from "../getSchemaType.js";
+import isConstant from "../isConstant.js";
+import isFixedItems from "../isFixedItems.js";
+import isObject from "../isObject.js";
+import mergeDefaultsWithFormData from "../mergeDefaultsWithFormData.js";
+import mergeObjects from "../mergeObjects.js";
+import mergeSchemas from "../mergeSchemas.js";
+import optionsList from "../optionsList.js";
+import { getByPath } from "../pathUtils.js";
+import getClosestMatchingOption from "./getClosestMatchingOption.js";
+import isMultiSelect from "./isMultiSelect.js";
+import isSelect from "./isSelect.js";
+import retrieveSchema, { resolveDependencies } from "./retrieveSchema.js";
 const PRIMITIVE_TYPES = ['string', 'number', 'integer', 'boolean', 'null'];
 /** Enum that indicates how `schema.additionalItems` should be handled by the `getInnerSchemaForArrayItem()` function.
  */
@@ -58,6 +58,21 @@ export function getInnerSchemaForArrayItem(schema, additionalItems = AdditionalI
     }
     return {};
 }
+/** Determines whether `value` holds anything: a non-empty string or array, or an object with at least one own key.
+ * Everything else — including numbers, booleans, `null` and `undefined` — has no content.
+ *
+ * @param value - The value to inspect
+ * @returns - True if the value holds content, otherwise false
+ */
+function hasContent(value) {
+    if (typeof value === 'string' || Array.isArray(value)) {
+        return value.length > 0;
+    }
+    if (typeof value === 'object' && value !== null) {
+        return Object.keys(value).length > 0;
+    }
+    return false;
+}
 /** Checks if the given `schema` contains the `null` type along with another type AND if the `default` contained within
  * the schema is `null` AND the `computedDefault` is empty. If all of those conditions are true, then the `schema`'s
  * default should be `null` rather than `computedDefault`.
@@ -68,7 +83,7 @@ export function getInnerSchemaForArrayItem(schema, additionalItems = AdditionalI
  */
 export function computeDefaultBasedOnSchemaTypeAndDefaults(schema, computedDefault) {
     const { default: schemaDefault, type } = schema;
-    const shouldReturnNullAsDefault = Array.isArray(type) && type.includes('null') && isEmpty(computedDefault) && schemaDefault === null;
+    const shouldReturnNullAsDefault = Array.isArray(type) && type.includes('null') && !hasContent(computedDefault) && schemaDefault === null;
     return shouldReturnNullAsDefault ? null : computedDefault;
 }
 /** Either add `computedDefault` at `key` into `obj` or not add it based on its value, the value of
@@ -102,7 +117,9 @@ function maybeAddDefaultToObject(acc, key, computedDefault, includeUndefinedValu
     else if (includeUndefinedValues === 'excludeObjectChildren') {
         // Fix for Issue #4709: When in 'excludeObjectChildren' mode, don't set primitive fields to empty objects
         // Only add the computed default if it's not an empty object placeholder for a primitive field
-        if ((isNullType && computedDefault !== undefined) || !isObject(computedDefault) || !isEmpty(computedDefault)) {
+        if ((isNullType && computedDefault !== undefined) ||
+            !isObject(computedDefault) ||
+            Object.keys(computedDefault).length > 0) {
             acc[key] = computedDefault;
         }
         // If computedDefault is an empty object {}, don't add it - let the field stay undefined
@@ -114,13 +131,13 @@ function maybeAddDefaultToObject(acc, key, computedDefault, includeUndefinedValu
         if (isObject(computedDefault)) {
             // If emptyObjectFields 'skipEmptyDefaults' store computedDefault if it's a non-empty object(e.g. not {})
             if (emptyObjectFields === 'skipEmptyDefaults') {
-                if (!isEmpty(computedDefault)) {
+                if (Object.keys(computedDefault).length > 0) {
                     acc[key] = computedDefault;
                 }
             } // Else store computedDefault if it's a non-empty object(e.g. not {}) and satisfies certain conditions
             // Condition 1: If computedDefault is not empty or if the key is a required field
             // Condition 2: If the parent object is required or emptyObjectFields is not 'populateRequiredDefaults'
-            else if ((!isEmpty(computedDefault) || requiredFields.includes(key)) &&
+            else if ((Object.keys(computedDefault).length > 0 || requiredFields.includes(key)) &&
                 (isSelfOrParentRequired || emptyObjectFields !== 'populateRequiredDefaults')) {
                 acc[key] = computedDefault;
             }
@@ -152,13 +169,13 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
     const schema = isObject(rawSchema) ? rawSchema : {};
     // Compute the defaults recursively: give highest priority to deepest nodes unless nestedDefaultsPrecedence is ancestorWins.
     let defaults = parentDefaults;
-    const preferParentDefaults = defaults && (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.nestedDefaultsPrecedence) === 'ancestorWins';
+    const preferParentDefaults = defaults && experimental_defaultFormStateBehavior?.nestedDefaultsPrecedence === 'ancestorWins';
     // If we get a new schema, then we need to recompute defaults again for the new schema found.
     let schemaToCompute = null;
     let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
     let updatedRecurseList = _recurseList;
     if (schema[CONST_KEY] !== undefined &&
-        (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.constAsDefaults) !== 'never' &&
+        experimental_defaultFormStateBehavior?.constAsDefaults !== 'never' &&
         !constIsAjvDataReference(schema)) {
         defaults = schema[CONST_KEY];
     }
@@ -199,7 +216,7 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
         // Then set the defaults from the current schema for the referenced schema.
         // Only do this if rawFormData has no meaningful data - we don't want to override user's existing values.
         // Check for undefined OR empty object - rawFormData may be coerced to {} when not an object.
-        const hasNoExistingData = rawFormData === undefined || (isObject(rawFormData) && isEmpty(rawFormData));
+        const hasNoExistingData = rawFormData === undefined || (isObject(rawFormData) && Object.keys(rawFormData).length === 0);
         if (schemaToCompute && !defaults && hasNoExistingData) {
             defaults = schema.default;
         }
@@ -243,14 +260,14 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
         const { type = 'null' } = remaining;
         if (!Array.isArray(type) &&
             PRIMITIVE_TYPES.includes(type) &&
-            (experimental_dfsb_to_compute === null || experimental_dfsb_to_compute === void 0 ? void 0 : experimental_dfsb_to_compute.constAsDefaults) === 'skipOneOf') {
+            experimental_dfsb_to_compute?.constAsDefaults === 'skipOneOf') {
             // If we are in a oneOf of a primitive type, then we want to pass constAsDefaults as 'never' for the recursion
             experimental_dfsb_to_compute = {
                 ...experimental_dfsb_to_compute,
                 constAsDefaults: 'never',
             };
         }
-        schemaToCompute = oneOf[getClosestMatchingOption(validator, rootSchema, rawFormData !== null && rawFormData !== void 0 ? rawFormData : schema.default, oneOf, 0, discriminator, experimental_customMergeAllOf)];
+        schemaToCompute = oneOf[getClosestMatchingOption(validator, rootSchema, rawFormData ?? schema.default, oneOf, 0, discriminator, experimental_customMergeAllOf)];
         schemaToCompute = mergeSchemas(remaining, schemaToCompute);
     }
     else if (ANY_OF_KEY in schema) {
@@ -259,7 +276,7 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
             return undefined;
         }
         const discriminator = getDiscriminatorFieldFromSchema(schema);
-        schemaToCompute = anyOf[getClosestMatchingOption(validator, rootSchema, rawFormData !== null && rawFormData !== void 0 ? rawFormData : schema.default, anyOf, 0, discriminator, experimental_customMergeAllOf)];
+        schemaToCompute = anyOf[getClosestMatchingOption(validator, rootSchema, rawFormData ?? schema.default, anyOf, 0, discriminator, experimental_customMergeAllOf)];
         schemaToCompute = mergeSchemas(remaining, schemaToCompute);
     }
     if (schemaToCompute) {
@@ -270,7 +287,7 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
             experimental_defaultFormStateBehavior: experimental_dfsb_to_compute,
             experimental_customMergeAllOf,
             parentDefaults: defaults,
-            rawFormData: rawFormData !== null && rawFormData !== void 0 ? rawFormData : formData,
+            rawFormData: rawFormData ?? formData,
             required,
             shouldMergeDefaultsIntoFormData,
             initialDefaultsGenerated,
@@ -281,7 +298,7 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
         defaults = schema.default;
     }
     const defaultBasedOnSchemaType = getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults);
-    let defaultsWithFormData = defaultBasedOnSchemaType !== null && defaultBasedOnSchemaType !== void 0 ? defaultBasedOnSchemaType : defaults;
+    let defaultsWithFormData = defaultBasedOnSchemaType ?? defaults;
     // if shouldMergeDefaultsIntoFormData is true, then merge the defaults into the formData.
     if (shouldMergeDefaultsIntoFormData) {
         const { arrayMinItems = {} } = experimental_defaultFormStateBehavior || {};
@@ -307,7 +324,7 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
  * @returns - valid formData that matches schema
  */
 export function ensureFormDataMatchingSchema(validator, schema, rootSchema, formData, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
-    const shouldRetrieveAllOf = (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.allOf) === 'populateDefaults' && ALL_OF_KEY in schema;
+    const shouldRetrieveAllOf = experimental_defaultFormStateBehavior?.allOf === 'populateDefaults' && ALL_OF_KEY in schema;
     const schemaToMatch = shouldRetrieveAllOf
         ? retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf)
         : schema;
@@ -316,19 +333,19 @@ export function ensureFormDataMatchingSchema(validator, schema, rootSchema, form
     let validFormData = formData;
     if (isSelectField) {
         const getOptionsList = optionsList(schemaToMatch);
-        const isValid = getOptionsList === null || getOptionsList === void 0 ? void 0 : getOptionsList.some((option) => deepEquals(option.value, formData));
+        const isValid = getOptionsList?.some((option) => deepEquals(option.value, formData));
         validFormData = isValid ? formData : undefined;
     }
     // Override the formData with the const if the constAsDefaults is set to always
-    const constTakesPrecedence = schemaToMatch[CONST_KEY] && (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.constAsDefaults) === 'always';
+    const constTakesPrecedence = schemaToMatch[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults === 'always';
     if (constTakesPrecedence) {
         validFormData = schemaToMatch.const;
     }
     else if (isObject(validFormData) && isObject(schemaToMatch.properties)) {
         validFormData = Object.keys(schemaToMatch.properties).reduce((acc, key) => {
-            const propertySchema = get(schemaToMatch, [PROPERTIES_KEY, key], {});
+            const propertySchema = getPropertySchema(schemaToMatch, key);
             if (key in acc && (shouldRetrieveAllOf || (isObject(propertySchema) && ALL_OF_KEY in propertySchema))) {
-                acc[key] = ensureFormDataMatchingSchema(validator, propertySchema, rootSchema, get(acc, key), experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
+                acc[key] = ensureFormDataMatchingSchema(validator, propertySchema, rootSchema, acc[key], experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
             }
             return acc;
         }, { ...validFormData });
@@ -351,20 +368,19 @@ export function getObjectDefaults(validator, rawSchema, { rawFormData, rootSchem
         // - If schema contains `allOf` AND `experimental_defaultFormStateBehavior.allOf` is set to `populateDefaults`
         // - OR if schema contains an 'if' AND `emptyObjectFields` is not set to `skipEmptyDefaults`
         // This ensures we compute defaults correctly for schemas with these keywords.
-        const shouldRetrieveSchema = ((experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.allOf) === 'populateDefaults' && ALL_OF_KEY in schema) ||
-            ((experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.emptyObjectFields) !== 'skipEmptyDefaults' && IF_KEY in schema);
+        const shouldRetrieveSchema = (experimental_defaultFormStateBehavior?.allOf === 'populateDefaults' && ALL_OF_KEY in schema) ||
+            (experimental_defaultFormStateBehavior?.emptyObjectFields !== 'skipEmptyDefaults' && IF_KEY in schema);
         const retrievedSchema = shouldRetrieveSchema
             ? retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf)
             : schema;
         const parentConst = retrievedSchema[CONST_KEY];
         const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce((acc, key) => {
-            var _a;
-            const propertySchema = get(retrievedSchema, [PROPERTIES_KEY, key], {});
+            const propertySchema = getPropertySchema(retrievedSchema, key);
             // Check if the parent schema has a const property defined AND we are supporting const as defaults, then we
             // should always return the computedDefault since it's coming from the const.
             const hasParentConst = isObject(parentConst) && parentConst[key] !== undefined;
             const hasConst = ((isObject(propertySchema) && CONST_KEY in propertySchema) || hasParentConst) &&
-                (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.constAsDefaults) !== 'never' &&
+                experimental_defaultFormStateBehavior?.constAsDefaults !== 'never' &&
                 !constIsAjvDataReference(propertySchema);
             // Compute the defaults for this node, with the parent defaults we might
             // have from a previous run: defaults[key].
@@ -374,13 +390,13 @@ export function getObjectDefaults(validator, rawSchema, { rawFormData, rootSchem
                 experimental_defaultFormStateBehavior,
                 experimental_customMergeAllOf,
                 includeUndefinedValues: includeUndefinedValues === true,
-                parentDefaults: get(defaults, [key]),
-                rawFormData: get(formData, [key]),
-                required: (_a = retrievedSchema.required) === null || _a === void 0 ? void 0 : _a.includes(key),
+                parentDefaults: getByPath(defaults, key),
+                rawFormData: getByPath(formData, key),
+                required: retrievedSchema.required?.includes(key),
                 shouldMergeDefaultsIntoFormData,
                 initialDefaultsGenerated,
             });
-            maybeAddDefaultToObject(acc, key, computedDefault, includeUndefinedValues, required, retrievedSchema.required, experimental_defaultFormStateBehavior, hasConst, (propertySchema === null || propertySchema === void 0 ? void 0 : propertySchema.type) === 'null');
+            maybeAddDefaultToObject(acc, key, computedDefault, includeUndefinedValues, required, retrievedSchema.required, experimental_defaultFormStateBehavior, hasConst, propertySchema?.type === 'null');
             return acc;
         }, {});
         if (retrievedSchema.additionalProperties && !initialDefaultsGenerated) {
@@ -405,16 +421,15 @@ export function getObjectDefaults(validator, rawSchema, { rawFormData, rootSchem
                     .forEach((key) => keys.add(key));
             }
             keys.forEach((key) => {
-                var _a;
                 const computedDefault = computeDefaults(validator, additionalPropertiesSchema, {
                     rootSchema,
                     _recurseList,
                     experimental_defaultFormStateBehavior,
                     experimental_customMergeAllOf,
                     includeUndefinedValues: includeUndefinedValues === true,
-                    parentDefaults: get(defaults, [key]),
-                    rawFormData: get(formData, [key]),
-                    required: (_a = retrievedSchema.required) === null || _a === void 0 ? void 0 : _a.includes(key),
+                    parentDefaults: getByPath(defaults, key),
+                    rawFormData: getByPath(formData, key),
+                    required: retrievedSchema.required?.includes(key),
                     shouldMergeDefaultsIntoFormData,
                     initialDefaultsGenerated,
                 });
@@ -434,16 +449,15 @@ export function getObjectDefaults(validator, rawSchema, { rawFormData, rootSchem
  * @returns - The default value based on the schema type if they are defined for object or array schemas.
  */
 export function getArrayDefaults(validator, rawSchema, { rawFormData, rootSchema = {}, _recurseList = [], experimental_defaultFormStateBehavior, experimental_customMergeAllOf, required, requiredAsRoot = false, shouldMergeDefaultsIntoFormData, initialDefaultsGenerated, } = {}, initialDefaults) {
-    var _a, _b;
     let defaults = initialDefaults;
     const schema = rawSchema;
-    const arrayMinItemsStateBehavior = (_a = experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.arrayMinItems) !== null && _a !== void 0 ? _a : {};
+    const arrayMinItemsStateBehavior = experimental_defaultFormStateBehavior?.arrayMinItems ?? {};
     const { populate: arrayMinItemsPopulate, mergeExtraDefaults: arrayMergeExtraDefaults } = arrayMinItemsStateBehavior;
     const neverPopulate = arrayMinItemsPopulate === 'never';
     const ignoreMinItemsFlagSet = arrayMinItemsPopulate === 'requiredOnly';
     const isPopulateAll = arrayMinItemsPopulate === 'all' || (!neverPopulate && !ignoreMinItemsFlagSet);
-    const computeSkipPopulate = (_b = arrayMinItemsStateBehavior === null || arrayMinItemsStateBehavior === void 0 ? void 0 : arrayMinItemsStateBehavior.computeSkipPopulate) !== null && _b !== void 0 ? _b : (() => false);
-    const isSkipEmptyDefaults = (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.emptyObjectFields) === 'skipEmptyDefaults';
+    const computeSkipPopulate = arrayMinItemsStateBehavior?.computeSkipPopulate ?? (() => false);
+    const isSkipEmptyDefaults = experimental_defaultFormStateBehavior?.emptyObjectFields === 'skipEmptyDefaults';
     const emptyDefault = isSkipEmptyDefaults ? undefined : [];
     // Inject defaults into existing array defaults
     if (Array.isArray(defaults)) {
@@ -476,7 +490,7 @@ export function getArrayDefaults(validator, rawSchema, { rawFormData, rootSchema
                 experimental_defaultFormStateBehavior,
                 experimental_customMergeAllOf,
                 rawFormData: item,
-                parentDefaults: get(defaults, [idx]),
+                parentDefaults: getByPath(defaults, idx),
                 required,
                 shouldMergeDefaultsIntoFormData,
                 initialDefaultsGenerated,
@@ -495,7 +509,7 @@ export function getArrayDefaults(validator, rawSchema, { rawFormData, rootSchema
             // letting the validator report `minItems` violations instead of a missing-required-property error.
             return defaults;
         }
-        return defaults !== null && defaults !== void 0 ? defaults : emptyDefault;
+        return defaults ?? emptyDefault;
     }
     if (ignoreMinItemsFlagSet && !required) {
         // If no form data exists or defaults are set leave the field empty/non-existent, otherwise
@@ -546,6 +560,14 @@ export function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefault
         case 'array': {
             return getArrayDefaults(validator, rawSchema, computeDefaultsProps, defaults);
         }
+        case 'boolean': {
+            // A required boolean with no explicit default gets false — it must be
+            // present in the submitted data, and false is the natural zero-value.
+            if (computeDefaultsProps.required && defaults === undefined) {
+                return false;
+            }
+            return undefined;
+        }
         default:
             return undefined;
     }
@@ -594,7 +616,7 @@ export default function getDefaultFormState(validator, theSchema, formData, root
     if (isObject(formData) || Array.isArray(formData)) {
         const { mergeDefaultsIntoFormData } = experimental_defaultFormStateBehavior || {};
         const defaultSupercedesUndefined = mergeDefaultsIntoFormData === 'useDefaultIfFormDataUndefined';
-        const matchingFormData = ensureFormDataMatchingSchema(validator, schema, rootSchema !== null && rootSchema !== void 0 ? rootSchema : schema, formData, experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
+        const matchingFormData = ensureFormDataMatchingSchema(validator, schema, rootSchema ?? schema, formData, experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
         const result = mergeDefaultsWithFormData(defaults, matchingFormData, true, // set to true to add any additional default array entries.
         defaultSupercedesUndefined, true);
         return result;