change approach for 3.0 after review

Author: Artem Parkhomenko

src/language/typescript/2.0/serializers/operation-object.ts

@@ -257,7 +257,6 @@ export const serializeOperationObject = combineReader(
 			fold(
 				() => 'json',
 				produces => {
-					console.log(produces);
 					if (produces.includes('application/octet-stream')) {
 						return 'blob';
 					}

src/language/typescript/3.0/serializers/operation-object.ts

@@ -5,7 +5,6 @@ import {
 	getTypeName,
 	getURL,
 	HTTPMethod,
-	JSON_RESPONSE_TYPE,
 	XHRResponseType,
 } from '../../common/utils';
 import {
@@ -43,7 +42,7 @@ import { ResolveRefContext, fromString, getRelativePath, Ref } from '../../../..
 import { OperationObject } from '../../../../schema/3.0/operation-object';
 import { ParameterObject, ParameterObjectCodec } from '../../../../schema/3.0/parameter-object';
 import { RequestBodyObjectCodec } from '../../../../schema/3.0/request-body-object';
-import { chain, exists, getOrElse, isSome, none, Option, some, map } from 'fp-ts/lib/Option';
+import { chain, isSome, none, Option, some, map, fromEither, fold } from 'fp-ts/lib/Option';
 import { constFalse } from 'fp-ts/lib/function';
 import { clientRef } from '../../common/bundled/client';
 import { Kind } from '../../../../utils/types';
@@ -57,8 +56,8 @@ import {
 	serializedFragment,
 	SerializedFragment,
 } from '../../common/data/serialized-fragment';
-import { PrimitiveSchemaObjectCodec, SchemaObjectCodec } from '../../../../schema/3.0/schema-object';
-import { lookup } from 'fp-ts/lib/Record';
+import { SchemaObjectCodec } from '../../../../schema/3.0/schema-object';
+import { lookup, keys } from 'fp-ts/lib/Record';
 import { ResponseObjectCodec } from '../../../../schema/3.0/response-object';
 
 const getOperationName = (pattern: string, operation: OperationObject, method: HTTPMethod): string =>
@@ -261,28 +260,25 @@ export const serializeOperationObject = combineReader(
 
 		const responseType: XHRResponseType = pipe(
 			lookup('200', operation.responses),
-			chain(response => e.deepLookup(response, ResponseObjectCodec, ReferenceObjectCodec)),
+			chain(response =>
+				ReferenceObjectCodec.is(response)
+					? fromEither(e.resolveRef(response.$ref, ResponseObjectCodec))
+					: some(response),
+			),
 			chain(response => response.content),
-			chain(content => lookup('application/json', content)),
-			chain(contentBody => contentBody.schema),
-			chain(schema => e.deepLookup(schema, PrimitiveSchemaObjectCodec, ReferenceObjectCodec)),
-			map(schema => {
-				const isBinary = pipe(
-					schema.format,
-					exists(format => format === 'binary'),
-				);
-
-				if (schema.type === 'string' && isBinary) {
-					return 'blob';
-				}
-
-				if (schema.type === 'string') {
-					return 'text';
-				}
-
-				return 'json';
-			}),
-			getOrElse(() => JSON_RESPONSE_TYPE),
+			map(keys),
+			fold(
+				() => 'json',
+				types => {
+					if (types.includes('application/octet-stream')) {
+						return 'blob';
+					}
+					if (types.includes('text/plain')) {
+						return 'text';
+					}
+					return 'json';
+				},
+			),
 		);
 
 		return combineEither(

test/specs/3.0/file-and-text.yml

@@ -24,7 +24,7 @@ paths:
         200:
           description: succesfull operation
           content:
-            application/json:
+            application/octet-stream:
               schema:
                 type: string
                 format: binary
@@ -49,7 +49,7 @@ paths:
         200:
           description: succesfull operation
           content:
-            application/json:
+            application/octet-stream:
               schema:
                 $ref: '#/components/schemas/File'
   /text/1/version/1:
@@ -62,7 +62,7 @@ paths:
         200:
           description: succesfull operation
           content:
-            application/json:
+            text/plain:
               schema:
                 type: string
   /textWithResponseRef:
@@ -75,7 +75,7 @@ paths:
         200:
           description: ok
           content:
-            application/json:
+            text/plain:
               schema:
                 $ref: '#/components/responses/SuccessfulText'
   /textWithSchemaRef:
@@ -88,7 +88,7 @@ paths:
         200:
           description: succesfull operation
           content:
-            application/json:
+            text/plain:
               schema:
                 $ref: '#/components/schemas/Text'
 components:
@@ -104,12 +104,12 @@ components:
     SuccessfulFile:
       description: succesfull operation
       content:
-        application/json:
+        application/octet-stream:
           schema:
             $ref: '#/components/schemas/File'
     SuccessfulText:
       description: succesful text data loading
       content:
-        application/json:
+        text/plain:
           schema:
             $ref: '#/components/schemas/Text'