refactor: rebase file-system routing onto @solidjs/file-routes

packages/start/package.json

@@ -56,6 +56,7 @@
     "@babel/core": "^7.29.0",
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
+    "@solidjs/file-routes": "^0.1.0",
     "@solidjs/meta": "0.30.0-next.0",
     "@solidjs/router": "0.17.0-next.6",
     "@solidjs/web": "2.0.0-beta.21",

packages/start/src/config/fs-router.ts

@@ -1,86 +1,23 @@
-import type { StaticExportEntry } from "oxc-parser";
-
 import {
   analyzeModule,
-  BaseFileSystemRouter,
-  cleanPath,
+  getExportName,
+  getLocalExportName,
+  PageFileSystemRouter,
   type FileSystemRouterConfig,
-} from "./fs-routes/router.ts";
-
-export class SolidStartClientFileRouter extends BaseFileSystemRouter {
-  toPath(src: string) {
-    const routePath = cleanPath(src, this.config)
-      // remove the initial slash
-      .slice(1)
-      .replace(/index$/, "")
-      .replace(/\[([^/]+)\]/g, (_, m) => {
-        if (m.length > 3 && m.startsWith("...")) {
-          return `*${m.slice(3)}`;
-        }
-        if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
-          return `:${m.slice(1, -1)}?`;
-        }
-        return `:${m}`;
-      });
-
-    return routePath?.length > 0 ? `/${routePath}` : "/";
-  }
-
-  toRoute(src: string) {
-    const path = this.toPath(src);
+  type ModuleRef,
+  type RouteManifestEntry,
+} from "@solidjs/file-routes";
 
-    if (src.endsWith(".md") || src.endsWith(".mdx")) {
-      return {
-        page: true,
-        $component: {
-          src: src,
-          pick: ["$css"],
-        },
-        $$route: undefined,
-        path,
-        // filePath: src
-      };
-    }
-
-    const exports = analyzeModule(src);
-    const exportNames = exports.map(getExportName);
-    const localExportNames = exports.map(getLocalExportName).filter(name => name !== undefined);
-    const hasDefault = exportNames.includes("default");
-    const hasRouteConfig = exportNames.includes("route");
-    if (hasDefault) {
-      return {
-        page: true,
-        $component: {
-          src: src,
-          pick: [...localExportNames.filter(name => name !== "route"), "default", "$css"],
-        },
-        $$route: hasRouteConfig
-          ? {
-              src: src,
-              pick: ["route"],
-            }
-          : undefined,
-        path,
-        // filePath: src
-      };
-    }
-  }
-}
+/**
+ * The client router is the plain page convention from `@solidjs/file-routes`:
+ * default export = page, optional `route` config export, md/mdx pages.
+ */
+export { PageFileSystemRouter as SolidStartClientFileRouter };
 
 const HTTP_METHODS = ["HEAD", "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
 
-function getExportName(entry: StaticExportEntry) {
-  return entry.exportName.name ?? "default";
-}
-
-function getLocalExportName(entry: StaticExportEntry) {
-  const name = getExportName(entry);
-  if (name === "default") return;
-  return name === (entry.localName.name ?? entry.importName.name ?? name) ? name : undefined;
-}
-
 function createHTTPHandlers(src: string, exports: readonly string[]) {
-  const handlers: Record<string, any> = {};
+  const handlers: Record<string, ModuleRef> = {};
   for (const exp of exports) {
     if (HTTP_METHODS.includes(exp)) {
       handlers[`$${exp}`] = {
@@ -99,33 +36,24 @@ function createHTTPHandlers(src: string, exports: readonly string[]) {
   return handlers;
 }
 
-export class SolidStartServerFileRouter extends BaseFileSystemRouter {
+/**
+ * SolidStart's server convention on top of the shared page convention:
+ * modules may additionally export `GET`, `POST`, etc. API handlers, and
+ * component refs are omitted entirely when SSR is disabled (`dataOnly`).
+ */
+export class SolidStartServerFileRouter extends PageFileSystemRouter {
   declare config: FileSystemRouterConfig & { dataOnly?: boolean };
 
   constructor(config: FileSystemRouterConfig & { dataOnly?: boolean }) {
     super(config);
   }
 
-  toPath(src: string) {
-    const routePath = cleanPath(src, this.config)
-      // remove the initial slash
-      .slice(1)
-      .replace(/index$/, "")
-      .replace(/\[([^/]+)\]/g, (_, m) => {
-        if (m.length > 3 && m.startsWith("...")) {
-          return `*${m.slice(3)}`;
-        }
-        if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
-          return `:${m.slice(1, -1)}?`;
-        }
-        return `:${m}`;
-      });
+  toRoute(src: string): RouteManifestEntry | undefined {
+    if (this.config.toRoute) return this.config.toRoute(src, this);
 
-    return routePath?.length > 0 ? `/${routePath}` : "/";
-  }
-
-  toRoute(src: string) {
     const path = this.toPath(src);
+    if (path === undefined) return;
+
     if (src.endsWith(".md") || src.endsWith(".mdx")) {
       return {
         page: true,