@rjsf/utils 6.1.1 → 6.2.3

package/dist/utils.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash/isPlainObject'), require('lodash/isEqualWith'), require('lodash/get'), require('lodash/has'), require('lodash/isEqual'), require('lodash/set'), require('lodash/times'), require('lodash/transform'), require('lodash/merge'), require('lodash/flattenDeep'), require('lodash/uniq'), require('json-schema-merge-allof'), require('jsonpointer'), require('lodash/omit'), require('lodash/isObject'), require('lodash/isEmpty'), require('fast-uri'), require('lodash/isString'), require('lodash/union'), require('lodash/isNumber'), require('lodash/reduce'), require('lodash/isNil'), require('lodash/cloneDeep'), require('lodash/setWith'), require('lodash/keys'), require('lodash/pickBy'), require('lodash/difference'), require('lodash/uniqueId'), require('react'), require('react-is'), require('react/jsx-runtime'), require('lodash/toPath'), require('lodash/forEach')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'lodash/isPlainObject', 'lodash/isEqualWith', 'lodash/get', 'lodash/has', 'lodash/isEqual', 'lodash/set', 'lodash/times', 'lodash/transform', 'lodash/merge', 'lodash/flattenDeep', 'lodash/uniq', 'json-schema-merge-allof', 'jsonpointer', 'lodash/omit', 'lodash/isObject', 'lodash/isEmpty', 'fast-uri', 'lodash/isString', 'lodash/union', 'lodash/isNumber', 'lodash/reduce', 'lodash/isNil', 'lodash/cloneDeep', 'lodash/setWith', 'lodash/keys', 'lodash/pickBy', 'lodash/difference', 'lodash/uniqueId', 'react', 'react-is', 'react/jsx-runtime', 'lodash/toPath', 'lodash/forEach'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject2, global.isEqualWith, global.get14, global.has5, global.isEqual2, global.set, global.times, global.transform, global.merge, global.flattenDeep, global.uniq, global.mergeAllOf, global.jsonpointer, global.omit, global.isObject2, global.isEmpty4, global.UriResolver, global.isString, global.union, global.isNumber, global.reduce, global.isNil, global.cloneDeep, global.setWith, global.keys, global.pickBy, global.difference, global.uniqueId, global.react, global.ReactIs, global.jsxRuntime, global.toPath, global.forEach));
-})(this, (function (exports, isPlainObject2, isEqualWith, get14, has5, isEqual2, set, times, transform, merge, flattenDeep, uniq, mergeAllOf, jsonpointer, omit, isObject2, isEmpty4, UriResolver, isString, union, isNumber, reduce, isNil, cloneDeep, setWith, keys, pickBy, difference, uniqueId, react, ReactIs, jsxRuntime, toPath, forEach) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash/isPlainObject'), require('lodash/isEqualWith'), require('lodash/get'), require('lodash/has'), require('lodash/isEqual'), require('lodash/set'), require('lodash/times'), require('lodash/transform'), require('lodash/merge'), require('lodash/flattenDeep'), require('lodash/uniq'), require('lodash/isEmpty'), require('@x0k/json-schema-merge'), require('@x0k/json-schema-merge/lib/array'), require('jsonpointer'), require('lodash/omit'), require('lodash/isObject'), require('fast-uri'), require('lodash/isString'), require('lodash/union'), require('lodash/isNumber'), require('lodash/reduce'), require('lodash/isNil'), require('lodash/pick'), require('lodash/cloneDeep'), require('lodash/setWith'), require('lodash/keys'), require('lodash/pickBy'), require('lodash/difference'), require('lodash/uniqueId'), require('react'), require('react-is'), require('react/jsx-runtime'), require('lodash/toPath'), require('lodash/forEach')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'lodash/isPlainObject', 'lodash/isEqualWith', 'lodash/get', 'lodash/has', 'lodash/isEqual', 'lodash/set', 'lodash/times', 'lodash/transform', 'lodash/merge', 'lodash/flattenDeep', 'lodash/uniq', 'lodash/isEmpty', '@x0k/json-schema-merge', '@x0k/json-schema-merge/lib/array', 'jsonpointer', 'lodash/omit', 'lodash/isObject', 'fast-uri', 'lodash/isString', 'lodash/union', 'lodash/isNumber', 'lodash/reduce', 'lodash/isNil', 'lodash/pick', 'lodash/cloneDeep', 'lodash/setWith', 'lodash/keys', 'lodash/pickBy', 'lodash/difference', 'lodash/uniqueId', 'react', 'react-is', 'react/jsx-runtime', 'lodash/toPath', 'lodash/forEach'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject2, global.isEqualWith, global.get16, global.has5, global.isEqual2, global.set, global.times, global.transform, global.merge, global.flattenDeep, global.uniq, global.isEmpty4, global.jsonSchemaMerge, global.array, global.jsonpointer, global.omit, global.isObject2, global.UriResolver, global.isString, global.union, global.isNumber, global.reduce, global.isNil, global.pick, global.cloneDeep, global.setWith, global.keys, global.pickBy, global.difference, global.uniqueId, global.react, global.ReactIs, global.jsxRuntime, global.toPath, global.forEach));
+})(this, (function (exports, isPlainObject2, isEqualWith, get16, has5, isEqual2, set, times, transform, merge, flattenDeep, uniq, isEmpty4, jsonSchemaMerge, array, jsonpointer, omit, isObject2, UriResolver, isString, union, isNumber, reduce, isNil, pick, cloneDeep, setWith, keys, pickBy, difference, uniqueId, react, ReactIs, jsxRuntime, toPath, forEach) { 'use strict';
 
   // src/isObject.ts
   function isObject(thing) {
@@ -176,7 +176,7 @@
     return void 0;
   }
   function makeAllReferencesAbsolute(schema, baseURI) {
-    const currentURI = get14(schema, ID_KEY, baseURI);
+    const currentURI = get16(schema, ID_KEY, baseURI);
     if (REF_KEY in schema) {
       schema = { ...schema, [REF_KEY]: UriResolver.resolve(currentURI, schema[REF_KEY]) };
     }
@@ -197,7 +197,7 @@
     const remaining = omit(object, [key]);
     return [remaining, value];
   }
-  function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = get14(rootSchema, [ID_KEY])) {
+  function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = get16(rootSchema, [ID_KEY])) {
     const ref = $ref || "";
     let current = void 0;
     if (ref.startsWith("#")) {
@@ -247,13 +247,13 @@
     }
     return current;
   }
-  function findSchemaDefinition($ref, rootSchema = {}, baseURI = get14(rootSchema, [ID_KEY])) {
+  function findSchemaDefinition($ref, rootSchema = {}, baseURI = get16(rootSchema, [ID_KEY])) {
     const recurseList = [];
     return findSchemaDefinitionRecursive($ref, rootSchema, recurseList, baseURI);
   }
   function getDiscriminatorFieldFromSchema(schema) {
     let discriminator;
-    const maybeString = get14(schema, DISCRIMINATOR_PATH);
+    const maybeString = get16(schema, DISCRIMINATOR_PATH);
     if (isString(maybeString)) {
       discriminator = maybeString;
     } else if (maybeString !== void 0) {
@@ -324,13 +324,13 @@
   }
   function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
     if (formData && discriminatorField) {
-      const value = get14(formData, discriminatorField);
+      const value = get16(formData, discriminatorField);
       if (value === void 0) {
         return;
       }
       for (let i = 0; i < options.length; i++) {
         const option = options[i];
-        const discriminator = get14(option, [PROPERTIES_KEY, discriminatorField], {});
+        const discriminator = get16(option, [PROPERTIES_KEY, discriminatorField], {});
         if (discriminator.type === "object" || discriminator.type === "array") {
           continue;
         }
@@ -357,8 +357,8 @@
     for (let i = 0; i < options.length; i++) {
       const option = options[i];
       if (discriminatorField && has5(option, [PROPERTIES_KEY, discriminatorField])) {
-        const value = get14(formData, discriminatorField);
-        const discriminator = get14(option, [PROPERTIES_KEY, discriminatorField], {});
+        const value = get16(formData, discriminatorField);
+        const discriminator = get16(option, [PROPERTIES_KEY, discriminatorField], {});
         if (validator.isValid(discriminator, value, rootSchema)) {
           return i;
         }
@@ -391,6 +391,8 @@
     }
     return 0;
   }
+
+  // src/schema/retrieveSchema.ts
   function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs = false) {
     return retrieveSchemaInternal(
       validator,
@@ -636,7 +638,7 @@
             validator,
             { [ALL_OF_KEY]: Object.values(matchingProperties) },
             rootSchema,
-            get14(formData, [key]),
+            get16(formData, [key]),
             experimental_customMergeAllOf
           );
           set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -649,7 +651,7 @@
           if (REF_KEY in schema.additionalProperties) {
             additionalProperties = retrieveSchema(
               validator,
-              { [REF_KEY]: get14(schema.additionalProperties, [REF_KEY]) },
+              { [REF_KEY]: get16(schema.additionalProperties, [REF_KEY]) },
               rootSchema,
               formData,
               experimental_customMergeAllOf
@@ -662,10 +664,10 @@
               ...schema.additionalProperties
             };
           } else {
-            additionalProperties = { type: guessType(get14(formData, [key])) };
+            additionalProperties = { type: guessType(get16(formData, [key])) };
           }
         } else {
-          additionalProperties = { type: guessType(get14(formData, [key])) };
+          additionalProperties = { type: guessType(get16(formData, [key])) };
         }
         schema.properties[key] = additionalProperties;
         set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
@@ -676,6 +678,15 @@
     });
     return schema;
   }
+  var { compareSchemaDefinitions, compareSchemaValues } = jsonSchemaMerge.createComparator();
+  var { mergeArrayOfSchemaDefinitions } = jsonSchemaMerge.createMerger({
+    intersectJson: array.createIntersector(compareSchemaValues),
+    deduplicateJsonSchemaDef: array.createDeduplicator(compareSchemaDefinitions)
+  });
+  var shallowAllOfMerge = jsonSchemaMerge.createShallowAllOfMerge(mergeArrayOfSchemaDefinitions);
+  function mergeAllOf(schema) {
+    return shallowAllOfMerge(schema);
+  }
   function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
     if (!isObject(schema)) {
       return [{}];
@@ -721,12 +732,7 @@
           if (withContainsSchemas.length) {
             resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
           }
-          resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema, {
-            deep: false,
-            resolvers: {
-              $defs: mergeAllOf.options.resolvers.definitions
-            }
-          });
+          resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema);
           if (withContainsSchemas.length) {
             resolvedSchema.allOf = withContainsSchemas;
           }
@@ -745,7 +751,7 @@
                 validator,
                 { allOf: [schema2.properties[key], ...Object.values(matchingProperties)] },
                 rootSchema,
-                get14(rawFormData, [key]),
+                get16(rawFormData, [key]),
                 experimental_customMergeAllOf
               );
             }
@@ -817,7 +823,7 @@
   function processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
     let schemas = [resolvedSchema];
     for (const dependencyKey in dependencies) {
-      if (!expandAllBranches && get14(formData, [dependencyKey]) === void 0) {
+      if (!expandAllBranches && get16(formData, [dependencyKey]) === void 0) {
         continue;
       }
       if (resolvedSchema.properties && !(dependencyKey in resolvedSchema.properties)) {
@@ -948,11 +954,11 @@
       const xxxOfs = schema[xxx].map(
         (xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf)
       );
-      const data = get14(formData, selectorField);
+      const data = get16(formData, selectorField);
       if (data !== void 0) {
         return xxxOfs.find((xxx2) => {
           return isEqual2(
-            get14(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get14(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
+            get16(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get16(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
             data
           );
         });
@@ -971,7 +977,7 @@
     const pathList = Array.isArray(path) ? path : path.split(".");
     const [part, ...nestedPath] = pathList;
     if (part && has5(fieldSchema, part)) {
-      fieldSchema = get14(fieldSchema, part);
+      fieldSchema = get16(fieldSchema, part);
       return getFromSchemaInternal(
         validator,
         rootSchema,
@@ -1013,7 +1019,7 @@
             parentField,
             fieldName,
             ONE_OF_KEY,
-            get14(formData, subPath),
+            get16(formData, subPath),
             experimental_customMergeAllOf
           );
         } else if (has5(parentField, ANY_OF_KEY)) {
@@ -1023,7 +1029,7 @@
             parentField,
             fieldName,
             ANY_OF_KEY,
-            get14(formData, subPath),
+            get16(formData, subPath),
             experimental_customMergeAllOf
           );
         }
@@ -1091,7 +1097,7 @@
         totalScore += reduce(
           schema.properties,
           (score, value, key) => {
-            const formValue = get14(formData, key);
+            const formValue = get16(formData, key);
             if (typeof value === "boolean") {
               return score;
             }
@@ -1118,7 +1124,7 @@
                 validator,
                 rootSchema,
                 formValue,
-                get14(value, key2),
+                get16(value, key2),
                 -1,
                 discriminator,
                 experimental_customMergeAllOf
@@ -1220,22 +1226,22 @@
     if (isObject(formData)) {
       const acc = Object.assign({}, defaults);
       return Object.keys(formData).reduce((acc2, key) => {
-        const keyValue = get14(formData, key);
+        const keyValue = get16(formData, key);
         const keyExistsInDefaults = isObject(defaults) && key in defaults;
         const keyExistsInFormData = key in formData;
-        const keyDefault = get14(defaults, key) ?? {};
+        const keyDefault = get16(defaults, key) ?? {};
         const defaultValueIsNestedObject = keyExistsInDefaults && Object.entries(keyDefault).some(([, v]) => isObject(v));
-        const keyDefaultIsObject = keyExistsInDefaults && isObject(get14(defaults, key));
+        const keyDefaultIsObject = keyExistsInDefaults && isObject(get16(defaults, key));
         const keyHasFormDataObject = keyExistsInFormData && isObject(keyValue);
         if (keyDefaultIsObject && keyHasFormDataObject && !defaultValueIsNestedObject) {
           acc2[key] = {
-            ...get14(defaults, key),
+            ...get16(defaults, key),
             ...keyValue
           };
           return acc2;
         }
         acc2[key] = mergeDefaultsWithFormData(
-          get14(defaults, key),
+          get16(defaults, key),
           keyValue,
           mergeExtraArrayDefaults,
           defaultSupercedesUndefined,
@@ -1354,8 +1360,8 @@
       let value;
       let label = title;
       if (selectorField) {
-        const innerSchema = get14(aSchema, [PROPERTIES_KEY, selectorField], {});
-        value = get14(innerSchema, DEFAULT_KEY, get14(innerSchema, CONST_KEY));
+        const innerSchema = get16(aSchema, [PROPERTIES_KEY, selectorField], {});
+        value = get16(innerSchema, DEFAULT_KEY, get16(innerSchema, CONST_KEY));
         label = label || innerSchema?.title || aSchema.title || String(value);
       } else {
         value = toConstant(aSchema);
@@ -1442,7 +1448,7 @@
     let updatedRecurseList = _recurseList;
     if (schema[CONST_KEY] !== void 0 && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
       defaults = schema[CONST_KEY];
-    } else if (isObject(defaults) && isObject(schema.default)) {
+    } else if (isObject(defaults) && isObject(schema.default) && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
       defaults = mergeObjects(defaults, schema.default);
     } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
       defaults = schema.default;
@@ -1452,7 +1458,8 @@
         updatedRecurseList = _recurseList.concat(refName);
         schemaToCompute = findSchemaDefinition(refName, rootSchema);
       }
-      if (schemaToCompute && !defaults) {
+      const hasNoExistingData = rawFormData === void 0 || isObject(rawFormData) && isEmpty4(rawFormData);
+      if (schemaToCompute && !defaults && hasNoExistingData) {
         defaults = schema.default;
       }
       if (shouldMergeDefaultsIntoFormData && schemaToCompute && !isObject(rawFormData)) {
@@ -1596,11 +1603,12 @@
     {
       const formData = isObject(rawFormData) ? rawFormData : {};
       const schema = rawSchema;
-      const retrievedSchema = experimental_defaultFormStateBehavior?.allOf === "populateDefaults" && ALL_OF_KEY in schema ? retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf) : 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) => {
-          const propertySchema = get14(retrievedSchema, [PROPERTIES_KEY, key], {});
+          const propertySchema = get16(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, {
@@ -1609,8 +1617,8 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get14(defaults, [key]),
-            rawFormData: get14(formData, [key]),
+            parentDefaults: get16(defaults, [key]),
+            rawFormData: get16(formData, [key]),
             required: retrievedSchema.required?.includes(key),
             shouldMergeDefaultsIntoFormData,
             initialDefaultsGenerated
@@ -1648,8 +1656,8 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get14(defaults, [key]),
-            rawFormData: get14(formData, [key]),
+            parentDefaults: get16(defaults, [key]),
+            rawFormData: get16(formData, [key]),
             required: retrievedSchema.required?.includes(key),
             shouldMergeDefaultsIntoFormData,
             initialDefaultsGenerated
@@ -1690,12 +1698,14 @@
     if (Array.isArray(defaults)) {
       defaults = defaults.map((item, idx) => {
         const schemaItem = getInnerSchemaForArrayItem(schema, 2 /* Fallback */, idx);
+        const itemFormData = Array.isArray(rawFormData) ? rawFormData[idx] : void 0;
         return computeDefaults(validator, schemaItem, {
           rootSchema,
           _recurseList,
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           parentDefaults: item,
+          rawFormData: itemFormData,
           required,
           shouldMergeDefaultsIntoFormData,
           initialDefaultsGenerated
@@ -1714,7 +1724,7 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             rawFormData: item,
-            parentDefaults: get14(defaults, [idx]),
+            parentDefaults: get16(defaults, [idx]),
             required,
             shouldMergeDefaultsIntoFormData,
             initialDefaultsGenerated
@@ -1840,7 +1850,7 @@
     let displayLabel = Boolean(label);
     if (displayLabel) {
       const schemaType = getSchemaType(schema);
-      const addedByAdditionalProperty = get14(schema, ADDITIONAL_PROPERTY_FLAG, false);
+      const addedByAdditionalProperty = get16(schema, ADDITIONAL_PROPERTY_FLAG, false);
       if (schemaType === "array") {
         displayLabel = addedByAdditionalProperty || isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || isFilesArray(validator, schema, uiSchema, rootSchema, experimental_customMergeAllOf) || isCustomWidget(uiSchema);
       }
@@ -1856,25 +1866,183 @@
     }
     return displayLabel;
   }
+  function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
+    if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema || IF_KEY in schema) {
+      const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
+      const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
+      if (sameSchemaIndex === -1) {
+        return toPathSchemaInternal(
+          validator,
+          _schema,
+          name,
+          rootSchema,
+          formData,
+          _recurseList.concat(_schema),
+          experimental_customMergeAllOf
+        );
+      }
+    }
+    let pathSchema = {
+      [NAME_KEY]: name.replace(/^\./, "")
+    };
+    if (ONE_OF_KEY in schema || ANY_OF_KEY in schema) {
+      const xxxOf = ONE_OF_KEY in schema ? schema.oneOf : schema.anyOf;
+      const discriminator = getDiscriminatorFieldFromSchema(schema);
+      const index = getClosestMatchingOption(
+        validator,
+        rootSchema,
+        formData,
+        xxxOf,
+        0,
+        discriminator,
+        experimental_customMergeAllOf
+      );
+      const _schema = xxxOf[index];
+      pathSchema = {
+        ...pathSchema,
+        ...toPathSchemaInternal(
+          validator,
+          _schema,
+          name,
+          rootSchema,
+          formData,
+          _recurseList,
+          experimental_customMergeAllOf
+        )
+      };
+    }
+    if (ADDITIONAL_PROPERTIES_KEY in schema && schema[ADDITIONAL_PROPERTIES_KEY] !== false) {
+      set(pathSchema, RJSF_ADDITIONAL_PROPERTIES_FLAG, true);
+    }
+    if (ITEMS_KEY in schema && Array.isArray(formData)) {
+      const { items: schemaItems, additionalItems: schemaAdditionalItems } = schema;
+      if (Array.isArray(schemaItems)) {
+        formData.forEach((element, i) => {
+          if (schemaItems[i]) {
+            pathSchema[i] = toPathSchemaInternal(
+              validator,
+              schemaItems[i],
+              `${name}.${i}`,
+              rootSchema,
+              element,
+              _recurseList,
+              experimental_customMergeAllOf
+            );
+          } else if (schemaAdditionalItems) {
+            pathSchema[i] = toPathSchemaInternal(
+              validator,
+              schemaAdditionalItems,
+              `${name}.${i}`,
+              rootSchema,
+              element,
+              _recurseList,
+              experimental_customMergeAllOf
+            );
+          } else {
+            console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
+          }
+        });
+      } else {
+        formData.forEach((element, i) => {
+          pathSchema[i] = toPathSchemaInternal(
+            validator,
+            schemaItems,
+            `${name}.${i}`,
+            rootSchema,
+            element,
+            _recurseList,
+            experimental_customMergeAllOf
+          );
+        });
+      }
+    } else if (PROPERTIES_KEY in schema) {
+      for (const property in schema.properties) {
+        const field = get16(schema, [PROPERTIES_KEY, property], {});
+        pathSchema[property] = toPathSchemaInternal(
+          validator,
+          field,
+          `${name}.${property}`,
+          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
+          get16(formData, [property]),
+          _recurseList,
+          experimental_customMergeAllOf
+        );
+      }
+    }
+    return pathSchema;
+  }
+  function toPathSchema(validator, schema, name = "", rootSchema, formData, experimental_customMergeAllOf) {
+    return toPathSchemaInternal(validator, schema, name, rootSchema, formData, void 0, experimental_customMergeAllOf);
+  }
+
+  // src/schema/omitExtraData.ts
+  function getUsedFormData(formData, fields) {
+    if (fields.length === 0 && typeof formData !== "object") {
+      return formData;
+    }
+    const data = pick(formData, fields);
+    if (Array.isArray(formData)) {
+      return Object.keys(data).map((key) => data[key]);
+    }
+    return data;
+  }
+  function getFieldNames(pathSchema, formData) {
+    const formValueHasData = (value, isLeaf) => typeof value !== "object" || isEmpty4(value) || isLeaf && !isEmpty4(value);
+    const getAllPaths = (_obj, acc = [], paths = [[]]) => {
+      const objKeys = Object.keys(_obj);
+      objKeys.forEach((key) => {
+        const data = _obj[key];
+        if (typeof data === "object") {
+          const newPaths = paths.map((path) => [...path, key]);
+          if (data[RJSF_ADDITIONAL_PROPERTIES_FLAG] && data[NAME_KEY] !== "") {
+            acc.push(data[NAME_KEY]);
+          } else {
+            getAllPaths(data, acc, newPaths);
+          }
+        } else if (key === NAME_KEY && data !== "") {
+          paths.forEach((path) => {
+            const formValue = get16(formData, path);
+            const isLeaf = objKeys.length === 1;
+            if (formValueHasData(formValue, isLeaf) || Array.isArray(formValue) && formValue.every((val) => formValueHasData(val, isLeaf))) {
+              acc.push(path);
+            }
+          });
+        }
+      });
+      return acc;
+    };
+    return getAllPaths(pathSchema);
+  }
+  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);
+  }
   var NO_VALUE = Symbol("no Value");
   function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}, experimental_customMergeAllOf) {
     let newFormData;
     if (has5(newSchema, PROPERTIES_KEY)) {
       const removeOldSchemaData = {};
       if (has5(oldSchema, PROPERTIES_KEY)) {
-        const properties = get14(oldSchema, PROPERTIES_KEY, {});
+        const properties = get16(oldSchema, PROPERTIES_KEY, {});
         Object.keys(properties).forEach((key) => {
           if (has5(data, key)) {
             removeOldSchemaData[key] = void 0;
           }
         });
       }
-      const keys2 = Object.keys(get14(newSchema, PROPERTIES_KEY, {}));
+      const keys2 = Object.keys(get16(newSchema, PROPERTIES_KEY, {}));
       const nestedData = {};
       keys2.forEach((key) => {
-        const formValue = get14(data, key);
-        let oldKeyedSchema = get14(oldSchema, [PROPERTIES_KEY, key], {});
-        let newKeyedSchema = get14(newSchema, [PROPERTIES_KEY, key], {});
+        const formValue = get16(data, key);
+        let oldKeyedSchema = get16(oldSchema, [PROPERTIES_KEY, key], {});
+        let newKeyedSchema = get16(newSchema, [PROPERTIES_KEY, key], {});
         if (has5(oldKeyedSchema, REF_KEY)) {
           oldKeyedSchema = retrieveSchema(
             validator,
@@ -1893,8 +2061,8 @@
             experimental_customMergeAllOf
           );
         }
-        const oldSchemaTypeForKey = get14(oldKeyedSchema, "type");
-        const newSchemaTypeForKey = get14(newKeyedSchema, "type");
+        const oldSchemaTypeForKey = get16(oldKeyedSchema, "type");
+        const newSchemaTypeForKey = get16(newKeyedSchema, "type");
         if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
           if (has5(removeOldSchemaData, key)) {
             delete removeOldSchemaData[key];
@@ -1912,17 +2080,17 @@
               nestedData[key] = itemData;
             }
           } else {
-            const newOptionDefault = get14(newKeyedSchema, "default", NO_VALUE);
-            const oldOptionDefault = get14(oldKeyedSchema, "default", NO_VALUE);
+            const newOptionDefault = get16(newKeyedSchema, "default", NO_VALUE);
+            const oldOptionDefault = get16(oldKeyedSchema, "default", NO_VALUE);
             if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
               if (oldOptionDefault === formValue) {
                 removeOldSchemaData[key] = newOptionDefault;
-              } else if (get14(newKeyedSchema, "readOnly") === true) {
+              } else if (get16(newKeyedSchema, "readOnly") === true) {
                 removeOldSchemaData[key] = void 0;
               }
             }
-            const newOptionConst = get14(newKeyedSchema, "const", NO_VALUE);
-            const oldOptionConst = get14(oldKeyedSchema, "const", NO_VALUE);
+            const newOptionConst = get16(newKeyedSchema, "const", NO_VALUE);
+            const oldOptionConst = get16(oldKeyedSchema, "const", NO_VALUE);
             if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
               removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
             }
@@ -1934,9 +2102,9 @@
         ...removeOldSchemaData,
         ...nestedData
       };
-    } else if (get14(oldSchema, "type") === "array" && get14(newSchema, "type") === "array" && Array.isArray(data)) {
-      let oldSchemaItems = get14(oldSchema, "items");
-      let newSchemaItems = get14(newSchema, "items");
+    } else if (get16(oldSchema, "type") === "array" && get16(newSchema, "type") === "array" && Array.isArray(data)) {
+      let oldSchemaItems = get16(oldSchema, "items");
+      let newSchemaItems = get16(newSchema, "items");
       if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
         if (has5(oldSchemaItems, REF_KEY)) {
           oldSchemaItems = retrieveSchema(
@@ -1956,10 +2124,10 @@
             experimental_customMergeAllOf
           );
         }
-        const oldSchemaType = get14(oldSchemaItems, "type");
-        const newSchemaType = get14(newSchemaItems, "type");
+        const oldSchemaType = get16(oldSchemaItems, "type");
+        const newSchemaType = get16(newSchemaItems, "type");
         if (!oldSchemaType || oldSchemaType === newSchemaType) {
-          const maxItems = get14(newSchema, "maxItems", -1);
+          const maxItems = get16(newSchema, "maxItems", -1);
           if (newSchemaType === "object") {
             newFormData = data.reduce((newValue, aValue) => {
               const itemValue = sanitizeDataForNewSchema(
@@ -1985,116 +2153,6 @@
     }
     return newFormData;
   }
-  function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
-    if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
-      const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
-      const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
-      if (sameSchemaIndex === -1) {
-        return toPathSchemaInternal(
-          validator,
-          _schema,
-          name,
-          rootSchema,
-          formData,
-          _recurseList.concat(_schema),
-          experimental_customMergeAllOf
-        );
-      }
-    }
-    let pathSchema = {
-      [NAME_KEY]: name.replace(/^\./, "")
-    };
-    if (ONE_OF_KEY in schema || ANY_OF_KEY in schema) {
-      const xxxOf = ONE_OF_KEY in schema ? schema.oneOf : schema.anyOf;
-      const discriminator = getDiscriminatorFieldFromSchema(schema);
-      const index = getClosestMatchingOption(
-        validator,
-        rootSchema,
-        formData,
-        xxxOf,
-        0,
-        discriminator,
-        experimental_customMergeAllOf
-      );
-      const _schema = xxxOf[index];
-      pathSchema = {
-        ...pathSchema,
-        ...toPathSchemaInternal(
-          validator,
-          _schema,
-          name,
-          rootSchema,
-          formData,
-          _recurseList,
-          experimental_customMergeAllOf
-        )
-      };
-    }
-    if (ADDITIONAL_PROPERTIES_KEY in schema && schema[ADDITIONAL_PROPERTIES_KEY] !== false) {
-      set(pathSchema, RJSF_ADDITIONAL_PROPERTIES_FLAG, true);
-    }
-    if (ITEMS_KEY in schema && Array.isArray(formData)) {
-      const { items: schemaItems, additionalItems: schemaAdditionalItems } = schema;
-      if (Array.isArray(schemaItems)) {
-        formData.forEach((element, i) => {
-          if (schemaItems[i]) {
-            pathSchema[i] = toPathSchemaInternal(
-              validator,
-              schemaItems[i],
-              `${name}.${i}`,
-              rootSchema,
-              element,
-              _recurseList,
-              experimental_customMergeAllOf
-            );
-          } else if (schemaAdditionalItems) {
-            pathSchema[i] = toPathSchemaInternal(
-              validator,
-              schemaAdditionalItems,
-              `${name}.${i}`,
-              rootSchema,
-              element,
-              _recurseList,
-              experimental_customMergeAllOf
-            );
-          } else {
-            console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
-          }
-        });
-      } else {
-        formData.forEach((element, i) => {
-          pathSchema[i] = toPathSchemaInternal(
-            validator,
-            schemaItems,
-            `${name}.${i}`,
-            rootSchema,
-            element,
-            _recurseList,
-            experimental_customMergeAllOf
-          );
-        });
-      }
-    } else if (PROPERTIES_KEY in schema) {
-      for (const property in schema.properties) {
-        const field = get14(schema, [PROPERTIES_KEY, property], {});
-        pathSchema[property] = toPathSchemaInternal(
-          validator,
-          field,
-          `${name}.${property}`,
-          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
-          get14(formData, [property]),
-          _recurseList,
-          experimental_customMergeAllOf
-        );
-      }
-    }
-    return pathSchema;
-  }
-  function toPathSchema(validator, schema, name = "", rootSchema, formData, experimental_customMergeAllOf) {
-    return toPathSchemaInternal(validator, schema, name, rootSchema, formData, void 0, experimental_customMergeAllOf);
-  }
   var SchemaUtils = class {
     /** Constructs the `SchemaUtils` instance with the given `validator` and `rootSchema` stored as instance variables
      *
@@ -2105,7 +2163,7 @@
      */
     constructor(validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
       if (rootSchema && rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
-        this.rootSchema = makeAllReferencesAbsolute(rootSchema, get14(rootSchema, ID_KEY, "#"));
+        this.rootSchema = makeAllReferencesAbsolute(rootSchema, get16(rootSchema, ID_KEY, "#"));
       } else {
         this.rootSchema = rootSchema;
       }
@@ -2297,6 +2355,18 @@
     isSelect(schema) {
       return isSelect(this.validator, schema, this.rootSchema, this.experimental_customMergeAllOf);
     }
+    /**
+     * The function 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.
+     *
+     * @param schema - The schema to use for filtering the `formData`
+     * @param [formData] - The formData to filter
+     * @returns The new form data, with any fields not defined in the schema removed
+     */
+    omitExtraData(schema, formData) {
+      return omitExtraData(this.validator, schema, this.rootSchema, formData);
+    }
     /** Retrieves an expanded schema that has had all of its conditions, additional properties, references and
      * dependencies resolved and merged into the `schema` given a `rawFormData` that is used to do the potentially
      * recursive resolution.
@@ -2539,7 +2609,7 @@
      */
     getOrCreateErrorBlock(pathOfError) {
       const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-      let errorBlock = hasPath ? get14(this.errorSchema, pathOfError) : this.errorSchema;
+      let errorBlock = hasPath ? get16(this.errorSchema, pathOfError) : this.errorSchema;
       if (!errorBlock && pathOfError) {
         errorBlock = {};
         setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2565,7 +2635,7 @@
      */
     addErrors(errorOrList, pathOfError) {
       const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-      let errorsList = get14(errorBlock, ERRORS_KEY);
+      let errorsList = get16(errorBlock, ERRORS_KEY);
       if (!Array.isArray(errorsList)) {
         errorsList = [];
         errorBlock[ERRORS_KEY] = errorsList;
@@ -2615,7 +2685,7 @@
     } else if (!aIsPlainObject && bIsPlainObject) {
       return keys(b);
     } else {
-      const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get14(b, key))));
+      const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get16(b, key))));
       const diffFields = difference(keys(b), keys(a));
       return [...unequalFields, ...diffFields];
     }
@@ -2728,7 +2798,7 @@
     );
   }
   function getTestIds() {
-    if (typeof process === "undefined" || get14(process, "env.NODE_ENV") !== "test") {
+    if (typeof process === "undefined" || get16(process, "env.NODE_ENV") !== "test") {
       return {};
     }
     const ids = /* @__PURE__ */ new Map();
@@ -2797,7 +2867,7 @@
     }
   };
   function mergeWidgetOptions(AWidget) {
-    let MergedWidget = get14(AWidget, "MergedWidget");
+    let MergedWidget = get16(AWidget, "MergedWidget");
     if (!MergedWidget) {
       const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
       MergedWidget = ({ options, ...props }) => {
@@ -2927,7 +2997,7 @@
     if (has5(regOrFc, FORM_CONTEXT_NAME)) {
       lookupPath.unshift(FORM_CONTEXT_NAME);
     }
-    return get14(regOrFc, [...lookupPath, toLookup], fallback);
+    return get16(regOrFc, [...lookupPath, toLookup], fallback);
   }
 
   // src/orderProperties.ts
@@ -3417,6 +3487,7 @@
     TranslatableString2["OptionalObjectEmptyMsg"] = "No data for optional field";
     TranslatableString2["Type"] = "Type";
     TranslatableString2["Value"] = "Value";
+    TranslatableString2["ClearButton"] = "clear input";
     TranslatableString2["UnknownFieldType"] = "Unknown field type %1";
     TranslatableString2["OptionPrefix"] = "Option %1";
     TranslatableString2["TitleOptionPrefix"] = "%1 option %2";
@@ -3454,7 +3525,7 @@
      * @param hash - The hash value at which to map the schema
      */
     addSchema(schema, hash) {
-      const key = get14(schema, ID_KEY, hash);
+      const key = get16(schema, ID_KEY, hash);
       const identifiedSchema = { ...schema, [ID_KEY]: key };
       const existing = this.schemaMap[key];
       if (!existing) {
@@ -3614,6 +3685,7 @@
   exports.getDefaultFormState = getDefaultFormState;
   exports.getDiscriminatorFieldFromSchema = getDiscriminatorFieldFromSchema;
   exports.getDisplayLabel = getDisplayLabel;
+  exports.getFieldNames = getFieldNames;
   exports.getFirstMatchingOption = getFirstMatchingOption;
   exports.getFromSchema = getFromSchema;
   exports.getInputProps = getInputProps;
@@ -3623,6 +3695,7 @@
   exports.getTemplate = getTemplate;
   exports.getTestIds = getTestIds;
   exports.getUiOptions = getUiOptions;
+  exports.getUsedFormData = getUsedFormData;
   exports.getWidget = getWidget;
   exports.guessType = guessType;
   exports.hasWidget = hasWidget;
@@ -3645,6 +3718,7 @@
   exports.mergeDefaultsWithFormData = mergeDefaultsWithFormData;
   exports.mergeObjects = mergeObjects;
   exports.mergeSchemas = mergeSchemas;
+  exports.omitExtraData = omitExtraData;
   exports.optionId = optionId;
   exports.optionalControlsId = optionalControlsId;
   exports.optionsList = optionsList;