Skip to content

Commit cd72b39

Browse files
authoredDec 2, 2020
fix(deps): bump @octokit/plugin-rest-endpoints to 4.3.0 (#1948)
* fix(deps): bump @octokit/plugin-rest-endpoints to 4.3.0 ([changelogs](https://github.com/octokit/plugin-rest-endpoint-methods.js/releases/tag/v4.3.0)) * build(deps): update to latest * docs: `:param` url notation is now `{param}` * test: adapt for latest `@octokit/types`
1 parent 6e3120d commit cd72b39

14 files changed

+3033
-2173
lines changed
 

‎HOW_IT_WORKS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
## Endpoint options (① - ④)
1717

18-
`@octokit/rest` exposes a method for each [REST API endpoint](https://docs.github.com/en/rest/reference/), for example `octokit.repos.listForOrg()` for [`GET /orgs/:org/repos`](https://docs.github.com/en/rest/reference/repos/#list-organization-repositories). The methods are generated in [`@octokit/plugin-rest-endpoint-methods`](https://github.com/octokit/plugin-rest-endpoint-methods.js/). The [`src/generated/endpoints.ts` file](https://github.com/octokit/plugin-rest-endpoint-methods.js/blob/master/src/generated/endpoints.ts) defines the **② endpoint default options** `method`, `url`, and in some cases `mediaType` and `headers`.
18+
`@octokit/rest` exposes a method for each [REST API endpoint](https://docs.github.com/en/rest/reference/), for example `octokit.repos.listForOrg()` for [`GET /orgs/{org}/repos`](https://docs.github.com/en/rest/reference/repos/#list-organization-repositories). The methods are generated in [`@octokit/plugin-rest-endpoint-methods`](https://github.com/octokit/plugin-rest-endpoint-methods.js/). The [`src/generated/endpoints.ts` file](https://github.com/octokit/plugin-rest-endpoint-methods.js/blob/master/src/generated/endpoints.ts) defines the **② endpoint default options** `method`, `url`, and in some cases `mediaType` and `headers`.
1919

2020
**② endpoint default options** are merged with **① global defaults**, which are based on [@octokit/endpoint/src/defaults.ts](https://github.com/octokit/endpoint.js/blob/master/src/defaults.ts) and the options that were passed into the `new Octokit(options)` constructor.
2121

@@ -59,7 +59,7 @@ octokit.repos.listForOrg({ org: "octokit", type: "public" });
5959
</tr>
6060
<tr>
6161
<td><strong>url</strong></td>
62-
<td><code>'/orgs/:org/repos'</code></td>
62+
<td><code>'/orgs/{org}/repos'</code></td>
6363
<td>② endpoint defaults</td>
6464
</tr>
6565
<tr>

‎docs/src/pages/api/05_pagination.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ To automatically receive all results across all pages, you can use the `octokit.
88

99
```js
1010
octokit
11-
.paginate("GET /repos/:owner/:repo/issues", {
11+
.paginate("GET /repos/{owner}/{repo}/issues", {
1212
owner: "octokit",
1313
repo: "rest.js",
1414
})
@@ -25,7 +25,7 @@ octokit
2525
```js
2626
octokit
2727
.paginate(
28-
"GET /repos/:owner/:repo/issues",
28+
"GET /repos/{owner}/{repo}/issues",
2929
{ owner: "octokit", repo: "rest.js" },
3030
(response) => response.data.map((issue) => issue.title)
3131
)

‎docs/src/pages/api/07_custom_endpoints.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ octokit.registerEndpoints({
4949
foo: {
5050
bar: {
5151
method: "PATCH",
52-
url: "/repos/:owner/:repo/foo",
52+
url: "/repos/{owner}/{repo}/foo",
5353
headers: {
5454
accept: "application/vnd.github.foo-bar-preview+json",
5555
},

‎package-lock.json

+3,002-2,140
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
],
3333
"repository": "https://github.com/octokit/rest.js",
3434
"dependencies": {
35-
"@octokit/core": "^3.0.0",
36-
"@octokit/plugin-paginate-rest": "^2.2.0",
37-
"@octokit/plugin-request-log": "^1.0.0",
38-
"@octokit/plugin-rest-endpoint-methods": "4.2.1"
35+
"@octokit/core": "^3.2.2",
36+
"@octokit/plugin-paginate-rest": "^2.6.1",
37+
"@octokit/plugin-request-log": "^1.0.2",
38+
"@octokit/plugin-rest-endpoint-methods": "4.3.0"
3939
},
4040
"devDependencies": {
4141
"@octokit/auth": "^2.0.0",

‎test/integration/deprecations-test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ describe("deprecations", () => {
137137
expect(url).to.equal(
138138
"https://api.github.com/repos/octocat/hello-world/issues/123"
139139
);
140-
expect(options.url).to.equal("/repos/:owner/:repo/issues/:issue_number");
140+
expect(options.url).to.equal("/repos/{owner}/{repo}/issues/{issue_number}");
141141
expect("number" in options).to.equal(false);
142142
expect(options.issue_number).to.equal(123);
143143
expect(warnCalledCount).to.equal(2);
@@ -1072,7 +1072,7 @@ describe("deprecations", () => {
10721072
/**
10731073
* There is a special case for OAuth applications, when `clientId` and `clientSecret` is passed as
10741074
* Basic Authorization instead of query parameters. The only routes where that applies share the same
1075-
* URL though: `/applications/:client_id/tokens/:access_token`. We identify this acception by looking
1075+
* URL though: `/applications/{client_id}/tokens/{access_token}`. We identify this acception by looking
10761076
* for this path.
10771077
*
10781078
* 1. [Check an authorization](https://docs.github.com/en/rest/reference/apps/#check-an-authorization)
@@ -1107,15 +1107,15 @@ describe("deprecations", () => {
11071107

11081108
return Promise.all([
11091109
octokit.request(
1110-
"GET /applications/:client_id/tokens/:access_token",
1110+
"GET /applications/{client_id}/tokens/{access_token}",
11111111
options
11121112
),
11131113
octokit.request(
1114-
"POST /applications/:client_id/tokens/:access_token",
1114+
"POST /applications/{client_id}/tokens/{access_token}",
11151115
options
11161116
),
11171117
octokit.request(
1118-
"DELETE /applications/:client_id/tokens/:access_token",
1118+
"DELETE /applications/{client_id}/tokens/{access_token}",
11191119
options
11201120
),
11211121
]);

‎test/integration/pagination-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ describe("pagination", () => {
177177
const iterator = octokit.paginate
178178
.iterator({
179179
method: "GET",
180-
url: "/orgs/:org",
180+
url: "/orgs/{org}",
181181
org: "myorg",
182182
})
183183
[Symbol.asyncIterator]();

‎test/integration/register-endpoints-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe("registerEndpoints", () => {
3939
type: "string",
4040
},
4141
},
42-
url: "/repos/:owner/:repo/issues/:issue_number",
42+
url: "/repos/{owner}/{repo}/issues/{issue_number}",
4343
},
4444
},
4545
});

‎test/issues/881-redirect-url.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ describe("https://github.com/octokit/rest.js/issues/881", () => {
2424
});
2525

2626
return octokit.repos
27-
.downloadArchive({
27+
.downloadTarballArchive({
2828
method: "HEAD",
2929
owner: "octocat",
3030
repo: "Hello-World",
31-
archive_format: "tarball",
3231
ref: "master",
3332
})
3433

3534
.then((response) => {
35+
// @ts-ignore https://github.com/octokit/types.ts/issues/211
3636
expect(response.url).toEqual(
3737
"https://issue-881-codeload.github.com/octocat/Hello-World/legacy.tar.gz/master"
3838
);

‎test/scenarios/create-file.test.ts

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ describe("api.github.com", () => {
2424
})
2525

2626
.then((response) => {
27+
// @ts-ignore https://github.com/github/rest-api-description/issues/107
2728
expect(response.data.content.type).toEqual("file");
2829
});
2930
});

‎test/scenarios/get-archive.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ describe("api.github.com", () => {
1515
return it.skip("octokit.repos.archive() (#758)");
1616
}
1717

18-
it('octokit.repos.archive({owner: "octokit-fixture-org", repo: "get-archive"})', () => {
18+
it('octokit.repos.downloadTarballArchive({owner: "octokit-fixture-org", repo: "get-archive"})', () => {
1919
return octokit.repos
20-
.downloadArchive({
20+
.downloadTarballArchive({
2121
owner: "octokit-fixture-org",
2222
repo: "get-archive",
23-
archive_format: "tarball",
2423
ref: "main",
2524
})
2625

2726
.then((response) => {
27+
// @ts-ignore https://github.com/octokit/types.ts/issues/211
2828
expect(response.data.byteLength).toEqual(172);
2929
});
3030
});

‎test/scenarios/get-repository.test.ts

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ describe("api.github.com", () => {
1919
})
2020

2121
.then((response) => {
22+
// @ts-ignore unclear what causes "Object is possibly 'null'" TypeScript error
2223
expect(response.data.owner.login).toEqual("octokit-fixture-org");
2324
});
2425
});

‎test/scenarios/labels.test.ts

-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ describe("api.github.com", () => {
5757
repo: "labels",
5858
name: "test-label-updated",
5959
});
60-
})
61-
62-
.then((result) => {
63-
expect(result.data).toEqual(undefined);
6460
});
6561
});
6662
});

‎test/typescript-validate.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -106,35 +106,35 @@ export default async function () {
106106

107107
// request & endpoint
108108
octokit.request("/");
109-
octokit.request("GET /repos/:owner/:repo/issues", {
109+
octokit.request("GET /repos/{owner}/{repo}/issues", {
110110
owner: "octokit",
111111
repo: "rest.js",
112112
});
113113
octokit.request({
114114
method: "GET",
115-
url: "/repos/:owner/:repo/issues",
115+
url: "/repos/{owner}/{repo}/issues",
116116
owner: "octokit",
117117
repo: "rest.js",
118118
});
119119
octokit.request.endpoint("/");
120-
octokit.request.endpoint("GET /repos/:owner/:repo/issues", {
120+
octokit.request.endpoint("GET /repos/{owner}/{repo}/issues", {
121121
owner: "octokit",
122122
repo: "rest.js",
123123
});
124124
octokit.request.endpoint({
125125
method: "GET",
126-
url: "/repos/:owner/:repo/issues",
126+
url: "/repos/{owner}/{repo}/issues",
127127
owner: "octokit",
128128
repo: "rest.js",
129129
});
130130
octokit.request.endpoint.merge({ foo: "bar" });
131131
octokit.request.endpoint
132132
.defaults({ owner: "octokit", repo: "rest.js" })
133-
.merge({ method: "GET", url: "/repos/:owner/:repo/issues" });
133+
.merge({ method: "GET", url: "/repos/{owner}/{repo}/issues" });
134134

135135
// pagination
136136
octokit
137-
.paginate("GET /repos/:owner/:repo/issues", {
137+
.paginate("GET /repos/{owner}/{repo}/issues", {
138138
owner: "octokit",
139139
repo: "rest.js",
140140
})
@@ -144,7 +144,7 @@ export default async function () {
144144

145145
octokit
146146
.paginate(
147-
"GET /repos/:owner/:repo/issues",
147+
"GET /repos/{owner}/{repo}/issues",
148148
{ owner: "octokit", repo: "rest.js" },
149149
(response) => response.data.map((issue) => issue.title)
150150
)
@@ -238,7 +238,7 @@ export default async function () {
238238
name: "bug",
239239
url: "",
240240
},
241-
status: 201,
241+
status: 200,
242242
url: "",
243243
};
244244
}

0 commit comments

Comments
 (0)
Please sign in to comment.