@rjsf/utils 6.5.2 → 6.6.0

package/lib/schema/omitExtraData.d.ts

@@ -1,4 +1,4 @@
-import { PathSchema, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
+import { Experimental_CustomMergeAllOf, FormContextType, PathSchema, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
 /** Returns the `formData` with only the elements specified in the `fields` list
  *
  * @param formData - The data for the `Form`
@@ -13,14 +13,24 @@ export declare function getUsedFormData<T = any>(formData: T | undefined, fields
  * @deprecated - To be removed as an exported `@rjsf/utils` function in a future release
  */
 export declare function getFieldNames<T = any>(pathSchema: PathSchema<T>, formData?: T): string[][];
-/** Takes a `schema` and `formData` and returns a copy of the formData with any fields not defined in the schema removed.
- * This is useful for ensuring that only data that is relevant to the schema is preserved. Objects with
- * `additionalProperties` keyword set to `true` will not have their extra fields removed.
+/** Returns true when a form value is considered empty: null/undefined/'', an empty array, or a plain
+ * object whose every own value is itself empty (recursive). Scalars like `0` and `false` are not empty.
+ *
+ * @param value - The value to check
+ * @returns - True if the value is considered empty, false otherwise
+ */
+export declare function isValueEmpty(value: unknown): boolean;
+/** A recursive, schema-driven filter that walks `schema` and `formData` in lockstep, keeping only
+ * values that are described by the schema. Handles `$ref`, `allOf`, `anyOf`, `oneOf`, `if/then/else`,
+ * `patternProperties`, `additionalProperties`, `propertyNames`, and `dependencies`. Optional object
+ * properties whose schema-filtered content is entirely empty (per `isValueEmpty`) are pruned; required
+ * properties and scalar values are always kept when schema-defined.
  *
  * @param validator - An implementation of the `ValidatorType` interface that will be used when necessary
- * @param schema - The schema to use for filtering the formData
- * @param [rootSchema] - The root schema, used to primarily to look up `$ref`s
+ * @param schema - The schema for which to filter the formData
+ * @param [rootSchema] - The root schema, used primarily to look up `$ref`s
  * @param [formData] - The data for the `Form`
- * @returns The `formData` after omitting extra data
+ * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
+ * @returns - The `formData` after omitting extra data, or `undefined` when `formData` is undefined
  */
-export default function omitExtraData<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, schema: S, rootSchema?: S, formData?: T): T | undefined;
+export default function omitExtraData<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, schema: S, rootSchema?: S, formData?: T, experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>): T | undefined;

package/lib/schema/omitExtraData.js

@@ -1,9 +1,16 @@
-import pick from 'lodash-es/pick.js';
-import isEmpty from 'lodash-es/isEmpty.js';
 import get from 'lodash-es/get.js';
+import isEmpty from 'lodash-es/isEmpty.js';
+import isNil from 'lodash-es/isNil.js';
+import pick from 'lodash-es/pick.js';
 import { NAME_KEY, RJSF_ADDITIONAL_PROPERTIES_FLAG } from '../constants.js';
-import retrieveSchema from './retrieveSchema.js';
-import toPathSchema from './toPathSchema.js';
+import findSchemaDefinition from '../findSchemaDefinition.js';
+import getDiscriminatorFieldFromSchema from '../getDiscriminatorFieldFromSchema.js';
+import getSchemaType from '../getSchemaType.js';
+import isObject from '../isObject.js';
+import getClosestMatchingOption from './getClosestMatchingOption.js';
+import isSelect from './isSelect.js';
+import { relaxOptionsForScoring, resolveAllReferences } from './retrieveSchema.js';
+import shallowAllOfMerge from './shallowAllOfMerge.js';
 /** Returns the `formData` with only the elements specified in the `fields` list
  *
  * @param formData - The data for the `Form`
@@ -59,21 +66,350 @@ export function getFieldNames(pathSchema, formData) {
     };
     return getAllPaths(pathSchema);
 }
-/** Takes a `schema` and `formData` and returns a copy of the formData with any fields not defined in the schema removed.
- * This is useful for ensuring that only data that is relevant to the schema is preserved. Objects with
- * `additionalProperties` keyword set to `true` will not have their extra fields removed.
+/** Returns true when a form value is considered empty: null/undefined/'', an empty array, or a plain
+ * object whose every own value is itself empty (recursive). Scalars like `0` and `false` are not empty.
+ *
+ * @param value - The value to check
+ * @returns - True if the value is considered empty, false otherwise
+ */
+export function isValueEmpty(value) {
+    if (isNil(value) || value === '') {
+        return true;
+    }
+    if (Array.isArray(value)) {
+        return value.length === 0;
+    }
+    if (isObject(value)) {
+        return Object.values(value).every(isValueEmpty);
+    }
+    return false;
+}
+/** Merges an `allOf` schema into a single flat schema, delegating to `experimental_customMergeAllOf`
+ * when provided or falling back to the module-level `shallowAllOfMerge` otherwise.
+ *
+ * @param schema - A schema containing an `allOf` array to be merged
+ * @param [experimental_customMergeAllOf] - Optional custom merge function; see `Form` documentation
+ * @returns - The merged schema with `allOf` resolved into a single schema object
+ */
+function doMergeAllOf(schema, experimental_customMergeAllOf) {
+    return experimental_customMergeAllOf ? experimental_customMergeAllOf(schema) : shallowAllOfMerge(schema);
+}
+/** A recursive, schema-driven filter that walks `schema` and `formData` in lockstep, keeping only
+ * values that are described by the schema. Handles `$ref`, `allOf`, `anyOf`, `oneOf`, `if/then/else`,
+ * `patternProperties`, `additionalProperties`, `propertyNames`, and `dependencies`. Optional object
+ * properties whose schema-filtered content is entirely empty (per `isValueEmpty`) are pruned; required
+ * properties and scalar values are always kept when schema-defined.
  *
  * @param validator - An implementation of the `ValidatorType` interface that will be used when necessary
- * @param schema - The schema to use for filtering the formData
- * @param [rootSchema] - The root schema, used to primarily to look up `$ref`s
+ * @param schema - The schema for which to filter the formData
+ * @param [rootSchema] - The root schema, used primarily to look up `$ref`s
  * @param [formData] - The data for the `Form`
- * @returns The `formData` after omitting extra data
+ * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
+ * @returns - The `formData` after omitting extra data, or `undefined` when `formData` is undefined
  */
-export default function omitExtraData(validator, schema, rootSchema = {}, formData) {
-    const retrievedSchema = retrieveSchema(validator, schema, rootSchema, formData);
-    const pathSchema = toPathSchema(validator, retrievedSchema, '', rootSchema, formData);
-    const fieldNames = getFieldNames(pathSchema, formData);
-    const lodashFieldNames = fieldNames.map((fieldPaths) => Array.isArray(fieldPaths) ? fieldPaths.join('.') : fieldPaths);
-    return getUsedFormData(formData, lodashFieldNames);
+export default function omitExtraData(validator, schema, rootSchema = {}, formData, experimental_customMergeAllOf) {
+    /** Type predicate that narrows `value` to `GenericObjectType` — true when `value` is a plain,
+     * non-array object (i.e. a JSON object). Used to distinguish JSON objects from arrays and primitives.
+     *
+     * @param value - The value to check
+     * @returns - True if `value` is a plain non-array object
+     */
+    function isObjectValue(value) {
+        return isObject(value);
+    }
+    /** Type predicate that narrows a `S | boolean` schema definition to `S` — true when `schemaDef` is
+     * a schema object rather than a JSON Schema boolean shorthand (`true` meaning allow-all, `false`
+     * meaning deny-all).
+     *
+     * @param schemaDef - The schema definition to check
+     * @returns - True if `schemaDef` is a schema object
+     */
+    function isSchemaObj(schemaDef) {
+        return isObject(schemaDef);
+    }
+    /** Copies schema-defined properties from `source` into `target`, applying `omit` recursively for
+     * each value. Handles `properties`, `patternProperties`, `additionalProperties`, and `propertyNames`.
+     * Optional object-valued properties are pruned when every key in the filtered result is both
+     * optional (per the inner schema's `required`) and empty (per `isValueEmpty`). This preserves
+     * optional objects whose required children have empty values, while still dropping objects whose
+     * schema-filtered content is entirely optional-and-empty. Required properties and scalar values
+     * are always written when defined. Always returns `target` — pruning of the object itself is
+     * the caller's responsibility.
+     *
+     * @param schema - The object schema describing which properties are allowed
+     * @param source - The source form data object to read values from
+     * @param target - The accumulator object to write filtered values into
+     * @returns - `target` after all schema-defined properties have been processed
+     */
+    function handleObject(schema, source, target) {
+        var _a;
+        const { properties, additionalProperties, patternProperties, propertyNames } = schema;
+        const requiredSet = new Set(((_a = schema.required) !== null && _a !== void 0 ? _a : []));
+        /** Recursively omits extra data from `value` via `omit`, then conditionally writes the result to
+         * `target[key]`. Optional object-valued properties are dropped when every key in the filtered
+         * result is both optional (within the inner schema's `required` list) and has an empty value per
+         * `isValueEmpty`. This per-key approach prevents required-but-empty child properties — kept by
+         * inner `setProperty` calls — from inadvertently causing the parent optional object to be dropped,
+         * while still pruning optional objects whose schema-filtered content is entirely empty. Vacuously
+         * true for `{}`, so empty results are always dropped. Scalar and array values are not pruned here.
+         *
+         * @param key - The property key to write on `target`
+         * @param schemaDef - The schema (or boolean shorthand) that governs the value at `key`
+         * @param value - The raw source value to filter
+         * @param [required=false] - When true the property is never pruned regardless of its filtered value
+         */
+        function setProperty(key, schemaDef, value, required = false) {
+            var _a;
+            const v = omit(schemaDef, value, target[key]);
+            if (!required && isObject(v)) {
+                // Resolve $ref so we can inspect the effective required list for the inner schema.
+                let sd = isSchemaObj(schemaDef) ? schemaDef : {};
+                if (sd.$ref !== undefined) {
+                    sd = findSchemaDefinition(sd.$ref, rootSchema);
+                }
+                const innerRequired = new Set(((_a = sd.required) !== null && _a !== void 0 ? _a : []));
+                // Drop this optional object when every key in v is both optional in the inner schema
+                // and has an empty value. Vacuously true for {} so empty objects are always dropped.
+                const shouldDrop = Object.entries(v).every(([k, val]) => !innerRequired.has(k) && isValueEmpty(val));
+                if (shouldDrop) {
+                    return;
+                }
+            }
+            if (v !== undefined) {
+                target[key] = v;
+            }
+        }
+        if (properties !== undefined) {
+            for (const [key, schemaDef] of Object.entries(properties)) {
+                setProperty(key, schemaDef, source[key], requiredSet.has(key));
+            }
+        }
+        // Track keys not handled by properties/patterns so additionalProperties can pick them up.
+        let patternPropertiesRest;
+        if (patternProperties !== undefined) {
+            patternPropertiesRest = [];
+            const patterns = Object.entries(patternProperties).map(([pattern, schemaDef]) => [
+                new RegExp(pattern),
+                schemaDef,
+            ]);
+            const knownProperties = new Set(Object.keys(properties !== null && properties !== void 0 ? properties : {}));
+            for (const [key, value] of Object.entries(source)) {
+                if (knownProperties.has(key)) {
+                    continue;
+                }
+                const matched = patterns.find(([re]) => re.test(key));
+                if (matched === undefined) {
+                    patternPropertiesRest.push(key);
+                    continue;
+                }
+                setProperty(key, matched[1], value);
+            }
+        }
+        // JSON Schema spec: absent additionalProperties defaults to true (allow all extra keys). Here
+        // we treat it as false so omitExtraData never inadvertently passes through undescribed keys.
+        if (additionalProperties !== undefined && additionalProperties !== false) {
+            const addlSchema = additionalProperties;
+            if (patternPropertiesRest !== undefined) {
+                for (const key of patternPropertiesRest) {
+                    setProperty(key, addlSchema, source[key]);
+                }
+            }
+            else {
+                const knownProperties = new Set(Object.keys(properties !== null && properties !== void 0 ? properties : {}));
+                for (const [key, value] of Object.entries(source)) {
+                    if (knownProperties.has(key)) {
+                        continue;
+                    }
+                    setProperty(key, addlSchema, value);
+                }
+            }
+        }
+        // When propertyNames is present, the schema only constrains key names — all source keys are valid.
+        if (propertyNames !== undefined) {
+            for (const [key, value] of Object.entries(source)) {
+                target[key] = value;
+            }
+        }
+        return target;
+    }
+    /** Filters array elements from `source` into `target` according to `schema.items` and
+     * `schema.additionalItems`. For tuple schemas (`items` is an array) each element is filtered by its
+     * per-index schema; elements beyond the tuple length are covered by `additionalItems` when present.
+     * For list schemas (`items` is a single schema) every element is filtered by that schema.
+     *
+     * @param schema - The array schema describing `items` and optionally `additionalItems`
+     * @param source - The source array to read elements from
+     * @param target - The accumulator array to push filtered elements into
+     * @returns - `target` after all applicable source elements have been pushed
+     */
+    function handleArray(schema, source, target) {
+        const { items, additionalItems } = schema;
+        if (items !== undefined) {
+            if (Array.isArray(items)) {
+                for (let i = 0; i < items.length; i++) {
+                    target.push(omit(items[i], source[i]));
+                }
+            }
+            else {
+                for (let i = 0; i < source.length; i++) {
+                    target.push(omit(items, source[i]));
+                }
+            }
+        }
+        // additionalItems covers tuple items beyond the items array length.
+        if (additionalItems) {
+            for (let i = target.length; i < source.length; i++) {
+                target.push(omit(additionalItems, source[i]));
+            }
+        }
+        return target;
+    }
+    /** Applies the `if/then/else` conditional keywords from `schema` to `target`. When `schema.if` is
+     * absent the original `target` is returned unchanged. Otherwise the condition is evaluated — using
+     * `validator.isValid` for schema conditions or the boolean value directly — and the matching branch
+     * (`then` or `else`) is applied via `omit`. When the selected branch is absent, `target` is returned
+     * unchanged.
+     *
+     * @param schema - The schema potentially containing `if`, `then`, and `else` keywords
+     * @param source - The current form data value, passed to `validator.isValid` and the branch `omit`
+     * @param target - The already-filtered value to merge the branch result into
+     * @returns - The result of applying the matched branch, or `target` when no branch applies
+     */
+    function handleConditions(schema, source, target) {
+        const { if: condition, then, else: otherwise } = schema;
+        if (condition === undefined) {
+            return target;
+        }
+        // validator.isValid signature: (schema, formData, rootSchema)
+        const isThenBranch = isSchemaObj(condition)
+            ? validator.isValid(condition, source, rootSchema)
+            : condition;
+        const branch = isThenBranch ? then : otherwise;
+        return branch === undefined ? target : omit(branch, source, target);
+    }
+    /** Applies the best-matching `oneOf` option to `source`, merging the result into `target`. When
+     * `oneOf` is not an array or the schema represents a select widget (enum-driven), `target` is
+     * returned unchanged. `additionalProperties: false` is relaxed on each option before scoring so that
+     * `getClosestMatchingOption` can validate freely, but the original option schema is used for the
+     * actual `omit` call.
+     *
+     * @param oneOf - The `oneOf` array from the schema, or `undefined`
+     * @param schema - The parent schema containing the `oneOf` keyword
+     * @param source - The current form data value used to score each option
+     * @param target - The already-filtered value to merge the winning option's result into
+     * @returns - The result of applying the best-matching option, or `target` when no matching applies
+     */
+    function handleOneOf(oneOf, schema, source, target) {
+        if (!Array.isArray(oneOf) || isSelect(validator, schema, rootSchema, experimental_customMergeAllOf)) {
+            return target;
+        }
+        // Resolve $refs and relax additionalProperties:false → true in one pass for scoring only.
+        // The unrelaxed resolved schema is re-derived for the winning option so that omit() still
+        // respects additionalProperties:false during filtering.
+        const scoringOptions = relaxOptionsForScoring(oneOf, true, rootSchema);
+        const bestIndex = getClosestMatchingOption(validator, rootSchema, source, scoringOptions, 0, getDiscriminatorFieldFromSchema(schema), experimental_customMergeAllOf);
+        const winning = oneOf[bestIndex];
+        // For object options, re-resolve without relaxation so additionalProperties:false is respected.
+        // For boolean options, scoringOptions already holds the converted schema (true→{}, false→{not:{}}).
+        const resolved = isObject(winning)
+            ? resolveAllReferences(winning, rootSchema, [])
+            : scoringOptions[bestIndex];
+        return omit(resolved, source, target);
+    }
+    /** Applies `anyOf` branches from `schema` to `source`, merging results into `target`. When `anyOf`
+     * is absent or not an array, `target` is returned unchanged. For undefined or empty sources (so that
+     * defaults can flow through all branches) every branch is applied in sequence. For non-empty sources
+     * the best-matching branch is selected via `handleOneOf`.
+     *
+     * @param schema - The schema potentially containing an `anyOf` keyword
+     * @param source - The current form data value; empty or undefined triggers all-branch application
+     * @param target - The already-filtered value to merge branch results into
+     * @returns - The result after applying the relevant `anyOf` branch(es), or `target` when inapplicable
+     */
+    function handleAnyOf(schema, source, target) {
+        const { anyOf } = schema;
+        if (!Array.isArray(anyOf)) {
+            return target;
+        }
+        // For undefined or empty collections, apply every branch so defaults flow through.
+        if (source === undefined ||
+            (Array.isArray(source) && source.length === 0) ||
+            (isObject(source) && Object.keys(source).length === 0)) {
+            for (const branch of anyOf) {
+                target = omit(branch, source, target);
+            }
+            return target;
+        }
+        return handleOneOf(anyOf, schema, source, target);
+    }
+    /** Applies schema-based `dependencies` from `schema` to `source`, merging each active dependency's
+     * schema into `target` via `omit`. Property dependencies (plain string arrays) are skipped — only
+     * schema dependencies are processed. A dependency is considered active when its trigger key is
+     * present on `source`.
+     *
+     * @param schema - The schema potentially containing a `dependencies` keyword
+     * @param source - The current form data value; must be a plain object for dependencies to apply
+     * @param target - The already-filtered value to merge dependency results into
+     * @returns - The result after applying all active schema dependencies, or `target` when inapplicable
+     */
+    function handleDependencies(schema, source, target) {
+        const { dependencies } = schema;
+        if (dependencies === undefined || !isObjectValue(source)) {
+            return target;
+        }
+        for (const [key, deps] of Object.entries(dependencies)) {
+            // Skip property dependencies (string arrays); only process schema dependencies.
+            if (!(key in source) || Array.isArray(deps)) {
+                continue;
+            }
+            target = omit(deps, source, target);
+        }
+        return target;
+    }
+    /** Core recursive filter. Resolves `$ref`s, merges `allOf`, then delegates to the type-specific
+     * handlers (`handleObject`, `handleArray`) and keyword handlers (`handleAnyOf`, `handleOneOf`,
+     * `handleConditions`, `handleDependencies`). Returns `undefined` when `source` is undefined or
+     * `schemaDef` is `false`; returns `source` unchanged when `schemaDef` is `true` or empty.
+     *
+     * @param schemaDef - The schema (or boolean shorthand) to filter `source` against
+     * @param source - The raw form data value to filter
+     * @param [target] - An optional accumulator carrying results from prior oneOf/anyOf processing
+     * @returns - The filtered value, or `undefined` when the schema rejects the value
+     */
+    function omit(schemaDef, source, target) {
+        if (source === undefined || schemaDef === false) {
+            return undefined;
+        }
+        if (schemaDef === true || isEmpty(schemaDef)) {
+            return source;
+        }
+        let schema = schemaDef;
+        const { $ref: ref, allOf } = schema;
+        if (ref !== undefined) {
+            return omit(findSchemaDefinition(ref, rootSchema), source, target);
+        }
+        if (allOf) {
+            schema = doMergeAllOf(schema, experimental_customMergeAllOf);
+        }
+        target = handleAnyOf(schema, source, handleOneOf(schema.oneOf, schema, source, target));
+        const type = getSchemaType(schema);
+        if (type === 'object') {
+            if (!isObjectValue(source)) {
+                return undefined;
+            }
+            target = handleObject(schema, source, isObjectValue(target) ? target : {});
+        }
+        else if (type === 'array') {
+            if (!Array.isArray(source)) {
+                return undefined;
+            }
+            target = handleArray(schema, source, Array.isArray(target) ? target : []);
+        }
+        else if (target === undefined) {
+            target = source;
+        }
+        return handleDependencies(schema, source, handleConditions(schema, source, target));
+    }
+    return omit(schema, formData);
 }
 //# sourceMappingURL=omitExtraData.js.map

package/lib/schema/omitExtraData.js.map

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

package/lib/schema/retrieveSchema.d.ts

@@ -132,6 +132,21 @@ export declare function retrieveSchemaInternal<T = any, S extends StrictRJSFSche
  * @returns - Either an array containing the best matching option or all options if `expandAllBranches` is true
  */
 export declare function resolveAnyOrOneOfSchemas<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, schema: S, rootSchema: S, expandAllBranches: boolean, rawFormData?: T): S[];
+/** Normalises a list of `oneOf`/`anyOf` options for use in option-scoring only (not for filtering).
+ * Boolean schemas are converted to their object equivalents (`true` → `{}`, `false` → `{not:{}}`).
+ * When `resolveRefs` is `true`, each object option is first passed through `resolveAllReferences`
+ * so that `$ref`-based options expose their `additionalProperties` constraint before relaxation.
+ * Any option whose `additionalProperties` is `false` is widened to `true` so that
+ * `getClosestMatchingOption` / `validator.isValid()` does not produce false negatives when the
+ * form data contains keys not listed in `properties`.
+ *
+ * @param options - The raw `oneOf`/`anyOf` array, which may contain boolean schemas
+ * @param [resolveRefs=false] - When `true`, resolve `$ref`s in each option before relaxing; pass
+ *   `rootSchema` as well. Set `false` (default) when refs are already resolved at the call site.
+ * @param [rootSchema] - Required when `resolveRefs` is `true`; the root schema used to look up `$ref`s
+ * @returns - A new array of plain schema objects with `additionalProperties` relaxed where needed
+ */
+export declare function relaxOptionsForScoring<S extends StrictRJSFSchema = RJSFSchema>(options: Array<S | boolean>, resolveRefs?: boolean, rootSchema?: S): S[];
 /** Resolves dependencies within a schema and its 'anyOf/oneOf' children. Passes the `expandAllBranches` flag down to
  * the `resolveAnyOrOneOfSchema()` and `processDependencies()` helper calls.
  *

package/lib/schema/retrieveSchema.js

@@ -1,21 +1,20 @@
+import flattenDeep from 'lodash-es/flattenDeep.js';
 import get from 'lodash-es/get.js';
+import isEmpty from 'lodash-es/isEmpty.js';
+import merge from 'lodash-es/merge.js';
 import set from 'lodash-es/set.js';
 import times from 'lodash-es/times.js';
 import transform from 'lodash-es/transform.js';
-import merge from 'lodash-es/merge.js';
-import flattenDeep from 'lodash-es/flattenDeep.js';
 import uniq from 'lodash-es/uniq.js';
-import isEmpty from 'lodash-es/isEmpty.js';
-import { createComparator, createMerger, createShallowAllOfMerge } from '@x0k/json-schema-merge';
-import { createDeduplicator, createIntersector } from '@x0k/json-schema-merge/lib/array';
 import { ADDITIONAL_PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, ALL_OF_KEY, ANY_OF_KEY, DEPENDENCIES_KEY, ID_KEY, IF_KEY, ITEMS_KEY, ONE_OF_KEY, PATTERN_PROPERTIES_KEY, PROPERTIES_KEY, REF_KEY, RJSF_REF_KEY, } from '../constants.js';
+import deepEquals from '../deepEquals.js';
 import findSchemaDefinition, { splitKeyElementFromObject } from '../findSchemaDefinition.js';
 import getDiscriminatorFieldFromSchema from '../getDiscriminatorFieldFromSchema.js';
 import guessType from '../guessType.js';
 import isObject from '../isObject.js';
 import mergeSchemas from '../mergeSchemas.js';
 import getFirstMatchingOption from './getFirstMatchingOption.js';
-import deepEquals from '../deepEquals.js';
+import shallowAllOfMerge from './shallowAllOfMerge.js';
 /** Retrieves an expanded schema that has had all of its conditions, additional properties, references and dependencies
  * resolved and merged into the `schema` given a `validator`, `rootSchema` and `rawFormData` that is used to do the
  * potentially recursive resolution.
@@ -305,13 +304,6 @@ export function stubExistingAdditionalProperties(validator, theSchema, rootSchem
     });
     return schema;
 }
-// Set up @x0k/json-schema-merge utilities
-const { compareSchemaDefinitions, compareSchemaValues } = createComparator();
-const { mergeArrayOfSchemaDefinitions } = createMerger({
-    intersectJson: createIntersector(compareSchemaValues),
-    deduplicateJsonSchemaDef: createDeduplicator(compareSchemaDefinitions),
-});
-const shallowAllOfMerge = createShallowAllOfMerge(mergeArrayOfSchemaDefinitions);
 /**
  * Internal helper that merges allOf schemas using @x0k/json-schema-merge's shallow allOf merge
  * @param schema - The schema containing an `allOf` keyword
@@ -434,12 +426,43 @@ export function resolveAnyOrOneOfSchemas(validator, schema, rootSchema, expandAl
         // Call this to trigger the set of isValid() calls that the schema parser will need
         const option = getFirstMatchingOption(validator, formData, anyOrOneOf, rootSchema, discriminator);
         if (expandAllBranches) {
+            // Also trigger isValid() for the relaxed variants so that precompiled validators capture their hashes.
+            // omitExtraData's handleOneOf relaxes additionalProperties:false → true before scoring; those mutated
+            // schemas must be present in a precompiled validator's compiled set or isValid() will throw at runtime.
+            // Using getFirstMatchingOption (rather than calling isValid directly) ensures that the augmented forms
+            // of each option (as constructed internally by getFirstMatchingOption for options with properties) are
+            // also captured. The return value is discarded — the call is purely for ParserValidator's side effect.
+            const relaxed = relaxOptionsForScoring(anyOrOneOf, false, rootSchema);
+            getFirstMatchingOption(validator, formData, relaxed, rootSchema, discriminator);
             return anyOrOneOf.map((item) => mergeSchemas(remaining, item));
         }
         schema = mergeSchemas(remaining, anyOrOneOf[option]);
     }
     return [schema];
 }
+/** Normalises a list of `oneOf`/`anyOf` options for use in option-scoring only (not for filtering).
+ * Boolean schemas are converted to their object equivalents (`true` → `{}`, `false` → `{not:{}}`).
+ * When `resolveRefs` is `true`, each object option is first passed through `resolveAllReferences`
+ * so that `$ref`-based options expose their `additionalProperties` constraint before relaxation.
+ * Any option whose `additionalProperties` is `false` is widened to `true` so that
+ * `getClosestMatchingOption` / `validator.isValid()` does not produce false negatives when the
+ * form data contains keys not listed in `properties`.
+ *
+ * @param options - The raw `oneOf`/`anyOf` array, which may contain boolean schemas
+ * @param [resolveRefs=false] - When `true`, resolve `$ref`s in each option before relaxing; pass
+ *   `rootSchema` as well. Set `false` (default) when refs are already resolved at the call site.
+ * @param [rootSchema] - Required when `resolveRefs` is `true`; the root schema used to look up `$ref`s
+ * @returns - A new array of plain schema objects with `additionalProperties` relaxed where needed
+ */
+export function relaxOptionsForScoring(options, resolveRefs = false, rootSchema) {
+    return options.map((d) => {
+        if (!isObject(d)) {
+            return (d ? {} : { not: {} });
+        }
+        const schema = resolveRefs && rootSchema ? resolveAllReferences(d, rootSchema, []) : d;
+        return schema.additionalProperties === false ? { ...schema, additionalProperties: true } : schema;
+    });
+}
 /** Resolves dependencies within a schema and its 'anyOf/oneOf' children. Passes the `expandAllBranches` flag down to
  * the `resolveAnyOrOneOfSchema()` and `processDependencies()` helper calls.
  *