elysia 1.4.25 → 1.4.27

package/dist/adapter/bun/handler.js

@@ -30,7 +30,7 @@ const mapResponse = (response, set, request) => {
         return new Response(response, set);
       case "Array":
       case "Object":
-        return set.headers["content-type"] = "application/json", new Response(JSON.stringify(response), set);
+        return Response.json(response, set);
       case "ElysiaFile":
         return (0, import_utils.handleFile)(response.value, set);
       case "File":
@@ -44,7 +44,7 @@ const mapResponse = (response, set, request) => {
           request
         );
       case void 0:
-        return response ? new Response(JSON.stringify(response), set) : new Response("", set);
+        return response ? Response.json(response, set) : new Response("", set);
       case "Response":
         return handleResponse(response, set, request);
       case "Error":
@@ -88,20 +88,13 @@ const mapResponse = (response, set, request) => {
             (x) => mapResponse(x, set)
           );
         if (Array.isArray(response))
-          return new Response(JSON.stringify(response), {
-            headers: {
-              "Content-Type": "application/json"
-            }
-          });
+          return Response.json(response);
         if (typeof response?.toResponse == "function")
           return mapResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91)
-            return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-              JSON.stringify(response),
-              set
-            );
+            return Response.json(response, set);
         }
         return new Response(response, set);
     }
@@ -117,7 +110,7 @@ const mapResponse = (response, set, request) => {
           return new Response(response, set);
         case "Array":
         case "Object":
-          return set.headers["content-type"] = "application/json", new Response(JSON.stringify(response), set);
+          return Response.json(response, set);
         case "ElysiaFile":
           return (0, import_utils.handleFile)(response.value, set);
         case "File":
@@ -131,7 +124,7 @@ const mapResponse = (response, set, request) => {
             request
           );
         case void 0:
-          return response ? new Response(JSON.stringify(response), set) : void 0;
+          return response ? Response.json(response, set) : void 0;
         case "Response":
           return handleResponse(response, set, request);
         case "Promise":
@@ -177,18 +170,11 @@ const mapResponse = (response, set, request) => {
           if (typeof response?.toResponse == "function")
             return mapEarlyResponse(response.toResponse(), set);
           if (Array.isArray(response))
-            return new Response(JSON.stringify(response), {
-              headers: {
-                "Content-Type": "application/json"
-              }
-            });
+            return Response.json(response);
           if ("charCodeAt" in response) {
             const code = response.charCodeAt(0);
             if (code === 123 || code === 91)
-              return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-                JSON.stringify(response),
-                set
-              );
+              return Response.json(response, set);
           }
           return new Response(response, set);
       }
@@ -198,7 +184,7 @@ const mapResponse = (response, set, request) => {
           return new Response(response);
         case "Array":
         case "Object":
-          return set.headers["content-type"] = "application/json", new Response(JSON.stringify(response), set);
+          return Response.json(response, set);
         case "ElysiaFile":
           return (0, import_utils.handleFile)(response.value, set);
         case "File":
@@ -212,11 +198,7 @@ const mapResponse = (response, set, request) => {
             request
           );
         case void 0:
-          return response ? new Response(JSON.stringify(response), {
-            headers: {
-              "content-type": "application/json"
-            }
-          }) : new Response("");
+          return response ? Response.json(response) : new Response("");
         case "Response":
           return response;
         case "Promise":
@@ -259,18 +241,11 @@ const mapResponse = (response, set, request) => {
           if (typeof response?.toResponse == "function")
             return mapEarlyResponse(response.toResponse(), set);
           if (Array.isArray(response))
-            return new Response(JSON.stringify(response), {
-              headers: {
-                "Content-Type": "application/json"
-              }
-            });
+            return Response.json(response);
           if ("charCodeAt" in response) {
             const code = response.charCodeAt(0);
             if (code === 123 || code === 91)
-              return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-                JSON.stringify(response),
-                set
-              );
+              return Response.json(response, set);
           }
           return new Response(response);
       }
@@ -280,11 +255,7 @@ const mapResponse = (response, set, request) => {
       return new Response(response);
     case "Object":
     case "Array":
-      return new Response(JSON.stringify(response), {
-        headers: {
-          "Content-Type": "application/json"
-        }
-      });
+      return Response.json(response);
     case "ElysiaFile":
       return (0, import_utils.handleFile)(response.value);
     case "File":
@@ -300,11 +271,7 @@ const mapResponse = (response, set, request) => {
         }
       );
     case void 0:
-      return response ? new Response(JSON.stringify(response), {
-        headers: {
-          "content-type": "application/json"
-        }
-      }) : new Response("");
+      return response ? Response.json(response) : new Response("");
     case "Response":
       return response;
     case "Error":
@@ -348,20 +315,11 @@ const mapResponse = (response, set, request) => {
         );
       if (typeof response?.toResponse == "function")
         return mapCompactResponse(response.toResponse());
-      if (Array.isArray(response))
-        return new Response(JSON.stringify(response), {
-          headers: {
-            "Content-Type": "application/json"
-          }
-        });
+      if (Array.isArray(response)) return Response.json(response);
       if ("charCodeAt" in response) {
         const code = response.charCodeAt(0);
         if (code === 123 || code === 91)
-          return new Response(JSON.stringify(response), {
-            headers: {
-              "Content-Type": "application/json"
-            }
-          });
+          return Response.json(response);
       }
       return new Response(response);
   }
@@ -370,12 +328,12 @@ const mapResponse = (response, set, request) => {
     const raw = error.toResponse(), targetSet = set ?? { headers: {}, status: 200, redirect: "" }, apply = (resolved) => (resolved instanceof Response && (targetSet.status = resolved.status), mapResponse(resolved, targetSet));
     return typeof raw?.then == "function" ? raw.then(apply) : apply(raw);
   }
-  return new Response(
-    JSON.stringify({
+  return Response.json(
+    {
       name: error?.name,
       message: error?.message,
       cause: error?.cause
-    }),
+    },
     {
       status: set?.status !== 200 ? set?.status ?? 500 : 500,
       headers: set?.headers

package/dist/adapter/bun/handler.mjs

@@ -14,7 +14,7 @@ const mapResponse = (response, set, request) => {
         return new Response(response, set);
       case "Array":
       case "Object":
-        return set.headers["content-type"] = "application/json", new Response(JSON.stringify(response), set);
+        return Response.json(response, set);
       case "ElysiaFile":
         return handleFile(response.value, set);
       case "File":
@@ -28,7 +28,7 @@ const mapResponse = (response, set, request) => {
           request
         );
       case void 0:
-        return response ? new Response(JSON.stringify(response), set) : new Response("", set);
+        return response ? Response.json(response, set) : new Response("", set);
       case "Response":
         return handleResponse(response, set, request);
       case "Error":
@@ -72,20 +72,13 @@ const mapResponse = (response, set, request) => {
             (x) => mapResponse(x, set)
           );
         if (Array.isArray(response))
-          return new Response(JSON.stringify(response), {
-            headers: {
-              "Content-Type": "application/json"
-            }
-          });
+          return Response.json(response);
         if (typeof response?.toResponse == "function")
           return mapResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91)
-            return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-              JSON.stringify(response),
-              set
-            );
+            return Response.json(response, set);
         }
         return new Response(response, set);
     }
@@ -101,7 +94,7 @@ const mapResponse = (response, set, request) => {
           return new Response(response, set);
         case "Array":
         case "Object":
-          return set.headers["content-type"] = "application/json", new Response(JSON.stringify(response), set);
+          return Response.json(response, set);
         case "ElysiaFile":
           return handleFile(response.value, set);
         case "File":
@@ -115,7 +108,7 @@ const mapResponse = (response, set, request) => {
             request
           );
         case void 0:
-          return response ? new Response(JSON.stringify(response), set) : void 0;
+          return response ? Response.json(response, set) : void 0;
         case "Response":
           return handleResponse(response, set, request);
         case "Promise":
@@ -161,18 +154,11 @@ const mapResponse = (response, set, request) => {
           if (typeof response?.toResponse == "function")
             return mapEarlyResponse(response.toResponse(), set);
           if (Array.isArray(response))
-            return new Response(JSON.stringify(response), {
-              headers: {
-                "Content-Type": "application/json"
-              }
-            });
+            return Response.json(response);
           if ("charCodeAt" in response) {
             const code = response.charCodeAt(0);
             if (code === 123 || code === 91)
-              return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-                JSON.stringify(response),
-                set
-              );
+              return Response.json(response, set);
           }
           return new Response(response, set);
       }
@@ -182,7 +168,7 @@ const mapResponse = (response, set, request) => {
           return new Response(response);
         case "Array":
         case "Object":
-          return set.headers["content-type"] = "application/json", new Response(JSON.stringify(response), set);
+          return Response.json(response, set);
         case "ElysiaFile":
           return handleFile(response.value, set);
         case "File":
@@ -196,11 +182,7 @@ const mapResponse = (response, set, request) => {
             request
           );
         case void 0:
-          return response ? new Response(JSON.stringify(response), {
-            headers: {
-              "content-type": "application/json"
-            }
-          }) : new Response("");
+          return response ? Response.json(response) : new Response("");
         case "Response":
           return response;
         case "Promise":
@@ -243,18 +225,11 @@ const mapResponse = (response, set, request) => {
           if (typeof response?.toResponse == "function")
             return mapEarlyResponse(response.toResponse(), set);
           if (Array.isArray(response))
-            return new Response(JSON.stringify(response), {
-              headers: {
-                "Content-Type": "application/json"
-              }
-            });
+            return Response.json(response);
           if ("charCodeAt" in response) {
             const code = response.charCodeAt(0);
             if (code === 123 || code === 91)
-              return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-                JSON.stringify(response),
-                set
-              );
+              return Response.json(response, set);
           }
           return new Response(response);
       }
@@ -264,11 +239,7 @@ const mapResponse = (response, set, request) => {
       return new Response(response);
     case "Object":
     case "Array":
-      return new Response(JSON.stringify(response), {
-        headers: {
-          "Content-Type": "application/json"
-        }
-      });
+      return Response.json(response);
     case "ElysiaFile":
       return handleFile(response.value);
     case "File":
@@ -284,11 +255,7 @@ const mapResponse = (response, set, request) => {
         }
       );
     case void 0:
-      return response ? new Response(JSON.stringify(response), {
-        headers: {
-          "content-type": "application/json"
-        }
-      }) : new Response("");
+      return response ? Response.json(response) : new Response("");
     case "Response":
       return response;
     case "Error":
@@ -332,20 +299,11 @@ const mapResponse = (response, set, request) => {
         );
       if (typeof response?.toResponse == "function")
         return mapCompactResponse(response.toResponse());
-      if (Array.isArray(response))
-        return new Response(JSON.stringify(response), {
-          headers: {
-            "Content-Type": "application/json"
-          }
-        });
+      if (Array.isArray(response)) return Response.json(response);
       if ("charCodeAt" in response) {
         const code = response.charCodeAt(0);
         if (code === 123 || code === 91)
-          return new Response(JSON.stringify(response), {
-            headers: {
-              "Content-Type": "application/json"
-            }
-          });
+          return Response.json(response);
       }
       return new Response(response);
   }
@@ -354,12 +312,12 @@ const mapResponse = (response, set, request) => {
     const raw = error.toResponse(), targetSet = set ?? { headers: {}, status: 200, redirect: "" }, apply = (resolved) => (resolved instanceof Response && (targetSet.status = resolved.status), mapResponse(resolved, targetSet));
     return typeof raw?.then == "function" ? raw.then(apply) : apply(raw);
   }
-  return new Response(
-    JSON.stringify({
+  return Response.json(
+    {
       name: error?.name,
       message: error?.message,
       cause: error?.cause
-    }),
+    },
     {
       status: set?.status !== 200 ? set?.status ?? 500 : 500,
       headers: set?.headers

package/dist/adapter/bun/index.d.ts

@@ -1,3 +1,6 @@
 import type { ElysiaAdapter } from '../types';
 export declare const isHTMLBundle: (handle: any) => boolean;
+type Routes = Record<string, Function | Response | Record<string, unknown>>;
+export declare const removeTrailingPath: (routes: Routes) => Routes;
 export declare const BunAdapter: ElysiaAdapter;
+export {};

package/dist/adapter/bun/index.js

@@ -16,7 +16,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
 var bun_exports = {};
 __export(bun_exports, {
   BunAdapter: () => BunAdapter,
-  isHTMLBundle: () => isHTMLBundle
+  isHTMLBundle: () => isHTMLBundle,
+  removeTrailingPath: () => removeTrailingPath
 });
 module.exports = __toCommonJS(bun_exports);
 var import_web_standard = require('../web-standard/index.js'), import_utils = require('../utils.js'), import_compose = require('./compose.js'), import_handler_native = require('./handler-native.js'), import_cookies = require('../../cookies.js'), import_error = require('../../error.js'), import_schema = require('../../schema.js'), import_utils2 = require('../../utils.js'), import_handler = require('./handler.js'), import_ws = require('../../ws/index.js');
@@ -88,6 +89,10 @@ const optionalParam = /:.+?\?(?=\/|$)/, getPossibleParams = (path) => {
       }
     }
   return r1;
+}, removeTrailingPath = (routes) => {
+  for (const key of Object.keys(routes))
+    key.charCodeAt(key.length - 1) === 47 && (routes[key.slice(0, -1)] = routes[key], delete routes[key]);
+  return routes;
 }, BunAdapter = {
   ...import_web_standard.WebStandardAdapter,
   name: "bun",
@@ -147,21 +152,22 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
             staticRoutes[path] = route;
           }
         return withAsync ? Promise.all(ops).then(() => staticRoutes) : staticRoutes;
-      }, serve = typeof options == "object" ? {
-        development: !import_error.isProduction,
-        reusePort: !0,
-        idleTimeout: 30,
-        ...app.config.serve || {},
-        ...options || {},
-        // @ts-ignore
-        routes: mergeRoutes(
+      }, routes = removeTrailingPath(
+        mergeRoutes(
           mergeRoutes(
             createStaticRoute(app.router.response),
             mapRoutes(app)
           ),
           // @ts-ignore
           app.config.serve?.routes
-        ),
+        )
+      ), serve = typeof options == "object" ? {
+        development: !import_error.isProduction,
+        reusePort: !0,
+        idleTimeout: 30,
+        ...app.config.serve || {},
+        ...options || {},
+        routes,
         websocket: {
           ...app.config.websocket || {},
           ...import_ws.websocket || {},
@@ -173,15 +179,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
         reusePort: !0,
         idleTimeout: 30,
         ...app.config.serve || {},
-        // @ts-ignore
-        routes: mergeRoutes(
-          mergeRoutes(
-            createStaticRoute(app.router.response),
-            mapRoutes(app)
-          ),
-          // @ts-ignore
-          app.config.serve?.routes
-        ),
+        routes,
         websocket: {
           ...app.config.websocket || {},
           ...import_ws.websocket || {}
@@ -197,11 +195,9 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
           for (let i = 0; i < app.event.stop.length; i++)
             app.event.stop[i].fn(app);
       }), app.promisedModules.then(async () => {
-        app.config.aot, app.compile(), app.server?.reload({
-          ...serve,
-          fetch: app.fetch,
-          // @ts-ignore
-          routes: mergeRoutes(
+        app.config.aot, app.compile();
+        const routes2 = removeTrailingPath(
+          mergeRoutes(
             mergeRoutes(
               await createStaticRoute(app.router.response, {
                 withAsync: !0
@@ -211,6 +207,12 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
             // @ts-ignore
             app.config.serve?.routes
           )
+        );
+        app.server?.reload({
+          ...serve,
+          fetch: app.fetch,
+          // @ts-ignore
+          routes: routes2
         }), Bun?.gc(!1);
       });
     };
@@ -375,5 +377,6 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BunAdapter,
-  isHTMLBundle
+  isHTMLBundle,
+  removeTrailingPath
 });

package/dist/adapter/bun/index.mjs

@@ -92,6 +92,10 @@ const optionalParam = /:.+?\?(?=\/|$)/, getPossibleParams = (path) => {
       }
     }
   return r1;
+}, removeTrailingPath = (routes) => {
+  for (const key of Object.keys(routes))
+    key.charCodeAt(key.length - 1) === 47 && (routes[key.slice(0, -1)] = routes[key], delete routes[key]);
+  return routes;
 }, BunAdapter = {
   ...WebStandardAdapter,
   name: "bun",
@@ -151,21 +155,22 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
             staticRoutes[path] = route;
           }
         return withAsync ? Promise.all(ops).then(() => staticRoutes) : staticRoutes;
-      }, serve = typeof options == "object" ? {
-        development: !isProduction,
-        reusePort: !0,
-        idleTimeout: 30,
-        ...app.config.serve || {},
-        ...options || {},
-        // @ts-ignore
-        routes: mergeRoutes(
+      }, routes = removeTrailingPath(
+        mergeRoutes(
           mergeRoutes(
             createStaticRoute(app.router.response),
             mapRoutes(app)
           ),
           // @ts-ignore
           app.config.serve?.routes
-        ),
+        )
+      ), serve = typeof options == "object" ? {
+        development: !isProduction,
+        reusePort: !0,
+        idleTimeout: 30,
+        ...app.config.serve || {},
+        ...options || {},
+        routes,
         websocket: {
           ...app.config.websocket || {},
           ...websocket || {},
@@ -177,15 +182,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
         reusePort: !0,
         idleTimeout: 30,
         ...app.config.serve || {},
-        // @ts-ignore
-        routes: mergeRoutes(
-          mergeRoutes(
-            createStaticRoute(app.router.response),
-            mapRoutes(app)
-          ),
-          // @ts-ignore
-          app.config.serve?.routes
-        ),
+        routes,
         websocket: {
           ...app.config.websocket || {},
           ...websocket || {}
@@ -201,11 +198,9 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
           for (let i = 0; i < app.event.stop.length; i++)
             app.event.stop[i].fn(app);
       }), app.promisedModules.then(async () => {
-        app.config.aot, app.compile(), app.server?.reload({
-          ...serve,
-          fetch: app.fetch,
-          // @ts-ignore
-          routes: mergeRoutes(
+        app.config.aot, app.compile();
+        const routes2 = removeTrailingPath(
+          mergeRoutes(
             mergeRoutes(
               await createStaticRoute(app.router.response, {
                 withAsync: !0
@@ -215,6 +210,12 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
             // @ts-ignore
             app.config.serve?.routes
           )
+        );
+        app.server?.reload({
+          ...serve,
+          fetch: app.fetch,
+          // @ts-ignore
+          routes: routes2
         }), Bun?.gc(!1);
       });
     };
@@ -378,5 +379,6 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
 };
 export {
   BunAdapter,
-  isHTMLBundle
+  isHTMLBundle,
+  removeTrailingPath
 };