@rjsf/utils 5.13.1 → 5.13.3

package/dist/index.js

@@ -708,7 +708,7 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
     return resolvedSchema;
   });
 }
-function resolveAnyOrOneOfSchemas(validator, schema, rootSchema, expandAllBranches, recurseList, rawFormData) {
+function resolveAnyOrOneOfSchemas(validator, schema, rootSchema, expandAllBranches, rawFormData) {
   let anyOrOneOf;
   const { oneOf, anyOf, ...remaining } = schema;
   if (Array.isArray(oneOf)) {
@@ -720,7 +720,7 @@ function resolveAnyOrOneOfSchemas(validator, schema, rootSchema, expandAllBranch
     const formData = rawFormData === void 0 && expandAllBranches ? {} : rawFormData;
     const discriminator = getDiscriminatorFieldFromSchema(schema);
     anyOrOneOf = anyOrOneOf.map((s) => {
-      return resolveAllReferences(s, rootSchema, recurseList);
+      return resolveAllReferences(s, rootSchema, []);
     });
     const option = getFirstMatchingOption(validator, formData, anyOrOneOf, rootSchema, discriminator);
     if (expandAllBranches) {
@@ -737,7 +737,6 @@ function resolveDependencies(validator, schema, rootSchema, expandAllBranches, r
     remainingSchema,
     rootSchema,
     expandAllBranches,
-    recurseList,
     formData
   );
   return resolvedSchemas.flatMap(
@@ -1578,16 +1577,43 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     (0, import_set2.default)(pathSchema, RJSF_ADDITONAL_PROPERTIES_FLAG, true);
   }
   if (ITEMS_KEY in schema && Array.isArray(formData)) {
-    formData.forEach((element, i) => {
-      pathSchema[i] = toPathSchemaInternal(
-        validator,
-        schema.items,
-        `${name}.${i}`,
-        rootSchema,
-        element,
-        _recurseList
-      );
-    });
+    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
+          );
+        } else if (schemaAdditionalItems) {
+          pathSchema[i] = toPathSchemaInternal(
+            validator,
+            schemaAdditionalItems,
+            `${name}.${i}`,
+            rootSchema,
+            element,
+            _recurseList
+          );
+        } 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
+        );
+      });
+    }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
       const field = (0, import_get10.default)(schema, [PROPERTIES_KEY, property]);
@@ -2637,13 +2663,12 @@ var ParserValidator = class {
 
 // src/parser/schemaParser.ts
 function parseSchema(validator, recurseList, rootSchema, schema) {
-  const recurseRefs = [];
-  const schemas = retrieveSchemaInternal(validator, schema, rootSchema, void 0, true, recurseRefs);
+  const schemas = retrieveSchemaInternal(validator, schema, rootSchema, void 0, true);
   schemas.forEach((schema2) => {
     const sameSchemaIndex = recurseList.findIndex((item) => (0, import_isEqual7.default)(item, schema2));
     if (sameSchemaIndex === -1) {
       recurseList.push(schema2);
-      const allOptions = resolveAnyOrOneOfSchemas(validator, schema2, rootSchema, true, recurseRefs);
+      const allOptions = resolveAnyOrOneOfSchemas(validator, schema2, rootSchema, true);
       allOptions.forEach((s) => {
         if (PROPERTIES_KEY in s && s[PROPERTIES_KEY]) {
           (0, import_forEach.default)(schema2[PROPERTIES_KEY], (value) => {