refactor: type event.node.req.originalUrl

unjs · Jul 31, 2023 · 6c87d87 · 6c87d87
1 parent e155950
commit 6c87d87
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -103,10 +103,8 @@ export function createAppEventHandler(stack: Stack, options: AppOptions) {
   const spacing = options.debug ? 2 : undefined;
   return eventHandler(async (event) => {
     // Keep original incoming url accessable
-    (event.node.req as { originalUrl?: string }).originalUrl =
-      (event.node.req as { originalUrl?: string }).originalUrl ||
-      event.node.req.url ||
-      "/";
+    event.node.req.originalUrl =
+      event.node.req.originalUrl || event.node.req.url || "/";
 
     // Keep a copy of incoming url
     const _reqPath = event._path || event.node.req.url || "/";

diff --git a/src/event/event.ts b/src/event/event.ts
@@ -18,7 +18,7 @@ const PayloadMethods: Set<HTTPMethod> = new Set([
 ]);
 
 export interface NodeEventContext {
-  req: NodeIncomingMessage;
+  req: NodeIncomingMessage & { originalUrl?: string };
   res: NodeServerResponse;
 }
 
@@ -49,11 +49,7 @@ export class H3Event<
   }
 
   get _originalPath() {
-    return (
-      (this.node.req as { originalUrl?: string }).originalUrl ||
-      this.node.req.url ||
-      "/"
-    );
+    return this.node.req.originalUrl || this.node.req.url || "/";
   }
 
   get _hasBody() {

diff --git a/src/utils/route.ts b/src/utils/route.ts
@@ -11,10 +11,8 @@ export function useBase(base: string, handler: EventHandler): EventHandler {
 
   return eventHandler(async (event) => {
     // Keep original incoming url accessable
-    (event.node.req as { originalUrl?: string }).originalUrl =
-      (event.node.req as { originalUrl?: string }).originalUrl ||
-      event.node.req.url ||
-      "/";
+    event.node.req.originalUrl =
+      event.node.req.originalUrl || event.node.req.url || "/";
 
     const _path = event._path || event.node.req.url || "/";