Skip to content

Commit 598143e

Browse files
authored
Merge branch 'master' into remove-ts_post_process_file
2 parents 525fdf8 + ab54bdb commit 598143e

File tree

111 files changed

+718
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+718
-100
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v4
20+
with:
21+
submodules: true
22+
- name: actions/setup-java@v3
23+
uses: actions/setup-java@v3
24+
with:
25+
distribution: 'temurin'
26+
java-version: 17
27+
architecture: x64
2028
- name: Setup Node.js
2129
uses: actions/setup-node@v3
2230
with:
@@ -28,3 +36,5 @@ jobs:
2836
run: npm test
2937
- name: Test building docs
3038
run: export NODE_OPTIONS=--openssl-legacy-provider; npm run docs:build
39+
- name: Test generator
40+
run: cd generator; mvn package

generator/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,16 @@
4545
</configuration>
4646
</plugin>
4747

48-
<!-- attach test jar -->
4948
<plugin>
5049
<groupId>org.apache.maven.plugins</groupId>
5150
<artifactId>maven-jar-plugin</artifactId>
5251
<version>3.3.0</version>
5352
<executions>
5453
<execution>
55-
<goals>
56-
<goal>jar</goal>
57-
<goal>test-jar</goal>
58-
</goals>
54+
<id>default-jar</id>
55+
<goals>
56+
<goal>jar</goal>
57+
</goals>
5958
</execution>
6059
</executions>
6160
<configuration>

generator/src/main/resources/line-bot-sdk-nodejs-generator/model.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { {{modelName}} } from './models';
1212

1313
export type {{classname}} =
1414
{{#mappedModels}}
15-
| {{modelName}} // {{mappingName}}
15+
{{^-first}}| {{/-first}}{{modelName}} // {{mappingName}}
1616
{{/mappedModels}}
1717
| Unknown{{classname}}
1818
;
@@ -38,10 +38,10 @@ export type {{classname}}{{#discriminator}}Base{{/discriminator}} = {{#parent}}{
3838
{{#description}}
3939
* {{{.}}}
4040
{{/description}}
41-
{{#externalDocs}}
41+
{{#externalDocumentation}}
4242
* {{description}}
43-
* @see <a href="{{url}}">{{summary}} Documentation</a>
44-
{{/externalDocs}}
43+
* @see <a href="{{url}}">{{name}} Documentation</a>
44+
{{/externalDocumentation}}
4545
*/
4646
'{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}/*{{#defaultValue}} = {{#isEnum}}{{classname}}.{{/isEnum}}{{{.}}}{{/defaultValue}}*/;
4747
{{/vars}}
@@ -54,7 +54,7 @@ export namespace {{classname}} {
5454
export type {{enumName}} =
5555
{{#allowableValues}}
5656
{{#enumVars}}
57-
{{^-last}}| {{/-last}}{{{value}}}
57+
{{^-first}}| {{/-first}}{{{value}}}
5858
{{/enumVars}}
5959
{{/allowableValues}}
6060
;

lib/channel-access-token/model/channelAccessTokenKeyIdsResponse.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
export type ChannelAccessTokenKeyIdsResponse = {
1717
/**
1818
* Array of channel access token key IDs.
19+
*
20+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#get-all-valid-channel-access-token-key-ids-v2-1">kids Documentation</a>
1921
*/
2022
kids: Array<string> /**/;
2123
};

lib/channel-access-token/model/issueChannelAccessTokenResponse.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,26 @@
1616
export type IssueChannelAccessTokenResponse = {
1717
/**
1818
* Channel access token.
19+
*
20+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">accessToken Documentation</a>
1921
*/
2022
accessToken: string /**/;
2123
/**
2224
* Amount of time in seconds from issue to expiration of the channel access token
25+
*
26+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">expiresIn Documentation</a>
2327
*/
2428
expiresIn: number /**/;
2529
/**
2630
* A token type.
31+
*
32+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">tokenType Documentation</a>
2733
*/
2834
tokenType: string /* = 'Bearer'*/;
2935
/**
3036
* Unique key ID for identifying the channel access token.
37+
*
38+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">keyId Documentation</a>
3139
*/
3240
keyId: string /**/;
3341
};

lib/channel-access-token/model/issueShortLivedChannelAccessTokenResponse.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,20 @@
1616
export type IssueShortLivedChannelAccessTokenResponse = {
1717
/**
1818
* A short-lived channel access token. Valid for 30 days. Note: Channel access tokens cannot be refreshed.
19+
*
20+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-shortlived-channel-access-token">accessToken Documentation</a>
1921
*/
2022
accessToken: string /**/;
2123
/**
2224
* Time until channel access token expires in seconds from time the token is issued.
25+
*
26+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-shortlived-channel-access-token">expiresIn Documentation</a>
2327
*/
2428
expiresIn: number /**/;
2529
/**
2630
* Token type. The value is always `Bearer`.
31+
*
32+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-shortlived-channel-access-token">tokenType Documentation</a>
2733
*/
2834
tokenType: string /* = 'Bearer'*/;
2935
};

lib/channel-access-token/model/issueStatelessChannelAccessTokenResponse.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,20 @@
1616
export type IssueStatelessChannelAccessTokenResponse = {
1717
/**
1818
* A stateless channel access token. The token is an opaque string which means its format is an implementation detail and the consumer of this token should never try to use the data parsed from the token.
19+
*
20+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-stateless-channel-access-token">accessToken Documentation</a>
1921
*/
2022
accessToken: string /**/;
2123
/**
2224
* Duration in seconds after which the issued access token expires
25+
*
26+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-stateless-channel-access-token">expiresIn Documentation</a>
2327
*/
2428
expiresIn: number /**/;
2529
/**
2630
* Token type. The value is always `Bearer`.
31+
*
32+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-stateless-channel-access-token">tokenType Documentation</a>
2733
*/
2834
tokenType: string /* = 'Bearer'*/;
2935
};

lib/insight/model/ageTile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ export namespace AgeTile {
3131
| "from35to39"
3232
| "from40to44"
3333
| "from45to49"
34-
| "from50";
35-
"unknown";
34+
| "from50"
35+
| "unknown";
3636
}

lib/insight/model/appTypeTile.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ export type AppTypeTile = {
2222
};
2323

2424
export namespace AppTypeTile {
25-
export type AppTypeEnum = "ios" | "android";
26-
"others";
25+
export type AppTypeEnum = "ios" | "android" | "others";
2726
}

lib/insight/model/errorResponse.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ import { ErrorDetail } from "./errorDetail";
1414
export type ErrorResponse = {
1515
/**
1616
* Message containing information about the error.
17+
*
18+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#error-responses">message Documentation</a>
1719
*/
1820
message: string /**/;
1921
/**
2022
* An array of error details. If the array is empty, this property will not be included in the response.
23+
*
24+
* @see <a href="https://developers.line.biz/en/reference/messaging-api/#error-responses">details Documentation</a>
2125
*/
2226
details?: Array<ErrorDetail> /**/;
2327
};

0 commit comments

Comments
 (0)