Compiled/ExpandAllBranches Resolve AllOf Schemas

rjsf-team · Jul 13, 2023 · 011153c · 011153c
1 parent 6d330ec
commit 011153c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/utils/src/schema/retrieveSchema.ts b/packages/utils/src/schema/retrieveSchema.ts
@@ -280,16 +280,17 @@ export function retrieveSchemaInternal<
       return resolveCondition<T, S, F>(validator, resolvedSchema, rootSchema, expandAllBranches, rawFormData as T);
     }
     if (ALL_OF_KEY in schema) {
+      // resolve allOf schemas
+      if (expandAllBranches) {
+        return [...(resolvedSchema.allOf as S[])];
+      }
       try {
         resolvedSchema = mergeAllOf(s, {
           deep: false,
         } as Options) as S;
       } catch (e) {
         console.warn('could not merge subschemas in allOf:\n', e);
         const { allOf, ...resolvedSchemaWithoutAllOf } = resolvedSchema;
-        if (expandAllBranches && allOf) {
-          return [resolvedSchemaWithoutAllOf as S, ...(allOf as S[])];
-        }
         return resolvedSchemaWithoutAllOf as S;
       }
     }

diff --git a/packages/utils/test/schema/retrieveSchemaTest.ts b/packages/utils/test/schema/retrieveSchemaTest.ts
@@ -5,6 +5,7 @@ import {
   getAllPermutationsOfXxxOf,
   resolveAnyOrOneOfSchemas,
   resolveCondition,
+  retrieveSchemaInternal,
   stubExistingAdditionalProperties,
   withDependentProperties,
   withExactlyOneSubschema,
@@ -687,6 +688,14 @@ export default function retrieveSchemaTest(testValidator: TestValidatorType) {
           expect.any(Error)
         );
       });
+      it('should return allOf as individual schemas when expand all', () => {
+        const schema: RJSFSchema = {
+          allOf: [{ type: 'string' }, { type: 'boolean' }],
+        };
+        const rootSchema: RJSFSchema = { definitions: {} };
+        const formData = {};
+        expect(retrieveSchemaInternal(testValidator, schema, rootSchema, formData, true)).toEqual(schema.allOf);
+      });
       it('should merge types with $ref in them', () => {
         const schema: RJSFSchema = {
           allOf: [{ $ref: '#/definitions/1' }, { $ref: '#/definitions/2' }],