Merge pull request #6 from michealroberts/refactor/dependencies/h3

refactor: Upgraded to h3 => v1.8.0 dependency in nitro-cors.

package.json

@@ -36,7 +36,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "h3": "^1.6.6",
+    "h3": "^1.8.0",
     "ufo": "^1.1.2"
   },
   "devDependencies": {

src/corsEventHandler.ts

@@ -6,12 +6,25 @@
 
 /*****************************************************************************************************************/
 
-import { type EventHandler, type H3CorsOptions, defineEventHandler, handleCors } from 'h3'
+import {
+  type EventHandler,
+  type EventHandlerRequest,
+  type EventHandlerResponse,
+  type H3CorsOptions,
+  defineEventHandler,
+  handleCors
+} from 'h3'
 
 /*****************************************************************************************************************/
 
-export const corsEventHandler = <T>(handler: EventHandler<T>, options: H3CorsOptions) => {
-  return defineEventHandler(async event => {
+export const corsEventHandler = <
+  TRequest extends EventHandlerRequest,
+  TResponse extends EventHandlerResponse
+>(
+  handler: EventHandler<TRequest, TResponse>,
+  options: H3CorsOptions
+): EventHandler<EventHandlerRequest, TResponse> => {
+  return defineEventHandler(event => {
     handleCors(event, options)
     return handler(event)
   })

src/defineCORSEventHandler.ts

@@ -8,6 +8,8 @@
 
 import {
   type EventHandler,
+  type EventHandlerRequest,
+  type EventHandlerResponse,
   type H3CorsOptions,
   getHeaders,
   setHeader,
@@ -19,11 +21,14 @@ import { useCORS } from './internals/utils'
 
 /*****************************************************************************************************************/
 
-export const defineCORSEventHandler = <T extends any>(
-  handler: EventHandler<T>,
+export const defineCORSEventHandler = <
+  TRequest extends EventHandlerRequest,
+  TResponse extends EventHandlerResponse
+>(
+  handler: EventHandler<TRequest, TResponse>,
   options: H3CorsOptions
-) => {
-  return defineEventHandler(async event => {
+): EventHandler<EventHandlerRequest, TResponse> => {
+  return defineEventHandler(event => {
     useCORS(event, options)
 
     const { origin } = getHeaders(event)

src/internals/utils.ts

@@ -11,21 +11,19 @@ import {
   type H3CorsOptions,
   appendCorsHeaders,
   appendCorsPreflightHeaders,
-  getMethod,
   isPreflightRequest,
   sendNoContent
 } from 'h3'
 
 /*****************************************************************************************************************/
 
 export const useCORS = (event: H3Event, options: H3CorsOptions): boolean => {
-  const method = getMethod(event)
-
   const { methods = [] } = options
 
-  const methodIsAllowed = (Array.isArray(methods) && methods.includes(method)) || methods == '*'
+  const methodIsAllowed =
+    (Array.isArray(methods) && methods.includes(event.method)) || methods == '*'
 
-  const methodIsOptions = method === 'OPTIONS'
+  const methodIsOptions = event.method === 'OPTIONS'
 
   // If the method is not allowed, return:
   if (!methodIsAllowed && !methodIsOptions) {

tests/defineCORSEventHandler.spec.ts

@@ -6,7 +6,9 @@
 
 /*****************************************************************************************************************/
 
-import { describe, expect, it, suite } from 'vitest'
+import { describe, expect, expectTypeOf, it, suite } from 'vitest'
+
+import { type EventHandler, type EventHandlerRequest } from 'h3'
 
 import { defineCORSEventHandler } from '../src'
 
@@ -17,5 +19,41 @@ suite('nitro-cors eventHandler', () => {
     it('should be defined', () => {
       expect(defineCORSEventHandler).toBeDefined()
     })
+
+    it('should return the correct event handler types when specified', async () => {
+      const handler = defineCORSEventHandler(
+        async _event => {
+          return {
+            cors: true
+          }
+        },
+        {
+          origin: '*',
+          methods: '*'
+        }
+      )
+
+      expectTypeOf(handler).toEqualTypeOf<
+        EventHandler<EventHandlerRequest, Promise<{ cors: boolean }>>
+      >()
+    })
+
+    it('should return the correct event handler types when specified', () => {
+      const handler = defineCORSEventHandler(
+        _event => {
+          return {
+            cors: true
+          }
+        },
+        {
+          origin: '*',
+          methods: '*'
+        }
+      )
+
+      expectTypeOf(handler).toEqualTypeOf<EventHandler<EventHandlerRequest, { cors: boolean }>>()
+    })
   })
 })
+
+/*****************************************************************************************************************/