elysia 0.6.21 → 0.6.23

package/dist/cjs/index.d.ts

@@ -502,10 +502,10 @@ export default class Elysia<BasePath extends string = '', Instance extends Elysi
         schema: Instance['schema'];
         meta: Instance['meta'];
     }>;
-    decorate<const Decorators extends Record<string, unknown>>(name: Decorators): Elysia<BasePath, {
+    decorate<Decorators extends Record<string, unknown>>(name: Decorators): Elysia<BasePath, {
         store: Instance['store'];
         error: Instance['error'];
-        request: Reconciliation<Instance['request'], DeepWritable<Decorators>>;
+        request: Reconciliation<Instance['request'], Decorators>;
         schema: Instance['schema'];
         meta: Instance['meta'];
     }>;

package/dist/cjs/utils.d.ts

@@ -1,9 +1,9 @@
 import { TSchema } from '@sinclair/typebox';
 import { TypeCheck } from '@sinclair/typebox/compiler';
-import type { ElysiaInstance, DeepMergeTwoTypes, LifeCycleStore, LocalHook, TypedSchema, RegisteredHook, WithArray } from './types';
+import type { ElysiaInstance, LifeCycleStore, LocalHook, TypedSchema, RegisteredHook, WithArray } from './types';
+export declare const mergeDeep: any;
 export declare const mergeObjectArray: <T>(a: T | T[], b: T | T[]) => T[];
 export declare const mergeHook: (a: LocalHook<any, any> | LifeCycleStore<any>, b: LocalHook<any, any>) => RegisteredHook<any>;
-export declare const mergeDeep: <A extends Object = Object, B extends Object = Object>(target: A, source: B) => DeepMergeTwoTypes<A, B>;
 export declare const getSchemaValidator: (s: TSchema | string | undefined, { models, additionalProperties, dynamic }: {
     models?: Record<string, TSchema> | undefined;
     additionalProperties?: boolean | undefined;

package/dist/cjs/utils.js

@@ -1,9 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterGlobalHook = exports.asGlobal = exports.asGlobalHook = exports.mergeLifeCycle = exports.checksum = exports.getResponseSchemaValidator = exports.getSchemaValidator = exports.mergeDeep = exports.mergeHook = exports.mergeObjectArray = void 0;
+exports.filterGlobalHook = exports.asGlobal = exports.asGlobalHook = exports.mergeLifeCycle = exports.checksum = exports.getResponseSchemaValidator = exports.getSchemaValidator = exports.mergeHook = exports.mergeObjectArray = exports.mergeDeep = void 0;
 const typebox_1 = require("@sinclair/typebox");
 const value_1 = require("@sinclair/typebox/value");
 const compiler_1 = require("@sinclair/typebox/compiler");
+const mergician_1 = __importDefault(require("mergician"));
+exports.mergeDeep = (0, mergician_1.default)({
+    appendArrays: true
+});
 const mergeObjectArray = (a, b) => {
     const array = [...(Array.isArray(a) ? a : [a])];
     const checksums = [];
@@ -36,25 +43,6 @@ const mergeHook = (a, b) => {
     };
 };
 exports.mergeHook = mergeHook;
-const isObject = (item) => item && typeof item === 'object' && !Array.isArray(item);
-const mergeDeep = (target, source) => {
-    const output = Object.assign({}, target);
-    if (isObject(target) && isObject(source)) {
-        Object.keys(source).forEach((key) => {
-            if (isObject(source[key])) {
-                if (!(key in target))
-                    Object.assign(output, { [key]: source[key] });
-                else
-                    output[key] = (0, exports.mergeDeep)(target[key], source[key]);
-            }
-            else {
-                Object.assign(output, { [key]: source[key] });
-            }
-        });
-    }
-    return output;
-};
-exports.mergeDeep = mergeDeep;
 const getSchemaValidator = (s, { models = {}, additionalProperties = false, dynamic = false }) => {
     if (!s)
         return;

package/dist/index.d.ts

@@ -502,10 +502,10 @@ export default class Elysia<BasePath extends string = '', Instance extends Elysi
         schema: Instance['schema'];
         meta: Instance['meta'];
     }>;
-    decorate<const Decorators extends Record<string, unknown>>(name: Decorators): Elysia<BasePath, {
+    decorate<Decorators extends Record<string, unknown>>(name: Decorators): Elysia<BasePath, {
         store: Instance['store'];
         error: Instance['error'];
-        request: Reconciliation<Instance['request'], DeepWritable<Decorators>>;
+        request: Reconciliation<Instance['request'], Decorators>;
         schema: Instance['schema'];
         meta: Instance['meta'];
     }>;

package/dist/utils.d.ts

@@ -1,9 +1,9 @@
 import { TSchema } from '@sinclair/typebox';
 import { TypeCheck } from '@sinclair/typebox/compiler';
-import type { ElysiaInstance, DeepMergeTwoTypes, LifeCycleStore, LocalHook, TypedSchema, RegisteredHook, WithArray } from './types';
+import type { ElysiaInstance, LifeCycleStore, LocalHook, TypedSchema, RegisteredHook, WithArray } from './types';
+export declare const mergeDeep: any;
 export declare const mergeObjectArray: <T>(a: T | T[], b: T | T[]) => T[];
 export declare const mergeHook: (a: LocalHook<any, any> | LifeCycleStore<any>, b: LocalHook<any, any>) => RegisteredHook<any>;
-export declare const mergeDeep: <A extends Object = Object, B extends Object = Object>(target: A, source: B) => DeepMergeTwoTypes<A, B>;
 export declare const getSchemaValidator: (s: TSchema | string | undefined, { models, additionalProperties, dynamic }: {
     models?: Record<string, TSchema> | undefined;
     additionalProperties?: boolean | undefined;

package/dist/utils.js

@@ -1 +1 @@
-import{Kind as e}from"@sinclair/typebox";import{Value as r}from"@sinclair/typebox/value";import{TypeCompiler as o}from"@sinclair/typebox/compiler";export const mergeObjectArray=(e,r)=>{let o=[...Array.isArray(e)?e:[e]],t=[];for(let e of o)e.$elysiaChecksum&&t.push(e.$elysiaChecksum);for(let e of Array.isArray(r)?r:[r])t.includes(e?.$elysiaChecksum)||o.push(e);return o};export const mergeHook=(e,r)=>({body:r?.body??e?.body,headers:r?.headers??e?.headers,params:r?.params??e?.params,query:r?.query??e?.query,response:r?.response??e?.response,type:e?.type||r?.type,detail:mergeDeep(r?.detail??{},e?.detail??{}),parse:mergeObjectArray(e.parse??[],r?.parse??[]),transform:mergeObjectArray(e.transform??[],r?.transform??[]),beforeHandle:mergeObjectArray(e.beforeHandle??[],r?.beforeHandle??[]),afterHandle:mergeObjectArray(e.afterHandle??[],r?.afterHandle??[]),onResponse:mergeObjectArray(e.onResponse??[],r?.onResponse??[]),error:mergeObjectArray(e.error??[],r?.error??[])});let t=e=>e&&"object"==typeof e&&!Array.isArray(e);export const mergeDeep=(e,r)=>{let o=Object.assign({},e);return t(e)&&t(r)&&Object.keys(r).forEach(a=>{t(r[a])&&a in e?o[a]=mergeDeep(e[a],r[a]):Object.assign(o,{[a]:r[a]})}),o};export const getSchemaValidator=(e,{models:t={},additionalProperties:a=!1,dynamic:s=!1})=>{if(!e||"string"==typeof e&&!(e in t))return;let n="string"==typeof e?t[e]:e;return("object"===n.type&&"additionalProperties"in n==!1&&(n.additionalProperties=a),s)?{schema:n,references:"",checkFunc:()=>{},code:"",Check:e=>r.Check(n,e),Errors:e=>r.Errors(n,e),Code:()=>""}:o.Compile(n)};export const getResponseSchemaValidator=(t,{models:a={},additionalProperties:s=!1,dynamic:n=!1})=>{if(!t||"string"==typeof t&&!(t in a))return;let l="string"==typeof t?a[t]:t,p=e=>n?{schema:e,references:"",checkFunc:()=>{},code:"",Check:o=>r.Check(e,o),Errors:o=>r.Errors(e,o),Code:()=>""}:o.Compile(e);if(e in l)return{200:p(l)};let i={};return Object.keys(l).forEach(r=>{let o=l[r];if("string"==typeof o){if(o in a){let t=a[o];t.type,i[+r]=e in t?p(t):t}return}"object"===o.type&&"additionalProperties"in o==!1&&(o.additionalProperties=s),i[+r]=e in o?p(o):o}),i};export const checksum=e=>{let r=9;for(let o=0;o<e.length;)r=Math.imul(r^e.charCodeAt(o++),387420489);return r^r>>>9};export const mergeLifeCycle=(e,r,o)=>{let t=e=>(o&&(e.$elysiaChecksum=o),e);return{start:mergeObjectArray(e.start,("start"in r?r.start:[]).map(t)),request:mergeObjectArray(e.request,("request"in r?r.request:[]).map(t)),parse:mergeObjectArray(e.parse,r?.parse??[]).map(t),transform:mergeObjectArray(e.transform,(r?.transform??[]).map(t)),beforeHandle:mergeObjectArray(e.beforeHandle,(r?.beforeHandle??[]).map(t)),afterHandle:mergeObjectArray(e.afterHandle,(r?.afterHandle??[]).map(t)),onResponse:mergeObjectArray(e.onResponse,(r?.onResponse??[]).map(t)),error:mergeObjectArray(e.error,(r?.error??[]).map(t)),stop:mergeObjectArray(e.stop,("stop"in r?r.stop:[]).map(t))}};export const asGlobalHook=(e,r=!0)=>({...e,type:e?.type,detail:e?.detail,parse:asGlobal(e?.parse,r),transform:asGlobal(e?.transform,r),beforeHandle:asGlobal(e?.beforeHandle,r),afterHandle:asGlobal(e?.afterHandle,r),onResponse:asGlobal(e?.onResponse,r),error:asGlobal(e?.error,r)});export const asGlobal=(e,r=!0)=>e?"function"==typeof e?(r?e.$elysiaHookType="global":e.$elysiaHookType=void 0,e):e.map(e=>(r?e.$elysiaHookType="global":e.$elysiaHookType=void 0,e)):e;let a=e=>e?"function"==typeof e?"global"===e.$elysiaHookType?e:void 0:e.filter(e=>"global"===e.$elysiaHookType):e;export const filterGlobalHook=e=>({...e,type:e?.type,detail:e?.detail,parse:a(e?.parse),transform:a(e?.transform),beforeHandle:a(e?.beforeHandle),afterHandle:a(e?.afterHandle),onResponse:a(e?.onResponse),error:a(e?.error)});
+import{Kind as e}from"@sinclair/typebox";import{Value as r}from"@sinclair/typebox/value";import{TypeCompiler as o}from"@sinclair/typebox/compiler";import a from"mergician";export const mergeDeep=a({appendArrays:!0});export const mergeObjectArray=(e,r)=>{let o=[...Array.isArray(e)?e:[e]],a=[];for(let e of o)e.$elysiaChecksum&&a.push(e.$elysiaChecksum);for(let e of Array.isArray(r)?r:[r])a.includes(e?.$elysiaChecksum)||o.push(e);return o};export const mergeHook=(e,r)=>({body:r?.body??e?.body,headers:r?.headers??e?.headers,params:r?.params??e?.params,query:r?.query??e?.query,response:r?.response??e?.response,type:e?.type||r?.type,detail:mergeDeep(r?.detail??{},e?.detail??{}),parse:mergeObjectArray(e.parse??[],r?.parse??[]),transform:mergeObjectArray(e.transform??[],r?.transform??[]),beforeHandle:mergeObjectArray(e.beforeHandle??[],r?.beforeHandle??[]),afterHandle:mergeObjectArray(e.afterHandle??[],r?.afterHandle??[]),onResponse:mergeObjectArray(e.onResponse??[],r?.onResponse??[]),error:mergeObjectArray(e.error??[],r?.error??[])});export const getSchemaValidator=(e,{models:a={},additionalProperties:t=!1,dynamic:s=!1})=>{if(!e||"string"==typeof e&&!(e in a))return;let n="string"==typeof e?a[e]:e;return("object"===n.type&&"additionalProperties"in n==!1&&(n.additionalProperties=t),s)?{schema:n,references:"",checkFunc:()=>{},code:"",Check:e=>r.Check(n,e),Errors:e=>r.Errors(n,e),Code:()=>""}:o.Compile(n)};export const getResponseSchemaValidator=(a,{models:t={},additionalProperties:s=!1,dynamic:n=!1})=>{if(!a||"string"==typeof a&&!(a in t))return;let l="string"==typeof a?t[a]:a,p=e=>n?{schema:e,references:"",checkFunc:()=>{},code:"",Check:o=>r.Check(e,o),Errors:o=>r.Errors(e,o),Code:()=>""}:o.Compile(e);if(e in l)return{200:p(l)};let i={};return Object.keys(l).forEach(r=>{let o=l[r];if("string"==typeof o){if(o in t){let a=t[o];a.type,i[+r]=e in a?p(a):a}return}"object"===o.type&&"additionalProperties"in o==!1&&(o.additionalProperties=s),i[+r]=e in o?p(o):o}),i};export const checksum=e=>{let r=9;for(let o=0;o<e.length;)r=Math.imul(r^e.charCodeAt(o++),387420489);return r^r>>>9};export const mergeLifeCycle=(e,r,o)=>{let a=e=>(o&&(e.$elysiaChecksum=o),e);return{start:mergeObjectArray(e.start,("start"in r?r.start:[]).map(a)),request:mergeObjectArray(e.request,("request"in r?r.request:[]).map(a)),parse:mergeObjectArray(e.parse,r?.parse??[]).map(a),transform:mergeObjectArray(e.transform,(r?.transform??[]).map(a)),beforeHandle:mergeObjectArray(e.beforeHandle,(r?.beforeHandle??[]).map(a)),afterHandle:mergeObjectArray(e.afterHandle,(r?.afterHandle??[]).map(a)),onResponse:mergeObjectArray(e.onResponse,(r?.onResponse??[]).map(a)),error:mergeObjectArray(e.error,(r?.error??[]).map(a)),stop:mergeObjectArray(e.stop,("stop"in r?r.stop:[]).map(a))}};export const asGlobalHook=(e,r=!0)=>({...e,type:e?.type,detail:e?.detail,parse:asGlobal(e?.parse,r),transform:asGlobal(e?.transform,r),beforeHandle:asGlobal(e?.beforeHandle,r),afterHandle:asGlobal(e?.afterHandle,r),onResponse:asGlobal(e?.onResponse,r),error:asGlobal(e?.error,r)});export const asGlobal=(e,r=!0)=>e?"function"==typeof e?(r?e.$elysiaHookType="global":e.$elysiaHookType=void 0,e):e.map(e=>(r?e.$elysiaHookType="global":e.$elysiaHookType=void 0,e)):e;let t=e=>e?"function"==typeof e?"global"===e.$elysiaHookType?e:void 0:e.filter(e=>"global"===e.$elysiaHookType):e;export const filterGlobalHook=e=>({...e,type:e?.type,detail:e?.detail,parse:t(e?.parse),transform:t(e?.transform),beforeHandle:t(e?.beforeHandle),afterHandle:t(e?.afterHandle),onResponse:t(e?.onResponse),error:t(e?.error)});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elysia",
   "description": "Fast, and friendly Bun web framework",
-  "version": "0.6.21",
+  "version": "0.6.23",
   "author": {
     "name": "saltyAom",
     "url": "https://github.com/SaltyAom",
@@ -113,6 +113,7 @@
     "@sinclair/typebox": "^0.30.4",
     "fast-querystring": "^1.1.2",
     "memoirist": "0.1.4",
+    "mergician": "^1.1.0",
     "openapi-types": "^12.1.3"
   },
   "devDependencies": {