seperate wrappers for resource/collection look better

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
+preview/
 package-lock.json

components/schemas/Wrapper-Collection.yaml

@@ -0,0 +1,13 @@
+$id: WrapperCollection
+description: This is a generic request/response wrapper which contains both data and links which serve as hypermedia controls (HATEOAS).
+type: object
+properties:
+  data:
+    description: The wrapper for a collection is an array of objects.
+    type: array
+    items:
+      type: object
+  links:
+    description: A set of hypermedia links which serve as controls for the client.
+    type: object
+    readOnly: true

components/schemas/Wrapper-Resource.yaml

@@ -0,0 +1,11 @@
+$id: WrapperResource
+description: This is a generic request/response wrapper which contains both data and links which serve as hypermedia controls (HATEOAS).
+type: object
+properties:
+  data:
+    description: The wrapper for a resource is a single object.
+    type: object
+  links:
+    description: A set of hypermedia links which serve as controls for the client.
+    type: object
+    readOnly: true

paths/bookings.yaml

@@ -9,16 +9,17 @@ get:
         application/json:
           schema:
             allOf:
-              - $ref: ../components/schemas/Wrapper.yaml 
-              - data:
-                  type: array
-                  items:
-                    $ref: ../components/schemas/Booking.yaml
-              - links:
-                  allOf: 
-                    - $ref: ../components/schemas/Links.yaml
-                    - $ref: ../components/schemas/Links-Self.yaml
-                    - $ref: ../components/schemas/Links-Pagination.yaml
+              - $ref: ../components/schemas/Wrapper-Collection.yaml 
+              - properties:
+                  data:
+                    type: array
+                    items:
+                      $ref: ../components/schemas/Booking.yaml
+              - properties:
+                  links:
+                    allOf: 
+                      - $ref: ../components/schemas/Links-Self.yaml
+                      - $ref: ../components/schemas/Links-Pagination.yaml
           example:
             data:
               - booking_id: efdbb9d1-02c2-4bc3-afb7-6788d8782b1e
@@ -57,11 +58,10 @@ post:
       application/json:
         schema:
           allOf: 
-            - $ref: ../components/schemas/Wrapper.yaml
-            - data:
-                type: array
-                items:
-                  $ref: ../components/schemas/Trip.yaml
+            - $ref: ../components/schemas/Wrapper-Resource.yaml
+            - properties:
+                data:
+                  $ref: ../components/schemas/Booking.yaml
         example:
           data:
             trip_id: efdbb9d1-02c2-4bc3-afb7-6788d8782b1e
@@ -75,13 +75,13 @@ post:
         application/json:
           schema:
             allOf: 
-              - $ref: ../components/schemas/Wrapper.yaml
-              - data:
-                  $ref: ../components/schemas/Booking.yaml
-              - links:
-                  allOf:
-                    - $ref: ../components/schemas/Links.yaml
-                    - $ref: ../components/schemas/Links-Self.yaml
+              - $ref: ../components/schemas/Wrapper-Resource.yaml
+              - properties:
+                  data:
+                    $ref: ../components/schemas/Booking.yaml
+              - properties:
+                  links:
+                    $ref: ../components/schemas/Links-Self.yaml
     '400':
       $ref: ../components/responses/BadRequest.yaml
     '401':

paths/stations.yaml

@@ -9,16 +9,17 @@ get:
         application/json:
           schema:
             allOf: 
-              - $ref: ../components/schemas/Wrapper.yaml
-              - data:
-                  type: array
-                  items:
-                    $ref: ../components/schemas/Station.yaml
-              - links:
-                  allOf:
-                    - $ref: ../components/schemas/Links.yaml
-                    - $ref: ../components/schemas/Links-Self.yaml
-                    - $ref: ../components/schemas/Links-Pagination.yaml
+              - $ref: ../components/schemas/Wrapper-Collection.yaml
+              - properties:
+                  data:
+                    type: array
+                    items:
+                      $ref: ../components/schemas/Station.yaml
+              - properties:
+                  links:
+                    allOf:
+                      - $ref: ../components/schemas/Links-Self.yaml
+                      - $ref: ../components/schemas/Links-Pagination.yaml
           example:
             data:
               - id: efdbb9d1-02c2-4bc3-afb7-6788d8782b1e

paths/trips.yaml

@@ -48,16 +48,17 @@ get:
         application/json:
           schema:
             allOf: 
-              - $ref: ../components/schemas/Wrapper.yaml
-              - data:
-                  type: array
-                  items:
-                    $ref: ../components/schemas/Trip.yaml
-              - links:
-                  allOf: 
-                    - $ref: ../components/schemas/Links.yaml
-                    - $ref: ../components/schemas/Links-Self.yaml
-                    - $ref: ../components/schemas/Links-Pagination.yaml
+              - $ref: ../components/schemas/Wrapper-Collection.yaml
+              - properties:
+                  data:
+                    type: array
+                    items:
+                      $ref: ../components/schemas/Trip.yaml
+              - properties:
+                  links:
+                    allOf: 
+                      - $ref: ../components/schemas/Links-Self.yaml
+                      - $ref: ../components/schemas/Links-Pagination.yaml
           example:
             data:
               - id: efdbb9d1-02c2-4bc3-afb7-6788d8782b1e