WIP

Author: marvinhagemeister

src/app.ts

@@ -243,7 +243,7 @@ export class App<State> {
       fns = middlewares;
     }
 
-    const segment = getOrCreateSegment(this.#root, path);
+    const segment = getOrCreateSegment(this.#root, path, false);
     segment.middlewares.push(...fns);
 
     return this;
@@ -259,12 +259,11 @@ export class App<State> {
     return this;
   }
 
-  error(
+  onError(
     path: string,
     routeOrMiddleware: Route<State> | MiddlewareFn<State>,
   ): this {
-    if (!path.endsWith("/")) path += "/";
-    const segment = getOrCreateSegment(this.#root, path);
+    const segment = getOrCreateSegment(this.#root, path, true);
     segment.errorRoute = typeof routeOrMiddleware === "function"
       ? { handler: routeOrMiddleware }
       : routeOrMiddleware;
@@ -275,7 +274,7 @@ export class App<State> {
   }
 
   appWrapper(component: RouteComponent<State>) {
-    const segment = getOrCreateSegment<State>(this.#root, "");
+    const segment = getOrCreateSegment<State>(this.#root, "", false);
     segment.app = component;
   }
 
@@ -284,15 +283,14 @@ export class App<State> {
     component: RouteComponent<State>,
     config?: LayoutConfig,
   ): this {
-    if (!path.endsWith("/")) path += "/";
-    const segment = getOrCreateSegment<State>(this.#root, path);
+    const segment = getOrCreateSegment<State>(this.#root, path, true);
     segment.layout = { component, config: config ?? null };
 
     return this;
   }
 
   route(path: string, route: Route<State>): this {
-    const segment = getOrCreateSegment<State>(this.#root, path);
+    const segment = getOrCreateSegment<State>(this.#root, path, false);
     const middlewares = segmentToMiddlewares(segment);
 
     ensureHandler(route);
@@ -347,7 +345,7 @@ export class App<State> {
     fns: MiddlewareFn<State>[],
     unshift = false,
   ) {
-    const segment = getOrCreateSegment<State>(this.#root, path);
+    const segment = getOrCreateSegment<State>(this.#root, path, false);
     const result = segmentToMiddlewares(segment);
 
     result.push(...fns);
@@ -367,7 +365,7 @@ export class App<State> {
 
   mountApp(path: string, app: App<State>): this {
     const segmentPath = mergePath(path, `/__${INTERNAL_ID++}/`);
-    const segment = getOrCreateSegment(this.#root, segmentPath);
+    const segment = getOrCreateSegment(this.#root, segmentPath, true);
     const fns = segmentToMiddlewares(segment);
 
     const routes = app.#routeDefs;

src/app_test.tsx

@@ -569,3 +569,42 @@ Deno.test("App - overwrite default 404 handler", async () => {
   res = await server.get("/thrower");
   expect(await res.text()).toEqual("bar");
 });
+
+Deno.test("App - uses error route", async () => {
+  const app = new App()
+    .onError("*", () => new Response("error route", { status: 200 }))
+    .get("/thrower", () => {
+      throw new HttpError(404);
+    });
+
+  const server = new FakeServer(app.handler());
+
+  let res = await server.get("/invalid");
+  expect(await res.text()).toEqual("error route");
+
+  res = await server.get("/thrower");
+  expect(await res.text()).toEqual("error route");
+});
+
+Deno.test("App - uses notFound route on 404", async () => {
+  const app = new App()
+    .notFound(() => new Response("not found route", { status: 404 }))
+    .onError("*", () => new Response("error route", { status: 500 }))
+    .get("/thrower", () => {
+      throw new HttpError(404);
+    })
+    .get("/thrower_2", () => {
+      throw new HttpError(500);
+    });
+
+  const server = new FakeServer(app.handler());
+
+  let res = await server.get("/invalid");
+  expect(await res.text()).toEqual("not found route");
+
+  res = await server.get("/thrower");
+  expect(await res.text()).toEqual("not found route");
+
+  res = await server.get("/thrower_2");
+  expect(await res.text()).toEqual("error route");
+});

src/plugins/fs_routes/mod.ts

@@ -212,7 +212,7 @@ export async function fsRoutes<State>(
         keepGroups: true,
       });
       errorPaths.add(pattern);
-      app.error(pattern, {
+      app.onError(pattern, {
         config: routeMod.config ?? undefined,
         component: routeMod.component ?? undefined,
         // deno-lint-ignore no-explicit-any
@@ -233,7 +233,7 @@ export async function fsRoutes<State>(
       });
       if (errorPaths.has(pattern)) continue;
 
-      app.error(pattern, {
+      app.onError(pattern, {
         config: routeMod.config ?? undefined,
         component: routeMod.component ?? undefined,
         // deno-lint-ignore no-explicit-any

src/router.ts

@@ -281,10 +281,14 @@ export function pathToPattern(
   return route;
 }
 
-export function patternToSegments(path: string, root: string): string[] {
+export function patternToSegments(
+  path: string,
+  root: string,
+  includeLast: boolean = false,
+): string[] {
   const out: string[] = [root];
 
-  if (path === "/") return out;
+  if (path === "/" || path === "*" || path === "/*") return out;
 
   let start = -1;
   for (let i = 0; i < path.length; i++) {
@@ -299,6 +303,10 @@ export function patternToSegments(path: string, root: string): string[] {
     }
   }
 
+  if (includeLast && start < path.length - 1) {
+    out.push(path.slice(start + 1));
+  }
+
   return out;
 }
 

src/router_test.ts

@@ -150,6 +150,8 @@ Deno.test("patternToSegments", () => {
   expect(patternToSegments("/:foo/:bar", "")).toEqual(["", ":foo"]);
   expect(patternToSegments("/:foo-:bar/foo", "")).toEqual(["", ":foo-:bar"]);
   expect(patternToSegments("/foo/", "")).toEqual(["", "foo"]);
+
+  expect(patternToSegments("/foo/bar", "", true)).toEqual(["", "foo", "bar"]);
 });
 
 Deno.test("mergePath", () => {

src/segments.ts

@@ -52,10 +52,11 @@ export function newSegment<State>(
 export function getOrCreateSegment<State>(
   root: Segment<State>,
   path: string,
+  includeLast: boolean,
 ): Segment<State> {
   let current = root;
 
-  const segments = patternToSegments(path, root.pattern);
+  const segments = patternToSegments(path, root.pattern, includeLast);
   for (let i = 0; i < segments.length; i++) {
     const seg = segments[i];
     if (seg === root.pattern) {

src/segments_test.ts

@@ -3,26 +3,32 @@ import { getOrCreateSegment, newSegment } from "./segments.ts";
 
 Deno.test("findOrCreateSegment - root", () => {
   const root = newSegment("", null);
-  const found = getOrCreateSegment(root, "");
+  const found = getOrCreateSegment(root, "", false);
   expect(found).toEqual(root);
 });
 
 Deno.test("findOrCreateSegment - /foo/bar", () => {
   const root = newSegment("", null);
-  const found = getOrCreateSegment(root, "/foo/bar");
+  const found = getOrCreateSegment(root, "/foo/bar", false);
   expect(found).toEqual(root.children.get("foo"));
 });
 
 Deno.test("findOrCreateSegment - /:foo/bar/:baz", () => {
   const root = newSegment("", null);
-  const found = getOrCreateSegment(root, "/:foo/bar/:baz");
+  const found = getOrCreateSegment(root, "/:foo/bar/:baz", false);
   expect(found).toEqual(
     root.children.get(":foo")?.children.get("bar"),
   );
 });
 
 Deno.test("findOrCreateSegment - /foo/bar/", () => {
   const root = newSegment("", null);
-  const found = getOrCreateSegment(root, "/foo/bar/");
+  const found = getOrCreateSegment(root, "/foo/bar/", false);
+  expect(found).toEqual(root.children.get("foo")?.children.get("bar"));
+});
+
+Deno.test("findOrCreateSegment - /foo/bar with last", () => {
+  const root = newSegment("", null);
+  const found = getOrCreateSegment(root, "/foo/bar", true);
   expect(found).toEqual(root.children.get("foo")?.children.get("bar"));
 });