fix: oneof find nearest merge

diplodoc-platform · Nov 24, 2023 · 4a6b8e1 · 4a6b8e1
1 parent 85f327c
commit 4a6b8e1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/openapi-extension",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "OpenAPI extension for Diplodoc transformer and builder",
   "main": "plugin/cjs/index.min.js",
   "types": "plugin/index.d.ts",

diff --git a/src/includer/traverse/tables.ts b/src/includer/traverse/tables.ts
@@ -204,18 +204,22 @@ function prepareComplexDescription(baseDescription: string, value: OpenJSONSchem
 function findNonNullOneOfElement(schema: OpenJSONSchema): OpenJSONSchema {
     const isValid = (v: OpenJSONSchema) => {
         if (typeof inferType(v) === 'string') {
-            return true;
+            return v;
         }
 
-        if (Object.keys(v.properties || {}).length) {
-            return true;
+        const merged = RefsService.merge(v);
+
+        if (Object.keys(merged.properties || {}).length) {
+            return v;
         }
 
         return false;
     };
 
-    if (isValid(schema)) {
-        return RefsService.merge(schema);
+    const result = isValid(schema);
+
+    if (result) {
+        return result;
     }
 
     const stack = [...(schema.oneOf || [])];
@@ -227,8 +231,10 @@ function findNonNullOneOfElement(schema: OpenJSONSchema): OpenJSONSchema {
             continue;
         }
 
-        if (isValid(v)) {
-            return RefsService.merge(v);
+        const status = isValid(v);
+
+        if (status) {
+            return status;
         }
 
         stack.push(...(v.oneOf || []));