ci: regenerated with OpenAPI Doc 0.3.0, Speakeay CLI 1.12.0

Author: speakeasybot

README.md

@@ -31,29 +31,27 @@ const sdk = new Speakeasy({
     apiKey: "YOUR_API_KEY_HERE",
   },
 });
-    
+
 const req: GetApisRequest = {
-  queryParams: {
-    metadata: {
-      "deserunt": [
-        "nulla",
-        "id",
-        "vero",
-      ],
-      "perspiciatis": [
-        "nihil",
-        "fuga",
-        "facilis",
-        "eum",
-      ],
-      "iusto": [
-        "saepe",
-        "inventore",
-      ],
-    },
-    op: {
-      and: false,
-    },
+  metadata: {
+    "deserunt": [
+      "nulla",
+      "id",
+      "vero",
+    ],
+    "perspiciatis": [
+      "nihil",
+      "fuga",
+      "facilis",
+      "eum",
+    ],
+    "iusto": [
+      "saepe",
+      "inventore",
+    ],
+  },
+  op: {
+    and: false,
   },
 };
 

RELEASES.md

@@ -198,4 +198,12 @@ Based on:
 - OpenAPI Doc 0.3.0 https://docs.speakeasyapi.dev/openapi.yaml
 - Speakeasy CLI 1.11.0 https://github.com/speakeasy-api/speakeasy
 ### Releases
-- [NPM v1.10.0] https://www.npmjs.com/package/@speakeasy-api/speakeasy-client-sdk-typescript/v/1.10.0 - .
+- [NPM v1.10.0] https://www.npmjs.com/package/@speakeasy-api/speakeasy-client-sdk-typescript/v/1.10.0 - .
+
+## 2023-03-16 00:12:49
+### Changes
+Based on:
+- OpenAPI Doc 0.3.0 https://docs.speakeasyapi.dev/openapi.yaml
+- Speakeasy CLI 1.12.0 https://github.com/speakeasy-api/speakeasy
+### Releases
+- [NPM v1.11.0] https://www.npmjs.com/package/@speakeasy-api/speakeasy-client-sdk-typescript/v/1.11.0 - .

USAGE.md

@@ -12,29 +12,27 @@ const sdk = new Speakeasy({
     apiKey: "YOUR_API_KEY_HERE",
   },
 });
-    
+
 const req: GetApisRequest = {
-  queryParams: {
-    metadata: {
-      "deserunt": [
-        "nulla",
-        "id",
-        "vero",
-      ],
-      "perspiciatis": [
-        "nihil",
-        "fuga",
-        "facilis",
-        "eum",
-      ],
-      "iusto": [
-        "saepe",
-        "inventore",
-      ],
-    },
-    op: {
-      and: false,
-    },
+  metadata: {
+    "deserunt": [
+      "nulla",
+      "id",
+      "vero",
+    ],
+    "perspiciatis": [
+      "nihil",
+      "fuga",
+      "facilis",
+      "eum",
+    ],
+    "iusto": [
+      "saepe",
+      "inventore",
+    ],
+  },
+  op: {
+    and: false,
   },
 };
 

gen.yaml

@@ -2,12 +2,12 @@ configVersion: 1.0.0
 management:
   docChecksum: 2bba3b8f9d211b02569b3f9aff0d34b4
   docVersion: 0.3.0
-  speakeasyVersion: 1.11.0
+  speakeasyVersion: 1.12.0
 generation:
   telemetryEnabled: true
   sdkClassName: speakeasy
   sdkFlattening: true
 typescript:
-  version: 1.10.0
+  version: 1.11.0
   author: Speakeasy
   packageName: '@speakeasy-api/speakeasy-client-sdk-typescript'

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@speakeasy-api/speakeasy-client-sdk-typescript",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "author": "Speakeasy",
   "scripts": {
     "prepare": "tsc --build"

package.json

@@ -8,6 +8,7 @@ import {
   ParamDecorator,
   convertIfDateObjectToISOString,
 } from "./utils";
+import {requestMetadataKey} from "./requestbody";
 
 export const headerMetadataKey = "header";
 
@@ -18,6 +19,14 @@ export function getHeadersFromRequest(headerParams: any): any {
 
   const fieldNames: string[] = Object.getOwnPropertyNames(headerParams);
   fieldNames.forEach((fname) => {
+    const requestBodyAnn: string = Reflect.getMetadata(
+      requestMetadataKey,
+      headerParams,
+      fname
+    );
+
+    if (requestBodyAnn) return;
+
     const headerAnn: string = Reflect.getMetadata(
       headerMetadataKey,
       headerParams,

src/internal/utils/headers.ts

@@ -6,6 +6,7 @@ import {
 } from "./utils";
 
 import { ParamDecorator } from "./utils";
+import {requestMetadataKey} from "./requestbody";
 
 export const qpMetadataKey = "queryParam";
 const queryStringPrefix = "?";
@@ -20,6 +21,14 @@ export function serializeQueryParams(queryParams: any, globals?: any): string {
       : Object.getOwnPropertyNames(queryParams);
 
   fieldNames.forEach((fname) => {
+    const requestBodyAnn: string = Reflect.getMetadata(
+      requestMetadataKey,
+      queryParams,
+      fname
+    );
+
+    if (requestBodyAnn) return;
+
     const qpAnn: string = Reflect.getMetadata(
       qpMetadataKey,
       queryParams,
@@ -41,31 +50,31 @@ export function serializeQueryParams(queryParams: any, globals?: any): string {
     value = populateFromGlobals(value, fname, "queryParam", globals);
 
     if (qpDecorator.Serialization === "json")
-      queryStringParts.push(jsonSerializer({ [fname]: value }));
+      queryStringParts.push(jsonSerializer({ [qpDecorator.ParamName]: value }));
     else {
       switch (qpDecorator.Style) {
         case "deepObject":
           queryStringParts.push(
-            deepObjectSerializer({ [fname]: value }, qpDecorator.DateTimeFormat)
+            deepObjectSerializer({ [qpDecorator.ParamName]: value }, qpDecorator.DateTimeFormat)
           );
           return;
         case "form":
           if (!qpDecorator.Explode)
             queryStringParts.push(
-              formSerializer({ [fname]: value }, qpDecorator.DateTimeFormat)
+              formSerializer({ [qpDecorator.ParamName]: value }, qpDecorator.DateTimeFormat)
             );
           else
             queryStringParts.push(
               formSerializerExplode(
-                { [fname]: value },
+                { [qpDecorator.ParamName]: value },
                 qpDecorator.DateTimeFormat
               )
             );
           return;
         default:
           queryStringParts.push(
             formSerializerExplode(
-              { [fname]: value },
+              { [qpDecorator.ParamName]: value },
               qpDecorator.DateTimeFormat
             )
           );

src/internal/utils/queryparams.ts

@@ -3,78 +3,69 @@ import {
   convertIfDateObjectToISOString,
   isBooleanRecord,
   isNumberRecord,
-  isStringRecord,
+  isStringRecord, SerializationMethodToContentType,
 } from "./utils";
 
-const requestMetadataKey = "request";
+export const requestMetadataKey = "request";
 const mpFormMetadataKey = "multipart_form";
 
-export function serializeRequestBody(request: any): [object, any] {
-  if (!request.hasOwnProperty(requestMetadataKey)) {
-    throw new Error("request body not found");
+export function serializeRequestBody(request: any, requestFieldName: string, serializationMethod: string): [object, any] {
+  if (request !== Object(request) || !request.hasOwnProperty(requestFieldName)) {
+    return serializeContentType(SerializationMethodToContentType[serializationMethod], request);
   }
 
-  let requestBodyObj = request;
-
-  const firstLevelRequestAnn: string = Reflect.getMetadata(
+  const requestBodyAnn: string = Reflect.getMetadata(
     requestMetadataKey,
     request,
-    requestMetadataKey
+    requestFieldName
   );
-  if (firstLevelRequestAnn == null)
-    requestBodyObj = request[requestMetadataKey];
-
-  let [requestHeaders, requestBody]: [object, any] = [{}, {}];
-
-  const fieldNames: string[] = Object.getOwnPropertyNames(requestBodyObj);
-  fieldNames.forEach((fname) => {
-    const requestAnn: string = Reflect.getMetadata(
-      requestMetadataKey,
-      requestBodyObj,
-      fname
-    );
-    if (requestAnn == null) return;
-
-    const requestDecorator: RequestDecorator =
-      parseRequestDecorator(requestAnn);
-
-    switch (requestDecorator.MediaType) {
-      case "multipart/form-data":
-      case "multipart/mixed":
-        requestBody = encodeMultipartFormData(requestBodyObj[fname]);
-        requestHeaders = (requestBody as FormData).getHeaders();
-        break;
+  if (!requestBodyAnn) {
+    throw new Error("invalid request type");
+  }
 
-      case "application/x-www-form-urlencoded":
-        [requestHeaders, requestBody] = [
-          { "Content-Type": `${requestDecorator.MediaType}` },
-          encodeFormUrlEncodeData(requestBodyObj[fname]),
-        ];
-        break;
+  const requestDecorator: RequestDecorator = parseRequestDecorator(requestBodyAnn);
+  return serializeContentType(requestDecorator.MediaType, request[requestFieldName]);
+}
 
-      case "application/json":
-      case "text/json":
-        [requestHeaders, requestBody] = [
-          { "Content-Type": `${requestDecorator.MediaType}` },
-          requestBodyObj[fname],
-        ];
-        break;
+const serializeContentType = (contentType: string, reqBody: any): [object, any] => {
+  let [requestHeaders, requestBody]: [object, any] = [{}, {}];
 
-      default:
-        requestBody = requestBodyObj[fname];
-        const requestBodyType: string = typeof requestBody;
-        if (
-          requestBodyType === "string" ||
-          requestBody instanceof String ||
-          requestBody instanceof Uint8Array
-        )
-          requestHeaders = { "Content-Type": `${requestDecorator.MediaType}` };
-        else
-          throw new Error(
-            `invalid request body type ${requestBodyType} for mediaType ${requestDecorator.MediaType}`
-          );
-    }
-  });
+  switch (contentType) {
+    case "multipart/form-data":
+    case "multipart/mixed":
+      requestBody = encodeMultipartFormData(reqBody);
+      requestHeaders = (requestBody as FormData).getHeaders();
+      break;
+
+    case "application/x-www-form-urlencoded":
+      [requestHeaders, requestBody] = [
+        { "Content-Type": `${contentType}` },
+        encodeFormUrlEncodeData(reqBody),
+      ];
+      break;
+
+    case "application/json":
+    case "text/json":
+      [requestHeaders, requestBody] = [
+        { "Content-Type": `${contentType}` },
+        reqBody,
+      ];
+      break;
+
+    default:
+      requestBody = reqBody;
+      const requestBodyType: string = typeof requestBody;
+      if (
+        requestBodyType === "string" ||
+        requestBody instanceof String ||
+        requestBody instanceof Uint8Array
+      )
+        requestHeaders = { "Content-Type": `${contentType}` };
+      else
+        throw new Error(
+          `invalid request body type ${requestBodyType} for mediaType ${contentType}`
+        );
+  }
   return [requestHeaders, requestBody];
 }