Merge pull request #1 from jessewang-arvatosystems/generate-custom-rebase

Add new property to list allMediaTypes.

Author: alexjennings

src/client/interfaces/OperationParameter.d.ts

@@ -4,4 +4,5 @@ export interface OperationParameter extends Model {
     in: 'path' | 'query' | 'header' | 'formData' | 'body' | 'cookie';
     prop: string;
     mediaType: string | null;
+    allMediaTypes: string[];
 }

src/client/interfaces/OperationResponse.d.ts

@@ -3,4 +3,6 @@ import type { Model } from './Model';
 export interface OperationResponse extends Model {
     in: 'response' | 'header';
     code: number;
+    mediaType: string | null;
+    allMediaTypes: string[];
 }

src/openApi/v2/parser/getOperationParameter.ts

@@ -43,6 +43,7 @@ export const getOperationParameter = (openApi: OpenApi, parameter: OpenApiParame
         enums: [],
         properties: [],
         mediaType: null,
+        allMediaTypes: [],
     };
 
     if (parameter.$ref) {

src/openApi/v2/parser/getOperationResponse.ts

@@ -30,6 +30,8 @@ export const getOperationResponse = (
         enum: [],
         enums: [],
         properties: [],
+        mediaType: null,
+        allMediaTypes: [],
     };
 
     // If this response has a schema, then we need to check two things:

src/openApi/v2/parser/getOperationResults.ts

@@ -39,6 +39,8 @@ export const getOperationResults = (operationResponses: OperationResponse[]): Op
             enum: [],
             enums: [],
             properties: [],
+            mediaType: null,
+            allMediaTypes: [],
         });
     }
 

src/openApi/v3/parser/getContent.ts

@@ -6,15 +6,19 @@ import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 
 export interface Content {
     mediaType: string;
+    allMediaTypes: string[];
     schema: OpenApiSchema;
 }
 
 const BASIC_MEDIA_TYPES = [
     'application/json-patch+json',
     'application/json',
-    'application/x-www-form-urlencoded',
     'text/json',
     'text/plain',
+    'application/xml',
+    'application/javascript',
+    'application/octet-stream',
+    'application/x-www-form-urlencoded',
     'multipart/form-data',
     'multipart/mixed',
     'multipart/related',
@@ -31,6 +35,7 @@ export const getContent = (openApi: OpenApi, content: Dictionary<OpenApiMediaTyp
     if (basicMediaTypeWithSchema) {
         return {
             mediaType: basicMediaTypeWithSchema,
+            allMediaTypes: Object.keys(content),
             schema: content[basicMediaTypeWithSchema].schema as OpenApiSchema,
         };
     }
@@ -39,6 +44,7 @@ export const getContent = (openApi: OpenApi, content: Dictionary<OpenApiMediaTyp
     if (firstMediaTypeWithSchema) {
         return {
             mediaType: firstMediaTypeWithSchema,
+            allMediaTypes: Object.keys(content),
             schema: content[firstMediaTypeWithSchema].schema as OpenApiSchema,
         };
     }

src/openApi/v3/parser/getOperationParameter.ts

@@ -30,6 +30,7 @@ export const getOperationParameter = (openApi: OpenApi, parameter: OpenApiParame
         enums: [],
         properties: [],
         mediaType: null,
+        allMediaTypes: [],
     };
 
     if (parameter.$ref) {

src/openApi/v3/parser/getOperationRequestBody.ts

@@ -27,12 +27,14 @@ export const getOperationRequestBody = (openApi: OpenApi, body: OpenApiRequestBo
         enums: [],
         properties: [],
         mediaType: null,
+        allMediaTypes: [],
     };
 
     if (body.content) {
         const content = getContent(openApi, body.content);
         if (content) {
             requestBody.mediaType = content.mediaType;
+            requestBody.allMediaTypes = content.allMediaTypes;
             switch (requestBody.mediaType) {
                 case 'application/x-www-form-urlencoded':
                 case 'multipart/form-data':

src/openApi/v3/parser/getOperationResponse.ts

@@ -31,11 +31,15 @@ export const getOperationResponse = (
         enum: [],
         enums: [],
         properties: [],
+        mediaType: null,
+        allMediaTypes: [],
     };
 
     if (response.content) {
         const content = getContent(openApi, response.content);
         if (content) {
+            operationResponse.mediaType = content.mediaType;
+            operationResponse.allMediaTypes = content.allMediaTypes;
             if (content.schema.$ref?.startsWith('#/components/responses/')) {
                 content.schema = getRef<OpenApiSchema>(openApi, content.schema);
             }

src/openApi/v3/parser/getOperationResults.ts

@@ -39,6 +39,8 @@ export const getOperationResults = (operationResponses: OperationResponse[]): Op
             enum: [],
             enums: [],
             properties: [],
+            mediaType: null,
+            allMediaTypes: [],
         });
     }