elysia 1.4.28 → 1.4.30

package/dist/index.mjs

@@ -23,7 +23,6 @@ import {
   encodePath,
   lifeCycleToArray,
   supportPerMethodInlineHandler,
-  redirect,
   emptySchema,
   insertStandaloneValidator
 } from "./utils.mjs";
@@ -53,7 +52,6 @@ import {
   createDynamicHandler
 } from "./dynamic-handle.mjs";
 import {
-  status,
   ERROR_CODE,
   ValidationError
 } from "./error.mjs";
@@ -546,37 +544,12 @@ const _Elysia = class _Elysia {
       return;
     }
     const adapter = this["~adapter"].handler, nativeStaticHandler = typeof handle != "function" ? () => {
-      const context = {
-        redirect,
-        request: this["~adapter"].isWebStandard ? new Request(`http://ely.sia${path}`, {
-          method
-        }) : void 0,
-        server: null,
-        set: {
-          headers: Object.assign({}, this.setHeaders)
-        },
-        status,
-        store: this.store
-      };
-      try {
-        this.event.request?.map((x) => {
-          if (typeof x.fn == "function")
-            return x.fn(context);
-          if (typeof x == "function") return x(context);
-        });
-      } catch (error) {
-        let res;
-        context.error = error, this.event.error?.some((x) => {
-          if (typeof x.fn == "function")
-            return res = x.fn(context);
-          if (typeof x == "function")
-            return res = x(context);
-        }), res !== void 0 && (handle = res);
-      }
       const fn = adapter.createNativeStaticHandler?.(
         handle,
         hooks,
-        context.set
+        {
+          headers: Object.assign({}, this.setHeaders)
+        }
       );
       return fn instanceof Promise ? fn.then((fn2) => {
         if (fn2) return fn2;

package/dist/schema.d.ts

@@ -3,7 +3,7 @@ import { type Instruction as ExactMirrorInstruction } from 'exact-mirror';
 import { type TypeCheck } from './type-system';
 import { mapValueError } from './error';
 import type { CookieOptions } from './cookies';
-import type { AnySchema, ElysiaConfig, InputSchema, IsAny, MaybeArray, StandaloneInputSchema, UnwrapSchema } from './types';
+import type { AnySchema, ElysiaConfig, InputSchema, IsAny, MaybeArray, MaybePromise, StandaloneInputSchema, UnwrapSchema } from './types';
 import type { StandardSchemaV1Like } from './types';
 import { type ReplaceSchemaTypeOptions } from './replace-schema';
 type MapValueError = ReturnType<typeof mapValueError>;
@@ -11,11 +11,14 @@ export interface ElysiaTypeCheck<T extends AnySchema> extends Omit<TypeCheck<TSc
     provider: 'typebox' | 'standard';
     schema: T;
     config: Object;
-    Check(value: unknown): T extends TSchema ? boolean : {
+    Check(value: unknown): boolean;
+    Validate?(value: unknown): MaybePromise<{
         value: UnwrapSchema<T>;
+        issues?: never;
     } | {
+        value?: never;
         issues: unknown[];
-    };
+    }>;
     Clean?(v: unknown): UnwrapSchema<T>;
     parse(v: unknown): UnwrapSchema<T>;
     safeParse(v: unknown): {

package/dist/schema.js

@@ -268,13 +268,20 @@ const isOptional = (schema) => schema ? schema?.[import_typebox.Kind] === "Impor
   if ("~standard" in schema || validators?.length && validators.some(
     (x) => x && typeof x != "string" && "~standard" in x
   )) {
-    let Check2 = function(value, validated = !1) {
-      let v = validated ? value : mainCheck.validate(value);
+    let Validate2 = function(value) {
+      const v = mainCheck.validate(value);
       if (v instanceof Promise)
-        return v.then((v2) => Check2(v2, !0));
+        return v.then((resolved) => {
+          if (resolved.issues) return resolved;
+          const values2 = [];
+          return resolved && typeof resolved == "object" && values2.push(resolved.value), runCheckers2(value, 0, values2, resolved);
+        });
       if (v.issues) return v;
       const values = [];
       return v && typeof v == "object" && values.push(v.value), runCheckers2(value, 0, values, v);
+    }, Check2 = function(value) {
+      const v = Validate2(value);
+      return v instanceof Promise ? !1 : !v.issues;
     }, runCheckers2 = function(value, startIndex, values, lastV) {
       for (let i = startIndex; i < checkers.length; i++) {
         let v = checkers[i].validate(value);
@@ -298,7 +305,7 @@ const isOptional = (schema) => schema ? schema?.[import_typebox.Kind] === "Impor
         newValue = (0, import_utils.mergeDeep)(newValue, values[i]);
       return { value: newValue };
     };
-    var Check = Check2, runCheckers = runCheckers2, mergeValues = mergeValues2;
+    var Validate = Validate2, Check = Check2, runCheckers = runCheckers2, mergeValues = mergeValues2;
     const typeboxSubValidator = (schema2) => {
       let mirror;
       if (normalize === !0 || normalize === "exactMirror")
@@ -353,13 +360,13 @@ const isOptional = (schema) => schema ? schema?.[import_typebox.Kind] === "Impor
       checkFunc: () => {
       },
       code: "",
-      // @ts-ignore
       Check: Check2,
+      Validate: Validate2,
       // @ts-ignore
-      Errors: (value) => Check2(value)?.then?.((x) => x?.issues),
+      Errors: (value) => Validate2(value)?.then?.((x) => x?.issues),
       Code: () => "",
       // @ts-ignore
-      Decode: Check2,
+      Decode: Validate2,
       // @ts-ignore
       Encode: (value) => value,
       hasAdditionalProperties: !1,

package/dist/schema.mjs

@@ -250,13 +250,20 @@ const isOptional = (schema) => schema ? schema?.[Kind] === "Import" && schema.Re
   if ("~standard" in schema || validators?.length && validators.some(
     (x) => x && typeof x != "string" && "~standard" in x
   )) {
-    let Check2 = function(value, validated = !1) {
-      let v = validated ? value : mainCheck.validate(value);
+    let Validate2 = function(value) {
+      const v = mainCheck.validate(value);
       if (v instanceof Promise)
-        return v.then((v2) => Check2(v2, !0));
+        return v.then((resolved) => {
+          if (resolved.issues) return resolved;
+          const values2 = [];
+          return resolved && typeof resolved == "object" && values2.push(resolved.value), runCheckers2(value, 0, values2, resolved);
+        });
       if (v.issues) return v;
       const values = [];
       return v && typeof v == "object" && values.push(v.value), runCheckers2(value, 0, values, v);
+    }, Check2 = function(value) {
+      const v = Validate2(value);
+      return v instanceof Promise ? !1 : !v.issues;
     }, runCheckers2 = function(value, startIndex, values, lastV) {
       for (let i = startIndex; i < checkers.length; i++) {
         let v = checkers[i].validate(value);
@@ -280,7 +287,7 @@ const isOptional = (schema) => schema ? schema?.[Kind] === "Import" && schema.Re
         newValue = mergeDeep(newValue, values[i]);
       return { value: newValue };
     };
-    var Check = Check2, runCheckers = runCheckers2, mergeValues = mergeValues2;
+    var Validate = Validate2, Check = Check2, runCheckers = runCheckers2, mergeValues = mergeValues2;
     const typeboxSubValidator = (schema2) => {
       let mirror;
       if (normalize === !0 || normalize === "exactMirror")
@@ -335,13 +342,13 @@ const isOptional = (schema) => schema ? schema?.[Kind] === "Import" && schema.Re
       checkFunc: () => {
       },
       code: "",
-      // @ts-ignore
       Check: Check2,
+      Validate: Validate2,
       // @ts-ignore
-      Errors: (value) => Check2(value)?.then?.((x) => x?.issues),
+      Errors: (value) => Validate2(value)?.then?.((x) => x?.issues),
       Code: () => "",
       // @ts-ignore
-      Decode: Check2,
+      Decode: Validate2,
       // @ts-ignore
       Encode: (value) => value,
       hasAdditionalProperties: !1,

package/dist/ws/index.js

@@ -22,6 +22,9 @@ __export(ws_exports, {
 });
 module.exports = __toCommonJS(ws_exports);
 var import_utils = require('../utils.js'), import_error = require('../error.js');
+function isInvalidResponse(validator, data) {
+  return validator ? validator.provider === "standard" ? validator.schema["~standard"].validate(data).issues : validator.Check(data) === !1 : !1;
+}
 const websocket = {
   open(ws) {
     ws.data.open?.(ws);
@@ -60,7 +63,7 @@ class ElysiaWS {
    * ws.send(new Uint8Array([1, 2, 3, 4]));
    */
   send(data, compress) {
-    return Buffer.isBuffer(data) ? this.raw.send(data, compress) : this.validator?.Check(data) === !1 ? this.raw.send(
+    return Buffer.isBuffer(data) ? this.raw.send(data, compress) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new import_error.ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.send(data, compress));
   }
@@ -70,7 +73,7 @@ class ElysiaWS {
    * @param data The data to send
    */
   ping(data) {
-    return Buffer.isBuffer(data) ? this.raw.ping(data) : this.validator?.Check(data) === !1 ? this.raw.send(
+    return Buffer.isBuffer(data) ? this.raw.ping(data) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new import_error.ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.ping(data));
   }
@@ -80,7 +83,7 @@ class ElysiaWS {
    * @param data The data to send
    */
   pong(data) {
-    return Buffer.isBuffer(data) ? this.raw.pong(data) : this.validator?.Check(data) === !1 ? this.raw.send(
+    return Buffer.isBuffer(data) ? this.raw.pong(data) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new import_error.ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.pong(data));
   }
@@ -100,7 +103,7 @@ class ElysiaWS {
       topic,
       data,
       compress
-    ) : this.validator?.Check(data) === !1 ? this.raw.send(
+    ) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new import_error.ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.publish(topic, data, compress));
   }
@@ -136,19 +139,15 @@ const createWSMessageParser = (parse) => {
       return data.then((data2) => handleWSResponse(ws, data2));
     if (Buffer.isBuffer(data)) return ws.send(data.toString());
     if (data === void 0) return;
-    const validateResponse = responseValidator ? (
-      // @ts-ignore
-      responseValidator.provider === "standard" ? (data2) => (
-        // @ts-ignore
-        responseValidator.schema["~standard"].validate(data2).issues
-      ) : (data2) => responseValidator.Check(data2) === !1
-    ) : void 0, send = (datum) => {
-      if (validateResponse && validateResponse(datum) === !1)
-        return ws.send(
-          new import_error.ValidationError("message", responseValidator, datum).message
-        );
-      if (typeof datum == "object") return ws.send(JSON.stringify(datum));
-      ws.send(datum);
+    const send = (datum) => {
+      if (datum !== void 0) {
+        if (isInvalidResponse(responseValidator, datum))
+          return ws.send(
+            new import_error.ValidationError("message", responseValidator, datum).message
+          );
+        if (typeof datum == "object") return ws.send(JSON.stringify(datum));
+        ws.send(datum);
+      }
     };
     if (typeof data?.next != "function")
       return void send(data);
@@ -156,14 +155,6 @@ const createWSMessageParser = (parse) => {
     if (init instanceof Promise)
       return (async () => {
         const first = await init;
-        if (validateResponse && validateResponse(first))
-          return ws.send(
-            new import_error.ValidationError(
-              "message",
-              responseValidator,
-              first
-            ).message
-          );
         if (send(first.value), !first.done)
           for await (const datum of data) send(datum);
       })();

package/dist/ws/index.mjs

@@ -1,5 +1,8 @@
 import { isNumericString } from "../utils.mjs";
 import { ValidationError } from "../error.mjs";
+function isInvalidResponse(validator, data) {
+  return validator ? validator.provider === "standard" ? validator.schema["~standard"].validate(data).issues : validator.Check(data) === !1 : !1;
+}
 const websocket = {
   open(ws) {
     ws.data.open?.(ws);
@@ -38,7 +41,7 @@ class ElysiaWS {
    * ws.send(new Uint8Array([1, 2, 3, 4]));
    */
   send(data, compress) {
-    return Buffer.isBuffer(data) ? this.raw.send(data, compress) : this.validator?.Check(data) === !1 ? this.raw.send(
+    return Buffer.isBuffer(data) ? this.raw.send(data, compress) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.send(data, compress));
   }
@@ -48,7 +51,7 @@ class ElysiaWS {
    * @param data The data to send
    */
   ping(data) {
-    return Buffer.isBuffer(data) ? this.raw.ping(data) : this.validator?.Check(data) === !1 ? this.raw.send(
+    return Buffer.isBuffer(data) ? this.raw.ping(data) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.ping(data));
   }
@@ -58,7 +61,7 @@ class ElysiaWS {
    * @param data The data to send
    */
   pong(data) {
-    return Buffer.isBuffer(data) ? this.raw.pong(data) : this.validator?.Check(data) === !1 ? this.raw.send(
+    return Buffer.isBuffer(data) ? this.raw.pong(data) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.pong(data));
   }
@@ -78,7 +81,7 @@ class ElysiaWS {
       topic,
       data,
       compress
-    ) : this.validator?.Check(data) === !1 ? this.raw.send(
+    ) : isInvalidResponse(this.validator, data) ? this.raw.send(
       new ValidationError("message", this.validator, data).message
     ) : (typeof data == "object" && (data = JSON.stringify(data)), this.raw.publish(topic, data, compress));
   }
@@ -114,19 +117,15 @@ const createWSMessageParser = (parse) => {
       return data.then((data2) => handleWSResponse(ws, data2));
     if (Buffer.isBuffer(data)) return ws.send(data.toString());
     if (data === void 0) return;
-    const validateResponse = responseValidator ? (
-      // @ts-ignore
-      responseValidator.provider === "standard" ? (data2) => (
-        // @ts-ignore
-        responseValidator.schema["~standard"].validate(data2).issues
-      ) : (data2) => responseValidator.Check(data2) === !1
-    ) : void 0, send = (datum) => {
-      if (validateResponse && validateResponse(datum) === !1)
-        return ws.send(
-          new ValidationError("message", responseValidator, datum).message
-        );
-      if (typeof datum == "object") return ws.send(JSON.stringify(datum));
-      ws.send(datum);
+    const send = (datum) => {
+      if (datum !== void 0) {
+        if (isInvalidResponse(responseValidator, datum))
+          return ws.send(
+            new ValidationError("message", responseValidator, datum).message
+          );
+        if (typeof datum == "object") return ws.send(JSON.stringify(datum));
+        ws.send(datum);
+      }
     };
     if (typeof data?.next != "function")
       return void send(data);
@@ -134,14 +133,6 @@ const createWSMessageParser = (parse) => {
     if (init instanceof Promise)
       return (async () => {
         const first = await init;
-        if (validateResponse && validateResponse(first))
-          return ws.send(
-            new ValidationError(
-              "message",
-              responseValidator,
-              first
-            ).message
-          );
         if (send(first.value), !first.done)
           for await (const datum of data) send(datum);
       })();

package/package.json

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