Reference types resolver bug (airtasker#183)

Removed root level reference type parsing optimisation which fixes root level complex type parsing bug.
adrian-chang · Apr 11, 2019 · 75a5526 · 75a5526
1 parent 723a86d
commit 75a5526
Show file tree

Hide file tree

Showing 8 changed files with 361 additions and 361 deletions.
diff --git a/lib/src/generators/contract/__snapshots__/json-schema.spec.ts.snap b/lib/src/generators/contract/__snapshots__/json-schema.spec.ts.snap
@@ -31,6 +31,32 @@ exports[`JSON Schema generator produces valid code: json 1`] = `
         \\"data\\"
       ]
     },
+    \\"Profile\\": {
+      \\"type\\": \\"object\\",
+      \\"properties\\": {
+        \\"private\\": {
+          \\"type\\": \\"boolean\\"
+        },
+        \\"messageOptions\\": {
+          \\"$ref\\": \\"#/definitions/MessageOptions\\"
+        }
+      },
+      \\"required\\": [
+        \\"private\\",
+        \\"messageOptions\\"
+      ]
+    },
+    \\"MessageOptions\\": {
+      \\"type\\": \\"object\\",
+      \\"properties\\": {
+        \\"newsletter\\": {
+          \\"type\\": \\"boolean\\"
+        }
+      },
+      \\"required\\": [
+        \\"newsletter\\"
+      ]
+    },
     \\"ErrorBody\\": {
       \\"type\\": \\"object\\",
       \\"properties\\": {
@@ -84,32 +110,6 @@ exports[`JSON Schema generator produces valid code: json 1`] = `
         \\"data\\"
       ]
     },
-    \\"Profile\\": {
-      \\"type\\": \\"object\\",
-      \\"properties\\": {
-        \\"private\\": {
-          \\"type\\": \\"boolean\\"
-        },
-        \\"messageOptions\\": {
-          \\"$ref\\": \\"#/definitions/MessageOptions\\"
-        }
-      },
-      \\"required\\": [
-        \\"private\\",
-        \\"messageOptions\\"
-      ]
-    },
-    \\"MessageOptions\\": {
-      \\"type\\": \\"object\\",
-      \\"properties\\": {
-        \\"newsletter\\": {
-          \\"type\\": \\"boolean\\"
-        }
-      },
-      \\"required\\": [
-        \\"newsletter\\"
-      ]
-    },
     \\"Email\\": {
       \\"type\\": \\"string\\"
     },
@@ -141,6 +141,23 @@ definitions:
           - profile
     required:
       - data
+  Profile:
+    type: object
+    properties:
+      private:
+        type: boolean
+      messageOptions:
+        $ref: '#/definitions/MessageOptions'
+    required:
+      - private
+      - messageOptions
+  MessageOptions:
+    type: object
+    properties:
+      newsletter:
+        type: boolean
+    required:
+      - newsletter
   ErrorBody:
     type: object
     properties:
@@ -177,23 +194,6 @@ definitions:
           - address
     required:
       - data
-  Profile:
-    type: object
-    properties:
-      private:
-        type: boolean
-      messageOptions:
-        $ref: '#/definitions/MessageOptions'
-    required:
-      - private
-      - messageOptions
-  MessageOptions:
-    type: object
-    properties:
-      newsletter:
-        type: boolean
-    required:
-      - newsletter
   Email:
     type: string
   Address:

diff --git a/lib/src/generators/contract/__snapshots__/openapi2.spec.ts.snap b/lib/src/generators/contract/__snapshots__/openapi2.spec.ts.snap
@@ -145,7 +145,10 @@ exports[`OpenAPI 2 generator produces valid code: json 1`] = `
     }
   },
   \\"definitions\\": {
-    \\"UserBody\\": {
+    \\"Address\\": {
+      \\"type\\": \\"string\\"
+    },
+    \\"CreateUserRequestBody\\": {
       \\"type\\": \\"object\\",
       \\"properties\\": {
         \\"data\\": {
@@ -157,21 +160,32 @@ exports[`OpenAPI 2 generator produces valid code: json 1`] = `
             \\"lastName\\": {
               \\"type\\": \\"string\\"
             },
-            \\"profile\\": {
-              \\"$ref\\": \\"#/definitions/Profile\\"
+            \\"age\\": {
+              \\"type\\": \\"number\\"
+            },
+            \\"email\\": {
+              \\"$ref\\": \\"#/definitions/Email\\"
+            },
+            \\"address\\": {
+              \\"$ref\\": \\"#/definitions/Address\\"
             }
           },
           \\"required\\": [
             \\"firstName\\",
             \\"lastName\\",
-            \\"profile\\"
+            \\"age\\",
+            \\"email\\",
+            \\"address\\"
           ]
         }
       },
       \\"required\\": [
         \\"data\\"
       ]
     },
+    \\"Email\\": {
+      \\"type\\": \\"string\\"
+    },
     \\"ErrorBody\\": {
       \\"type\\": \\"object\\",
       \\"properties\\": {
@@ -190,39 +204,15 @@ exports[`OpenAPI 2 generator produces valid code: json 1`] = `
         \\"message\\"
       ]
     },
-    \\"CreateUserRequestBody\\": {
+    \\"MessageOptions\\": {
       \\"type\\": \\"object\\",
       \\"properties\\": {
-        \\"data\\": {
-          \\"type\\": \\"object\\",
-          \\"properties\\": {
-            \\"firstName\\": {
-              \\"type\\": \\"string\\"
-            },
-            \\"lastName\\": {
-              \\"type\\": \\"string\\"
-            },
-            \\"age\\": {
-              \\"type\\": \\"number\\"
-            },
-            \\"email\\": {
-              \\"$ref\\": \\"#/definitions/Email\\"
-            },
-            \\"address\\": {
-              \\"$ref\\": \\"#/definitions/Address\\"
-            }
-          },
-          \\"required\\": [
-            \\"firstName\\",
-            \\"lastName\\",
-            \\"age\\",
-            \\"email\\",
-            \\"address\\"
-          ]
+        \\"newsletter\\": {
+          \\"type\\": \\"boolean\\"
         }
       },
       \\"required\\": [
-        \\"data\\"
+        \\"newsletter\\"
       ]
     },
     \\"Profile\\": {
@@ -240,22 +230,32 @@ exports[`OpenAPI 2 generator produces valid code: json 1`] = `
         \\"messageOptions\\"
       ]
     },
-    \\"MessageOptions\\": {
+    \\"UserBody\\": {
       \\"type\\": \\"object\\",
       \\"properties\\": {
-        \\"newsletter\\": {
-          \\"type\\": \\"boolean\\"
+        \\"data\\": {
+          \\"type\\": \\"object\\",
+          \\"properties\\": {
+            \\"firstName\\": {
+              \\"type\\": \\"string\\"
+            },
+            \\"lastName\\": {
+              \\"type\\": \\"string\\"
+            },
+            \\"profile\\": {
+              \\"$ref\\": \\"#/definitions/Profile\\"
+            }
+          },
+          \\"required\\": [
+            \\"firstName\\",
+            \\"lastName\\",
+            \\"profile\\"
+          ]
         }
       },
       \\"required\\": [
-        \\"newsletter\\"
+        \\"data\\"
       ]
-    },
-    \\"Email\\": {
-      \\"type\\": \\"string\\"
-    },
-    \\"Address\\": {
-      \\"type\\": \\"string\\"
     }
   },
   \\"securityDefinitions\\": {
@@ -373,7 +373,9 @@ paths:
           headers: {}
           description: ''
 definitions:
-  UserBody:
+  Address:
+    type: string
+  CreateUserRequestBody:
     type: object
     properties:
       data:
@@ -383,14 +385,22 @@ definitions:
             type: string
           lastName:
             type: string
-          profile:
-            $ref: '#/definitions/Profile'
+          age:
+            type: number
+          email:
+            $ref: '#/definitions/Email'
+          address:
+            $ref: '#/definitions/Address'
         required:
           - firstName
           - lastName
-          - profile
+          - age
+          - email
+          - address
     required:
       - data
+  Email:
+    type: string
   ErrorBody:
     type: object
     properties:
@@ -403,30 +413,13 @@ definitions:
     required:
       - name
       - message
-  CreateUserRequestBody:
+  MessageOptions:
     type: object
     properties:
-      data:
-        type: object
-        properties:
-          firstName:
-            type: string
-          lastName:
-            type: string
-          age:
-            type: number
-          email:
-            $ref: '#/definitions/Email'
-          address:
-            $ref: '#/definitions/Address'
-        required:
-          - firstName
-          - lastName
-          - age
-          - email
-          - address
+      newsletter:
+        type: boolean
     required:
-      - data
+      - newsletter
   Profile:
     type: object
     properties:
@@ -437,17 +430,24 @@ definitions:
     required:
       - private
       - messageOptions
-  MessageOptions:
+  UserBody:
     type: object
     properties:
-      newsletter:
-        type: boolean
+      data:
+        type: object
+        properties:
+          firstName:
+            type: string
+          lastName:
+            type: string
+          profile:
+            $ref: '#/definitions/Profile'
+        required:
+          - firstName
+          - lastName
+          - profile
     required:
-      - newsletter
-  Email:
-    type: string
-  Address:
-    type: string
+      - data
 securityDefinitions:
   securityHeader:
     type: apiKey