Skip to content

Commit 732e9bd

Browse files
committedJul 30, 2021
Follow-up fix
1 parent 1018c20 commit 732e9bd

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed
 

‎source/core/options.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -425,21 +425,21 @@ export interface PaginationOptions<ElementType, BodyType> {
425425
const limit = 10;
426426
427427
const items = got.paginate('https://example.com/items', {
428-
searchParameters: {
428+
searchParams: {
429429
limit,
430430
offset: 0
431431
},
432432
pagination: {
433433
paginate: ({response, currentItems}) => {
434-
const previousSearchParams = response.request.options.searchParameters;
434+
const previousSearchParams = response.request.options.searchParams;
435435
const previousOffset = previousSearchParams.get('offset');
436436
437437
if (currentItems.length < limit) {
438438
return false;
439439
}
440440
441441
return {
442-
searchParameters: {
442+
searchParams: {
443443
...previousSearchParams,
444444
offset: Number(previousOffset) + limit,
445445
}
@@ -707,10 +707,10 @@ const defaultInternals: Options['_internals'] = {
707707
maxHeaderSize: undefined,
708708
};
709709

710-
const cloneInternals = (internals: typeof defaultInternals): typeof defaultInternals => {
710+
const cloneInternals = (internals: typeof defaultInternals) => {
711711
const {hooks, retry} = internals;
712712

713-
const result = {
713+
const result: typeof defaultInternals = {
714714
...internals,
715715
context: {...internals.context},
716716
cacheOptions: {...internals.cacheOptions},
@@ -732,7 +732,7 @@ const cloneInternals = (internals: typeof defaultInternals): typeof defaultInter
732732
beforeRetry: [...hooks.beforeRetry],
733733
afterResponse: [...hooks.afterResponse],
734734
},
735-
searchParameters: internals.searchParams ? new URLSearchParams(internals.searchParams as URLSearchParams) : undefined,
735+
searchParams: internals.searchParams ? new URLSearchParams(internals.searchParams as URLSearchParams) : undefined,
736736
pagination: {...internals.pagination},
737737
};
738738

@@ -1176,10 +1176,10 @@ export default class Options {
11761176
@example
11771177
```
11781178
await got('https://example.com/?query=a b'); //=> https://example.com/?query=a%20b
1179-
await got('https://example.com/', {searchParameters: {query: 'a b'}}); //=> https://example.com/?query=a+b
1179+
await got('https://example.com/', {searchParams: {query: 'a b'}}); //=> https://example.com/?query=a+b
11801180
1181-
// The query string is overridden by `searchParameters`
1182-
await got('https://example.com/?query=a b', {searchParameters: {query: 'a b'}}); //=> https://example.com/?query=a+b
1181+
// The query string is overridden by `searchParams`
1182+
await got('https://example.com/?query=a b', {searchParams: {query: 'a b'}}); //=> https://example.com/?query=a+b
11831183
```
11841184
*/
11851185
get url(): string | URL | undefined {
@@ -1312,11 +1312,11 @@ export default class Options {
13121312
```
13131313
import got from 'got';
13141314
1315-
const searchParameters = new URLSearchParams([['key', 'a'], ['key', 'b']]);
1315+
const searchParams = new URLSearchParams([['key', 'a'], ['key', 'b']]);
13161316
1317-
await got('https://example.com', {searchParameters});
1317+
await got('https://example.com', {searchParams});
13181318
1319-
console.log(searchParameters.toString());
1319+
console.log(searchParams.toString());
13201320
//=> 'key=a&key=b'
13211321
```
13221322
*/

‎test/normalize-arguments.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,18 @@ test('extending responseType', t => {
152152
});
153153

154154
test('searchParams - multiple values for one key', t => {
155-
const searchParams = new URLSearchParams();
155+
const searchParameters = new URLSearchParams();
156156

157-
searchParams.append('a', '100');
158-
searchParams.append('a', '200');
159-
searchParams.append('a', '300');
157+
searchParameters.append('a', '100');
158+
searchParameters.append('a', '200');
159+
searchParameters.append('a', '300');
160160

161161
const options = new Options({
162-
searchParams
162+
searchParams: searchParameters,
163163
});
164164

165165
t.deepEqual(
166166
(options.searchParams as URLSearchParams).getAll('a'),
167-
['100', '200', '300']
167+
['100', '200', '300'],
168168
);
169169
});

0 commit comments

Comments
 (0)
Please sign in to comment.