feat: migrate to path-to-regexp-typed

Author: shigma

packages/core/package.json

@@ -41,6 +41,7 @@
     "accepts": "^1.3.8",
     "cosmokit": "^1.8.0",
     "path-to-regexp": "^8.2.0",
+    "path-to-regexp-typed": "^8.0.0",
     "ws": "^8.18.1"
   }
 }

packages/core/src/body.ts

@@ -8,6 +8,7 @@ export class Request implements Body {
   readonly url: string
   readonly method: string
   readonly headers: Headers
+  readonly query: URLSearchParams
 
   private _accepts?: accepts.Accepts
   private _bodyImpl: globalThis.Response
@@ -16,6 +17,7 @@ export class Request implements Body {
     defineProperty(this, Service.tracker, { associate: 'server.request' })
     this.url = _req.url!
     this.method = _req.method!
+    this.query = new URLSearchParams(_req.url!.split('?')[1])
     this.headers = new Headers()
     for (const [key, value] of Object.entries(_req.headers)) {
       if (Array.isArray(value)) {

packages/core/src/index.ts

@@ -2,7 +2,7 @@ import { Context, DisposableList, Inject, Service, z } from 'cordis'
 import { Awaitable, defineProperty, trimSlash } from 'cosmokit'
 import type {} from '@cordisjs/plugin-logger'
 import * as http from 'node:http'
-import { Keys, pathToRegexp } from 'path-to-regexp'
+import { ExtractParams, Keys, pathToRegexp } from 'path-to-regexp-typed'
 import { WebSocket, WebSocketServer } from 'ws'
 import { listen, ListenOptions } from './listen'
 import { Request, Response } from './body'
@@ -21,54 +21,6 @@ declare module 'cordis' {
   }
 }
 
-type Upper =
-  | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M'
-  | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z'
-
-type Lower =
-  | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm'
-  | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z'
-
-type Digit = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'
-
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-type Take<S extends string, D extends string, O extends string = ''> =
-  | S extends `${infer C extends D}${infer S}`
-  ? Take<S, D, `${O}${C}`>
-  : [O, S]
-
-type TakeIdent<S extends string> =
-  | S extends `"${infer P}"${infer S}`
-  ? [P, S]
-  : Take<S, Upper | Lower | Digit | '_'>
-
-// path-to-regexp v8 syntax
-export type ExtractParams<S extends string, O extends {} = {}, A extends 0[] = []> =
-  | string extends S
-  ? any
-  : S extends `${infer C}${infer S}`
-  ? | C extends '\\'
-    ? | S extends `${string}${infer S}`
-      ? ExtractParams<S, O, A>
-      : O
-    : C extends ':' | '*'
-    ? | TakeIdent<S> extends [infer P extends string, infer S extends string]
-      ? ExtractParams<S, O & (
-        | A['length'] extends 0
-        ? { [K in P]: string }
-        : { [K in P]?: string }
-      ), A>
-      : never
-    : C extends '{'
-    ? ExtractParams<S, O, [0, ...A]>
-    : C extends '}'
-    ? | A extends [0, ...infer A extends 0[]]
-      ? ExtractParams<S, O, A>
-      : ExtractParams<S, O, A>
-    : ExtractParams<S, O, A>
-  : O
-
 export abstract class Route {
   regexp: RegExp
   keys?: Keys

tsconfig.base.json

@@ -9,6 +9,7 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
     "strict": true,
     "noImplicitAny": false,
   },