Strip Ky-specific properties from normalized options passed to hooks

They were already stripped in types, but not in JS.

See #762

Author: sindresorhus

source/core/Ky.ts

@@ -623,7 +623,19 @@ export class Ky {
 
 	#getNormalizedOptions(): NormalizedOptions {
 		if (!this.#cachedNormalizedOptions) {
-			const {hooks, ...normalizedOptions} = this.#options;
+			// Exclude Ky-specific options that are not part of `RequestInit`.
+			const {
+				hooks,
+				json,
+				parseJson,
+				stringifyJson,
+				searchParams,
+				timeout,
+				throwHttpErrors,
+				fetch,
+				...normalizedOptions
+			} = this.#options;
+
 			this.#cachedNormalizedOptions = Object.freeze(normalizedOptions) as NormalizedOptions;
 		}
 

test/hooks.ts

@@ -1,7 +1,6 @@
 import {setTimeout as delay} from 'node:timers/promises';
 import test from 'ava';
 import ky, {HTTPError, isHTTPError, isForceRetryError} from '../source/index.js';
-import {type Options} from '../source/types/options.js';
 import {createHttpTestServer} from './helpers/create-http-test-server.js';
 
 const createStreamBody = (text: string) => new ReadableStream<Uint8Array>({
@@ -430,7 +429,7 @@ test('`afterResponse` hook is called with request, normalized options, and respo
 								return ky(request, {
 									...options,
 									json: {
-										...(options as Options).json as Record<string, unknown>,
+										...json,
 										token: 'valid:token',
 									},
 								});
@@ -932,18 +931,31 @@ test('beforeRequest hook receives retryCount parameter', async t => {
 	t.is(result, 'token refreshed-token');
 });
 
-test('hooks are not included in normalized options passed to hooks', async t => {
+test('Ky-specific options are not included in normalized options passed to hooks', async t => {
 	const server = await createHttpTestServer(t);
-	server.get('/', (_request, response) => {
+	server.post('/', (_request, response) => {
 		response.end('ok');
 	});
 
-	await ky.get(server.url, {
+	await ky.post(server.url, {
+		json: {key: 'value'},
+		searchParams: {foo: 'bar'},
+		parseJson: JSON.parse,
+		stringifyJson: JSON.stringify,
+		timeout: 5000,
+		throwHttpErrors: false,
 		hooks: {
 			beforeRequest: [
 				({options}) => {
-					// Verify hooks field is not present
+					// Verify Ky-specific properties are not present
 					t.false('hooks' in options);
+					t.false('json' in options);
+					t.false('parseJson' in options);
+					t.false('stringifyJson' in options);
+					t.false('searchParams' in options);
+					t.false('timeout' in options);
+					t.false('throwHttpErrors' in options);
+					t.false('fetch' in options);
 
 					// Verify options object is frozen (can't add/modify properties)
 					t.throws(() => {

test/main.ts

@@ -525,45 +525,6 @@ test('throwHttpErrors function - selective error handling', async t => {
 	);
 });
 
-test('throwHttpErrors preserves original type in hooks', async t => {
-	const server = await createHttpTestServer(t);
-
-	server.get('/', (_request, response) => {
-		response.sendStatus(200);
-	});
-
-	// Test that boolean is preserved
-	let booleanTypeInHook: unknown;
-	await ky.get(server.url, {
-		throwHttpErrors: false,
-		hooks: {
-			beforeRequest: [
-				({options}) => {
-					booleanTypeInHook = options.throwHttpErrors;
-				},
-			],
-		},
-	});
-	t.is(typeof booleanTypeInHook, 'boolean');
-	t.is(booleanTypeInHook, false);
-
-	// Test that function is preserved
-	let functionTypeInHook: unknown;
-	const throwFunction = (status: number) => status >= 500;
-	await ky.get(server.url, {
-		throwHttpErrors: throwFunction,
-		hooks: {
-			beforeRequest: [
-				({options}) => {
-					functionTypeInHook = options.throwHttpErrors;
-				},
-			],
-		},
-	});
-	t.is(typeof functionTypeInHook, 'function');
-	t.is(functionTypeInHook, throwFunction);
-});
-
 test('ky.create()', async t => {
 	const server = await createHttpTestServer(t);
 	server.get('/', (request, response) => {