Clean up

Author: ije

framework/core/route.ts

@@ -23,17 +23,17 @@ export type Route = readonly [
   meta: RouteMeta,
 ];
 
-export type Routes = {
+export type RouteRecord = {
+  routes: Route[];
   _404?: Route;
   _app?: Route;
   _error?: Route;
-  routes: Route[];
 };
 
 /** match routes against the given url */
 export function matchRoutes(
   url: URL,
-  { routes, _app, _404 }: Routes,
+  { routes, _app, _404 }: RouteRecord,
 ): [ret: URLPatternResult, route: RouteMeta][] {
   let { pathname } = url;
   if (pathname !== "/") {

framework/react/context.ts

@@ -4,6 +4,7 @@ import { createContext } from "react";
 export type RouterContextProps = {
   url: URL;
   params: Record<string, string>;
+  e404?: boolean;
   ssrHeadCollection?: string[];
   createPortal?: (children: ReactNode, container: Element, key?: null | string) => ReactPortal;
 };

framework/react/router.ts

@@ -3,7 +3,7 @@ import { createElement, StrictMode, useContext, useEffect, useMemo, useState } f
 import events from "../core/events.ts";
 import FetchError from "../core/fetch_error.ts";
 import { redirect } from "../core/redirect.ts";
-import type { Route, RouteMeta, RouteModule, Routes } from "../core/route.ts";
+import type { Route, RouteMeta, RouteModule, RouteRecord } from "../core/route.ts";
 import { matchRoutes } from "../core/route.ts";
 import { URLPatternCompat } from "../core/url_pattern.ts";
 import { ForwardPropsContext, RouterContext, type RouterContextProps } from "./context.ts";
@@ -217,6 +217,7 @@ export const Router: FC<RouterProps> = ({ ssrContext, suspense, createPortal })
       value: {
         url,
         params,
+        e404: modules[modules.length - 1].url.pathname === "/_404" ? true : undefined,
         ssrHeadCollection: ssrContext?.headCollection,
         createPortal,
       },
@@ -291,7 +292,7 @@ export const useForwardProps = <T = Record<string, unknown>>(): T => {
   return props as T;
 };
 
-function loadRoutesFromTag(): Routes {
+function loadRoutesFromTag(): RouteRecord {
   const el = window.document?.getElementById("routes-manifest");
   if (el) {
     try {

server/renderer.ts

@@ -1,5 +1,5 @@
 import FetchError from "../framework/core/fetch_error.ts";
-import type { RouteModule, Routes } from "../framework/core/route.ts";
+import type { RouteModule, RouteRecord } from "../framework/core/route.ts";
 import { matchRoutes } from "../framework/core/route.ts";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
@@ -41,7 +41,7 @@ export type SSRResult = {
 };
 
 export type RenderOptions = {
-  routes: Routes;
+  routes: RouteRecord;
   indexHtml: Uint8Array;
   customHTMLRewriter: Map<string, HTMLRewriterHandlers>;
   isDev: boolean;
@@ -336,7 +336,7 @@ export default {
 async function initSSR(
   req: Request,
   ctx: Record<string, unknown>,
-  routes: Routes,
+  routes: RouteRecord,
   suspense: boolean,
   onError?: (error: unknown, cause: { by: "ssr"; url: string }) => Response | void,
 ): Promise<

server/routing.ts

@@ -1,5 +1,5 @@
 import { extname, globToRegExp, join } from "https://deno.land/[email protected]/path/mod.ts";
-import type { Route, Routes } from "../framework/core/route.ts";
+import type { Route, RouteRecord } from "../framework/core/route.ts";
 import { URLPatternCompat, type URLPatternInput } from "../framework/core/url_pattern.ts";
 import { getFiles } from "../lib/fs.ts";
 import log from "../lib/log.ts";
@@ -33,7 +33,7 @@ export async function importRouteModule(filename: string) {
 
 /* check if the filename is a route */
 export function isRouteFile(filename: string): boolean {
-  const currentRoutes: Routes | undefined = Reflect.get(globalThis, "__ALEPH_ROUTES");
+  const currentRoutes: RouteRecord | undefined = Reflect.get(globalThis, "__ALEPH_ROUTES");
   const index = currentRoutes?.routes.findIndex(([_, meta]) => meta.filename === filename);
   if (index !== undefined && index !== -1) {
     return true;
@@ -54,7 +54,7 @@ type RouteRegExp = {
 };
 
 /** initialize routes from routes config */
-export async function initRoutes(config: string | RoutesConfig | RouteRegExp, cwd = Deno.cwd()): Promise<Routes> {
+export async function initRoutes(config: string | RoutesConfig | RouteRegExp, cwd = Deno.cwd()): Promise<RouteRecord> {
   return await globalIt("__ALEPH_ROUTES", async () => {
     const reg = isRouteRegExp(config) ? config : toRouteRegExp(config);
     const files = await getFiles(join(cwd, reg.prefix));