Skip to content

Commit 2816fb2

Browse files
committed
ci: regenerated with OpenAPI Doc 0.1.0, Speakeay CLI 0.13.3
1 parent 30643cd commit 2816fb2

18 files changed

+236
-234
lines changed

gen.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
management:
22
openapi-checksum: 46093b002f359f8049d6b8210be2bc73
33
openapi-version: 0.1.0
4-
speakeasy-version: 0.13.2
4+
speakeasy-version: 0.13.3
55
telemetryenabled: null
66
typescript:
77
author: Speakeasy
88
packagename: '@speakeasy-api/speakeasy-client-sdk-typescript'
9-
version: 0.3.0
9+
version: 0.3.1

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@speakeasy-api/speakeasy-client-sdk-typescript",
3-
"version": "0.3.0",
3+
"version": "0.3.1",
44
"author": "Speakeasy",
55
"scripts": {
66
"lint:fix": "tsc --noemit && eslint \"./src\" --ext .ts,.tsx --fix",

src/internal/utils/contenttype.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export function MatchContentType(
1+
export function matchContentType(
22
contentType: string,
33
pattern: string
44
): boolean {

src/internal/utils/headers.ts

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,62 @@
1-
import { ParamDecorator } from "./pathparams";
2-
import { ParseParamDecorator } from "./utils";
31
import { AxiosResponseHeaders, RawAxiosResponseHeaders } from "axios";
42

3+
import { ParamDecorator } from "./pathparams";
4+
import { parseParamDecorator } from "./utils";
5+
56
export const headerMetadataKey = "headerParam";
67

7-
export function GetHeadersFromRequest(headerParams: any): any {
8-
if (headerParams == null) return;
9-
const headers: any = {};
10-
const fieldNames: string[] = Object.getOwnPropertyNames(headerParams);
11-
fieldNames.forEach((fname) => {
12-
const headerAnn: string = Reflect.getMetadata(
13-
headerMetadataKey,
14-
headerParams,
15-
fname
16-
);
17-
if (headerAnn == null) return;
18-
const headerDecorator: ParamDecorator = ParseParamDecorator(
19-
headerAnn,
20-
fname,
21-
"simple",
22-
false
23-
);
24-
if (headerDecorator == null) return;
25-
const value: string = SerializeHeader(
26-
headerParams[fname],
27-
headerDecorator.Explode
28-
);
29-
if (value != "") headers[headerDecorator.ParamName] = value;
30-
});
31-
return headers;
8+
export function getHeadersFromRequest(headerParams: any): any {
9+
if (headerParams == null) return;
10+
const headers: any = {};
11+
const fieldNames: string[] = Object.getOwnPropertyNames(headerParams);
12+
fieldNames.forEach((fname) => {
13+
const headerAnn: string = Reflect.getMetadata(
14+
headerMetadataKey,
15+
headerParams,
16+
fname
17+
);
18+
if (headerAnn == null) return;
19+
const headerDecorator: ParamDecorator = parseParamDecorator(
20+
headerAnn,
21+
fname,
22+
"simple",
23+
false
24+
);
25+
if (headerDecorator == null) return;
26+
const value: string = serializeHeader(
27+
headerParams[fname],
28+
headerDecorator.Explode
29+
);
30+
if (value != "") headers[headerDecorator.ParamName] = value;
31+
});
32+
return headers;
3233
}
3334

34-
export function GetHeadersFromResponse(
35-
headers: RawAxiosResponseHeaders | AxiosResponseHeaders
35+
export function getHeadersFromResponse(
36+
headers: RawAxiosResponseHeaders | AxiosResponseHeaders
3637
): Map<string, string[]> {
37-
// TODO: convert Axios response headers to map
38-
return new Map<string, string[]>();
38+
// TODO: convert Axios response headers to map
39+
return new Map<string, string[]>();
3940
}
4041

41-
function SerializeHeader(header: any, explode: boolean): string {
42-
const headerVals: string[] = [];
43-
if (Array.isArray(header)) {
44-
header.forEach((val: any) => {
45-
headerVals.push(String(val));
46-
});
47-
} else if (header instanceof Map) {
48-
header.forEach((headerVal, headerKey) => {
49-
if (explode) headerVals.push(`${headerKey}=${headerVal}`);
50-
else headerVals.push(`${headerKey},${headerVal}`);
51-
});
52-
} else if (header instanceof Object) {
53-
Object.getOwnPropertyNames(header).forEach((headerKey: string) => {
54-
if (explode) headerVals.push(`${headerKey}=${header[headerKey]}`);
55-
else headerVals.push(`${headerKey},${header[headerKey]}`);
56-
});
57-
} else {
58-
return String(header);
59-
}
60-
return headerVals.join(",");
42+
function serializeHeader(header: any, explode: boolean): string {
43+
const headerVals: string[] = [];
44+
if (Array.isArray(header)) {
45+
header.forEach((val: any) => {
46+
headerVals.push(String(val));
47+
});
48+
} else if (header instanceof Map) {
49+
header.forEach((headerVal, headerKey) => {
50+
if (explode) headerVals.push(`${headerKey}=${headerVal}`);
51+
else headerVals.push(`${headerKey},${headerVal}`);
52+
});
53+
} else if (header instanceof Object) {
54+
Object.getOwnPropertyNames(header).forEach((headerKey: string) => {
55+
if (explode) headerVals.push(`${headerKey}=${header[headerKey]}`);
56+
else headerVals.push(`${headerKey},${header[headerKey]}`);
57+
});
58+
} else {
59+
return String(header);
60+
}
61+
return headerVals.join(",");
6162
}

src/internal/utils/pathparams.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export const ppMetadataKey = "pathParam";
22

3-
export function GetSimplePathParams(
4-
paramName: string,
5-
paramValue: any,
6-
explode: boolean
3+
export function getSimplePathParams(
4+
paramName: string,
5+
paramValue: any,
6+
explode: boolean
77
): Map<string, string> {
88
const pathParams: Map<string, string> = new Map<string, string>();
99
const ppVals: string[] = [];
@@ -35,8 +35,8 @@ export function GetSimplePathParams(
3535
function isEmpty(value: any): boolean {
3636
// check for undefined, null, and NaN
3737
let res: boolean = false;
38-
if (typeof value === 'number') res = Number.isNaN(value);
39-
else if (typeof value === 'string') res = value === "";
38+
if (typeof value === "number") res = Number.isNaN(value);
39+
else if (typeof value === "string") res = value === "";
4040
return res || value == null;
4141
}
4242

@@ -46,10 +46,10 @@ export class ParamDecorator {
4646
ParamName: string;
4747
Serialization?: string;
4848
constructor(
49-
Style: string,
50-
Explode: boolean,
51-
ParamName: string,
52-
Serialization?: string
49+
Style: string,
50+
Explode: boolean,
51+
ParamName: string,
52+
Serialization?: string
5353
) {
5454
this.Style = Style;
5555
this.Explode = Explode;

src/internal/utils/queryparams.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1+
import { ParamDecorator } from "./pathparams";
12
import { ParamsSerializerOptions } from "axios";
3+
import { parseParamDecorator } from "./utils";
24
import qs from "qs";
3-
import { ParamDecorator } from "./pathparams";
4-
import { ParseParamDecorator } from "./utils";
55

66
export const qpMetadataKey = "queryParam";
77

8-
export function GetQueryParamSerializer(
9-
queryParams: any
8+
export function getQueryParamSerializer(
9+
queryParams: any
1010
): ParamsSerializerOptions {
1111
let paramsSerializer: ParamsSerializerOptions = {
12-
encode: FormSerializerExplode,
12+
encode: formSerializerExplode,
1313
};
1414
if (queryParams == null) return paramsSerializer;
1515
const fieldNames: string[] = Object.getOwnPropertyNames(queryParams);
1616
fieldNames.forEach((fname) => {
1717
const qpAnn: string = Reflect.getMetadata(
18-
qpMetadataKey,
19-
queryParams,
20-
fname
18+
qpMetadataKey,
19+
queryParams,
20+
fname
2121
);
2222
if (qpAnn == null) return { encode: (params: unknown) => "" };
23-
const qpDecorator: ParamDecorator = ParseParamDecorator(
24-
qpAnn,
25-
fname,
26-
"form",
27-
true
23+
const qpDecorator: ParamDecorator = parseParamDecorator(
24+
qpAnn,
25+
fname,
26+
"form",
27+
true
2828
);
2929
if (qpDecorator == null) return;
3030
if (qpDecorator.Serialization === "json")
@@ -45,11 +45,11 @@ export function GetQueryParamSerializer(
4545
case "form":
4646
if (qpDecorator.Explode) {
4747
paramsSerializer = {
48-
encode: FormSerializerExplode,
48+
encode: formSerializerExplode,
4949
};
5050
} else {
5151
paramsSerializer = {
52-
encode: FormSerializer,
52+
encode: formSerializer,
5353
};
5454
}
5555
break;
@@ -62,7 +62,7 @@ export function GetQueryParamSerializer(
6262
return paramsSerializer;
6363
}
6464

65-
function FormSerializer(params: unknown): string {
65+
function formSerializer(params: unknown): string {
6666
const query: string[] = [];
6767
Object.entries(Object.assign({}, params)).forEach(([key, value]) => {
6868
if (value !== Object(value)) query.push(`${key}=${value}`);
@@ -71,25 +71,25 @@ function FormSerializer(params: unknown): string {
7171
query.push(`${key}=${values}`);
7272
} else {
7373
const values: string = Object.entries(Object.assign({}, value))
74-
.map(([objKey, objValue]) => `${objKey},${objValue}`)
75-
.join(",");
74+
.map(([objKey, objValue]) => `${objKey},${objValue}`)
75+
.join(",");
7676
query.push(`${key}=${values}`);
7777
}
7878
});
7979
return query.join("&");
8080
}
8181

82-
function FormSerializerExplode(params: unknown): string {
82+
function formSerializerExplode(params: unknown): string {
8383
const query: string[] = [];
8484
Object.entries(Object.assign({}, params)).forEach(([key, value]) => {
8585
if (value !== Object(value)) query.push(`${key}=${value}`);
8686
else if (Array.isArray(value)) {
8787
query.push(value.map((aValue) => `${key}=${aValue}`).join("&"));
8888
} else
8989
query.push(
90-
Object.entries(Object.assign({}, value))
91-
.map(([objKey, objValue]) => `${objKey}=${objValue}`)
92-
.join("&")
90+
Object.entries(Object.assign({}, value))
91+
.map(([objKey, objValue]) => `${objKey}=${objValue}`)
92+
.join("&")
9393
);
9494
});
9595
return query.join("&");

src/internal/utils/requestbody.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import FormData from "form-data";
21
import { createReadStream, writeFileSync } from "fs";
2+
3+
import FormData from "form-data";
34
import { join } from "path";
45
import qs from "qs";
56

67
const requestMetadataKey = "request";
78
const mpFormMetadataKey = "multipart_form";
89

9-
export function SerializeRequestBody(request: any): [object, any] {
10+
export function serializeRequestBody(request: any): [object, any] {
1011
const fieldNames: string[] = Object.getOwnPropertyNames(request);
1112
let [requestHeaders, requestBody]: [object, any] = [{}, {}];
1213
fieldNames.forEach((fname) => {
@@ -17,11 +18,11 @@ export function SerializeRequestBody(request: any): [object, any] {
1718
);
1819
if (requestAnn == null) return;
1920
const requestDecorator: RequestDecorator =
20-
ParseRequestDecorator(requestAnn);
21+
parseRequestDecorator(requestAnn);
2122
switch (requestDecorator.MediaType) {
2223
case "multipart/form-data":
2324
case "multipart/mixed":
24-
requestBody = EncodeMultipartFormData(request[fname]);
25+
requestBody = encodeMultipartFormData(request[fname]);
2526
requestHeaders = (requestBody as FormData).getHeaders();
2627
break;
2728
case "application/x-www-form-urlencoded":
@@ -42,7 +43,7 @@ export function SerializeRequestBody(request: any): [object, any] {
4243
return [requestHeaders, requestBody];
4344
}
4445

45-
function EncodeMultipartFormData(form: any): FormData {
46+
function encodeMultipartFormData(form: any): FormData {
4647
const formData: FormData = new FormData();
4748
const fieldNames: string[] = Object.getOwnPropertyNames(form);
4849
fieldNames.forEach((fname) => {
@@ -53,9 +54,9 @@ function EncodeMultipartFormData(form: any): FormData {
5354
);
5455
if (mpFormAnn == null) return;
5556
const mpFormDecorator: MultipartFormDecorator =
56-
ParseMultipartFormDecorator(mpFormAnn);
57+
parseMultipartFormDecorator(mpFormAnn);
5758
if (mpFormDecorator.File)
58-
return EncodeMultipartFormDataFile(formData, form[fname]);
59+
return encodeMultipartFormDataFile(formData, form[fname]);
5960
else if (mpFormDecorator.JSON) {
6061
formData.append(mpFormDecorator.Name, { ...form[fname] });
6162
} else {
@@ -71,7 +72,7 @@ function EncodeMultipartFormData(form: any): FormData {
7172
return formData;
7273
}
7374

74-
function EncodeMultipartFormDataFile(formData: FormData, file: any): FormData {
75+
function encodeMultipartFormDataFile(formData: FormData, file: any): FormData {
7576
if (typeof file !== "object" || Array.isArray(file) || file == null) {
7677
throw new Error("invalid type for multipart/form-data file");
7778
}
@@ -88,7 +89,7 @@ function EncodeMultipartFormDataFile(formData: FormData, file: any): FormData {
8889
);
8990
if (mpFormAnn == null) return;
9091
const mpFormDecorator: MultipartFormDecorator =
91-
ParseMultipartFormDecorator(mpFormAnn);
92+
parseMultipartFormDecorator(mpFormAnn);
9293
if (!mpFormDecorator.Content && mpFormDecorator.Name == "") return;
9394
if (mpFormDecorator.Content) content = file[fname];
9495
else {
@@ -109,7 +110,7 @@ function EncodeMultipartFormDataFile(formData: FormData, file: any): FormData {
109110
return formData;
110111
}
111112

112-
function ParseMultipartFormDecorator(
113+
function parseMultipartFormDecorator(
113114
mpFormAnn: string
114115
): MultipartFormDecorator {
115116
// example "name=file"
@@ -152,7 +153,7 @@ class MultipartFormDecorator {
152153
}
153154
}
154155

155-
function ParseRequestDecorator(requestAnn: string): RequestDecorator {
156+
function parseRequestDecorator(requestAnn: string): RequestDecorator {
156157
// example "media_type=multipart/form-data"
157158
const requestDecorator: RequestDecorator = new RequestDecorator(
158159
"application/octet-stream"

0 commit comments

Comments
 (0)