fix: move title propagation to the correct place

Redocly · Jan 10, 2018 · 0b0bc99 · 0b0bc99
1 parent 9d0f2a9
commit 0b0bc99
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/services/OpenAPIParser.ts b/src/services/OpenAPIParser.ts
@@ -191,10 +191,6 @@ export class OpenAPIParser {
       };
     });
 
-    if (receiver.title === undefined && isNamedDefinition($ref)) {
-      receiver.title = JsonPointer.baseName($ref);
-    }
-
     for (let { $ref: subSchemaRef, schema: subSchema } of allOfSchemas) {
       if (
         receiver.type !== subSchema.type &&
@@ -220,17 +216,22 @@ export class OpenAPIParser {
         receiver.required = (receiver.required || []).concat(subSchema.required);
       }
 
+      // merge rest of constraints
+      // TODO: do more intelegent merge
+      receiver = { ...subSchema, ...receiver };
+
       if (subSchemaRef) {
         receiver.parentRefs!.push(subSchemaRef);
         if (receiver.title === undefined && isNamedDefinition(subSchemaRef)) {
           receiver.title = JsonPointer.baseName(subSchemaRef);
         }
       }
+    }
 
-      // merge rest of constraints
-      // TODO: do more intelegent merge
-      receiver = { ...subSchema, ...receiver };
+    if (receiver.title === undefined && isNamedDefinition($ref)) {
+      receiver.title = JsonPointer.baseName($ref);
     }
+
     return receiver;
   }