elysia 1.3.5 → 1.3.6

package/dist/adapter/bun/compose.mjs

@@ -134,6 +134,7 @@ var primitiveHooks = [
   {}
 );
 var isBun2 = typeof Bun < "u", hasBunHash = isBun2 && typeof Bun.hash == "function", checksum = (s) => {
+  if (hasBunHash) return Bun.hash(s);
   let h = 9;
   for (let i = 0; i < s.length; ) h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
   return h = h ^ h >>> 9;
@@ -2008,14 +2009,14 @@ var allocateIf = (value, condition) => condition ? value : "", createContext = (
   hasTrace && (fnLiteral += `const id=randomId()
 `);
   let isDynamic = /[:*]/.test(route.path), getQi = `const u=request.url,s=u.indexOf('/',${app.config.handler?.standardHostname ?? !0 ? 11 : 7}),qi=u.indexOf('?', s + 1)
-`;
-  inference.query && (fnLiteral += getQi);
-  let getPath = inference.path ? isDynamic ? "get path(){" + (inference.query ? "" : getQi) + `if(qi===-1)return u.substring(s)
+`, needsQuery = inference.query || !!route.hooks.query || !!route.standaloneValidators?.find((x) => x.query);
+  needsQuery && (fnLiteral += getQi);
+  let getPath = inference.path ? isDynamic ? "get path(){" + (needsQuery ? "" : getQi) + `if(qi===-1)return u.substring(s)
 return u.substring(s,qi)
 },` : `path:'${route.path}',` : "";
-  fnLiteral += allocateIf("const c=", !isInline) + "{request,store," + allocateIf("qi,", inference.query) + allocateIf("params:request.params,", isDynamic) + getPath + allocateIf(
+  fnLiteral += allocateIf("const c=", !isInline) + "{request,store," + allocateIf("qi,", needsQuery) + allocateIf("params:request.params,", isDynamic) + getPath + allocateIf(
     "url:request.url,",
-    hasTrace || inference.url || inference.query
+    hasTrace || inference.url || needsQuery
   ) + "redirect,error:status,status,set:{headers:" + (isNotEmpty(defaultHeaders) ? "Object.assign({},app.setHeaders)" : "Object.create(null)") + ",status:200}", inference.server && (fnLiteral += ",get server(){return app.getServer()}"), hasTrace && (fnLiteral += ",[ELYSIA_REQUEST_ID]:id");
   {
     let decoratorsLiteral = "";
@@ -2039,8 +2040,10 @@ return u.substring(s,qi)
   );
   let fnLiteral = "const handler=data.handler,app=data.app,store=data.store,decorator=data.decorator,redirect=data.redirect,route=data.route,mapEarlyResponse=data.mapEarlyResponse," + allocateIf("randomId=data.randomId,", hasTrace) + allocateIf("ELYSIA_REQUEST_ID=data.ELYSIA_REQUEST_ID,", hasTrace) + allocateIf("ELYSIA_TRACE=data.ELYSIA_TRACE,", hasTrace) + allocateIf("trace=data.trace,", hasTrace) + allocateIf("hoc=data.hoc,", hasHoc) + `status=data.status
 `;
-  return app.event.request?.length && (fnLiteral += `const onRequest=app.event.request.map(x=>x.fn)
-`), fnLiteral += `${app.event.request?.find(isAsync) ? "async" : ""} function map(request){`, hasTrace || inference.query || app.event.request?.length ? (fnLiteral += createContext(app, route, inference), fnLiteral += createOnRequestHandler(app), fnLiteral += "return handler(c)}") : fnLiteral += `return handler(${createContext(app, route, inference, !0)})}`, fnLiteral += createHoc(app), Function(
+  app.event.request?.length && (fnLiteral += `const onRequest=app.event.request.map(x=>x.fn)
+`), fnLiteral += `${app.event.request?.find(isAsync) ? "async" : ""} function map(request){`;
+  let needsQuery = inference.query || !!route.hooks.query || !!route.standaloneValidators?.find((x) => x.query);
+  return hasTrace || needsQuery ? (fnLiteral += createContext(app, route, inference), fnLiteral += createOnRequestHandler(app), fnLiteral += "return handler(c)}") : fnLiteral += `return handler(${createContext(app, route, inference, !0)})}`, fnLiteral += createHoc(app), Function(
     "data",
     fnLiteral
   )({

package/dist/adapter/bun/handler-native.mjs

@@ -697,7 +697,7 @@ var createNativeStaticHandler = (handle, hooks, setHeaders = {}) => {
     return response instanceof Promise ? response.then((response2) => {
       if (response2)
         return response2.headers.has("content-type") || response2.headers.append("content-type", "text/plain"), response2.clone();
-    }) : (response.headers.has("content-type") || response.headers.append("content-type", "text/plain"), response.clone.bind(response));
+    }) : (response.headers.has("content-type") || response.headers.append("content-type", "text/plain"), () => response.clone());
 };
 export {
   createNativeStaticHandler

package/dist/adapter/bun/index.mjs

@@ -138,6 +138,7 @@ var primitiveHooks = [
   {}
 );
 var isBun2 = typeof Bun < "u", hasBunHash = isBun2 && typeof Bun.hash == "function", checksum = (s) => {
+  if (hasBunHash) return Bun.hash(s);
   let h = 9;
   for (let i = 0; i < s.length; ) h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
   return h = h ^ h >>> 9;
@@ -1184,6 +1185,15 @@ else c.body[key]=value}`;
       }
     }
   },
+  async stop(app, closeActiveConnections) {
+    if (!app.server)
+      throw new Error(
+        "Elysia isn't running. Call `app.listen` to start the server."
+      );
+    if (app.server && (app.server.stop(closeActiveConnections), app.server = null, app.event.stop?.length))
+      for (let i = 0; i < app.event.stop.length; i++)
+        app.event.stop[i].fn(app);
+  },
   composeGeneralHandler: {
     parameters: "r",
     createContext(app) {
@@ -2125,6 +2135,8 @@ var hasProperty = (expectedProperty, _schema) => {
 }, _replaceSchemaType = (schema, options, config) => {
   if (!schema) return schema;
   let root = config.root;
+  if (options.onlyFirstObject && schema.type === "object")
+    return options.to(schema) ?? schema;
   if (options.untilObjectFound && !root && schema.type === "object")
     return schema;
   let fromSymbol = options.from[Kind3];
@@ -2321,17 +2333,20 @@ var hasProperty = (expectedProperty, _schema) => {
           }));
           break;
       }
-  return schema;
+  return schema.type === "array" && schema.items && (Array.isArray(schema.items) ? schema.items = schema.items.map(
+    (item) => _replaceSchemaType(item, options, {
+      ...config,
+      root: !1
+    })
+  ) : schema.items = _replaceSchemaType(schema.items, options, {
+    ...config,
+    root: !1
+  })), schema;
 }, createCleaner = (schema) => (value) => {
   if (typeof value == "object")
     try {
       return Value3.Clean(schema, value);
     } catch {
-      try {
-        return Value3.Clean(schema, value);
-      } catch {
-        return value;
-      }
     }
   return value;
 }, getSchemaValidator = (s, {
@@ -2403,7 +2418,18 @@ var hasProperty = (expectedProperty, _schema) => {
       })
     ]), schema.type === "object" && hasAdditional && (schema.additionalProperties = !1));
   } else
-    schema.type === "object" && !("additionalProperties" in schema) && (schema.additionalProperties = additionalProperties);
+    schema.type === "object" && !("additionalProperties" in schema) ? schema.additionalProperties = additionalProperties : schema = replaceSchemaType(schema, {
+      onlyFirstObject: !0,
+      from: t.Object({}),
+      // @ts-ignore
+      to({ properties, ...options }) {
+        if (properties && !("additionalProperties" in schema))
+          return t.Object(properties, {
+            ...options,
+            additionalProperties: !1
+          });
+      }
+    });
   if (dynamic) {
     let validator = {
       schema,
@@ -3068,14 +3094,14 @@ var allocateIf = (value, condition) => condition ? value : "", createContext = (
   hasTrace && (fnLiteral += `const id=randomId()
 `);
   let isDynamic = /[:*]/.test(route.path), getQi = `const u=request.url,s=u.indexOf('/',${app.config.handler?.standardHostname ?? !0 ? 11 : 7}),qi=u.indexOf('?', s + 1)
-`;
-  inference.query && (fnLiteral += getQi);
-  let getPath = inference.path ? isDynamic ? "get path(){" + (inference.query ? "" : getQi) + `if(qi===-1)return u.substring(s)
+`, needsQuery = inference.query || !!route.hooks.query || !!route.standaloneValidators?.find((x) => x.query);
+  needsQuery && (fnLiteral += getQi);
+  let getPath = inference.path ? isDynamic ? "get path(){" + (needsQuery ? "" : getQi) + `if(qi===-1)return u.substring(s)
 return u.substring(s,qi)
 },` : `path:'${route.path}',` : "";
-  fnLiteral += allocateIf("const c=", !isInline) + "{request,store," + allocateIf("qi,", inference.query) + allocateIf("params:request.params,", isDynamic) + getPath + allocateIf(
+  fnLiteral += allocateIf("const c=", !isInline) + "{request,store," + allocateIf("qi,", needsQuery) + allocateIf("params:request.params,", isDynamic) + getPath + allocateIf(
     "url:request.url,",
-    hasTrace || inference.url || inference.query
+    hasTrace || inference.url || needsQuery
   ) + "redirect,error:status,status,set:{headers:" + (isNotEmpty(defaultHeaders) ? "Object.assign({},app.setHeaders)" : "Object.create(null)") + ",status:200}", inference.server && (fnLiteral += ",get server(){return app.getServer()}"), hasTrace && (fnLiteral += ",[ELYSIA_REQUEST_ID]:id");
   {
     let decoratorsLiteral = "";
@@ -3099,8 +3125,10 @@ return u.substring(s,qi)
   );
   let fnLiteral = "const handler=data.handler,app=data.app,store=data.store,decorator=data.decorator,redirect=data.redirect,route=data.route,mapEarlyResponse=data.mapEarlyResponse," + allocateIf("randomId=data.randomId,", hasTrace) + allocateIf("ELYSIA_REQUEST_ID=data.ELYSIA_REQUEST_ID,", hasTrace) + allocateIf("ELYSIA_TRACE=data.ELYSIA_TRACE,", hasTrace) + allocateIf("trace=data.trace,", hasTrace) + allocateIf("hoc=data.hoc,", hasHoc) + `status=data.status
 `;
-  return app.event.request?.length && (fnLiteral += `const onRequest=app.event.request.map(x=>x.fn)
-`), fnLiteral += `${app.event.request?.find(isAsync) ? "async" : ""} function map(request){`, hasTrace || inference.query || app.event.request?.length ? (fnLiteral += createContext(app, route, inference), fnLiteral += createOnRequestHandler(app), fnLiteral += "return handler(c)}") : fnLiteral += `return handler(${createContext(app, route, inference, !0)})}`, fnLiteral += createHoc(app), Function(
+  app.event.request?.length && (fnLiteral += `const onRequest=app.event.request.map(x=>x.fn)
+`), fnLiteral += `${app.event.request?.find(isAsync) ? "async" : ""} function map(request){`;
+  let needsQuery = inference.query || !!route.hooks.query || !!route.standaloneValidators?.find((x) => x.query);
+  return hasTrace || needsQuery ? (fnLiteral += createContext(app, route, inference), fnLiteral += createOnRequestHandler(app), fnLiteral += "return handler(c)}") : fnLiteral += `return handler(${createContext(app, route, inference, !0)})}`, fnLiteral += createHoc(app), Function(
     "data",
     fnLiteral
   )({
@@ -3133,7 +3161,7 @@ var createNativeStaticHandler = (handle, hooks, setHeaders = {}) => {
     return response instanceof Promise ? response.then((response2) => {
       if (response2)
         return response2.headers.has("content-type") || response2.headers.append("content-type", "text/plain"), response2.clone();
-    }) : (response.headers.has("content-type") || response.headers.append("content-type", "text/plain"), response.clone.bind(response));
+    }) : (response.headers.has("content-type") || response.headers.append("content-type", "text/plain"), () => response.clone());
 };
 
 // src/ws/index.ts
@@ -3414,7 +3442,6 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
           ...websocket || {}
         },
         fetch: app.fetch
-        // error: outerErrorHandler
       } : {
         development: !isProduction,
         reusePort: !0,
@@ -3434,7 +3461,6 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
         },
         port: options,
         fetch: app.fetch
-        // error: outerErrorHandler
       };
       if (app.server = Bun.serve(serve), app.event.start)
         for (let i = 0; i < app.event.start.length; i++)
@@ -3462,6 +3488,15 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
       });
     };
   },
+  async stop(app, closeActiveConnections) {
+    if (!app.server)
+      throw new Error(
+        "Elysia isn't running. Call `app.listen` to start the server."
+      );
+    if (app.server && (app.server.stop(closeActiveConnections), app.server = null, app.event.stop?.length))
+      for (let i = 0; i < app.event.stop.length; i++)
+        app.event.stop[i].fn(app);
+  },
   ws(app, path, options) {
     let { parse: parse2, body, response, ...rest } = options, validateMessage = getSchemaValidator(body, {
       // @ts-expect-error private property
@@ -3503,7 +3538,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
           result instanceof Promise && await result;
         }
         let errorHandlers = [
-          ...Array.isArray(options.error) ? options.error : [options.error],
+          ...options.error ? Array.isArray(options.error) ? options.error : [options.error] : [],
           ...(app.event.error ?? []).map(
             (x) => typeof x == "function" ? x : x.fn
           )
@@ -3530,9 +3565,9 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
             pong(data) {
               options.pong?.(data);
             },
-            open(ws) {
+            open: async (ws) => {
               try {
-                handleResponse3(
+                await handleResponse3(
                   ws,
                   options.open?.(
                     new ElysiaWS(ws, context)
@@ -3553,7 +3588,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
                   ).message
                 );
               try {
-                handleResponse3(
+                await handleResponse3(
                   ws,
                   options.message?.(
                     new ElysiaWS(
@@ -3568,9 +3603,9 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
                 handleErrors(ws, error);
               }
             },
-            drain(ws) {
+            drain: async (ws) => {
               try {
-                handleResponse3(
+                await handleResponse3(
                   ws,
                   options.drain?.(
                     new ElysiaWS(ws, context)
@@ -3580,9 +3615,9 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
                 handleErrors(ws, error);
               }
             },
-            close(ws, code, reason) {
+            close: async (ws, code, reason) => {
               try {
-                handleResponse3(
+                await handleResponse3(
                   ws,
                   options.close?.(
                     new ElysiaWS(ws, context),

package/dist/adapter/types.d.ts

@@ -7,6 +7,21 @@ import type { AnyWSLocalHook } from '../ws/types';
 export interface ElysiaAdapter {
     name: string;
     listen(app: AnyElysia): (options: string | number | Partial<Serve>, callback?: ListenCallback) => void;
+    /**
+     * Stop server from serving
+     *
+     * ---
+     * @example
+     * ```typescript
+     * app.stop()
+     * ```
+     *
+     * @example
+     * ```typescript
+     * app.stop(true) // Abruptly any requests inflight
+     * ```
+     */
+    stop(app: AnyElysia, closeActiveConnections?: boolean): Promise<void>;
     isWebStandard?: boolean;
     handler: {
         /**

package/dist/adapter/web-standard/index.mjs

@@ -918,6 +918,15 @@ else c.body[key]=value}`;
       }
     }
   },
+  async stop(app, closeActiveConnections) {
+    if (!app.server)
+      throw new Error(
+        "Elysia isn't running. Call `app.listen` to start the server."
+      );
+    if (app.server && (app.server.stop(closeActiveConnections), app.server = null, app.event.stop?.length))
+      for (let i = 0; i < app.event.stop.length; i++)
+        app.event.stop[i].fn(app);
+  },
   composeGeneralHandler: {
     parameters: "r",
     createContext(app) {

package/dist/bun/index.d.ts

@@ -1802,7 +1802,8 @@ export default class Elysia<const in out BasePath extends string = '', const in
      * app.stop(true) // Abruptly any requests inflight
      * ```
      */
-    stop: (closeActiveConnections?: boolean) => Promise<void>;
+    stop: (closeActiveConnections?: boolean) => Promise<this>;
+    [Symbol.dispose]: () => void;
     /**
      * Wait until all lazy loaded modules all load is fully
      */