chore: tidying up types (#1013)

ignatiusmb · web-flow · commit 084099c89ae8 · 2021-04-14T00:18:12.000-07:00
diff --git a/documentation/docs/04-hooks.md b/documentation/docs/04-hooks.md
@@ -95,10 +95,10 @@ type Response = {
 	body?: any;
 };
 
-type Handle<Context = any> = (
+type Handle<Context = any> = ({
 	request: Request<Context>,
 	render: (request: Request<Context>) => Promise<Response>
-) => Response | Promise<Response>;
+}) => Response | Promise<Response>;
 ```
 
 ```js
diff --git a/packages/kit/types.d.ts b/packages/kit/types.d.ts
@@ -61,18 +61,18 @@ interface ReadOnlyFormData extends Iterator<[string, string]> {
 	values: () => Iterator<string>;
 }
 
+type BaseBody = string | Buffer | ReadOnlyFormData;
+type ParameterizedBody<Body = unknown> = BaseBody & Body;
+
 export type Incoming = {
 	method: string;
 	host: string;
 	headers: Headers;
 	path: string;
 	query: URLSearchParams;
-	body: string | Buffer | ReadOnlyFormData;
+	body: BaseBody;
 };
 
-type BaseBody = string | Buffer | ReadOnlyFormData;
-type ParameterizedBody<Body = unknown> = BaseBody & Body;
-
 export type Request<Context = any, Body = unknown> = {
 	method: string;
 	host: string;
@@ -104,10 +104,7 @@ export type GetSession<Context = any, Session = any> = {
 	({ context }: { context: Context }): Session | Promise<Session>;
 };
 
-export type Handle<Context = any> = ({
-	request,
-	render
-}: {
+export type Handle<Context = any> = (input: {
 	request: Request<Context>;
 	render: (request: Request<Context>) => Response | Promise<Response>;
 }) => Response | Promise<Response>;
diff --git a/packages/kit/types.internal.d.ts b/packages/kit/types.internal.d.ts
@@ -10,7 +10,6 @@ import {
 	Response as SSRResponse
 } from './types';
 import { UserConfig as ViteConfig } from 'vite';
-import { Response as NodeFetchResponse } from 'node-fetch';
 
 declare global {
 	interface ImportMeta {
