gemi 0.41.4 → 0.42.0

package/dist/app/index.js

@@ -1,4 +1,4 @@
 // @bun
-import{o as a,p as b}from"../chunk-q3wpyr9y.js";import"../chunk-88fb6hzq.js";import"../chunk-c9wa4rtm.js";import"../chunk-a8wmfnw6.js";import"../chunk-p6ezs2w7.js";import"../chunk-6b1abejc.js";import"../chunk-xnhktttd.js";import"../chunk-c1hsc4aa.js";import"../chunk-agvzqxv7.js";export{b as prismaExtension,a as App};
+import{o as a,p as b}from"../chunk-gsvzrj5r.js";import"../chunk-pjgfvdr6.js";import"../chunk-yeqwzeq7.js";import"../chunk-sbmg0hfr.js";import"../chunk-b3qebxqh.js";import"../chunk-n1xpxhm0.js";import"../chunk-bfnh3gwv.js";import"../chunk-cwq1vdcb.js";export{b as prismaExtension,a as App};
 
-//# debugId=2854D00658AA381564756E2164756E21
+//# debugId=15EBDBCE0B2D702364756E2164756E21

package/dist/app/index.js.map

@@ -4,6 +4,6 @@
   "sourcesContent": [
   ],
   "mappings": "",
-  "debugId": "2854D00658AA381564756E2164756E21",
+  "debugId": "15EBDBCE0B2D702364756E2164756E21",
   "names": []
 }

package/dist/bin/gemi.js

@@ -50639,11 +50639,7 @@ class RedirectRoute {
     }
   }
   async run(req, path) {
-    const {
-      destination,
-      permanent = false,
-      status = 307
-    } = await this.handler(req);
+    const { destination, permanent = false, status = 307 } = await this.handler(req);
     if (!destination) {
       throw new Error(`Redirect destination is required see ${path}`);
     }
@@ -50655,6 +50651,74 @@ class RedirectRoute {
     return this;
   }
 }
+function contentDisposition(name, download) {
+  const kind = download ? "attachment" : "inline";
+  const fallback = name.replace(/["\\]/g, "").replace(/[^\x20-\x7e]/g, "_");
+  return `${kind}; filename="${fallback}"; filename*=UTF-8''${encodeURIComponent(name)}`;
+}
+async function createFileResponse(output, headers) {
+  if (output instanceof Response) {
+    return output;
+  }
+  const isBlob = output instanceof Blob;
+  const body = isBlob ? output : output.file;
+  const name = isBlob ? output.name : output.name ?? output.file?.name;
+  const type = (isBlob ? output.type : output.type ?? output.file?.type) || "";
+  const download = isBlob ? false : output.download ?? false;
+  const status = isBlob ? 200 : output.status ?? 200;
+  if (!isBlob) {
+    for (const [key, value] of Object.entries(output.headers ?? {})) {
+      headers.set(key, value);
+    }
+  }
+  if (body instanceof Blob && "exists" in body && typeof body.exists === "function") {
+    const exists = await body.exists();
+    if (!exists) {
+      return new Response("Not found", { status: 404 });
+    }
+  }
+  headers.set("Content-Type", type || "application/octet-stream");
+  if (body instanceof Blob) {
+    headers.set("Content-Length", String(body.size));
+  }
+  if (name) {
+    headers.set("Content-Disposition", contentDisposition(name, download));
+  }
+  return new Response(body instanceof Blob ? body.stream() : body, {
+    status,
+    headers
+  });
+}
+
+class FileRoute {
+  kind = "file";
+  viewPath = "FILE";
+  middlewares = [];
+  handler;
+  constructor(handler) {
+    if (!handler) {
+      this.handler = () => null;
+    } else if (typeof handler === "function") {
+      this.handler = handler;
+    } else {
+      const [controller, methodName] = handler;
+      const controllerInstance = new controller;
+      const controllerHandler = controllerInstance[methodName].bind(controllerInstance);
+      this.handler = (req) => controllerHandler(req);
+    }
+  }
+  async run(req, path) {
+    const file = await this.handler(req);
+    if (!file) {
+      throw new Error(`File route handler must return a file see ${path}`);
+    }
+    return { FILE: file };
+  }
+  middleware(middlewares) {
+    this.middlewares = middlewares;
+    return this;
+  }
+}
 
 class ViewRoute {
   viewPath;
@@ -50677,11 +50741,6 @@ class ViewRoute {
   }
   async run(req, path) {
     const data = await this.handler(req);
-    if (this.viewPath === "FILE") {
-      return {
-        FILE: data
-      };
-    }
     return {
       [this.viewPath]: {
         ...data,
@@ -50751,6 +50810,9 @@ class ViewRouter {
   view(viewPath, handler) {
     return new ViewRoute(viewPath, handler);
   }
+  file(handler) {
+    return new FileRoute(handler);
+  }
   redirect(handler) {
     return new RedirectRoute(handler);
   }
@@ -67889,12 +67951,21 @@ async function getTtfFont(family, weight, style) {
   const ttfUrl = css.match(/url\(([^)]+)\)/)?.[1];
   return await fetch(ttfUrl).then((res) => res.arrayBuffer());
 }
+var RESERVED_ROUTE_PREFIX = "/assets";
+function assertNoReservedRoutePaths(routePaths) {
+  const reserved = routePaths.filter((path) => path === RESERVED_ROUTE_PREFIX || path.startsWith(`${RESERVED_ROUTE_PREFIX}/`));
+  if (reserved.length > 0) {
+    const many = reserved.length > 1;
+    throw new Error(`View route path${many ? "s" : ""} ${reserved.map((path) => `"${path}"`).join(", ")} ` + `use${many ? "" : "s"} the reserved "${RESERVED_ROUTE_PREFIX}" prefix. ` + `The client build output is served from there before the router runs, so the route would never match. ` + `Mount it somewhere else.`);
+  }
+}
 
 class ViewRouterServiceContainer extends ServiceContainer {
   service;
   static _name = "ViewRouterServiceContainer";
   flatViewRoutes = {};
   routeManifest = {};
+  clientRouteManifest = {};
   componentTree = [];
   flatComponentTree = [];
   root = null;
@@ -67906,7 +67977,9 @@ class ViewRouterServiceContainer extends ServiceContainer {
       "/auth": AuthViewRouter
     };
     this.flatViewRoutes = createFlatViewRoutes(routes);
+    assertNoReservedRoutePaths(Object.keys(this.flatViewRoutes));
     this.routeManifest = createRouteManifest(routes);
+    this.clientRouteManifest = Object.fromEntries(Object.entries(this.routeManifest).filter(([, views]) => views.at(-1) !== "FILE"));
     this.componentTree = createComponentTree(routes);
     this.flatComponentTree = flattenComponentTree(this.componentTree);
     this.root = service.root;
@@ -67953,7 +68026,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
         prefetchedData,
         i18n,
         auth: { user },
-        routeManifest: this.routeManifest,
+        routeManifest: this.clientRouteManifest,
         breadcrumbs,
         router: {
           urlLocaleSegment,
@@ -68160,12 +68233,19 @@ class ViewRouterServiceContainer extends ServiceContainer {
           breadcrumbs[`${key}:${currentPathName2}`] = value.breadcrumb;
           viewData[key] = value;
         }
-        const views = this.routeManifest[currentPathName2];
-        const isFileRequest = views?.[views?.length ?? 0 - 1] === "FILE";
-        if (isFileRequest) {
-          const file = viewData.FILE;
-          headers.set("Content-Type", file.type || "application/octet-stream");
-          return new Response(file.stream(), { headers });
+        const fileOutput = viewData.FILE;
+        if (fileOutput) {
+          for (const cookie of cookies) {
+            headers.append("Set-Cookie", cookie.toString());
+          }
+          try {
+            await this.onRequestEnd(httpRequest2);
+          } catch (err2) {
+            Log.error(err2?.message ?? 'Error in "onRequestEnd" event handler', {
+              err: JSON.stringify(err2)
+            });
+          }
+          return await createFileResponse(fileOutput, headers);
         }
         if (isViewDataRequest) {
           headers.set("Content-Type", "application/json; charset=utf-8");
@@ -69181,5 +69261,5 @@ program.command("app:route-manifest").action(async () => {
 });
 program.parse();
 
-//# debugId=80FA759F65E85D4464756E2164756E21
+//# debugId=ED465C15ADFED86164756E2164756E21
 //# sourceMappingURL=gemi.js.map