implementing request body serialization

Author: anuraagnalluri

src/internal/utils/pathparams.ts

@@ -30,7 +30,7 @@ export function GetSimplePathParams(
   paramName: string,
   paramValue: any
 ): Map<string, string> {
-  const pathParams: Map<string, string> = new Map<string, string>();
+  let pathParams: Map<string, string> = new Map<string, string>();
   if (typeof paramValue === "string") pathParams.set(paramName, paramValue);
   else pathParams.set(paramName, JSON.stringify(paramValue));
   return pathParams;

src/internal/utils/queryparams.ts

@@ -36,7 +36,7 @@ export function GetQueryParamSerializer(
               encode: FormSerializer,
             };
           }
-        case "default":
+        default:
           // go to next query parameter field, assume first implemented serializer will serialize all query parameters for this request
           return;
       }

src/internal/utils/requestbody.ts

@@ -0,0 +1,47 @@
+const requestMetadataKey = "request";
+
+export function SerializeRequestBody(request: any): [string, unknown] {
+  const fieldNames: string[] = Object.getOwnPropertyNames(request);
+  let [mediaType, requestBody]: [string, unknown] = ["", ""];
+  fieldNames.forEach((fname) => {
+    const requestAnn: string = Reflect.getMetadata(
+      requestMetadataKey,
+      request,
+      fname
+    );
+    if (requestAnn == null) return;
+    const requestDecorator: RequestDecorator =
+      ParseRequestDecorator(requestAnn);
+    switch (requestDecorator.MediaType) {
+      case "multipart/form-data":
+      case "multipart/mixed":
+        [mediaType, requestBody] = [
+          requestDecorator.MediaType,
+          EncodeMultipartFormData(request[fname]),
+        ];
+        break;
+      case "application/json":
+      case "text/json":
+      default:
+        [mediaType, requestBody] = [requestDecorator.MediaType, request[fname]];
+    }
+  });
+  return [mediaType, requestBody];
+}
+
+function ParseRequestDecorator(requestAnn: string): RequestDecorator {
+  // example "media_type=multipart/form-data"
+  const requestDecorator: RequestDecorator = new RequestDecorator(
+    "application/octet-stream"
+  );
+  const [mediaTypeKey, mediaTypeVal]: string[] = requestAnn.split("=");
+  if (mediaTypeKey === "media_type") requestDecorator.MediaType = mediaTypeVal;
+  return requestDecorator;
+}
+
+class RequestDecorator {
+  MediaType: string;
+  constructor(MediaType: string) {
+    this.MediaType = MediaType;
+  }
+}

src/sdk/sdk.ts

@@ -6,6 +6,7 @@ import * as shared from "./models/shared";
 import * as operations from "./models/operations";
 import { ParamsSerializerOptions } from "axios";
 import { GetQueryParamSerializer } from "internal/utils/queryparams";
+import { SerializeRequestBody } from "../internal/utils/requestbody";
 
 const Servers = ["http://api.prod.speakeasyapi.dev"] as const;
 
@@ -1468,9 +1469,12 @@ export class SDK {
       props.PathParams
     );
 
-    let reqContentType = "application/json";
+    let [reqContentType, reqBody]: [string, unknown] = [
+      "application/json",
+      props.Request,
+    ];
     try {
-      reqContentType = utils.SerializeRequestBody(props);
+      [reqContentType, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
       if (e instanceof Error) {
         return new Error("Error serializing request body", {
@@ -1495,7 +1499,7 @@ export class SDK {
         operations.InsertVersionMetadataResponse,
         AxiosResponse<operations.InsertVersionMetadataResponse>,
         unknown
-      >(url, {
+      >(url, reqBody, {
         headers: headers,
         ...config,
       });
@@ -1602,9 +1606,12 @@ export class SDK {
       props.PathParams
     );
 
-    let reqContentType = "application/json";
+    let [reqContentType, reqBody]: [string, unknown] = [
+      "application/json",
+      props.Request,
+    ];
     try {
-      reqContentType = utils.SerializeRequestBody(props);
+      [reqContentType, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
       if (e instanceof Error) {
         return new Error("Error serializing request body", {
@@ -1628,7 +1635,7 @@ export class SDK {
         operations.RegisterSchemaResponse,
         AxiosResponse<operations.RegisterSchemaResponse>,
         unknown
-      >(url, {
+      >(url, reqBody, {
         headers: headers,
         ...config,
       });
@@ -1719,9 +1726,12 @@ export class SDK {
       props.PathParams
     );
 
-    let reqContentType = "application/json";
+    let [reqContentType, reqBody]: [string, unknown] = [
+      "application/json",
+      props.Request,
+    ];
     try {
-      reqContentType = utils.SerializeRequestBody(props);
+      [reqContentType, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
       if (e instanceof Error) {
         return new Error("Error serializing request body", {
@@ -1745,7 +1755,7 @@ export class SDK {
         operations.UpsertApiResponse,
         AxiosResponse<operations.UpsertApiResponse>,
         unknown
-      >(url, {
+      >(url, reqBody, {
         headers: headers,
         ...config,
       });
@@ -1791,9 +1801,12 @@ export class SDK {
       props.PathParams
     );
 
-    let reqContentType = "application/json";
+    let [reqContentType, reqBody]: [string, unknown] = [
+      "application/json",
+      props.Request,
+    ];
     try {
-      reqContentType = utils.SerializeRequestBody(props);
+      [reqContentType, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
       if (e instanceof Error) {
         return new Error("Error serializing request body", {
@@ -1818,7 +1831,7 @@ export class SDK {
         operations.UpsertApiEndpointResponse,
         AxiosResponse<operations.UpsertApiEndpointResponse>,
         unknown
-      >(url, {
+      >(url, reqBody, {
         headers: headers,
         ...config,
       });