feat: params and url (#1)

Author: yusukebe

README.md

@@ -36,23 +36,22 @@ const app = new Pico()
 app.get('/', () => 'Hello Pico!')
 
 // capture the path parameter and return JSON response
-app.post('/entry/:id', ({ pathname }) => {
-  const { id } = pathname.groups
+app.post('/entry/:id', ({ params }) => {
+  const { id } = params
   return {
     'your id is': id,
   }
 })
 
 // capture the parameters with RegExp
-app.get('/post/:date(\\d+)/:title([a-z]+)', ({ pathname }) => {
-  const { date, title } = pathname.groups
+app.get('/post/:date(\\d+)/:title([a-z]+)', ({ params }) => {
+  const { date, title } = params
   return { post: { date, title } }
 })
 
 // get the query parameter
-app.get('/search', ({ search }) => {
-  const params = new URLSearchParams(search.input)
-  return `Your query is ${params.get('q')}`
+app.get('/search', ({ url }) => {
+  return `Your query is ${url.searchParams.get('q')}`
 })
 
 // handle the PURGE method and return Redirect response

src/pico.ts

@@ -49,7 +49,13 @@ class Pico extends defineDynamicClass() {
   fetch = (request: Request, env?: object, executionContext?: ExecutionContext) => {
     const match = this.match(request.method, request.url)
     if (match === undefined) return this.notFound()
-    const response = match.handler({ request, ...match.result, env, executionContext })
+    const response = match.handler({
+      request,
+      params: match.result.pathname.groups,
+      url: new URL(request.url),
+      env,
+      executionContext,
+    })
     if (response instanceof Response) return response
     if (typeof response === 'string') {
       return new Response(response, {

src/types.ts

@@ -1,6 +1,8 @@
 export type Handler = (context: Context) => Response | string | object
-export type Context = {
+export interface Context {
   request: Request
   env: object
   executionContext: ExecutionContext
-} & URLPatternURLPatternResult
+  params: Record<string, string>
+  get url(): URL
+}

test/pico.test.ts

@@ -36,13 +36,12 @@ describe('Basic', () => {
 
 describe('RegExp', () => {
   const app = new Pico()
-  app.get('/post/:date(\\d+)/:title([a-z]+)', ({ pathname }) => {
-    const { date, title } = pathname.groups
+  app.get('/post/:date(\\d+)/:title([a-z]+)', ({ params }) => {
+    const { date, title } = params
     return { post: { date, title } }
   })
-  app.get('/assets/:filename(.*.png)', ({ pathname }) => {
-    const { filename } = pathname.groups
-    return { filename }
+  app.get('/assets/:filename(.*.png)', ({ params }) => {
+    return params
   })
 
   it('Should capture regexp path parameters', async () => {
@@ -66,6 +65,21 @@ describe('RegExp', () => {
   })
 })
 
+describe('URL', () => {
+  const app = new Pico()
+  app.get('/search', ({ url }) => {
+    const query = url.searchParams.get('q') || ''
+    return query
+  })
+
+  it('Should get query parameters', async () => {
+    const req = new Request('http://localhost/search?q=foo')
+    const res = app.fetch(req)
+    expect(res.status).toBe(200)
+    expect(await res.text()).toBe('foo')
+  })
+})
+
 describe('All', () => {
   const app = new Pico()
   app.all('/abc', () => 'Hi')