fix: type

Himenon · Feb 11, 2024 · f8a8036 · f8a8036
1 parent 7f50512
commit f8a8036
Show file tree

Hide file tree

Showing 7 changed files with 417 additions and 1,545 deletions.
diff --git a/src/internal/OpenApiTools/Extractor.ts b/src/internal/OpenApiTools/Extractor.ts
@@ -36,7 +36,13 @@ const extractResponseNamesByStatusCode = (type: "success" | "error", responses:
 };
 
 const getRequestContentTypeList = (requestBody: OpenApi.RequestBody): string[] => {
-  return Object.keys(requestBody.content);
+  return Object.entries(requestBody.content).reduce<string[]>((list, [key, mediaType]) => {
+    const hasValidContent = Object.values(mediaType).length > 0;
+    if (hasValidContent) {
+      return list.concat(key);
+    }
+    return list;
+  }, []);
 };
 
 const getSuccessResponseContentTypeList = (responses: { [statusCode: string]: OpenApi.Response }): string[] => {

diff --git a/src/internal/OpenApiTools/Walker/Operation.ts b/src/internal/OpenApiTools/Walker/Operation.ts
@@ -31,12 +31,15 @@ export const create = (rootSchema: OpenApi.Document): State => {
       }
       const parameters = [...(pathItem.parameters || []), ...(operation.parameters || [])] as OpenApi.Parameter[];
 
+      const requestBody = operation.requestBody as OpenApi.RequestBody | undefined;
+      const hasRequestBody = requestBody ? Object.values(requestBody.content).filter(Boolean).length > 0 : false;
+
       state[operation.operationId] = {
         httpMethod,
         requestUri,
         comment: [operation.summary, operation.description].filter(Boolean).join(EOL),
         deprecated: !!operation.deprecated,
-        requestBody: operation.requestBody as OpenApi.RequestBody,
+        requestBody: hasRequestBody ? requestBody : undefined,
         parameters: uniqParameters(parameters),
         responses: operation.responses as CodeGenerator.OpenApiResponses,
       };

diff --git a/src/internal/OpenApiTools/components/Operation.ts b/src/internal/OpenApiTools/components/Operation.ts
@@ -182,12 +182,21 @@ export const generateStatements = (
         });
       }
     } else {
-      statements.push(
-        RequestBody.generateInterface(entryPoint, currentPoint, factory, requestBodyName, operation.requestBody, context, converterContext),
-      );
-      store.updateOperationState(httpMethod, requestUri, operationId, {
-        requestBodyName: requestBodyName,
-      });
+      /**
+       * requestBody:
+       *   content:
+       *     application/json: {}
+       */
+      const hasValidMediaType =
+        Object.values(operation.requestBody.content).filter(mediaType => Object.values(mediaType).length > 0).length > 0;
+      if (hasValidMediaType) {
+        statements.push(
+          RequestBody.generateInterface(entryPoint, currentPoint, factory, requestBodyName, operation.requestBody, context, converterContext),
+        );
+        store.updateOperationState(httpMethod, requestUri, operationId, {
+          requestBodyName: requestBodyName,
+        });
+      }
     }
   }
 

diff --git a/src/internal/OpenApiTools/components/RequestBody.ts b/src/internal/OpenApiTools/components/RequestBody.ts
@@ -16,11 +16,17 @@ export const generateInterface = (
   context: ToTypeNode.Context,
   converterContext: ConverterContext.Types,
 ): ts.InterfaceDeclaration => {
+  /**
+   * requestBody:
+   *   content:
+   *     application/json: {}
+   */
+  const hasValidMediaType = Object.values(requestBody.content).filter(mediaType => Object.values(mediaType).length > 0).length > 0;
   const contentSignatures = MediaType.generatePropertySignatures(
     entryPoint,
     currentPoint,
     factory,
-    requestBody.content || {},
+    hasValidMediaType ? requestBody.content : {},
     context,
     converterContext,
   );