@solidjs/start 0.5.0 → 0.5.1

package/config/fs-router.js

@@ -24,7 +24,6 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
 
     if (src.endsWith(".md") || src.endsWith(".mdx")) {
       return {
-        type: "page",
         $component: {
           src: src,
           pick: ["$css"]
@@ -40,7 +39,6 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
     const hasRouteConfig = exports.find(e => e.n === "route");
     if (hasDefault) {
       return {
-        type: "page",
         $component: {
           src: src,
           pick: ["default", "$css"]
@@ -58,6 +56,20 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
   }
 }
 
+const HTTP_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH"];
+function createHTTPHandlers(src, exports) {
+  const handlers = {};
+  for (const exp of exports) {
+    if (HTTP_METHODS.includes(exp.n)) {
+      handlers[`$${exp.n}`] = {
+        src: src,
+        pick: [exp.n]
+      };
+    }
+  }
+  return handlers;
+}
+
 export class SolidStartServerFileRouter extends BaseFileSystemRouter {
   toPath(src) {
     const routePath = cleanPath(src, this.config)
@@ -79,10 +91,8 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
 
   toRoute(src) {
     let path = this.toPath(src);
-
     if (src.endsWith(".md") || src.endsWith(".mdx")) {
       return {
-        type: "page",
         $component: {
           src: src,
           pick: ["$css"]
@@ -95,62 +105,22 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
 
     const [_, exports] = analyzeModule(src);
     const hasRouteConfig = exports.find(e => e.n === "route");
-    if (exports.find(exp => exp.n === "default")) {
+    const hasDefault = exports.find(e => e.n === "default");
+    const hasAPIRoutes = exports.find(exp => HTTP_METHODS.includes(exp.n));
+    if (hasDefault || hasAPIRoutes) {
       return {
-        type: "page",
-        $component: {
-          src: src,
-          pick: ["default", "$css"]
-        },
+        $component: hasDefault
+          ? {
+              src: src,
+              pick: ["default", "$css"]
+            }
+          : undefined,
         $$route: hasRouteConfig
           ? {
               src: src,
               pick: ["route"]
             }
           : undefined,
-        path,
-        filePath: src
-      };
-    }
-  }
-}
-
-const HTTP_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH"];
-function createHTTPHandlers(src, exports) {
-  const handlers = {};
-  for (const exp of exports) {
-    if (HTTP_METHODS.includes(exp.n)) {
-      handlers[`$${exp.n}`] = {
-        src: src,
-        pick: [exp.n]
-      };
-    }
-  }
-  return handlers;
-}
-
-export class SolidStartAPIFileRouter extends BaseFileSystemRouter {
-  toPath(src) {
-    const routePath = cleanPath(src, this.config)
-      // remove the initial slash
-      .slice(1)
-      .replace(/index$/, "")
-      .replace(/\[([^\/]+)\]/g, (_, m) => {
-        if (m.length > 2 && m.startsWith("...")) {
-          return `**${m.length > 3 ? ":" + m.slice(3) : ""}`;
-        }
-        return `:${m}`;
-      });
-
-    return routePath?.length > 0 ? `/${routePath}` : "/";
-  }
-
-  toRoute(src) {
-    let path = this.toPath(src);
-    const [_, exports] = analyzeModule(src);
-    if (exports.find(exp => HTTP_METHODS.includes(exp.n))) {
-      return {
-        type: "api",
         ...createHTTPHandlers(src, exports),
         path,
         filePath: src

package/config/index.js

@@ -8,7 +8,10 @@ import { createApp, resolve } from "vinxi";
 import { normalize } from "vinxi/lib/path";
 import { config } from "vinxi/plugins/config";
 import solid from "vite-plugin-solid";
-import { SolidStartAPIFileRouter, SolidStartClientFileRouter, SolidStartServerFileRouter } from "./fs-router.js";
+import {
+  SolidStartClientFileRouter,
+  SolidStartServerFileRouter
+} from "./fs-router.js";
 import { serverComponents } from "./server-components.js";
 
 const DEFAULT_EXTENSIONS = ["js", "jsx", "ts", "tsx"];
@@ -37,18 +40,6 @@ function solidStartServerFsRouter(config) {
     );
 }
 
-function solidStartAPIFileRouter(config) {
-  return (router, app) =>
-    new SolidStartAPIFileRouter(
-      {
-        dir: resolve.absolute(config.dir, router.root),
-        extensions: config.extensions ?? DEFAULT_EXTENSIONS
-      },
-      router,
-      app
-    );
-}
-
 export function defineConfig(baseConfig = {}) {
   let { plugins = [], start = {}, ...userConfig } = baseConfig;
   const extensions = [...DEFAULT_EXTENSIONS, ...(start.extensions || [])];
@@ -86,15 +77,6 @@ export function defineConfig(baseConfig = {}) {
         dir: "./public",
         base: "/"
       },
-      {
-        name: "api",
-        type: "http",
-        target: "server",
-        base: "/",
-        handler: normalize(fileURLToPath(new URL("./api-handler.ts", import.meta.url))),
-        routes: solidStartAPIFileRouter({ dir: `${start.appRoot}/routes` }),
-        middleware: start.middleware
-      },
       {
         name: "ssr",
         type: "http",

package/config/server-fns-runtime.ts

@@ -1,5 +1,4 @@
 import { getRequestEvent } from "solid-js/web";
-//@ts-ignore
 import { provideRequestEvent } from "solid-js/web/storage";
 import { cloneEvent } from "../server/fetchEvent";
 

package/config/server-handler.ts

@@ -13,10 +13,9 @@ import {
   URLSearchParamsPlugin
 } from "seroval-plugins/web";
 import { sharedConfig } from "solid-js";
-/* @ts-ignore */
 import { provideRequestEvent } from "solid-js/web/storage";
+import { eventHandler, setHeader } from "vinxi/http";
 import invariant from "vinxi/lib/invariant";
-import { eventHandler, setHeader } from "vinxi/server";
 import { getFetchEvent, mergeResponseHeaders } from "../server/fetchEvent";
 
 function createChunk(data) {

package/middleware/index.ts

@@ -1,8 +1,8 @@
 import {
-  H3Event,
-  defineMiddleware,
-  sendWebResponse
-} from "vinxi/server";
+    H3Event,
+    defineMiddleware,
+    sendWebResponse
+} from "vinxi/http";
 import { getFetchEvent } from "../server/fetchEvent";
 import type { FetchEvent } from "../server/types";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -42,7 +42,7 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.12",
+    "solid-js": "^1.8.13",
     "vinxi": "^0.2.1"
   },
   "dependencies": {

package/server/fetchEvent.ts

@@ -12,7 +12,7 @@ import {
   setResponseHeader,
   setResponseStatus,
   toWebRequest
-} from "vinxi/server";
+} from "vinxi/http";
 import type { FetchEvent, ResponseStub } from "./types";
 
 const fetchEventSymbol = Symbol("fetchEvent");
@@ -40,7 +40,6 @@ export function getFetchEvent(h3Event: H3Event): FetchEvent {
   if (!h3Event[fetchEventSymbol]) {
     const fetchEvent = createFetchEvent(h3Event);
     h3Event[fetchEventSymbol] = fetchEvent;
-    // @ts-ignore
   }
 
   return h3Event[fetchEventSymbol];

package/server/handler.ts

@@ -1,6 +1,5 @@
 import { sharedConfig } from "solid-js";
 import { renderToStream, renderToString } from "solid-js/web";
-/* @ts-ignore */
 import { provideRequestEvent } from "solid-js/web/storage";
 import {
   EventHandlerObject,
@@ -10,10 +9,11 @@ import {
   sendRedirect,
   setHeader,
   setResponseStatus
-} from "vinxi/server";
+} from "vinxi/http";
+import { matchAPIRoute } from "../shared/routes";
 import { getFetchEvent } from "./fetchEvent";
 import { createPageEvent } from "./pageEvent";
-import { FetchEvent, PageEvent } from "./types";
+import type { APIEvent, FetchEvent, PageEvent } from "./types";
 
 export function createBaseHandler(
   fn: (context: PageEvent) => unknown,
@@ -36,6 +36,23 @@ export function createBaseHandler(
       const mode = import.meta.env.START_SSR;
 
       return provideRequestEvent(event, async () => {
+        // api
+        const match = matchAPIRoute(new URL(event.request.url).pathname, event.request.method);
+        if (match) {
+          const mod = await match.handler.import();
+          const fn = mod[event.request.method];
+          (event as APIEvent).params = match.params;
+          // @ts-ignore
+          sharedConfig.context = { event };
+          const res = await fn(event);
+          if (res !== undefined) return res;
+          if (event.request.method !== "GET") {
+            throw new Error(
+              `API handler for ${event.request.method} "${event.request.url}" did not return a response.`
+            );
+          }
+        }
+
         // render
         const context = await createPageEvent(event);
         if (mode === "sync") {
@@ -65,7 +82,7 @@ export function createBaseHandler(
         } else cloned.onCompleteShell = handleShellCompleteRedirect(context, e);
         const stream = renderToStream(() => {
           (sharedConfig.context as any).event = context;
-          return fn(context)
+          return fn(context);
         }, cloned);
         if (context.response && context.response.headers.get("Location")) {
           return sendRedirect(event, context.response.headers.get("Location"));
@@ -86,7 +103,7 @@ function handleShellCompleteRedirect(context: PageEvent, e: H3Event<EventHandler
       setResponseStatus(e, 302);
       setHeader(e, "Location", context.response.headers.get("Location"));
     }
-  }
+  };
 }
 
 function handleStreamCompleteRedirect(context: PageEvent) {
@@ -101,4 +118,4 @@ export function createHandler(
   options: Parameters<typeof createBaseHandler>[1] = {}
 ) {
   return createBaseHandler(fn, { ...options, createPageEvent });
-}
+}

package/server/pageEvent.ts

@@ -1,7 +1,7 @@
 import {
-  getCookie,
-  setCookie
-} from "vinxi/server";
+    getCookie,
+    setCookie
+} from "vinxi/http";
 import { createRoutes } from "../shared/FileRoutes";
 import { FetchEvent, PageEvent } from "./types";
 

package/server/types.ts

@@ -1,5 +1,5 @@
 import type { JSX } from "solid-js";
-import { HTTPEventSymbol, type EventHandlerRequest, type H3Event } from "vinxi/server";
+import { HTTPEventSymbol, type EventHandlerRequest, type H3Event } from "vinxi/http";
 
 // export const FETCH_EVENT = "$FETCH";
 

package/shared/routes.ts

@@ -1,23 +1,25 @@
+import { createRouter } from "radix3";
 import fileRoutes from "vinxi/routes";
 
 interface Route {
   path: string;
   id: string;
-  type: "page";
   children?: Route[];
+  $component?: any;
 }
 
 declare module "vinxi/routes" {
   export interface Register {
     route: {
       path: string;
-      type: "api" | "page";
       children?: Route[];
     };
   }
 }
 
-export const pageRoutes = defineRoutes((fileRoutes as unknown as Route[]).filter(o => o.type === "page"));
+export const pageRoutes = defineRoutes(
+  (fileRoutes as unknown as Route[]).filter(o => o.$component)
+);
 
 function defineRoutes(fileRoutes: Route[]) {
   function processRoute(routes: Route[], route: Route, id: string, full: string) {
@@ -46,3 +48,35 @@ function defineRoutes(fileRoutes: Route[]) {
     }, []);
 }
 
+export function matchAPIRoute(path: string, method: string) {
+  const match = router.lookup(path);
+  if (match) {
+    const handler = match.route[`$${method}`];
+    if (handler === undefined) return;
+    return {
+      handler,
+      params: match.params
+    };
+  }
+}
+
+function containsHTTP(route: Route) {
+  return route["$GET"] || route["$POST"] || route["$PUT"] || route["$PATCH"] || route["$DELETE"];
+}
+
+const router = createRouter({
+  routes: (fileRoutes as unknown as Route[]).reduce((memo, route) => {
+    if (!containsHTTP(route)) return memo;
+    let path = route.path.replace(/\(.*\)\/?/g, "").replace(/\*([^/]*)/g, (_, m) => `**:${m}`);
+    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 }>)
+});

package/config/api-handler.ts

@@ -1,64 +0,0 @@
-/// <reference types="vinxi/types/server" />
-import { createRouter } from "radix3";
-import { sharedConfig } from "solid-js";
-import fileRoutes from "vinxi/routes";
-
-// @ts-ignore
-import { provideRequestEvent } from "solid-js/web/storage";
-import { eventHandler } from "vinxi/server";
-import { getFetchEvent } from "../server/fetchEvent";
-import { APIEvent } from "../server/types";
-
-export default eventHandler(h3Event => {
-  const event = getFetchEvent(h3Event);
-  const match = matchAPIRoute(new URL(event.request.url).pathname, event.request.method);
-  if (match) {
-    return provideRequestEvent(event, async () => {
-      const mod = await match.handler.import();
-      const fn = mod[event.request.method];
-      (event as APIEvent).params = match.params;
-      // @ts-ignore
-      sharedConfig.context = { event };
-      const res = await fn(event);
-      if (res === undefined && event.request.method !== "GET") {
-        throw new Error(
-          `API handler for ${event.request.method} "${event.request.url}" did not return a response.`
-        );
-      }
-      return res;
-    });
-  }
-});
-
-interface Route {
-  path: string;
-  id: string;
-  type: "api" | "page";
-  children?: Route[];
-}
-
-const router = createRouter({
-  routes: (fileRoutes as unknown as Route[]).reduce((memo, route) => {
-    if (route.type !== "api") return memo;
-    const path = route.path.replace(/\(.*\)\/?/g, "");
-    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 matchAPIRoute(path: string, method: string) {
-  const match = router.lookup(path);
-  if (match) {
-    const handler = match.route[`$${method}`];
-    if (handler === "skip" || handler === undefined) return;
-    return {
-      handler,
-      params: match.params
-    };
-  }
-}