From 78fb36d3fef1c30ceee9f0b9b3ecabb29c8bb525 Mon Sep 17 00:00:00 2001 From: Marvin Hagemeister Date: Sun, 11 Jul 2021 09:11:17 +0200 Subject: [PATCH] Inline polka middleware type --- .changeset/four-comics-run.md | 5 +++++ packages/wmr/types.d.ts | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 .changeset/four-comics-run.md diff --git a/.changeset/four-comics-run.md b/.changeset/four-comics-run.md new file mode 100644 index 00000000..1aa75cfb --- /dev/null +++ b/.changeset/four-comics-run.md @@ -0,0 +1,5 @@ +--- +'wmr': patch +--- + +Fix incorrect middleware `request` typings diff --git a/packages/wmr/types.d.ts b/packages/wmr/types.d.ts index e1d374d7..3242cf11 100644 --- a/packages/wmr/types.d.ts +++ b/packages/wmr/types.d.ts @@ -2,11 +2,39 @@ declare module 'wmr' { import { Plugin as RollupPlugin, OutputOptions, RollupError, RollupWatcherEvent } from 'rollup'; - import { Middleware } from 'polka'; + import { ServerResponse, IncomingMessage } from 'http'; export type Mode = 'start' | 'serve' | 'build'; - export { Middleware }; + export interface Request extends IncomingMessage { + /** + * The originally-requested URL, including parent router segments. + */ + originalUrl: string; + + /** + * The path portion of the requested URL. + */ + path: string; + + /** + * The values of named parameters within your route pattern + */ + params: Record; + + /** + * The un-parsed querystring + */ + search: string | null; + + /** + * The parsed querystring + */ + query: Record; + } + + export type Next = (err?: string | Error) => void; + export type Middleware = (req: Request, res: ServerResponse, next: Next) => void; export type OutputOption = OutputOptions | ((opts: OutputOptions) => OutputOptions);