fix: nested oneOf + allOf

diplodoc-platform · Jan 30, 2024 · 02e1e5e · 02e1e5e
1 parent c79f415
commit 02e1e5e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 10 deletions.
diff --git a/src/__snapshots__/combiners/complex.test.ts.snap b/src/__snapshots__/combiners/complex.test.ts.snap
@@ -32,7 +32,10 @@ Generated server url{.openapi__request__description}
 
 \`\`\`json
 {
-    "name": "b"
+    "name": "b",
+    "age": {
+        "c": "c"
+    }
 }
 \`\`\`
 
@@ -86,7 +89,10 @@ Base 200 response
 
 \`\`\`json
 {
-    "name": "b"
+    "name": "b",
+    "age": {
+        "c": "c"
+    }
 }
 \`\`\`
 

diff --git a/src/__tests__/combiners/complex.test.ts b/src/__tests__/combiners/complex.test.ts
@@ -43,16 +43,26 @@ describe('operators complex test', () => {
                                         {
                                             allOf: [
                                                 {
-                                                    type: 'number',
-                                                    default: 10,
+                                                    type: 'object',
+                                                    properties: {
+                                                        c: {
+                                                            type: 'string',
+                                                            default: 'c'
+                                                        }
+                                                    }
                                                 },
                                             ],
                                         },
                                         {
                                             allOf: [
                                                 {
-                                                    type: 'boolean',
-                                                    default: true,
+                                                    type: 'object',
+                                                    properties: {
+                                                        d: {
+                                                            type: 'number',
+                                                            default: 10
+                                                        }
+                                                    }
                                                 },
                                             ],
                                         },
@@ -79,16 +89,26 @@ describe('operators complex test', () => {
                                         {
                                             allOf: [
                                                 {
-                                                    type: 'number',
-                                                    default: 10,
+                                                    type: 'object',
+                                                    properties: {
+                                                        c: {
+                                                            type: 'string',
+                                                            default: 'c'
+                                                        }
+                                                    }
                                                 },
                                             ],
                                         },
                                         {
                                             allOf: [
                                                 {
-                                                    type: 'boolean',
-                                                    default: true,
+                                                    type: 'object',
+                                                    properties: {
+                                                        d: {
+                                                            type: 'number',
+                                                            default: 10
+                                                        }
+                                                    }
                                                 },
                                             ],
                                         },

diff --git a/src/includer/traverse/tables.ts b/src/includer/traverse/tables.ts
@@ -334,6 +334,11 @@ function prepareSampleElement(
     }
 
     const downCallstack = callstack.concat(value);
+
+    if (value.oneOf?.length) {
+        return prepareSampleElement(key, value.oneOf[0], isRequired(key, value), downCallstack);
+    }
+
     const type = inferType(value);
 
     const schema = findNonNullOneOfElement(value);