@solidjs/start 2.0.0-alpha.0 → 2.0.0-alpha.2

package/src/server/manifest/ssr-manifest.ts

@@ -1,8 +1,10 @@
 import { getSsrDevManifest } from "./dev-ssr-manifest.ts";
 import { getSsrProdManifest } from "./prod-ssr-manifest.ts";
 
-export function getSsrManifest(target: "client" | "ssr"): ReturnType<typeof getSsrDevManifest> | ReturnType<typeof getSsrProdManifest> {
-	return import.meta.env.DEV ? getSsrDevManifest(target) : getSsrProdManifest();
+export function getSsrManifest(
+  target: "client" | "ssr",
+): ReturnType<typeof getSsrDevManifest> | ReturnType<typeof getSsrProdManifest> {
+  return import.meta.env.DEV ? getSsrDevManifest(target) : getSsrProdManifest();
 }
 
 export { getSsrManifest as getManifest };

package/src/server/routes.ts

@@ -5,134 +5,122 @@ import { createRouter } from "radix3";
 import type { FetchEvent } from "./types.ts";
 
 interface Route {
-	path: string;
-	id: string;
-	children?: Route[];
-	page?: boolean;
-	$component?: any;
-	$HEAD?: any;
-	$GET?: any;
-	$POST?: any;
-	$PUT?: any;
-	$PATCH?: any;
-	$DELETE?: any;
+  path: string;
+  id: string;
+  children?: Route[];
+  page?: boolean;
+  $component?: any;
+  $HEAD?: any;
+  $GET?: any;
+  $POST?: any;
+  $PUT?: any;
+  $PATCH?: any;
+  $DELETE?: any;
 }
 
-export const pageRoutes = defineRoutes(
-	(fileRoutes as unknown as Route[]).filter((o) => o.page),
-);
+export const pageRoutes = defineRoutes((fileRoutes as unknown as Route[]).filter(o => o.page));
 
 function defineRoutes(fileRoutes: Route[]) {
-	function processRoute(
-		routes: Route[],
-		route: Route,
-		id: string,
-		full: string,
-	) {
-		const parentRoute = Object.values(routes).find((o) => {
-			return id.startsWith(o.id + "/");
-		});
+  function processRoute(routes: Route[], route: Route, id: string, full: string) {
+    const parentRoute = Object.values(routes).find(o => {
+      return id.startsWith(o.id + "/");
+    });
 
-		if (!parentRoute) {
-			routes.push({
-				...route,
-				id,
-				path: id.replace(/\([^)/]+\)/g, "").replace(/\/+/g, "/"),
-			});
-			return routes;
-		}
-		processRoute(
-			parentRoute.children || (parentRoute.children = []),
-			route,
-			id.slice(parentRoute.id.length),
-			full,
-		);
+    if (!parentRoute) {
+      routes.push({
+        ...route,
+        id,
+        path: id.replace(/\([^)/]+\)/g, "").replace(/\/+/g, "/"),
+      });
+      return routes;
+    }
+    processRoute(
+      parentRoute.children || (parentRoute.children = []),
+      route,
+      id.slice(parentRoute.id.length),
+      full,
+    );
 
-		return routes;
-	}
+    return routes;
+  }
 
-	return fileRoutes
-		.sort((a, b) => a.path.length - b.path.length)
-		.reduce((prevRoutes: Route[], route) => {
-			return processRoute(prevRoutes, route, route.path, route.path);
-		}, []);
+  return fileRoutes
+    .sort((a, b) => a.path.length - b.path.length)
+    .reduce((prevRoutes: Route[], route) => {
+      return processRoute(prevRoutes, route, route.path, route.path);
+    }, []);
 }
 
 const router = createRouter({
-	routes: (fileRoutes as unknown as Route[]).reduce(
-		(memo, route) => {
-			if (!containsHTTP(route)) return memo;
-			const path = route.path
-				.replace(/\([^)/]+\)/g, "")
-				.replace(/\/+/g, "/")
-				.replace(/\*([^/]*)/g, (_, m) => `**:${m}`)
-				.split("/")
-				.map((s) =>
-					s.startsWith(":") || s.startsWith("*") ? s : encodeURIComponent(s),
-				)
-				.join("/");
-			if (/:[^/]*\?/g.test(path)) {
-				throw new Error(
-					`Optional parameters are not supported in API routes: ${path}`,
-				);
-			}
-			if (memo[path]) {
-				throw new Error(
-					`Duplicate API routes for "${path}" found at "${memo[path]!.route.path}" and "${
-						route.path
-					}"`,
-				);
-			}
-			memo[path] = { route };
-			return memo;
-		},
-		{} as Record<string, { route: Route }>,
-	),
+  routes: (fileRoutes as unknown as Route[]).reduce(
+    (memo, route) => {
+      if (!containsHTTP(route)) return memo;
+      const path = route.path
+        .replace(/\([^)/]+\)/g, "")
+        .replace(/\/+/g, "/")
+        .replace(/\*([^/]*)/g, (_, m) => `**:${m}`)
+        .split("/")
+        .map(s => (s.startsWith(":") || s.startsWith("*") ? s : encodeURIComponent(s)))
+        .join("/");
+      if (/:[^/]*\?/g.test(path)) {
+        throw new Error(`Optional parameters are not supported in API routes: ${path}`);
+      }
+      if (memo[path]) {
+        throw new Error(
+          `Duplicate API routes for "${path}" found at "${memo[path]!.route.path}" and "${
+            route.path
+          }"`,
+        );
+      }
+      memo[path] = { route };
+      return memo;
+    },
+    {} as Record<string, { route: Route }>,
+  ),
 });
 
 function containsHTTP(route: Route) {
-	return (
-		route["$HEAD"] ||
-		route["$GET"] ||
-		route["$POST"] ||
-		route["$PUT"] ||
-		route["$PATCH"] ||
-		route["$DELETE"]
-	);
+  return (
+    route["$HEAD"] ||
+    route["$GET"] ||
+    route["$POST"] ||
+    route["$PUT"] ||
+    route["$PATCH"] ||
+    route["$DELETE"]
+  );
 }
 
 export function matchAPIRoute(
-	path: string,
-	method: string,
+  path: string,
+  method: string,
 ):
-	| {
-			params?: Record<string, any>;
-			handler: {
-				import: () => Promise<Record<string, (e: FetchEvent) => Promise<any>>>;
-			};
-			isPage: boolean;
-	  }
-	| undefined {
-	const match = router.lookup(path);
-	if (match && match.route) {
-		const route = match.route;
+  | {
+      params?: Record<string, any>;
+      handler: {
+        import: () => Promise<Record<string, (e: FetchEvent) => Promise<any>>>;
+      };
+      isPage: boolean;
+    }
+  | undefined {
+  const match = router.lookup(path);
+  if (match && match.route) {
+    const route = match.route;
 
-		// Find the appropriate handler for the HTTP method
-		const handler =
-			method === "HEAD" ? route.$HEAD || route.$GET : route[`$${method}`];
+    // Find the appropriate handler for the HTTP method
+    const handler = method === "HEAD" ? route.$HEAD || route.$GET : route[`$${method}`];
 
-		if (handler === undefined) return;
+    if (handler === undefined) return;
 
-		// Check if this is a page route
-		const isPage = route.page === true && route.$component !== undefined;
+    // Check if this is a page route
+    const isPage = route.page === true && route.$component !== undefined;
 
-		// Return comprehensive route information
-		return {
-			handler,
-			params: match.params,
-			isPage,
-		};
-	}
+    // Return comprehensive route information
+    return {
+      handler,
+      params: match.params,
+      isPage,
+    };
+  }
 
-	return undefined;
+  return undefined;
 }

package/src/server/server-fns-runtime.ts

@@ -5,7 +5,7 @@ export function createServerReference(fn: Function, id: string) {
   if (typeof fn !== "function")
     throw new Error("Export from a 'use server' module must be a function");
   let baseURL = import.meta.env.BASE_URL ?? "/";
-  if(!baseURL.endsWith("/")) baseURL += "/"
+  if (!baseURL.endsWith("/")) baseURL += "/";
 
   return new Proxy(fn, {
     get(target, prop, receiver) {
@@ -20,12 +20,12 @@ export function createServerReference(fn: Function, id: string) {
       if (!ogEvt) throw new Error("Cannot call server function outside of a request");
       const evt = { ...ogEvt };
       evt.locals.serverFunctionMeta = {
-        id
+        id,
       };
       evt.serverOnly = true;
       return provideRequestEvent(evt, () => {
         return fn.apply(thisArg, args);
       });
-    }
+    },
   });
 }