fix(server): types

ardatan · Nov 25, 2024 · 5a9098c · 5a9098c
1 parent cc625d7
commit 5a9098c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/.changeset/nine-spiders-lick.md b/.changeset/nine-spiders-lick.md
@@ -0,0 +1,5 @@
+---
+'@whatwg-node/server': patch
+---
+
+Fix on plugin types
diff --git a/packages/server/src/createServerAdapter.ts b/packages/server/src/createServerAdapter.ts
@@ -149,18 +149,15 @@ function createServerAdapter<
 
   if (options?.plugins != null) {
     for (const plugin of options.plugins) {
-      if (plugin != null) {
-        if (plugin.onRequest) {
-          onRequestHooks.push(plugin.onRequest);
-        }
-        if (plugin.onResponse) {
-          onResponseHooks.push(plugin.onResponse);
-        }
-        const disposeFn =
-          plugin[DisposableSymbols.asyncDispose] || plugin[DisposableSymbols.dispose];
-        if (disposeFn != null) {
-          disposableStack.defer(disposeFn);
-        }
+      if (plugin.onRequest) {
+        onRequestHooks.push(plugin.onRequest);
+      }
+      if (plugin.onResponse) {
+        onResponseHooks.push(plugin.onResponse);
+      }
+      const disposeFn = plugin[DisposableSymbols.asyncDispose] || plugin[DisposableSymbols.dispose];
+      if (disposeFn != null) {
+        disposableStack.defer(disposeFn);
       }
     }
   }

diff --git a/packages/server/src/plugins/types.ts b/packages/server/src/plugins/types.ts
@@ -4,15 +4,12 @@ import {
   type ServerAdapterInitialContext,
 } from '../types.js';
 
-export type ServerAdapterPlugin<TServerContext = {}> =
-  | {
-      onRequest?: OnRequestHook<TServerContext & ServerAdapterInitialContext>;
-      onResponse?: OnResponseHook<TServerContext & ServerAdapterInitialContext>;
-      [Symbol.dispose]?: () => void;
-      [Symbol.asyncDispose]?: () => PromiseLike<void> | void;
-    }
-  | undefined;
-
+export interface ServerAdapterPlugin<TServerContext = {}> {
+  onRequest?: OnRequestHook<TServerContext & ServerAdapterInitialContext>;
+  onResponse?: OnResponseHook<TServerContext & ServerAdapterInitialContext>;
+  [Symbol.dispose]?: () => void;
+  [Symbol.asyncDispose]?: () => PromiseLike<void> | void;
+}
 export type OnRequestHook<TServerContext> = (
   payload: OnRequestEventPayload<TServerContext>,
 ) => Promise<void> | void;