fix: Fixes rjsf-team#3817 Precompiled schema allOf

cwendtxealth · Aug 10, 2023 · e0ebe71 · e0ebe71
1 parent f51ce0c
commit e0ebe71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/utils/src/schema/retrieveSchema.ts b/packages/utils/src/schema/retrieveSchema.ts
@@ -323,7 +323,8 @@ export function retrieveSchemaInternal<
     if (ALL_OF_KEY in resolvedSchema) {
       // resolve allOf schemas
       if (expandAllBranches) {
-        return [...(resolvedSchema.allOf as S[])];
+        const { allOf, ...restOfSchema } = resolvedSchema;
+        return [...(allOf as S[]), restOfSchema as S];
       }
       try {
         resolvedSchema = mergeAllOf(resolvedSchema, {

diff --git a/packages/utils/test/schema/retrieveSchemaTest.ts b/packages/utils/test/schema/retrieveSchemaTest.ts
@@ -688,13 +688,18 @@ export default function retrieveSchemaTest(testValidator: TestValidatorType) {
           expect.any(Error)
         );
       });
-      it('should return allOf as individual schemas when expand all', () => {
+      it('should return allOf and top level schemas when expand all', () => {
         const schema: RJSFSchema = {
+          properties: { test: { type: 'string' } },
           allOf: [{ type: 'string' }, { type: 'boolean' }],
         };
         const rootSchema: RJSFSchema = { definitions: {} };
         const formData = {};
-        expect(retrieveSchemaInternal(testValidator, schema, rootSchema, formData, true)).toEqual(schema.allOf);
+        const { allOf, ...restOfSchema } = schema;
+        expect(retrieveSchemaInternal(testValidator, schema, rootSchema, formData, true)).toEqual([
+          ...allOf!,
+          restOfSchema,
+        ]);
       });
       it('should merge types with $ref in them', () => {
         const schema: RJSFSchema = {