Bump TypeScript to 4.9.5 and fix types (#215)

package.json

@@ -32,6 +32,7 @@
     "@rollup/plugin-node-resolve": "13.0.0",
     "@rollup/plugin-typescript": "8.2.1",
     "@types/jest": "26.0.23",
+    "@types/node": "18.11.19",
     "@typescript-eslint/eslint-plugin": "4.28.0",
     "@typescript-eslint/parser": "4.28.0",
     "babel-jest": "27.0.5",
@@ -48,7 +49,7 @@
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-uglify": "6.0.4",
     "ts-jest": "27.0.3",
-    "typescript": "4.3.4"
+    "typescript": "4.9.5"
   },
   "scripts": {
     "lint": "eslint . --ext .ts,.js",

src/UniversalRouter.test.ts

@@ -8,6 +8,7 @@
  */
 
 import UniversalRouter, { Route } from './UniversalRouter'
+import type { RouteError } from './UniversalRouter'
 
 test('requires routes', () => {
   // @ts-expect-error missing argument
@@ -79,11 +80,11 @@ test('throws when route not found', async () => {
   try {
     await router.resolve('/')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
 })
 
 test("executes the matching route's action method and return its result", async () => {
@@ -128,11 +129,11 @@ test('skips action methods of routes that do not match the URL path', async () =
   try {
     await router.resolve('/b')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
   expect(action.mock.calls.length).toBe(0)
 })
 
@@ -294,7 +295,7 @@ test('supports next() across multiple routes', async () => {
           ],
         },
       ],
-      async action({ next }): Promise<unknown> {
+      async action({ next }) {
         log.push(1)
         const result = await next()
         log.push(10)
@@ -520,12 +521,12 @@ test('respects baseUrl', async () => {
   try {
     await router.resolve('/a/b/c')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(action.mock.calls.length).toBe(1)
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
 })
 
 test('matches routes with trailing slashes', async () => {
@@ -599,11 +600,11 @@ test('handles route not found error correctly', async () => {
   try {
     await router.resolve('/404')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
 })
 
 test('handles malformed URI params', async () => {

src/UniversalRouter.ts

@@ -146,7 +146,7 @@ function decode(val: string): string {
   }
 }
 
-function matchRoute<R, C>(
+function matchRoute<R, C extends RouterContext>(
   route: Route<R, C>,
   baseUrl: string,
   options: RouterOptions<R, C>,

src/UniversalRouterSync.test.ts

@@ -8,6 +8,7 @@
  */
 
 import UniversalRouter, { Route } from './UniversalRouterSync'
+import type { RouteError } from './UniversalRouterSync'
 
 test('requires routes', () => {
   // @ts-expect-error missing argument
@@ -79,11 +80,11 @@ test('throws when route not found', () => {
   try {
     router.resolve('/')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
 })
 
 test("executes the matching route's action method and return its result", () => {
@@ -128,11 +129,11 @@ test('skips action methods of routes that do not match the URL path', () => {
   try {
     router.resolve('/b')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
   expect(action.mock.calls.length).toBe(0)
 })
 
@@ -253,7 +254,7 @@ test('supports next() across multiple routes', () => {
           children: [
             {
               path: '',
-              action({ next }): Promise<void> {
+              action({ next }) {
                 log.push(3)
                 const result = next()
                 log.push(6)
@@ -262,7 +263,7 @@ test('supports next() across multiple routes', () => {
               children: [
                 {
                   path: '',
-                  action({ next }): Promise<void> {
+                  action({ next }) {
                     log.push(4)
                     const result = next()
                     log.push(5)
@@ -294,7 +295,7 @@ test('supports next() across multiple routes', () => {
           ],
         },
       ],
-      action({ next }): unknown {
+      action({ next }) {
         log.push(1)
         const result = next()
         log.push(10)
@@ -517,12 +518,12 @@ test('respects baseUrl', () => {
   try {
     router.resolve('/a/b/c')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(action.mock.calls.length).toBe(1)
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
 })
 
 test('matches routes with trailing slashes', () => {
@@ -596,11 +597,11 @@ test('handles route not found error correctly', () => {
   try {
     router.resolve('/404')
   } catch (e) {
-    err = e
+    err = e as RouteError
   }
   expect(err).toBeInstanceOf(Error)
-  expect(err.message).toBe('Route not found')
-  expect(err.status).toBe(404)
+  expect(err?.message).toBe('Route not found')
+  expect(err?.status).toBe(404)
 })
 
 test('handles malformed URI params', () => {

src/UniversalRouterSync.ts

@@ -147,7 +147,7 @@ function decode(val: string): string {
   }
 }
 
-function matchRoute<R, C>(
+function matchRoute<R, C extends RouterContext>(
   route: Route<R, C>,
   baseUrl: string,
   options: RouterOptions<R, C>,
@@ -324,7 +324,7 @@ class UniversalRouterSync<R = any, C extends RouterContext = RouterContext> {
       return next(true, this.root)
     } catch (error) {
       if (this.options.errorHandler) {
-        return this.options.errorHandler(error, currentContext)
+        return this.options.errorHandler(error as RouteError, currentContext)
       }
       throw error
     }