Skip to content

Commit b3138bf

Browse files
Yang-33Yang-33
committed
Upgrade ts to v6
1 parent 9aba62f commit b3138bf

28 files changed

Lines changed: 786 additions & 127 deletions

‎examples/echo-bot-ts-cjs/package-lock.json‎

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

‎examples/echo-bot-ts-cjs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"@types/express": "^4.17.17",
1818
"@types/node": "^20.6.3",
1919
"rimraf": "^5.0.1",
20-
"typescript": "^5.2.2"
20+
"typescript": "^6.0.0"
2121
}
2222
}

‎examples/echo-bot-ts-esm/package-lock.json‎

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

‎examples/echo-bot-ts-esm/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
"@types/express": "^4.17.17",
1919
"@types/node": "^20.6.3",
2020
"rimraf": "^5.0.1",
21-
"typescript": "^5.2.2"
21+
"typescript": "^6.0.0"
2222
}
2323
}

‎generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/normal.pebble‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,29 @@
99
return {httpResponse: response, body: convertResponseToReadable(response)};
1010
{% else %}
1111
{% if op.hasBodyParam %}const params = {{op.bodyParam.paramName}};
12-
{% elseif op.hasFormParams %}const formParams = {
12+
{% if op.bodyParam.isFile %}if (!params) { throw new Error("body is required"); }
13+
{% endif %}{% elseif op.hasFormParams %}const formParams = {
1314
{% for param in op.formParams -%}
1415
"{{param.baseName}}": {{param.paramName}},
1516
{% endfor %}
1617
};
17-
Object.keys(formParams).forEach((key: keyof typeof formParams) => {
18-
if (formParams[key] === undefined) {
19-
delete formParams[key];
18+
Object.keys(formParams).forEach((key: string) => {
19+
if (formParams[key as keyof typeof formParams] === undefined) {
20+
delete (formParams as Record<string, unknown>)[key];
2021
}
2122
});
2223
{% elseif op.hasQueryParams %}const queryParams = {
2324
{% for param in op.queryParams -%}
2425
{% if param.isArray -%}
25-
"{{param.baseName}}": [...{{param.paramName}}].join(","),
26+
"{{param.baseName}}": {{param.paramName}} ? [...{{param.paramName}}].join(",") : undefined,
2627
{% else -%}
2728
"{{param.baseName}}": {{param.paramName}},
2829
{% endif -%}
2930
{% endfor %}
3031
};
31-
Object.keys(queryParams).forEach((key: keyof typeof queryParams) => {
32-
if (queryParams[key] === undefined) {
33-
delete queryParams[key];
32+
Object.keys(queryParams).forEach((key: string) => {
33+
if (queryParams[key as keyof typeof queryParams] === undefined) {
34+
delete (queryParams as Record<string, unknown>)[key];
3435
}
3536
});
3637
{% endif %}

‎generator/src/main/resources/line-bot-sdk-nodejs-generator/api_test.pebble‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ function parseForm(
121121
requestCount++;
122122

123123
equal(req.method, "{{ op.httpMethod }}");
124+
if (!req.url) { throw new Error("req.url is undefined"); }
124125
const reqUrl = new URL(req.url, "http://localhost/");
125126
equal(reqUrl.pathname, "{{ op.path }}"
126127
{% for param in op.allParams -%}
@@ -151,8 +152,10 @@ function parseForm(
151152
"@line/bot-sdk/1.0.0-test",
152153
);
153154
{% if op.isMultipart %}
155+
const contentType = req.headers["content-type"];
156+
ok(contentType);
154157
ok(
155-
req.headers["content-type"]
158+
contentType
156159
.startsWith(`multipart/form-data; boundary=`),
157160
);
158161
{% endif %}

‎lib/channel-access-token/api/channelAccessTokenClient.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ export class ChannelAccessTokenClient {
8383
client_assertion_type: clientAssertionType,
8484
client_assertion: clientAssertion,
8585
};
86-
Object.keys(queryParams).forEach((key: keyof typeof queryParams) => {
87-
if (queryParams[key] === undefined) {
88-
delete queryParams[key];
86+
Object.keys(queryParams).forEach((key: string) => {
87+
if (queryParams[key as keyof typeof queryParams] === undefined) {
88+
delete (queryParams as Record<string, unknown>)[key];
8989
}
9090
});
9191

@@ -138,9 +138,9 @@ export class ChannelAccessTokenClient {
138138
client_id: clientId,
139139
client_secret: clientSecret,
140140
};
141-
Object.keys(formParams).forEach((key: keyof typeof formParams) => {
142-
if (formParams[key] === undefined) {
143-
delete formParams[key];
141+
Object.keys(formParams).forEach((key: string) => {
142+
if (formParams[key as keyof typeof formParams] === undefined) {
143+
delete (formParams as Record<string, unknown>)[key];
144144
}
145145
});
146146

@@ -193,9 +193,9 @@ export class ChannelAccessTokenClient {
193193
client_assertion_type: clientAssertionType,
194194
client_assertion: clientAssertion,
195195
};
196-
Object.keys(formParams).forEach((key: keyof typeof formParams) => {
197-
if (formParams[key] === undefined) {
198-
delete formParams[key];
196+
Object.keys(formParams).forEach((key: string) => {
197+
if (formParams[key as keyof typeof formParams] === undefined) {
198+
delete (formParams as Record<string, unknown>)[key];
199199
}
200200
});
201201

@@ -262,9 +262,9 @@ export class ChannelAccessTokenClient {
262262
client_id: clientId,
263263
client_secret: clientSecret,
264264
};
265-
Object.keys(formParams).forEach((key: keyof typeof formParams) => {
266-
if (formParams[key] === undefined) {
267-
delete formParams[key];
265+
Object.keys(formParams).forEach((key: string) => {
266+
if (formParams[key as keyof typeof formParams] === undefined) {
267+
delete (formParams as Record<string, unknown>)[key];
268268
}
269269
});
270270

@@ -298,9 +298,9 @@ export class ChannelAccessTokenClient {
298298
const formParams = {
299299
access_token: accessToken,
300300
};
301-
Object.keys(formParams).forEach((key: keyof typeof formParams) => {
302-
if (formParams[key] === undefined) {
303-
delete formParams[key];
301+
Object.keys(formParams).forEach((key: string) => {
302+
if (formParams[key as keyof typeof formParams] === undefined) {
303+
delete (formParams as Record<string, unknown>)[key];
304304
}
305305
});
306306

@@ -350,9 +350,9 @@ export class ChannelAccessTokenClient {
350350
client_secret: clientSecret,
351351
access_token: accessToken,
352352
};
353-
Object.keys(formParams).forEach((key: keyof typeof formParams) => {
354-
if (formParams[key] === undefined) {
355-
delete formParams[key];
353+
Object.keys(formParams).forEach((key: string) => {
354+
if (formParams[key as keyof typeof formParams] === undefined) {
355+
delete (formParams as Record<string, unknown>)[key];
356356
}
357357
});
358358

@@ -389,9 +389,9 @@ export class ChannelAccessTokenClient {
389389
const formParams = {
390390
access_token: accessToken,
391391
};
392-
Object.keys(formParams).forEach((key: keyof typeof formParams) => {
393-
if (formParams[key] === undefined) {
394-
delete formParams[key];
392+
Object.keys(formParams).forEach((key: string) => {
393+
if (formParams[key as keyof typeof formParams] === undefined) {
394+
delete (formParams as Record<string, unknown>)[key];
395395
}
396396
});
397397

@@ -425,9 +425,9 @@ export class ChannelAccessTokenClient {
425425
const queryParams = {
426426
access_token: accessToken,
427427
};
428-
Object.keys(queryParams).forEach((key: keyof typeof queryParams) => {
429-
if (queryParams[key] === undefined) {
430-
delete queryParams[key];
428+
Object.keys(queryParams).forEach((key: string) => {
429+
if (queryParams[key as keyof typeof queryParams] === undefined) {
430+
delete (queryParams as Record<string, unknown>)[key];
431431
}
432432
});
433433

‎lib/channel-access-token/tests/api/ChannelAccessTokenClientTest.spec.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ describe("ChannelAccessTokenClient", () => {
6969
requestCount++;
7070

7171
equal(req.method, "GET");
72+
if (!req.url) {
73+
throw new Error("req.url is undefined");
74+
}
7275
const reqUrl = new URL(req.url, "http://localhost/");
7376
equal(
7477
reqUrl.pathname,
@@ -132,6 +135,9 @@ describe("ChannelAccessTokenClient", () => {
132135
requestCount++;
133136

134137
equal(req.method, "GET");
138+
if (!req.url) {
139+
throw new Error("req.url is undefined");
140+
}
135141
const reqUrl = new URL(req.url, "http://localhost/");
136142
equal(
137143
reqUrl.pathname,
@@ -195,6 +201,9 @@ describe("ChannelAccessTokenClient", () => {
195201
requestCount++;
196202

197203
equal(req.method, "POST");
204+
if (!req.url) {
205+
throw new Error("req.url is undefined");
206+
}
198207
const reqUrl = new URL(req.url, "http://localhost/");
199208
equal(
200209
reqUrl.pathname,
@@ -245,6 +254,9 @@ describe("ChannelAccessTokenClient", () => {
245254
requestCount++;
246255

247256
equal(req.method, "POST");
257+
if (!req.url) {
258+
throw new Error("req.url is undefined");
259+
}
248260
const reqUrl = new URL(req.url, "http://localhost/");
249261
equal(
250262
reqUrl.pathname,
@@ -295,6 +307,9 @@ describe("ChannelAccessTokenClient", () => {
295307
requestCount++;
296308

297309
equal(req.method, "POST");
310+
if (!req.url) {
311+
throw new Error("req.url is undefined");
312+
}
298313
const reqUrl = new URL(req.url, "http://localhost/");
299314
equal(
300315
reqUrl.pathname,
@@ -345,6 +360,9 @@ describe("ChannelAccessTokenClient", () => {
345360
requestCount++;
346361

347362
equal(req.method, "POST");
363+
if (!req.url) {
364+
throw new Error("req.url is undefined");
365+
}
348366
const reqUrl = new URL(req.url, "http://localhost/");
349367
equal(
350368
reqUrl.pathname,
@@ -395,6 +413,9 @@ describe("ChannelAccessTokenClient", () => {
395413
requestCount++;
396414

397415
equal(req.method, "POST");
416+
if (!req.url) {
417+
throw new Error("req.url is undefined");
418+
}
398419
const reqUrl = new URL(req.url, "http://localhost/");
399420
equal(
400421
reqUrl.pathname,
@@ -453,6 +474,9 @@ describe("ChannelAccessTokenClient", () => {
453474
requestCount++;
454475

455476
equal(req.method, "POST");
477+
if (!req.url) {
478+
throw new Error("req.url is undefined");
479+
}
456480
const reqUrl = new URL(req.url, "http://localhost/");
457481
equal(
458482
reqUrl.pathname,
@@ -511,6 +535,9 @@ describe("ChannelAccessTokenClient", () => {
511535
requestCount++;
512536

513537
equal(req.method, "POST");
538+
if (!req.url) {
539+
throw new Error("req.url is undefined");
540+
}
514541
const reqUrl = new URL(req.url, "http://localhost/");
515542
equal(
516543
reqUrl.pathname,
@@ -552,6 +579,9 @@ describe("ChannelAccessTokenClient", () => {
552579
requestCount++;
553580

554581
equal(req.method, "POST");
582+
if (!req.url) {
583+
throw new Error("req.url is undefined");
584+
}
555585
const reqUrl = new URL(req.url, "http://localhost/");
556586
equal(
557587
reqUrl.pathname,
@@ -593,6 +623,9 @@ describe("ChannelAccessTokenClient", () => {
593623
requestCount++;
594624

595625
equal(req.method, "POST");
626+
if (!req.url) {
627+
throw new Error("req.url is undefined");
628+
}
596629
const reqUrl = new URL(req.url, "http://localhost/");
597630
equal(
598631
reqUrl.pathname,
@@ -643,6 +676,9 @@ describe("ChannelAccessTokenClient", () => {
643676
requestCount++;
644677

645678
equal(req.method, "POST");
679+
if (!req.url) {
680+
throw new Error("req.url is undefined");
681+
}
646682
const reqUrl = new URL(req.url, "http://localhost/");
647683
equal(
648684
reqUrl.pathname,
@@ -693,6 +729,9 @@ describe("ChannelAccessTokenClient", () => {
693729
requestCount++;
694730

695731
equal(req.method, "POST");
732+
if (!req.url) {
733+
throw new Error("req.url is undefined");
734+
}
696735
const reqUrl = new URL(req.url, "http://localhost/");
697736
equal(
698737
reqUrl.pathname,
@@ -734,6 +773,9 @@ describe("ChannelAccessTokenClient", () => {
734773
requestCount++;
735774

736775
equal(req.method, "POST");
776+
if (!req.url) {
777+
throw new Error("req.url is undefined");
778+
}
737779
const reqUrl = new URL(req.url, "http://localhost/");
738780
equal(
739781
reqUrl.pathname,
@@ -775,6 +817,9 @@ describe("ChannelAccessTokenClient", () => {
775817
requestCount++;
776818

777819
equal(req.method, "GET");
820+
if (!req.url) {
821+
throw new Error("req.url is undefined");
822+
}
778823
const reqUrl = new URL(req.url, "http://localhost/");
779824
equal(
780825
reqUrl.pathname,
@@ -826,6 +871,9 @@ describe("ChannelAccessTokenClient", () => {
826871
requestCount++;
827872

828873
equal(req.method, "GET");
874+
if (!req.url) {
875+
throw new Error("req.url is undefined");
876+
}
829877
const reqUrl = new URL(req.url, "http://localhost/");
830878
equal(
831879
reqUrl.pathname,

0 commit comments

Comments
 (0)