Fix types

sindresorhus · Mar 29, 2020 · 1e8cd40 · 1e8cd40
1 parent fcb2329
commit 1e8cd40
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/source/create.ts b/source/create.ts
@@ -33,7 +33,8 @@ import {
 	InstanceDefaults,
 	GotPaginate,
 	GotStream,
-	GotRequestFunction
+	GotRequestFunction,
+	OptionsWithPagination
 } from './types';
 import createRejection from './as-promise/create-rejection';
 import Request, {kIsNormalizedAlready} from './core';
@@ -192,7 +193,7 @@ const create = (defaults: InstanceDefaults): Got => {
 		});
 	};
 
-	got.paginate = (async function * <T>(url: string | URL, options?: Options) {
+	got.paginate = (async function * <T>(url: string | URL, options?: OptionsWithPagination<T>) {
 		let normalizedOptions = normalizeArguments(url, options, defaults.options);
 
 		const pagination = normalizedOptions.pagination!;
@@ -241,7 +242,7 @@ const create = (defaults: InstanceDefaults): Got => {
 		}
 	}) as GotPaginate;
 
-	got.paginate.all = (async <T>(url: string | URL, options?: Options) => {
+	got.paginate.all = (async <T>(url: string | URL, options?: OptionsWithPagination<T>) => {
 		const results: T[] = [];
 
 		for await (const item of got.paginate<T>(url, options)) {

diff --git a/source/types.ts b/source/types.ts
@@ -47,16 +47,18 @@ export type OptionsOfBufferResponseBody = Options & {isStream?: false; resolveBo
 export type StrictOptions = Except<Options, 'isStream' | 'responseType' | 'resolveBodyOnly'>;
 type ResponseBodyOnly = {resolveBodyOnly: true};
 
+export type OptionsWithPagination<T = unknown> = Merge<Options, PaginationOptions<T>>;
+
 export interface GotPaginate {
-	<T>(url: string | URL, options?: Merge<Options, PaginationOptions<T>>): AsyncIterableIterator<T>;
-	all<T>(url: string | URL, options?: Merge<Options, PaginationOptions<T>>): Promise<T[]>;
+	<T>(url: string | URL, options?: OptionsWithPagination<T>): AsyncIterableIterator<T>;
+	all<T>(url: string | URL, options?: OptionsWithPagination<T>): Promise<T[]>;
 
 	// A bug.
 	// eslint-disable-next-line @typescript-eslint/adjacent-overload-signatures
-	<T>(options?: Merge<Options, PaginationOptions<T>>): AsyncIterableIterator<T>;
+	<T>(options?: OptionsWithPagination<T>): AsyncIterableIterator<T>;
 	// A bug.
 	// eslint-disable-next-line @typescript-eslint/adjacent-overload-signatures
-	all<T>(options?: Merge<Options, PaginationOptions<T>>): Promise<T[]>;
+	all<T>(options?: OptionsWithPagination<T>): Promise<T[]>;
 }
 
 export interface GotRequestFunction {