elysia 1.3.20 → 1.3.21

package/dist/index.mjs

@@ -2250,22 +2250,26 @@ var handleFile = (response, set2) => {
         try {
           for await (let chunk of generator) {
             if (end) break;
-            if (chunk != null) {
+            if (chunk != null)
               if (chunk.toSSE)
                 controller.enqueue(chunk.toSSE());
-              else if (typeof chunk == "object")
-                try {
-                  controller.enqueue(
-                    format(JSON.stringify(chunk))
-                  );
-                } catch {
+              else {
+                if (typeof chunk == "object")
+                  try {
+                    controller.enqueue(
+                      format(JSON.stringify(chunk))
+                    );
+                  } catch {
+                    controller.enqueue(
+                      format(chunk.toString())
+                    );
+                  }
+                else
                   controller.enqueue(format(chunk.toString()));
-                }
-              else controller.enqueue(format(chunk.toString()));
-              await new Promise(
-                (resolve) => setTimeout(() => resolve(), 0)
-              );
-            }
+                isSSE || await new Promise(
+                  (resolve) => setTimeout(() => resolve(), 0)
+                );
+              }
           }
         } catch (error2) {
           console.warn(error2);
@@ -4365,11 +4369,16 @@ try{a${index}.push(JSON.parse(value))}catch{a${index}.push(value)}if(deepMemory=
     }
   }
   let isAsyncHandler = typeof handler == "function" && isAsync(handler), saveResponse = hasTrace || hooks.afterResponse?.length ? "c.response= " : "", maybeAsync = hasCookie || hasBody || isAsyncHandler || !!hooks.parse?.length || !!hooks.afterHandle?.some(isAsync) || !!hooks.beforeHandle?.some(isAsync) || !!hooks.transform?.some(isAsync) || !!hooks.mapResponse?.some(isAsync), maybeStream = (typeof handler == "function" ? isGenerator(handler) : !1) || !!hooks.beforeHandle?.some(isGenerator) || !!hooks.afterHandle?.some(isGenerator) || !!hooks.transform?.some(isGenerator), responseKeys = Object.keys(validator.response ?? {}), hasMultipleResponses = responseKeys.length > 1, hasSingle200 = responseKeys.length === 0 || responseKeys.length === 1 && responseKeys[0] === "200", hasSet = inference.cookie || inference.set || hasHeaders || hasTrace || hasMultipleResponses || !hasSingle200 || isHandleFn && hasDefaultHeaders || maybeStream, afterResponse = () => {
-    if (!hooks.afterResponse?.length) return "";
+    if (!hooks.afterResponse?.length && !hasTrace) return "";
     let afterResponse2 = "", prefix = hooks.afterResponse?.some(isAsync) ? "async " : "";
     afterResponse2 += `
 setImmediate(${prefix}()=>{`;
-    let reporter = report("afterResponse", {
+    let reporter = createReport({
+      trace: hooks.trace,
+      addFn: (word) => {
+        afterResponse2 += word;
+      }
+    })("afterResponse", {
       total: hooks.afterResponse?.length
     });
     if (hooks.afterResponse?.length && hooks.afterResponse)
@@ -4386,7 +4395,7 @@ ${prefix2}e.afterResponse[${i}](c)
   }, mapResponse3 = (r = "r") => {
     let after = afterResponse(), response = `${hasSet ? "mapResponse" : "mapCompactResponse"}(${saveResponse}${r}${hasSet ? ",c.set" : ""}${mapResponseContext})
 `;
-    return after || `${response}`, `const _res=${response}` + after + "return _res";
+    return after ? `const _res=${response}` + after + "return _res" : `return ${response}`;
   }, mapResponseContext = maybeStream || adapter.mapResponseContext ? `,${adapter.mapResponseContext}` : "";
   (hasTrace || inference.route) && (fnLiteral += `c.route=\`${path}\`
 `);
@@ -4540,15 +4549,16 @@ delete c.contentType`);
     }
     fnLiteral += "}catch(error){throw new ParseError(error)}";
   }
-  if (parseReporter.resolve(), hooks?.transform) {
+  if (parseReporter.resolve(), hooks?.transform || hasTrace) {
     let reporter = report("transform", {
-      total: hooks.transform.length
+      total: hooks.transform?.length
     });
-    hooks.transform.length && (fnLiteral += `let transformed
-`);
-    for (let i = 0; i < hooks.transform.length; i++) {
-      let transform = hooks.transform[i], endUnit = reporter.resolveChild(transform.fn.name);
-      fnLiteral += isAsync(transform) ? `transformed=await e.transform[${i}](c)
+    if (hooks.transform?.length) {
+      fnLiteral += `let transformed
+`;
+      for (let i = 0; i < hooks.transform.length; i++) {
+        let transform = hooks.transform[i], endUnit = reporter.resolveChild(transform.fn.name);
+        fnLiteral += isAsync(transform) ? `transformed=await e.transform[${i}](c)
 ` : `transformed=e.transform[${i}](c)
 `, transform.subType === "mapDerive" ? fnLiteral += "if(transformed instanceof ElysiaCustomStatusResponse){" + mapResponse3("transformed") + `}else{transformed.request=c.request
 transformed.store=c.store
@@ -4560,6 +4570,7 @@ transformed.set=c.set
 transformed.error=c.error
 c=transformed}` : fnLiteral += "if(transformed instanceof ElysiaCustomStatusResponse){" + mapResponse3("transformed") + `}else Object.assign(c,transformed)
 `, endUnit();
+      }
     }
     reporter.resolve();
   }
@@ -4747,14 +4758,15 @@ for(const [key,value] of Object.entries(c.cookie))cookieValue[key]=value.value
       )), cookieValidator.isOptional && (fnLiteral += "}");
     }
   }
-  if (hooks?.beforeHandle) {
+  if (hooks?.beforeHandle || hasTrace) {
     let reporter = report("beforeHandle", {
-      total: hooks.beforeHandle.length
+      total: hooks.beforeHandle?.length
     }), hasResolve = !1;
-    for (let i = 0; i < hooks.beforeHandle.length; i++) {
-      let beforeHandle = hooks.beforeHandle[i], endUnit = reporter.resolveChild(beforeHandle.fn.name), returning = hasReturn(beforeHandle);
-      if (beforeHandle.subType === "resolve" || beforeHandle.subType === "mapResolve")
-        hasResolve || (hasResolve = !0, fnLiteral += `
+    if (hooks.beforeHandle?.length)
+      for (let i = 0; i < hooks.beforeHandle.length; i++) {
+        let beforeHandle = hooks.beforeHandle[i], endUnit = reporter.resolveChild(beforeHandle.fn.name), returning = hasReturn(beforeHandle);
+        if (beforeHandle.subType === "resolve" || beforeHandle.subType === "mapResolve")
+          hasResolve || (hasResolve = !0, fnLiteral += `
 let resolved
 `), fnLiteral += isAsync(beforeHandle) ? `resolved=await e.beforeHandle[${i}](c);
 ` : `resolved=e.beforeHandle[${i}](c);
@@ -4767,76 +4779,78 @@ resolved.redirect=c.redirect
 resolved.set=c.set
 resolved.error=c.error
 c=resolved}` : fnLiteral += "if(resolved instanceof ElysiaCustomStatusResponse){" + mapResponse3("resolved") + `}else Object.assign(c, resolved)
-`;
-      else if (!returning)
-        fnLiteral += isAsync(beforeHandle) ? `await e.beforeHandle[${i}](c)
+`, endUnit();
+        else if (!returning)
+          fnLiteral += isAsync(beforeHandle) ? `await e.beforeHandle[${i}](c)
 ` : `e.beforeHandle[${i}](c)
 `, endUnit();
-      else {
-        if (fnLiteral += isAsync(beforeHandle) ? `be=await e.beforeHandle[${i}](c)
+        else {
+          if (fnLiteral += isAsync(beforeHandle) ? `be=await e.beforeHandle[${i}](c)
 ` : `be=e.beforeHandle[${i}](c)
-`, endUnit("be"), fnLiteral += "if(be!==undefined){", reporter.resolve(), hooks.afterHandle?.length) {
-          report("handle", {
-            name: isHandleFn ? handler.name : void 0
-          }).resolve();
-          let reporter2 = report("afterHandle", {
-            total: hooks.afterHandle.length
-          });
-          for (let i2 = 0; i2 < hooks.afterHandle.length; i2++) {
-            let hook = hooks.afterHandle[i2], returning2 = hasReturn(hook), endUnit2 = reporter2.resolveChild(hook.fn.name);
-            fnLiteral += `c.response = be
+`, endUnit("be"), fnLiteral += "if(be!==undefined){", reporter.resolve(), hooks.afterHandle?.length || hasTrace) {
+            report("handle", {
+              name: isHandleFn ? handler.name : void 0
+            }).resolve();
+            let reporter2 = report("afterHandle", {
+              total: hooks.afterHandle?.length
+            });
+            if (hooks.afterHandle?.length)
+              for (let i2 = 0; i2 < hooks.afterHandle.length; i2++) {
+                let hook = hooks.afterHandle[i2], returning2 = hasReturn(hook), endUnit2 = reporter2.resolveChild(hook.fn.name);
+                fnLiteral += `c.response = be
 `, returning2 ? (fnLiteral += isAsync(hook.fn) ? `af=await e.afterHandle[${i2}](c)
 ` : `af=e.afterHandle[${i2}](c)
 `, fnLiteral += `if(af!==undefined) c.response=be=af
 `) : fnLiteral += isAsync(hook.fn) ? `await e.afterHandle[${i2}](c, be)
 ` : `e.afterHandle[${i2}](c, be)
 `, endUnit2("af");
+              }
+            reporter2.resolve();
           }
-          reporter2.resolve();
-        }
-        validator.response && (fnLiteral += validation.response("be"));
-        let mapResponseReporter = report("mapResponse", {
-          total: hooks.mapResponse?.length
-        });
-        if (hooks.mapResponse?.length) {
-          fnLiteral += `c.response=be
+          validator.response && (fnLiteral += validation.response("be"));
+          let mapResponseReporter = report("mapResponse", {
+            total: hooks.mapResponse?.length
+          });
+          if (hooks.mapResponse?.length) {
+            fnLiteral += `c.response=be
 `;
-          for (let i2 = 0; i2 < hooks.mapResponse.length; i2++) {
-            let mapResponse4 = hooks.mapResponse[i2], endUnit2 = mapResponseReporter.resolveChild(
-              mapResponse4.fn.name
-            );
-            fnLiteral += `if(mr===undefined){mr=${isAsyncName(mapResponse4) ? "await " : ""}e.mapResponse[${i2}](c)
+            for (let i2 = 0; i2 < hooks.mapResponse.length; i2++) {
+              let mapResponse4 = hooks.mapResponse[i2], endUnit2 = mapResponseReporter.resolveChild(
+                mapResponse4.fn.name
+              );
+              fnLiteral += `if(mr===undefined){mr=${isAsyncName(mapResponse4) ? "await " : ""}e.mapResponse[${i2}](c)
 if(mr!==undefined)be=c.response=mr}`, endUnit2();
+            }
           }
-        }
-        mapResponseReporter.resolve(), fnLiteral += encodeCookie(), fnLiteral += `return mapEarlyResponse(${saveResponse}be,c.set${mapResponseContext})}
+          mapResponseReporter.resolve(), fnLiteral += encodeCookie(), fnLiteral += `return mapEarlyResponse(${saveResponse}be,c.set${mapResponseContext})}
 `;
+        }
       }
-    }
     reporter.resolve();
   }
-  if (hooks.afterHandle?.length) {
+  if (hooks.afterHandle?.length || hasTrace) {
     let handleReporter = report("handle", {
       name: isHandleFn ? handler.name : void 0
     });
-    hooks.afterHandle.length ? fnLiteral += isAsyncHandler ? `let r=c.response=await ${handle}
+    hooks.afterHandle?.length ? fnLiteral += isAsyncHandler ? `let r=c.response=await ${handle}
 ` : `let r=c.response=${handle}
 ` : fnLiteral += isAsyncHandler ? `let r=await ${handle}
 ` : `let r=${handle}
 `, handleReporter.resolve();
     let reporter = report("afterHandle", {
-      total: hooks.afterHandle.length
+      total: hooks.afterHandle?.length
     });
-    for (let i = 0; i < hooks.afterHandle.length; i++) {
-      let hook = hooks.afterHandle[i], returning = hasReturn(hook), endUnit = reporter.resolveChild(hook.fn.name);
-      returning ? (fnLiteral += isAsync(hook.fn) ? `af=await e.afterHandle[${i}](c)
+    if (hooks.afterHandle?.length)
+      for (let i = 0; i < hooks.afterHandle.length; i++) {
+        let hook = hooks.afterHandle[i], returning = hasReturn(hook), endUnit = reporter.resolveChild(hook.fn.name);
+        returning ? (fnLiteral += isAsync(hook.fn) ? `af=await e.afterHandle[${i}](c)
 ` : `af=e.afterHandle[${i}](c)
 `, endUnit("af"), validator.response ? (fnLiteral += "if(af!==undefined){", reporter.resolve(), fnLiteral += validation.response("af"), fnLiteral += "c.response=af}") : (fnLiteral += "if(af!==undefined){", reporter.resolve(), fnLiteral += "c.response=af}")) : (fnLiteral += isAsync(hook.fn) ? `await e.afterHandle[${i}](c)
 ` : `e.afterHandle[${i}](c)
 `, endUnit());
-    }
-    reporter.resolve(), fnLiteral += `r=c.response
-`, validator.response && (fnLiteral += validation.response()), fnLiteral += encodeCookie();
+      }
+    reporter.resolve(), hooks.afterHandle?.length && (fnLiteral += `r=c.response
+`), validator.response && (fnLiteral += validation.response()), fnLiteral += encodeCookie();
     let mapResponseReporter = report("mapResponse", {
       total: hooks.mapResponse?.length
     });
@@ -4854,7 +4868,7 @@ if(mr!==undefined)r=c.response=mr
     let handleReporter = report("handle", {
       name: isHandleFn ? handler.name : void 0
     });
-    if (validator.response || hooks.mapResponse?.length) {
+    if (validator.response || hooks.mapResponse?.length || hasTrace) {
       fnLiteral += isAsyncHandler ? `let r=await ${handle}
 ` : `let r=${handle}
 `, handleReporter.resolve(), validator.response && (fnLiteral += validation.response());
@@ -5174,22 +5188,29 @@ map: switch(p){
       fnLiteral += word;
     }
   }), afterResponse = () => {
-    if (!hooks.afterResponse?.length) return "";
-    let afterResponse2 = "", prefix = hooks.afterResponse.some(isAsync) ? "async" : "";
+    if (!hooks.afterResponse?.length && !hasTrace) return "";
+    let afterResponse2 = "", prefix = hooks.afterResponse?.some(isAsync) ? "async" : "";
     afterResponse2 += `
 setImmediate(${prefix}()=>{`;
-    let reporter = report("afterResponse", {
+    let reporter = createReport({
+      context: "context",
+      trace: hooks.trace,
+      addFn: (word) => {
+        afterResponse2 += word;
+      }
+    })("afterResponse", {
       total: hooks.afterResponse?.length,
       name: "context"
     });
-    for (let i = 0; i < hooks.afterResponse.length; i++) {
-      let fn = hooks.afterResponse[i].fn, endUnit = reporter.resolveChild(fn.name);
-      afterResponse2 += `
+    if (hooks.afterResponse?.length && hooks.afterResponse)
+      for (let i = 0; i < hooks.afterResponse.length; i++) {
+        let fn = hooks.afterResponse[i].fn, endUnit = reporter.resolveChild(fn.name);
+        afterResponse2 += `
 ${isAsyncName(fn) ? "await " : ""}afterResponse[${i}](context)
 `, endUnit();
-    }
-    return afterResponse2 += `})
-`, reporter.resolve(), afterResponse2;
+      }
+    return reporter.resolve(), afterResponse2 += `})
+`, afterResponse2;
   };
   fnLiteral += `const set=context.set
 let _r
@@ -5197,7 +5218,7 @@ if(!context.code)context.code=error.code??error[ERROR_CODE]
 if(!(context.error instanceof Error))context.error=error
 if(error instanceof ElysiaCustomStatusResponse){set.status=error.status=error.code
 error.message=error.response}`, adapter.declare && (fnLiteral += adapter.declare);
-  let saveResponse = hasTrace || hooks.afterResponse?.length || hooks.afterResponse?.length ? "context.response = " : "";
+  let saveResponse = hasTrace || hooks.afterResponse?.length ? "context.response = " : "";
   if (app.event.error)
     for (let i = 0; i < app.event.error.length; i++) {
       let handler = app.event.error[i], response = `${isAsync(handler) ? "await " : ""}onError[${i}](context)
@@ -5624,7 +5645,9 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
         ),
         websocket: {
           ...app.config.websocket || {},
-          ...websocket || {}
+          ...websocket || {},
+          // @ts-expect-error not available in this variant of options type
+          ...options.websocket || {}
         },
         fetch: app.fetch
       } : {
@@ -5730,7 +5753,7 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
           ...(app.event.error ?? []).map(
             (x) => typeof x == "function" ? x : x.fn
           )
-        ].filter((x) => x), handleErrors = errorHandlers.length ? async (ws, error2) => {
+        ].filter((x) => x), hasCustomErrorHandlers = errorHandlers.length > 0, handleErrors = hasCustomErrorHandlers ? async (ws, error2) => {
           for (let handleError of errorHandlers) {
             let response2 = handleError(
               Object.assign(context, { error: error2 })
@@ -5767,14 +5790,14 @@ for(const [k,v] of c.request.headers.entries())c.headers[k]=v
             },
             message: async (ws, _message) => {
               let message = await parseMessage(ws, _message);
-              if (validateMessage?.Check(message) === !1)
-                return void ws.send(
-                  new ValidationError(
-                    "message",
-                    validateMessage,
-                    message
-                  ).message
+              if (validateMessage?.Check(message) === !1) {
+                let validationError = new ValidationError(
+                  "message",
+                  validateMessage,
+                  message
                 );
+                return hasCustomErrorHandlers ? handleErrors(ws, validationError) : void ws.send(validationError.message);
+              }
               try {
                 await handleResponse3(
                   ws,
@@ -7313,7 +7336,7 @@ var _Elysia = class _Elysia {
         if (typeof plugin2 == "function") return plugin2(this);
         if (plugin2 instanceof _Elysia)
           return this._use(plugin2).compile();
-        if (plugin2.constructor.name === "Elysia")
+        if (plugin2.constructor?.name === "Elysia")
           return this._use(
             plugin2
           ).compile();
@@ -7321,9 +7344,9 @@ var _Elysia = class _Elysia {
           return plugin2.default(this);
         if (plugin2.default instanceof _Elysia)
           return this._use(plugin2.default);
-        if (plugin2.constructor.name === "Elysia")
+        if (plugin2.constructor?.name === "Elysia")
           return this._use(plugin2.default);
-        if (plugin2.constructor.name === "_Elysia")
+        if (plugin2.constructor?.name === "_Elysia")
           return this._use(plugin2.default);
         try {
           return this._use(plugin2.default);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "1.3.20",
+	"version": "1.3.21",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",