ci: regenerated with OpenAPI Doc 0.1.0, Speakeay CLI 0.15.7

speakeasy-ci · speakeasy-ci · commit f01fa6b854d5 · 2022-12-07T00:11:53.000Z
diff --git a/gen.yaml b/gen.yaml
@@ -1,9 +1,9 @@
 management:
     openapi-checksum: eb72fa251c1471dd090eb0b974395d58
     openapi-version: 0.1.0
-    speakeasy-version: 0.15.1
+    speakeasy-version: 0.15.7
 telemetryenabled: null
 typescript:
     author: Speakeasy
     packagename: '@speakeasy-api/speakeasy-client-sdk-typescript'
-    version: 0.5.1
+    version: 0.5.2
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,11 +1,10 @@
 {
   "name": "@speakeasy-api/speakeasy-client-sdk-typescript",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "author": "Speakeasy",
   "scripts": {
     "lint:fix": "tsc --noemit && eslint \"./src\" --ext .ts,.tsx --fix",
-    "build": "tsc --build",
-    "prepare": "npm run build"
+    "prepare": "tsc --build"
   },
   "dependencies": {
     "axios": "^1.1.3",
@@ -18,7 +17,6 @@
     "@typescript-eslint/parser": "^5.40.0",
     "@types/node": "^18.11.5",
     "@types/qs": "^6.9.7",
-    "@types/reflect-metadata": "^0.1.0",
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
diff --git a/src/internal/utils/requestbody.ts b/src/internal/utils/requestbody.ts
@@ -1,19 +1,20 @@
-import { createReadStream, writeFileSync } from "fs";
-
 import FormData from "form-data";
-import { join } from "path";
 import qs from "qs";
 
 const requestMetadataKey = "request";
 const mpFormMetadataKey = "multipart_form";
 
 export function serializeRequestBody(request: any): [object, any] {
-  const fieldNames: string[] = Object.getOwnPropertyNames(request);
+  if (!request.hasOwnProperty(requestMetadataKey)) {
+    throw new Error("request body not found");
+  }
+  const requestBodyObj = request[requestMetadataKey];
+  const fieldNames: string[] = Object.getOwnPropertyNames(requestBodyObj);
   let [requestHeaders, requestBody]: [object, any] = [{}, {}];
   fieldNames.forEach((fname) => {
     const requestAnn: string = Reflect.getMetadata(
       requestMetadataKey,
-      request,
+      requestBodyObj,
       fname
     );
     if (requestAnn == null) return;
@@ -22,22 +23,35 @@ export function serializeRequestBody(request: any): [object, any] {
     switch (requestDecorator.MediaType) {
       case "multipart/form-data":
       case "multipart/mixed":
-        requestBody = encodeMultipartFormData(request[fname]);
+        requestBody = encodeMultipartFormData(requestBodyObj[fname]);
         requestHeaders = (requestBody as FormData).getHeaders();
         break;
       case "application/x-www-form-urlencoded":
         [requestHeaders, requestBody] = [
           { "Content-Type": `${requestDecorator.MediaType}` },
-          qs.stringify({ ...request[fname] }),
+          qs.stringify(requestBodyObj[fname]),
         ];
         break;
       case "application/json":
       case "text/json":
-      default:
         [requestHeaders, requestBody] = [
           { "Content-Type": `${requestDecorator.MediaType}` },
-          { ...request[fname] },
+          { ...requestBodyObj[fname] },
         ];
+        break;
+      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}`
+          );
     }
   });
   return [requestHeaders, requestBody];
@@ -58,14 +72,14 @@ function encodeMultipartFormData(form: any): FormData {
     if (mpFormDecorator.File)
       return encodeMultipartFormDataFile(formData, form[fname]);
     else if (mpFormDecorator.JSON) {
-      formData.append(mpFormDecorator.Name, { ...form[fname] });
+      formData.append(mpFormDecorator.Name, JSON.stringify(form[fname]));
     } else {
       if (Array.isArray(form[fname])) {
         form[fname].forEach((val: any) => {
-          formData.append(mpFormDecorator.Name + "[]", JSON.stringify(val));
+          formData.append(mpFormDecorator.Name + "[]", String(val));
         });
       } else {
-        formData.append(mpFormDecorator.Name, JSON.stringify(form[fname]));
+        formData.append(mpFormDecorator.Name, String(form[fname]));
       }
     }
   });
@@ -98,14 +112,12 @@ function encodeMultipartFormDataFile(formData: FormData, file: any): FormData {
     }
   });
 
-  if (mpFormDecoratorName === "" || fileName === "" || content == null)
+  if (mpFormDecoratorName === "" || fileName === "" || content == null) {
     throw new Error("invalid multipart/form-data file");
-  writeFileSync(join(__dirname, fileName), content, {
-    flag: "w",
-  });
+  }
   formData.append(
     mpFormDecoratorName,
-    createReadStream(join(__dirname, fileName))
+    Buffer.from(content)
   );
   return formData;
 }
diff --git a/src/sdk/apiendpoints.ts b/src/sdk/apiendpoints.ts
@@ -1,5 +1,4 @@
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from "axios";
-import FormData from "form-data";
 import * as operations from "./models/operations";
 import * as utils from "../internal/utils";
 
@@ -370,16 +369,13 @@ export class ApiEndpoints {
     
     const client: AxiosInstance = this._securityClient!;
     const headers = {...reqBodyHeaders, ...config?.headers};
-    let body: any;
-    if (reqBody instanceof FormData) body = reqBody;
-    else body = {...reqBody};
-    if (body == null || Object.keys(body).length === 0) throw new Error("request body is required");
+    if (reqBody == null || Object.keys(reqBody).length === 0) throw new Error("request body is required");
     return client
       .request({
         url: url,
         method: "put",
         headers: headers,
-        data: body, 
+        data: reqBody, 
         ...config,
       }).then((httpRes: AxiosResponse) => {
         const contentType: string = httpRes?.headers?.["content-type"] ?? "";
diff --git a/src/sdk/apis.ts b/src/sdk/apis.ts
@@ -1,5 +1,4 @@
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, ParamsSerializerOptions } from "axios";
-import FormData from "form-data";
 import * as operations from "./models/operations";
 import * as utils from "../internal/utils";
 
@@ -300,16 +299,13 @@ export class Apis {
     
     const client: AxiosInstance = this._securityClient!;
     const headers = {...reqBodyHeaders, ...config?.headers};
-    let body: any;
-    if (reqBody instanceof FormData) body = reqBody;
-    else body = {...reqBody};
-    if (body == null || Object.keys(body).length === 0) throw new Error("request body is required");
+    if (reqBody == null || Object.keys(reqBody).length === 0) throw new Error("request body is required");
     return client
       .request({
         url: url,
         method: "put",
         headers: headers,
-        data: body, 
+        data: reqBody, 
         ...config,
       }).then((httpRes: AxiosResponse) => {
         const contentType: string = httpRes?.headers?.["content-type"] ?? "";
diff --git a/src/sdk/metadata.ts b/src/sdk/metadata.ts
@@ -1,5 +1,4 @@
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from "axios";
-import FormData from "form-data";
 import * as operations from "./models/operations";
 import * as utils from "../internal/utils";
 
@@ -133,16 +132,13 @@ export class Metadata {
     
     const client: AxiosInstance = this._securityClient!;
     const headers = {...reqBodyHeaders, ...config?.headers};
-    let body: any;
-    if (reqBody instanceof FormData) body = reqBody;
-    else body = {...reqBody};
-    if (body == null || Object.keys(body).length === 0) throw new Error("request body is required");
+    if (reqBody == null || Object.keys(reqBody).length === 0) throw new Error("request body is required");
     return client
       .request({
         url: url,
         method: "post",
         headers: headers,
-        data: body, 
+        data: reqBody, 
         ...config,
       }).then((httpRes: AxiosResponse) => {
         const contentType: string = httpRes?.headers?.["content-type"] ?? "";
diff --git a/src/sdk/schemas.ts b/src/sdk/schemas.ts
@@ -1,5 +1,4 @@
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from "axios";
-import FormData from "form-data";
 import * as operations from "./models/operations";
 import * as utils from "../internal/utils";
 
@@ -382,16 +381,13 @@ export class Schemas {
     
     const client: AxiosInstance = this._securityClient!;
     const headers = {...reqBodyHeaders, ...config?.headers};
-    let body: any;
-    if (reqBody instanceof FormData) body = reqBody;
-    else body = {...reqBody};
-    if (body == null || Object.keys(body).length === 0) throw new Error("request body is required");
+    if (reqBody == null || Object.keys(reqBody).length === 0) throw new Error("request body is required");
     return client
       .request({
         url: url,
         method: "post",
         headers: headers,
-        data: body, 
+        data: reqBody, 
         ...config,
       }).then((httpRes: AxiosResponse) => {
         const contentType: string = httpRes?.headers?.["content-type"] ?? "";
diff --git a/src/sdk/sdk.ts b/src/sdk/sdk.ts
@@ -17,43 +17,14 @@ export const ServerList: Record<string, string> = {
 	[ServerProd]: "https://api.prod.speakeasyapi.dev",
 } as const;
 
-export function withServerURL(
-  serverURL: string,
-  params?: Map<string, string>
-): OptsFunc {
-  return (sdk: SDK) => {
-    if (params != null) {
-      serverURL = utils.replaceParameters(serverURL, params);
-    }
-    sdk._serverURL = serverURL;
-  };
-}
 
-export function withServer(
-  server: string,
-  params?: Map<string, string>
-): OptsFunc {
-  return (sdk: SDK) => {
-    if (!ServerList.hasOwnProperty(server)) {
-      throw new Error("Invalid server: " + server);
-    }
-    withServerURL(ServerList[server], params)(sdk);
-  };
-}
 
-export function withClient(client: AxiosInstance): OptsFunc {
-  return (sdk: SDK) => {
-    sdk._defaultClient = client;
-  };
-}
+export type SDKProps = {
+  defaultClient?: AxiosInstance;
 
-export function withSecurity(security: Security): OptsFunc {
-  if (!(security instanceof utils.SpeakeasyBase)) {
-    security = new Security(security);
-  }
-  return (sdk: SDK) => {
-    sdk._security = security;
-  };
+  security?: Security;
+
+  serverUrl?: string;
 }
 
 /* SDK Documentation: https://docs.speakeasyapi.dev - The Speakeasy Platform Documentation*/
@@ -67,31 +38,22 @@ export class SDK {
 
   public _defaultClient: AxiosInstance;
   public _securityClient: AxiosInstance;
-  public _security?: Security;
   public _serverURL: string;
   private _language = "typescript";
-  private _sdkVersion = "0.5.1";
+  private _sdkVersion = "0.5.2";
   private _genVersion = "";
 
-  constructor(...opts: OptsFunc[]) {
-    opts.forEach((o) => o(this));
-    if (!this._serverURL) {
-      this._serverURL = ServerList[ServerProd];
-    }
+  constructor(props: SDKProps) {
+    this._serverURL = props.serverUrl ?? ServerList[ServerProd];
 
-    if (!this._defaultClient) {
-      this._defaultClient = axios.create({ baseURL: this._serverURL });
-    }
-
-    if (!this._securityClient) {
-      if (this._security) {
-        this._securityClient = utils.createSecurityClient(
-          this._defaultClient,
-          this._security
-        );
-      } else {
-        this._securityClient = this._defaultClient;
-      }
+    this._defaultClient = props.defaultClient ?? axios.create({ baseURL: this._serverURL });
+    if (props.security) {
+      this._securityClient = utils.createSecurityClient(
+        this._defaultClient,
+        props.security
+      );
+    } else {
+      this._securityClient = this._defaultClient;
     }
     
     this.apiEndpoints = new ApiEndpoints(
@@ -148,4 +110,4 @@ export class SDK {
       this._genVersion
     );
   }
-}
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": ["esnext", "DOM"],
+    "lib": ["es2021"],
     "baseUrl": "src",
     "rootDir": "src",
     "outDir": "dist",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`"target": "es5",`
`4`		`- "lib": ["esnext", "DOM"],`
	`4`	`+ "lib": ["es2021"],`
`5`	`5`	`"baseUrl": "src",`
`6`	`6`	`"rootDir": "src",`
`7`	`7`	`"outDir": "dist",`