Clean up

Author: ije

framework/core/redirect.ts

@@ -1,6 +1,6 @@
 import { isFilledString } from "../../shared/util.ts";
 import events from "./events.ts";
-import { matchRoutes, type Router } from "./routes.ts";
+import { matchRoutes, type Router } from "./router.ts";
 
 let router: Router | null = null;
 let preRedirect: URL | null = null;

framework/core/routes.ts framework/core/router.tsframework/core/routes.ts renamed to framework/core/router.ts

@@ -148,38 +148,6 @@ export function loadRouterFromTag(): Router {
   return { routes: [], prefix: "" };
 }
 
-// fetch route data
-export async function fetchRouteData(dataCache: Map<string, RouteData>, dataUrl: string, defer?: boolean) {
-  const rd: RouteData = {};
-  const fetchData = async () => {
-    const res = await fetch(dataUrl + (dataUrl.includes("?") ? "&" : "?") + "_data_");
-    if (!res.ok) {
-      const err = await FetchError.fromResponse(res);
-      const details = err.details as { redirect?: { location: string } };
-      if (err.status === 501 && typeof details.redirect?.location === "string") {
-        location.href = details.redirect?.location;
-        return;
-      }
-      return err;
-    }
-    try {
-      const data = await res.json();
-      const cc = res.headers.get("Cache-Control");
-      rd.dataCacheTtl = cc?.includes("max-age=") ? parseInt(cc.split("max-age=")[1]) : undefined;
-      rd.dataExpires = Date.now() + (rd.dataCacheTtl || 1) * 1000;
-      return data;
-    } catch (_e) {
-      return new Error("Data must be valid JSON");
-    }
-  };
-  if (defer) {
-    rd.data = fetchData;
-  } else {
-    rd.data = await fetchData();
-  }
-  dataCache.set(dataUrl, rd);
-}
-
 export function loadSSRModulesFromTag(): RouteModule[] {
   const { getRouteModule } = Reflect.get(window, "__aleph");
   const el = window.document.getElementById("ssr-data");
@@ -224,6 +192,37 @@ export function loadSSRModulesFromTag(): RouteModule[] {
   return [];
 }
 
+export async function fetchRouteData(dataCache: Map<string, RouteData>, dataUrl: string, defer?: boolean) {
+  const rd: RouteData = {};
+  const fetchData = async () => {
+    const res = await fetch(dataUrl + (dataUrl.includes("?") ? "&" : "?") + "_data_");
+    if (!res.ok) {
+      const err = await FetchError.fromResponse(res);
+      const details = err.details as { redirect?: { location: string } };
+      if (err.status === 501 && typeof details.redirect?.location === "string") {
+        location.href = details.redirect?.location;
+        return;
+      }
+      return err;
+    }
+    try {
+      const data = await res.json();
+      const cc = res.headers.get("Cache-Control");
+      rd.dataCacheTtl = cc?.includes("max-age=") ? parseInt(cc.split("max-age=")[1]) : undefined;
+      rd.dataExpires = Date.now() + (rd.dataCacheTtl || 1) * 1000;
+      return data;
+    } catch (_e) {
+      return new Error("Data must be valid JSON");
+    }
+  };
+  if (defer) {
+    rd.data = fetchData;
+  } else {
+    rd.data = await fetchData();
+  }
+  dataCache.set(dataUrl, rd);
+}
+
 export function listenHistory(onpopstate: (e: { type: string; url?: URL }) => Promise<void>): () => void {
   // deno-lint-ignore no-explicit-any
   const navigation = (window as any).navigation;

framework/core/style.ts

@@ -8,7 +8,6 @@ export function applyCSS(url: string, css: string) {
       el.hasAttribute("ssr")
     );
     if (ssrEl) {
-      // apply the css at next time
       ssrEl.removeAttribute("ssr");
     } else {
       const prevEls = Array.from(document.head.children).filter((el: Element) => {
@@ -127,7 +126,6 @@ function fixCSSText(cssText: string): string {
 function createCSSStyleSheet(css: string): CSSStyleSheet | null {
   try {
     const sheet = new CSSStyleSheet();
-    // @ts-ignore
     sheet.replaceSync(css);
     return sheet;
   } catch (_e) {

framework/react/router.ts

@@ -1,8 +1,8 @@
 import type { FC, ReactNode } from "react";
 import { createElement, isValidElement, StrictMode, Suspense, useContext, useEffect, useMemo, useState } from "react";
 import { redirect } from "../core/redirect.ts";
-import { RouteModule, watchRouter } from "../core/routes.ts";
-import { fetchRouteData, loadSSRModulesFromTag } from "../core/routes.ts";
+import { RouteModule, watchRouter } from "../core/router.ts";
+import { fetchRouteData, loadSSRModulesFromTag } from "../core/router.ts";
 import { ForwardPropsContext, RouterContext, type RouterContextProps } from "./context.ts";
 import { DataProvider, type RouteData } from "./data.ts";
 import { Err, ErrorBoundary } from "./error.ts";

framework/vue/router.ts

@@ -1,7 +1,7 @@
 import type { Component, Ref, ShallowRef } from "vue";
 import { createSSRApp, defineComponent, h, ref, shallowRef, watch } from "vue";
-import { RouteModule, watchRouter } from "../core/routes.ts";
-import { loadSSRModulesFromTag } from "../core/routes.ts";
+import { RouteModule, watchRouter } from "../core/router.ts";
+import { loadSSRModulesFromTag } from "../core/router.ts";
 import type { SSRContext } from "../../server/types.ts";
 import { RouterContext } from "./context.ts";
 import { Link } from "./link.ts";

plugins/deploy.ts

@@ -1,5 +1,5 @@
 import { colors, esbuild, path } from "../server/deps.ts";
-import type { Router } from "../framework/core/routes.ts";
+import type { Router } from "../framework/core/router.ts";
 import depGraph, { DependencyGraph } from "../server/graph.ts";
 import log from "../server/log.ts";
 import { getAlephConfig, getAppDir, getImportMap, getJSXConfig } from "../server/helpers.ts";

server/handler.ts

@@ -1,5 +1,5 @@
 import { generateErrorHtml, TransformError } from "../framework/core/error.ts";
-import type { Router } from "../framework/core/routes.ts";
+import type { Router } from "../framework/core/router.ts";
 import { isPlainObject, trimSuffix } from "../shared/util.ts";
 import { createContext } from "./context.ts";
 import { handleHMR } from "./dev.ts";

server/mock.ts

@@ -1,4 +1,4 @@
-import type { Router } from "../framework/core/routes.ts";
+import type { Router } from "../framework/core/router.ts";
 import { isPlainObject } from "../shared/util.ts";
 import { createContext } from "./context.ts";
 import { path } from "./deps.ts";

server/renderer.ts

@@ -1,5 +1,5 @@
 import { FetchError } from "../framework/core/error.ts";
-import { matchRoutes, type RouteModule, type Router } from "../framework/core/routes.ts";
+import { matchRoutes, type RouteModule, type Router } from "../framework/core/router.ts";
 import { cleanPath, isFilledString, isPlainObject, utf8Enc } from "../shared/util.ts";
 import { HTMLRewriter, path } from "./deps.ts";
 import depGraph from "./graph.ts";

server/routing.ts

@@ -1,5 +1,5 @@
 import { URLPatternCompat, type URLPatternInput } from "../framework/core/url_pattern.ts";
-import type { Route, RouteMatch, RouteMeta, Router, RouteRegExp } from "../framework/core/routes.ts";
+import type { Route, RouteMatch, RouteMeta, Router, RouteRegExp } from "../framework/core/router.ts";
 import {
   cleanPath,
   isFilledString,