merge binary payloads when they aint binary. you heard me.

modelerfour/modeler/modelerfour.ts

@@ -970,6 +970,24 @@ export class ModelerFour {
           // that were listed in the original 'produces' collection
           // because we *can't* infer that a json/xml/form media type means deserialize
 
+          switch (knownMediaType) {
+            case KnownMediaType.Json:
+            case KnownMediaType.Xml:
+            case KnownMediaType.Form:
+              // it's been mis-categorized as a deserialization
+              // but they said,"stream please"
+              // then we have to move it to the binary bucket.
+              let b = mediaTypeGroups.get(KnownMediaType.Binary);
+              if (!b) {
+                // we don't have a binary group at all.
+                // let's just create one
+                b = [];
+                mediaTypeGroups.set(KnownMediaType.Binary, b);
+              }
+              b.push(fmt);
+              // remove the current group 
+              mediaTypeGroups.delete(knownMediaType);
+          }
         } else {
           switch (knownMediaType) {
             case KnownMediaType.Json:

modelerfour/test/scenarios/body-file/flattened.yaml

@@ -30,19 +30,8 @@ schemas: !<!Schemas>
         name: Error-message
         description: ''
     protocol: !<!Protocols> {}
-  binaries:
-  - !<!BinarySchema> &ref_4
-    type: binary
-    apiVersions:
-    - !<!ApiVersion> 
-      version: 1.0.0
-    language: !<!Languages> 
-      default:
-        name: binary
-        description: ''
-    protocol: !<!Protocols> {}
   objects:
-  - !<!ObjectSchema> &ref_5
+  - !<!ObjectSchema> &ref_4
     type: object
     apiVersions:
     - !<!ApiVersion> 
@@ -124,24 +113,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''
@@ -188,24 +165,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''
@@ -252,24 +217,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''

modelerfour/test/scenarios/body-file/grouped.yaml

@@ -30,19 +30,8 @@ schemas: !<!Schemas>
         name: Error-message
         description: ''
     protocol: !<!Protocols> {}
-  binaries:
-  - !<!BinarySchema> &ref_4
-    type: binary
-    apiVersions:
-    - !<!ApiVersion> 
-      version: 1.0.0
-    language: !<!Languages> 
-      default:
-        name: binary
-        description: ''
-    protocol: !<!Protocols> {}
   objects:
-  - !<!ObjectSchema> &ref_5
+  - !<!ObjectSchema> &ref_4
     type: object
     apiVersions:
     - !<!ApiVersion> 
@@ -124,24 +113,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''
@@ -188,24 +165,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''
@@ -252,24 +217,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''

modelerfour/test/scenarios/body-file/modeler.yaml

@@ -30,19 +30,8 @@ schemas: !<!Schemas>
         name: Error-message
         description: ''
     protocol: !<!Protocols> {}
-  binaries:
-  - !<!BinarySchema> &ref_3
-    type: binary
-    apiVersions:
-    - !<!ApiVersion> 
-      version: 1.0.0
-    language: !<!Languages> 
-      default:
-        name: binary
-        description: ''
-    protocol: !<!Protocols> {}
   objects:
-  - !<!ObjectSchema> &ref_4
+  - !<!ObjectSchema> &ref_3
     type: object
     apiVersions:
     - !<!ApiVersion> 
@@ -75,7 +64,7 @@ schemas: !<!Schemas>
         namespace: ''
     protocol: !<!Protocols> {}
 globalParameters:
-- !<!Parameter> &ref_5
+- !<!Parameter> &ref_4
   schema: *ref_2
   clientDefaultValue: 'http://localhost:3000'
   implementation: Client
@@ -99,7 +88,7 @@ operationGroups:
     - !<!ApiVersion> 
       version: 1.0.0
     parameters:
-    - *ref_5
+    - *ref_4
     requests:
     - !<!Request> 
       language: !<!Languages> 
@@ -124,24 +113,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_3
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_4
+      schema: *ref_3
       language: !<!Languages> 
         default:
           name: ''
@@ -163,7 +140,7 @@ operationGroups:
     - !<!ApiVersion> 
       version: 1.0.0
     parameters:
-    - *ref_5
+    - *ref_4
     requests:
     - !<!Request> 
       language: !<!Languages> 
@@ -188,24 +165,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_3
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_4
+      schema: *ref_3
       language: !<!Languages> 
         default:
           name: ''
@@ -227,7 +192,7 @@ operationGroups:
     - !<!ApiVersion> 
       version: 1.0.0
     parameters:
-    - *ref_5
+    - *ref_4
     requests:
     - !<!Request> 
       language: !<!Languages> 
@@ -252,24 +217,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_3
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_4
+      schema: *ref_3
       language: !<!Languages> 
         default:
           name: ''

modelerfour/test/scenarios/body-file/namer.yaml

@@ -30,19 +30,8 @@ schemas: !<!Schemas>
         name: ErrorMessage
         description: ''
     protocol: !<!Protocols> {}
-  binaries:
-  - !<!BinarySchema> &ref_4
-    type: binary
-    apiVersions:
-    - !<!ApiVersion> 
-      version: 1.0.0
-    language: !<!Languages> 
-      default:
-        name: binary
-        description: ''
-    protocol: !<!Protocols> {}
   objects:
-  - !<!ObjectSchema> &ref_5
+  - !<!ObjectSchema> &ref_4
     type: object
     apiVersions:
     - !<!ApiVersion> 
@@ -124,24 +113,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''
@@ -188,24 +165,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''
@@ -252,24 +217,12 @@ operationGroups:
           knownMediaType: binary
           mediaTypes:
           - image/png
-          statusCodes:
-          - '200'
-    - !<!SchemaResponse> 
-      schema: *ref_4
-      language: !<!Languages> 
-        default:
-          name: ''
-          description: ''
-      protocol: !<!Protocols> 
-        http: !<!HttpResponse> 
-          knownMediaType: json
-          mediaTypes:
           - application/json
           statusCodes:
           - '200'
     exceptions:
     - !<!SchemaResponse> 
-      schema: *ref_5
+      schema: *ref_4
       language: !<!Languages> 
         default:
           name: ''