test: merge compiler with main tests

Author: pi0

package.json

@@ -24,7 +24,6 @@
     "lint:fix": "automd && eslint --fix . && prettier -w src test",
     "release": "pnpm test && pnpm build && changelogen --release && git push --follow-tags && npm publish",
     "test": "pnpm lint && pnpm test:types && vitest run --coverage",
-    "test:compiler": "TEST_COMPILER=1 vitest",
     "test:types": "tsc --noEmit"
   },
   "devDependencies": {

test/basic.test.ts renamed to test/find.test.ts

@@ -1,8 +1,9 @@
 import { describe, it, expect } from "vitest";
 import { createRouter, formatTree } from "./_utils.ts";
 import { findRoute, removeRoute } from "../src/index.ts";
+import { compileRouter } from "../src/compiler.ts";
 
-describe("Basic router", () => {
+describe("route matching", () => {
   const router = createRouter([
     "/test",
     "/test/:id",
@@ -18,6 +19,8 @@ describe("Basic router", () => {
     "/wildcard/**",
   ]);
 
+  const compiledLookup = compileRouter(router);
+
   it("snapshot", () => {
     expect(formatTree(router.root)).toMatchInlineSnapshot(`
       "<root>
@@ -39,55 +42,68 @@ describe("Basic router", () => {
     `);
   });
 
-  it("lookup works", () => {
-    // Static
-    expect(findRoute(router, "GET", "/test")).toEqual({
-      data: { path: "/test" },
-    });
-    expect(findRoute(router, "GET", "/test/foo")).toEqual({
-      data: { path: "/test/foo" },
-    });
-    expect(findRoute(router, "GET", "/test/fooo")).toEqual({
-      data: { path: "/test/fooo" },
-    });
-    expect(findRoute(router, "GET", "/another/path")).toEqual({
-      data: { path: "/another/path" },
-    });
-    // Param
-    expect(findRoute(router, "GET", "/test/123")).toEqual({
-      data: { path: "/test/:id" },
-      params: { id: "123" },
-    });
-    expect(findRoute(router, "GET", "/test/123/y")).toEqual({
-      data: { path: "/test/:idY/y" },
-      params: { idY: "123" },
-    });
-    expect(findRoute(router, "GET", "/test/123/y/z")).toEqual({
-      data: { path: "/test/:idYZ/y/z" },
-      params: { idYZ: "123" },
-    });
-    expect(findRoute(router, "GET", "/test/foo/123")).toEqual({
-      data: { path: "/test/foo/*" },
-      params: { _0: "123" },
-    });
-    // Wildcard
-    expect(findRoute(router, "GET", "/test/foo/123/456")).toEqual({
-      data: { path: "/test/foo/**" },
-      params: { _: "123/456" },
-    });
-    expect(findRoute(router, "GET", "/wildcard/foo")).toEqual({
-      data: { path: "/wildcard/**" },
-      params: { _: "foo" },
-    });
-    expect(findRoute(router, "GET", "/wildcard/foo/bar")).toEqual({
-      data: { path: "/wildcard/**" },
-      params: { _: "foo/bar" },
-    });
-    expect(findRoute(router, "GET", "/wildcard")).toEqual({
-      data: { path: "/wildcard/**" },
-      params: { _: "" },
+  const lookups = [
+    {
+      name: "findRoute",
+      match: (method: string, path: string) => findRoute(router, method, path),
+    },
+    {
+      name: "compiledLookup",
+      match: (method: string, path: string) => compiledLookup(method, path),
+    },
+  ];
+
+  for (const { name, match } of lookups) {
+    it(`match with ${name}`, () => {
+      // Static
+      expect(match("GET", "/test")).toEqual({
+        data: { path: "/test" },
+      });
+      expect(match("GET", "/test/foo")).toEqual({
+        data: { path: "/test/foo" },
+      });
+      expect(match("GET", "/test/fooo")).toEqual({
+        data: { path: "/test/fooo" },
+      });
+      expect(match("GET", "/another/path")).toEqual({
+        data: { path: "/another/path" },
+      });
+      // Param
+      expect(match("GET", "/test/123")).toEqual({
+        data: { path: "/test/:id" },
+        params: { id: "123" },
+      });
+      expect(match("GET", "/test/123/y")).toEqual({
+        data: { path: "/test/:idY/y" },
+        params: { idY: "123" },
+      });
+      expect(match("GET", "/test/123/y/z")).toEqual({
+        data: { path: "/test/:idYZ/y/z" },
+        params: { idYZ: "123" },
+      });
+      expect(match("GET", "/test/foo/123")).toEqual({
+        data: { path: "/test/foo/*" },
+        params: { _0: "123" },
+      });
+      // Wildcard
+      expect(match("GET", "/test/foo/123/456")).toEqual({
+        data: { path: "/test/foo/**" },
+        params: { _: "123/456" },
+      });
+      expect(match("GET", "/wildcard/foo")).toEqual({
+        data: { path: "/wildcard/**" },
+        params: { _: "foo" },
+      });
+      expect(match("GET", "/wildcard/foo/bar")).toEqual({
+        data: { path: "/wildcard/**" },
+        params: { _: "foo/bar" },
+      });
+      expect(match("GET", "/wildcard")).toEqual({
+        data: { path: "/wildcard/**" },
+        params: { _: "" },
+      });
     });
-  });
+  }
 
   it("remove works", () => {
     removeRoute(router, "GET", "/test");

test/router.test.ts

@@ -23,9 +23,7 @@ function testRouter(
 ) {
   const router = createRouter<{ path?: string }>(routes);
 
-  const compiledMatch = process.env.TEST_COMPILER
-    ? compileRouter(router)
-    : undefined;
+  const compiledMatch = compileRouter(router);
 
   if (!tests) {
     tests = Array.isArray(routes)
@@ -56,11 +54,15 @@ function testRouter(
     it.skipIf(tests[path]?.skip)(
       `lookup ${path} should be ${JSON.stringify(tests[path])}`,
       () => {
-        if (process.env.TEST_COMPILER) {
-          expect(compiledMatch!("GET", path)).to.toMatchObject(tests[path]!);
-        } else {
-          expect(findRoute(router, "GET", path)).to.toMatchObject(tests[path]!);
-        }
+        expect(
+          findRoute(router, "GET", path),
+          `findRoute(GET, ${path})`,
+        ).to.toMatchObject(tests[path]!);
+
+        expect(
+          compiledMatch("GET", path),
+          `compiledMatch(GET, ${path})`,
+        ).to.toMatchObject(tests[path]!);
       },
     );
   }