@solidjs/start 0.4.10 → 0.5.0

package/shared/dev-overlay/createStackFrame.ts

@@ -9,6 +9,13 @@ export interface StackFrameSource {
   column: number;
 }
 
+function getActualFileSource(path: string): string {
+  if (path.startsWith('file://')) {
+    return '/_build/@fs' + path.substring('file://'.length);
+  }
+  return path;
+}
+
 export function createStackFrame(
   stackframe: StackFrame,
   isCompiled: () => boolean,
@@ -24,7 +31,7 @@ export function createStackFrame(
       if (!source.fileName) {
         return null;
       }
-      const response = await fetch(source.fileName);
+      const response = await fetch(getActualFileSource(source.fileName));
       if (!response.ok) {
         return null;
       }
@@ -51,6 +58,7 @@ export function createStackFrame(
         line: source.line,
         column: source.column,
       });
+      console.log('sourcemap', result);
 
       return {
         ...result,

package/shared/dev-overlay/styles.css

@@ -25,12 +25,16 @@
   width: 75vw;
   margin-top: 2rem;
   margin-bottom: 2rem;
-  z-index: 10;
   gap: 0.5rem;
   color: rgb(17 24 39);
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
 
+.dev-overlay-panel-container {
+  margin: 2rem;
+  z-index: 10;
+}
+
 .dev-overlay-navbar {
   display: flex;
   flex-direction: row;

package/shared/index.tsx

@@ -1,5 +1,6 @@
-export { default as clientOnly } from "./clientOnly";
 export { FileRoutes } from "./FileRoutes";
+export { GET } from "./GET";
 export { HttpHeader } from "./HttpHeader";
 export { HttpStatusCode } from "./HttpStatusCode";
+export { default as clientOnly } from "./clientOnly";
 

package/shared/routes.ts

@@ -1,24 +1,12 @@
 import fileRoutes from "vinxi/routes";
-import { HTTPMethod } from "vinxi/server";
 
 interface Route {
   path: string;
   id: string;
-  type: "api" | "page";
+  type: "page";
   children?: Route[];
 }
 
-type MatchRoute = Route & {
-  score: number;
-  params: {
-    type: "*" | ":";
-    name: string;
-    index: number;
-  }[];
-  matchSegments: (string | null)[];
-  wildcard: boolean;
-};
-
 declare module "vinxi/routes" {
   export interface Register {
     route: {
@@ -30,49 +18,6 @@ declare module "vinxi/routes" {
 }
 
 export const pageRoutes = defineRoutes((fileRoutes as unknown as Route[]).filter(o => o.type === "page"));
-const apiRoutes = defineAPIRoutes((fileRoutes as unknown as Route[]).filter(o => o.type === "api"));
-
-export function matchAPIRoute(path: string, method: HTTPMethod) {
-  const segments = path.replace(import.meta.env.SERVER_BASE_URL, "").split("/").filter(Boolean);
-
-  routeLoop: for (const route of apiRoutes) {
-    const matchSegments = route.matchSegments;
-
-    if (
-      segments.length < matchSegments.length ||
-      (!route.wildcard && segments.length > matchSegments.length)
-    ) {
-      continue;
-    }
-
-    for (let index = 0; index < matchSegments.length; index++) {
-      const match = matchSegments[index];
-      if (!match) {
-        continue;
-      }
-
-      if (segments[index] !== match) {
-        continue routeLoop;
-      }
-    }
-
-    const handler = route[`$${method}`];
-    if (handler === "skip" || handler === undefined) {
-      return;
-    }
-
-    const params: Record<string, string> = {};
-    for (const { type, name, index } of route.params) {
-      if (type === ":") {
-        params[name] = segments[index];
-      } else {
-        params[name] = segments.slice(index).join("/");
-      }
-    }
-
-    return { handler, params };
-  }
-}
 
 function defineRoutes(fileRoutes: Route[]) {
   function processRoute(routes: Route[], route: Route, id: string, full: string) {
@@ -101,79 +46,3 @@ function defineRoutes(fileRoutes: Route[]) {
     }, []);
 }
 
-function defineAPIRoutes(routes: Route[]) {
-  return routes
-    .flatMap(route => {
-      const paths = expandOptionals(route.path);
-      return paths.map(path => ({ ...route, path }));
-    })
-    .map(routeToMatchRoute)
-    .sort((a, b) => b.score - a.score);
-}
-
-// This is copied from https://github.com/solidjs/solid-router/blob/main/src/utils.ts
-function expandOptionals(pattern: string): string[] {
-  let match = /(\/?\:[^\/]+)\?/.exec(pattern);
-  if (!match) return [pattern];
-
-  let prefix = pattern.slice(0, match.index);
-  let suffix = pattern.slice(match.index + match[0].length);
-  const prefixes: string[] = [prefix, (prefix += match[1])];
-
-  // This section handles adjacent optional params. We don't actually want all permuations since
-  // that will lead to equivalent apiRwhich have the same number of params. For example
-  // `/:a?/:b?/:c`? only has the unique expansion: `/`, `/:a`, `/:a/:b`, `/:a/:b/:c` and we can
-  // discard `/:b`, `/:c`, `/:b/:c` by building them up in order and not recursing. This also helps
-  // ensure predictability where earlier params have precidence.
-  while ((match = /^(\/\:[^\/]+)\?/.exec(suffix))) {
-    prefixes.push((prefix += match[1]));
-    suffix = suffix.slice(match[0].length);
-  }
-
-  return expandOptionals(suffix).reduce<string[]>(
-    (results, expansion) => [...results, ...prefixes.map(p => p + expansion)],
-    []
-  );
-}
-
-function routeToMatchRoute(route: Route): MatchRoute {
-  const segments = route.path.split("/").filter(Boolean);
-  const params: { type: "*" | ":"; name: string; index: number }[] = [];
-  const matchSegments: (string | null)[] = [];
-  let score = 0;
-  let wildcard = false;
-
-  for (const [index, segment] of segments.entries()) {
-    if (segment[0] === ":") {
-      const name = segment.slice(1);
-      score += 3;
-      params.push({
-        type: ":",
-        name,
-        index
-      });
-      matchSegments.push(null);
-    } else if (segment[0] === "*") {
-      score -= 1;
-      params.push({
-        type: "*",
-        name: segment.slice(1),
-        index
-      });
-      wildcard = true;
-    } else {
-      score += 4;
-      if (!segment.match(/^\(.+\)$/)) {
-        matchSegments.push(segment);
-      }
-    }
-  }
-
-  return {
-    ...route,
-    score,
-    params,
-    matchSegments,
-    wildcard
-  };
-}