Fixing definitions that were no longer included

Author: Deadarius

src/parse.ts

@@ -19,19 +19,13 @@ export async function parseModels(models: IModel[], root: string): Promise<{}> {
       continue;
     }
 
-    if (typeof model.schema === 'string') {
-      const fullPath = path.resolve(root, model.schema);
+    const schema = (typeof model.schema === 'string'
+      ? await $RefParser.bundle(path.resolve(root, model.schema))
+      : model.schema) as JSONSchema7;
 
-      const schema = await $RefParser.bundle(fullPath) as JSONSchema7;
-
-      _.assign(schemas, updateReferences(schema.definitions));
-
-      schemas[model.name] = updateReferences(cleanSchema(schema));
-    }
-
-    if(typeof model.schema === 'object') {
-      schemas[model.name] = updateReferences(cleanSchema(model.schema));
-    }
+      _.assign(schemas, updateReferences(schema.definitions), {
+        [model.name]: updateReferences(cleanSchema(schema)),
+      });
   }
 
   return schemas;

src/types.ts

@@ -2,7 +2,7 @@ export interface IModel {
   name: string;
   description: string;
   contentType: string;
-  schema: string;
+  schema: string | object;
   examples: any[];
   example: object;
 }

test/project/models/RecursiveResponseTwo.json

@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "directory": {
+      "type": "object",
+      "title": "Directory Schema",
+      "properties": {
+        "id": {
+          "type": "string",
+          "example": "3ba1c69c-3c81-4d6d-b304-873d898b2e3c",
+          "format": "uuid"
+        },
+        "directories": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/directory"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": ["id", "name", "directorys", "checklists"]
+    }
+  },
+  "type": "object",
+  "title": "Directories Response Schema",
+  "properties": {
+    "data": {
+      "$ref": "#/definitions/directory"
+    }
+  }
+}

test/project/openapi.yml

@@ -139,6 +139,30 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/folder'
+    directory:
+      type: object
+      title: Directory Schema
+      properties:
+        id:
+          type: string
+          example: 3ba1c69c-3c81-4d6d-b304-873d898b2e3c
+          format: uuid
+        directories:
+          type: array
+          items:
+            $ref: '#/components/schemas/directory'
+      additionalProperties: false
+      required:
+        - id
+        - name
+        - directorys
+        - checklists
+    RecursiveResponseTwo:
+      type: object
+      title: Directories Response Schema
+      properties:
+        data:
+          $ref: '#/components/schemas/directory'
     data:
       description: external type referenced in another schema
       type: object
@@ -165,7 +189,7 @@ components:
 info:
   title: ''
   description: ''
-  version: a04837c6-b32a-4f0f-9c25-0c72112a4136
+  version: ae88c557-65e0-4feb-a885-ebe66a58cca8
 paths:
   /create:
     post:

test/project/serverless.doc.yml

@@ -27,6 +27,11 @@ documentation:
       contentType: application/json
       schema: models/RecursiveResponse.json
 
+    - name: RecursiveResponseTwo
+      description: Recursive response example
+      contentType: application/json
+      schema: ${file(models/RecursiveResponseTwo.json)}
+
     - name: ExternalTest
       description: External reference example
       contentType: application/json