simplifies websocket, adds withParams option to AutoRouter

src/AutoRouter.spec.ts

@@ -55,6 +55,14 @@ describe(`SPECIFIC TESTS: AutoRouter`, () => {
         expect(response.status).toBe(418)
       })
 
+      it('withParams: can replace the withParams middleware', async () => {
+        const handler = vi.fn(({ a, b, params }) => [a, b, params.a, params.b])
+        const router = AutoRouter({ withParams: () => {} }).get('/:a/:b', handler)
+
+        await router.fetch(toReq('/foo/bar'))
+        expect(handler).toHaveReturnedWith([undefined, undefined, 'foo', 'bar'])
+      })
+
       it('before: RouteHandler - adds upstream middleware', async () => {
         const handler = vi.fn(r => typeof r.date)
         const router = AutoRouter({

src/AutoRouter.ts

@@ -2,7 +2,7 @@ import { Router } from './Router'
 import { error } from './error'
 import { json } from './json'
 import { AutoRouterOptions, AutoRouterType, IRequest } from './types'
-import { withParams } from './withParams'
+import { withParams as wp } from './withParams'
 
 export const AutoRouter = <
   RequestType extends IRequest = IRequest,
@@ -12,6 +12,7 @@ export const AutoRouter = <
   format = json,
   missing = () => error(404),
   finally: f = [],
+  withParams = wp,
   before = [],
   ...options }: AutoRouterOptions = {}
 ): AutoRouterType<RequestType, Args, ResponseType> => Router({

src/websocket.ts

@@ -1,7 +1,5 @@
-import { createResponse } from './createResponse'
-
-export const websocket = (client: WebSocket, options: object = {}) =>
-  createResponse()(null, {
+export const websocket = (client: WebSocket, options?: ResponseInit) =>
+  new Response(null, {
     status: 101,
     webSocket: client,
     ...options,

src/withParams.spec.ts

@@ -70,14 +70,4 @@ describe('withParams (middleware)', () => {
       testParam: 'testValue',
     })
   })
-
-  it('downstream handlers can access original Request through request.raw', async () => {
-    const handler = vi.fn(r => r.raw)
-    const router = Router().get('/', withParams, handler)
-    const request = toReq('/')
-
-    await router.fetch(request)
-
-    expect(handler).toHaveReturnedWith(request)
-  })
 })

src/withParams.ts

@@ -1,7 +1,6 @@
 import { IRequest } from './types'
 
 export const withParams = (request: IRequest): void => {
-  request.raw = request.raw ?? request  // places reference to request in request.raw if safe to do so
   request.proxy = new Proxy(request.proxy ?? request, {
     get: (obj, prop, receiver) =>
             obj[prop]?.bind?.(request)  // if prop exists (as function), return the function, bound to the original request