@solidjs/start 2.0.0-beta.4 → 2.0.0-beta.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @solidjs/start
 
+## 2.0.0-beta.5
+
+### Patch Changes
+
+- eb73dd5: Use `oxc-parser` to analyze filesystem route exports.
+
 ## 2.0.0-beta.4
 
 ### Patch Changes

package/dist/config/fs-router.js

@@ -30,19 +30,17 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
                 // filePath: src
             };
         }
-        const [_, exports] = analyzeModule(src);
-        const hasDefault = !!exports.find(e => e.n === "default");
-        const hasRouteConfig = !!exports.find(e => e.n === "route");
+        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: [
-                        ...exports.filter(e => e.n === e.ln && e.n !== "route").map(e => e.n),
-                        "default",
-                        "$css",
-                    ],
+                    pick: [...localExportNames.filter(name => name !== "route"), "default", "$css"],
                 },
                 $$route: hasRouteConfig
                     ? {
@@ -57,18 +55,27 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
     }
 }
 const HTTP_METHODS = ["HEAD", "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
+function getExportName(entry) {
+    return entry.exportName.name ?? "default";
+}
+function getLocalExportName(entry) {
+    const name = getExportName(entry);
+    if (name === "default")
+        return;
+    return name === (entry.localName.name ?? entry.importName.name ?? name) ? name : undefined;
+}
 function createHTTPHandlers(src, exports) {
     const handlers = {};
     for (const exp of exports) {
-        if (HTTP_METHODS.includes(exp.n)) {
-            handlers[`$${exp.n}`] = {
+        if (HTTP_METHODS.includes(exp)) {
+            handlers[`$${exp}`] = {
                 src: src,
-                pick: [exp.n],
+                pick: [exp],
             };
-            if (exp.n === "GET" && !exports.find(exp => exp.n === "HEAD")) {
+            if (exp === "GET" && !exports.includes("HEAD")) {
                 handlers.$HEAD = {
                     src: src,
-                    pick: [exp.n],
+                    pick: [exp],
                 };
             }
         }
@@ -108,10 +115,12 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
                 path,
             };
         }
-        const [_, exports] = analyzeModule(src);
-        const hasRouteConfig = exports.find(e => e.n === "route");
-        const hasDefault = !!exports.find(e => e.n === "default");
-        const hasAPIRoutes = !!exports.find(exp => HTTP_METHODS.includes(exp.n));
+        const exports = analyzeModule(src);
+        const exportNames = exports.map(getExportName);
+        const localExportNames = exports.map(getLocalExportName).filter(name => name !== undefined);
+        const hasRouteConfig = exportNames.includes("route");
+        const hasDefault = exportNames.includes("default");
+        const hasAPIRoutes = exportNames.some(name => HTTP_METHODS.includes(name));
         if (hasDefault || hasAPIRoutes) {
             return {
                 page: hasDefault,
@@ -119,9 +128,7 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
                     ? {
                         src: src,
                         pick: [
-                            ...exports
-                                .filter(e => e.n === e.ln && e.n !== "route" && !HTTP_METHODS.includes(e.n))
-                                .map(e => e.n),
+                            ...localExportNames.filter(name => name !== "route" && !HTTP_METHODS.includes(name)),
                             "default",
                             "$css",
                         ],
@@ -133,7 +140,7 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
                         pick: ["route"],
                     }
                     : undefined,
-                ...createHTTPHandlers(src, exports),
+                ...createHTTPHandlers(src, exportNames),
                 path,
             };
         }

package/dist/config/fs-routes/router.d.ts

@@ -1,3 +1,4 @@
+import { type StaticExportEntry } from "oxc-parser";
 import { pathToRegexp } from "path-to-regexp";
 export { pathToRegexp };
 export declare const glob: (path: string) => string[];
@@ -9,7 +10,7 @@ type Route = {
     path: string;
 } & Record<string, any>;
 export declare function cleanPath(src: string, config: FileSystemRouterConfig): string;
-export declare function analyzeModule(src: string): readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean, hasModuleSyntax: boolean];
+export declare function analyzeModule(src: string): StaticExportEntry[];
 type RouterEvent = CustomEvent<{
     route: string;
     type: "update" | "remove" | "add";

package/dist/config/fs-routes/router.js

@@ -1,9 +1,8 @@
-import { init, parse } from "es-module-lexer";
-import esbuild from "esbuild";
 import fg from "fast-glob";
 import fs from "node:fs";
 import micromatch from "micromatch";
 import { posix } from "node:path";
+import { parseSync } from "oxc-parser";
 import { pathToRegexp } from "path-to-regexp";
 import { normalizePath } from "vite";
 export { pathToRegexp };
@@ -14,11 +13,11 @@ export function cleanPath(src, config) {
         .replace(new RegExp(`\.(${(config.extensions ?? []).join("|")})$`), "");
 }
 export function analyzeModule(src) {
-    return parse(esbuild.transformSync(fs.readFileSync(src, "utf-8"), {
-        jsx: "transform",
-        format: "esm",
-        loader: "tsx",
-    }).code, src);
+    const result = parseSync(src, fs.readFileSync(src, "utf-8"), { lang: "tsx" });
+    const error = result.errors[0];
+    if (error)
+        throw new SyntaxError(`Failed to parse ${src}:\n${error.codeframe || error.message}`);
+    return result.module.staticExports.flatMap(({ entries }) => entries.filter(entry => !entry.isType && entry.exportName.kind !== "None"));
 }
 export class BaseFileSystemRouter extends EventTarget {
     routes;
@@ -37,7 +36,6 @@ export class BaseFileSystemRouter extends EventTarget {
             `.{${this.config.extensions.join(",")}}`);
     }
     async buildRoutes() {
-        await init;
         for (var src of glob(this.glob())) {
             await this.addRoute(src);
         }
@@ -53,8 +51,8 @@ export class BaseFileSystemRouter extends EventTarget {
         let path = this.toPath(src);
         if (path === undefined)
             return;
-        const [_, exports] = analyzeModule(src);
-        if (!exports.find(e => e.n === "default")) {
+        const exports = analyzeModule(src);
+        if (!exports.find(entry => entry.exportName.kind === "Default")) {
             console.warn("No default export", src);
         }
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "type": "module",
   "files": [
     "dist",
@@ -39,12 +39,11 @@
     "cookie-es": "^2.0.0",
     "defu": "^6.1.4",
     "error-stack-parser": "^2.1.4",
-    "es-module-lexer": "^2.0.0",
-    "esbuild": "^0.27.4",
     "fast-glob": "^3.3.3",
     "h3": "^2.0.1-rc.25",
     "html-to-image": "^1.11.13",
     "micromatch": "^4.0.8",
+    "oxc-parser": "^0.139.0",
     "path-to-regexp": "^8.3.0",
     "pathe": "^2.0.3",
     "radix3": "^1.1.2",