@elysiajs/eden 0.3.0 → 0.3.2

package/dist/fetch/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bun-types" />
 import type { Elysia, SCHEMA } from 'elysia';
 import type { EdenFetchError } from '../utils';
 import type { MapError, IsUnknown, IsNever } from '../types';

package/dist/fetch.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("./utils-0d7d9b21.js"),h=(o,p)=>async(n,{params:i,body:a,...c}={})=>{var u;i&&Object.entries(i).forEach(([e,t])=>{n=n.replace(`:${e}`,t)});const s=(u=c.headers)==null?void 0:u["Content-Type"];return(!s||s==="application/json")&&(a=JSON.stringify(a)),fetch(o+n,{...c,headers:{"content-type":"application/json",...c.headers},body:a}).then(async e=>{var l;let t;switch((l=e.headers.get("Content-Type"))==null?void 0:l.split(";")[0]){case"application/json":t=await e.json();break;default:t=await e.text().then(r=>Number.isNaN(+r)?r==="true"?!0:r==="false"?!1:r:+r)}return e.status>300?{data:null,error:new f.EdenFetchError(e.status,t)}:{data:t,error:null}})};exports.edenFetch=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("./utils-0d7d9b21.js"),o=(f,p)=>async(c,{params:i,body:a,...n}={})=>{var u;i&&Object.entries(i).forEach(([e,t])=>{c=c.replace(`:${e}`,t)});const s=(u=n.headers)==null?void 0:u["Content-Type"];if(!s||s==="application/json")try{a=JSON.stringify(a)}catch{}return fetch(f+c,{...n,headers:a?{"content-type":"application/json",...n.headers}:n.headers,body:a}).then(async e=>{var l;let t;switch((l=e.headers.get("Content-Type"))==null?void 0:l.split(";")[0]){case"application/json":t=await e.json();break;default:t=await e.text().then(r=>Number.isNaN(+r)?r==="true"?!0:r==="false"?!1:r:+r);break}return e.status>300?{data:null,error:new h.EdenFetchError(e.status,t)}:{data:t,error:null}})};exports.edenFetch=o;

package/dist/fetch.mjs

@@ -1,18 +1,23 @@
-import { E as o } from "./utils-0d2b8b1a.mjs";
-const j = (l, h) => (
+import { E as l } from "./utils-0d2b8b1a.mjs";
+const j = (h, o) => (
   // @ts-ignore
-  async (n, { params: i, body: a, ...c } = {}) => {
+  async (c, { params: s, body: a, ...n } = {}) => {
     var u;
-    i && Object.entries(i).forEach(([e, t]) => {
-      n = n.replace(`:${e}`, t);
+    s && Object.entries(s).forEach(([e, t]) => {
+      c = c.replace(`:${e}`, t);
     });
-    const s = (u = c.headers) == null ? void 0 : u["Content-Type"];
-    return (!s || s === "application/json") && (a = JSON.stringify(a)), fetch(l + n, {
-      ...c,
-      headers: {
+    const i = (u = n.headers) == null ? void 0 : u["Content-Type"];
+    if (!i || i === "application/json")
+      try {
+        a = JSON.stringify(a);
+      } catch {
+      }
+    return fetch(h + c, {
+      ...n,
+      headers: a ? {
         "content-type": "application/json",
-        ...c.headers
-      },
+        ...n.headers
+      } : n.headers,
       body: a
     }).then(async (e) => {
       var f;
@@ -23,10 +28,11 @@ const j = (l, h) => (
           break;
         default:
           t = await e.text().then((r) => Number.isNaN(+r) ? r === "true" ? !0 : r === "false" ? !1 : r : +r);
+          break;
       }
       return e.status > 300 ? {
         data: null,
-        error: new o(e.status, t)
+        error: new l(e.status, t)
       } : { data: t, error: null };
     });
   }

package/dist/fn/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bun-types" />
 import type { Elysia, EXPOSED } from 'elysia';
 export declare namespace EdenFn {
     type Create<App extends Elysia<any>> = App['meta'] extends Record<typeof EXPOSED, infer Schema extends Record<string, any>> ? EdenFn.Compose<Schema> : 'Please install Elysia before using Eden';

package/dist/treaty/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bun-types" />
 import type { Elysia, TypedSchema } from 'elysia';
 import type { EdenTreaty } from './types';
 export type { EdenTreaty } from './types';

package/dist/treaty/types.d.ts

@@ -1,8 +1,10 @@
-/// <reference types="bun-types" />
 import type { Elysia, SCHEMA, AnyTypedSchema } from 'elysia';
 import type { EdenWS } from './index';
 import type { IsNever, IsUnknown, MapError, UnionToIntersect } from '../types';
 import { EdenFetchError } from '../utils';
+type Replace<RecordType, TargetType, GenericType> = {
+    [K in keyof RecordType]: RecordType[K] extends TargetType ? GenericType : RecordType[K];
+};
 export declare namespace EdenTreaty {
     type Create<App extends Elysia<any>> = App['meta'] extends Record<typeof SCHEMA, infer Schema extends Record<string, any>> ? EdenTreaty.Sign<Schema> : 'Please install Elysia before using Eden';
     interface Config {
@@ -24,7 +26,7 @@ export declare namespace EdenTreaty {
             } | {
                 data: null;
                 error: MapError<Route['response']> extends infer Errors ? IsNever<Errors> extends true ? EdenFetchError<number, string> : Errors : EdenFetchError<number, string>;
-            }> : (params: Route['body'] & {
+            }> : (params: Replace<Route['body'], Blob | Blob[], File | FileList> & {
                 $query?: Record<string, string>;
                 $fetch?: RequestInit;
             }) => Promise<{
@@ -52,7 +54,7 @@ export declare namespace EdenTreaty {
             } | {
                 data: null;
                 error: MapError<Route['response']> extends infer Errors ? IsNever<Errors> extends true ? EdenFetchError<number, string> : Errors : EdenFetchError<number, string>;
-            }> : (params: Route['body'] & {
+            }> : (params: Replace<Route['body'], Blob | Blob[], File | FileList> & {
                 $query?: Record<string, string>;
                 $fetch?: RequestInit;
             }) => Promise<{
@@ -77,5 +79,5 @@ export declare namespace EdenTreaty {
         $query?: Record<string, string>;
     }
 }
-type NestPath<T extends string, V> = T extends `${infer First}/${infer Rest}` ? First extends `:${infer Parameter}` ? Record<string | number | `:${Parameter}`, NestPath<Rest, V>> : Record<First, NestPath<Rest, V>> : T extends `:${infer Parameter}` ? Record<string | number | T, V> : Record<T, V>;
+type NestPath<T extends string, V> = T extends `${infer First}/${infer Rest}` ? First extends `:${infer Parameter}` ? Record<(string & {}) | number | `:${Parameter}`, NestPath<Rest, V>> : Record<First, NestPath<Rest, V>> : T extends `:${infer Parameter}` ? Record<(string & {}) | number | T, V> : Record<T, V>;
 export {};

package/dist/treaty.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("./utils-0d7d9b21.js"),p=(n,e,t)=>{if(n.endsWith("/")||(n+="/"),e==="index"&&(e=""),!t||!Object.keys(t).length)return`${n}${e}`;let s="";for(const[i,r]of Object.entries(t))s+=`${i}=${r}&`;return`${n}${e}?${s.slice(0,-1)}`};class v{constructor(e){this.ws=new WebSocket(e),this.url=e}send(e){return Array.isArray(e)?(e.forEach(t=>this.send(t)),this):(this.ws.send(typeof e=="object"?JSON.stringify(e):e.toString()),this)}on(e,t,s){return this.addEventListener(e,t,s)}off(e,t,s){return this.ws.removeEventListener(e,t,s),this}subscribe(e,t){return this.addEventListener("message",e,t)}addEventListener(e,t,s){return this.ws.addEventListener(e,i=>{if(e==="message"){let r=i.data.toString();const o=r.charCodeAt(0);if(o===47||o===123)try{r=JSON.parse(r)}catch{}else Number.isNaN(+r)?r==="true"?r=!0:r==="fase"&&(r=!1):r=+r;t({...i,data:r})}else t(i)},s),this}removeEventListener(e,t,s){return this.off(e,t,s),this}close(){return this.ws.close(),this}}const w=(n,e="",t)=>new Proxy(()=>{},{get(s,i,r){return w(n,`${e}/${i.toString()}`)},apply(s,i,[{$query:r,$fetch:o,$body:E,...d}={$fetch:void 0,$query:void 0,$body:void 0}]=[{}]){const h=e.lastIndexOf("/"),y=e.slice(h+1),f=p(n,e.slice(0,h),r);if(y==="subscribe")return new v(f.replace(/^([^]+):\/\//,f.startsWith("https://")?"wss://":"ws://"));const l=E??(Object.keys(d).length?d:void 0),g=typeof l=="object";return fetch(f,{method:y,body:g?JSON.stringify(l):l,...o,headers:l?{"content-type":g?"application/json":"text/plain",...o==null?void 0:o.headers}:void 0}).then(async c=>{var b;let u;switch((b=c.headers.get("Content-Type"))==null?void 0:b.split(";")[0]){case"application/json":u=await c.json();break;default:u=await c.text().then(a=>Number.isNaN(+a)?a==="true"?!0:a==="false"?!1:a:+a)}return c.status>300?{data:u,error:new S.EdenFetchError(c.status,await u)}:{data:u,error:null}})}}),j=(n,e={})=>new Proxy({},{get(t,s){return w(n,s)}});exports.EdenWS=v;exports.edenTreaty=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const L=require("./utils-0d7d9b21.js"),N=(r,e,t)=>{if(r.endsWith("/")||(r+="/"),e==="index"&&(e=""),!t||!Object.keys(t).length)return`${r}${e}`;let n="";for(const[f,s]of Object.entries(t))n+=`${f}=${s}&`;return`${r}${e}?${n.slice(0,-1)}`},b=r=>typeof FileList>"u"?!1:r instanceof FileList||r instanceof File,O=r=>{for(let e in r){if(b(r[e]))return!0;if(Array.isArray(r[e])&&r[e].find(t=>b(t)))return!0}return!1},v=r=>new Promise(e=>{const t=new FileReader;t.onload=()=>{e(new Blob([t.result],{type:r.type}))},t.readAsArrayBuffer(r)});class E{constructor(e){this.ws=new WebSocket(e),this.url=e}send(e){return Array.isArray(e)?(e.forEach(t=>this.send(t)),this):(this.ws.send(typeof e=="object"?JSON.stringify(e):e.toString()),this)}on(e,t,n){return this.addEventListener(e,t,n)}off(e,t,n){return this.ws.removeEventListener(e,t,n),this}subscribe(e,t){return this.addEventListener("message",e,t)}addEventListener(e,t,n){return this.ws.addEventListener(e,f=>{if(e==="message"){let s=f.data.toString();const i=s.charCodeAt(0);if(i===47||i===123)try{s=JSON.parse(s)}catch{}else Number.isNaN(+s)?s==="true"?s=!0:s==="fase"&&(s=!1):s=+s;t({...f,data:s})}else t(f)},n),this}removeEventListener(e,t,n){return this.off(e,t,n),this}close(){return this.ws.close(),this}}const F=(r,e="",t)=>new Proxy(()=>{},{get(n,f,s){return F(r,`${e}/${f.toString()}`)},apply(n,f,[{$query:s,$fetch:i,$body:S,...w}={$fetch:void 0,$query:void 0,$body:void 0}]=[{}]){const g=e.lastIndexOf("/"),p=e.slice(g+1),d=N(r,e.slice(0,g),s);return p==="subscribe"?new E(d.replace(/^([^]+):\/\//,d.startsWith("https://")?"wss://":"ws://")):(async()=>{let c=S??(Object.keys(w).length?w:void 0);const y=typeof c=="object",h=y&&O(c);if(h){const o=new FormData;for(const[a,l]of Object.entries(c))if(l instanceof File)o.append(a,await v(l));else if(l instanceof FileList)for(let u=0;u<l.length;u++)o.append(a,await v(l[u]));else o.append(a,l);c=o}else y&&(c=JSON.stringify(c));return fetch(d,{method:p,body:c,...i,headers:c?h?i==null?void 0:i.headers:{"content-type":y?"application/json":"text/plain",...i==null?void 0:i.headers}:i==null?void 0:i.headers}).then(async o=>{var l;let a;switch((l=o.headers.get("Content-Type"))==null?void 0:l.split(";")[0]){case"application/json":a=await o.json();break;default:a=await o.text().then(u=>Number.isNaN(+u)?u==="true"?!0:u==="false"?!1:u:+u)}return o.status>300?{data:a,error:new L.EdenFetchError(o.status,await a)}:{data:a,error:null}})})()}}),m=(r,e={})=>new Proxy({},{get(t,n){return F(r,n)}});exports.EdenWS=E;exports.edenTreaty=m;

package/dist/treaty.mjs

@@ -1,13 +1,26 @@
-import { E as p } from "./utils-0d2b8b1a.mjs";
-const E = (n, e, t) => {
-  if (n.endsWith("/") || (n += "/"), e === "index" && (e = ""), !t || !Object.keys(t).length)
-    return `${n}${e}`;
-  let s = "";
-  for (const [i, r] of Object.entries(t))
-    s += `${i}=${r}&`;
-  return `${n}${e}?${s.slice(0, -1)}`;
-};
-class N {
+import { E as m } from "./utils-0d2b8b1a.mjs";
+const L = (r, e, t) => {
+  if (r.endsWith("/") || (r += "/"), e === "index" && (e = ""), !t || !Object.keys(t).length)
+    return `${r}${e}`;
+  let n = "";
+  for (const [f, s] of Object.entries(t))
+    n += `${f}=${s}&`;
+  return `${r}${e}?${n.slice(0, -1)}`;
+}, b = (r) => typeof FileList > "u" ? !1 : r instanceof FileList || r instanceof File, N = (r) => {
+  for (let e in r) {
+    if (b(r[e]))
+      return !0;
+    if (Array.isArray(r[e]) && r[e].find((t) => b(t)))
+      return !0;
+  }
+  return !1;
+}, v = (r) => new Promise((e) => {
+  const t = new FileReader();
+  t.onload = () => {
+    e(new Blob([t.result], { type: r.type }));
+  }, t.readAsArrayBuffer(r);
+});
+class x {
   constructor(e) {
     this.ws = new WebSocket(e), this.url = e;
   }
@@ -16,102 +29,118 @@ class N {
       typeof e == "object" ? JSON.stringify(e) : e.toString()
     ), this);
   }
-  on(e, t, s) {
-    return this.addEventListener(e, t, s);
+  on(e, t, n) {
+    return this.addEventListener(e, t, n);
   }
-  off(e, t, s) {
-    return this.ws.removeEventListener(e, t, s), this;
+  off(e, t, n) {
+    return this.ws.removeEventListener(e, t, n), this;
   }
   subscribe(e, t) {
     return this.addEventListener("message", e, t);
   }
-  addEventListener(e, t, s) {
+  addEventListener(e, t, n) {
     return this.ws.addEventListener(
       e,
-      (i) => {
+      (f) => {
         if (e === "message") {
-          let r = i.data.toString();
-          const o = r.charCodeAt(0);
-          if (o === 47 || o === 123)
+          let s = f.data.toString();
+          const i = s.charCodeAt(0);
+          if (i === 47 || i === 123)
             try {
-              r = JSON.parse(r);
+              s = JSON.parse(s);
             } catch {
             }
           else
-            Number.isNaN(+r) ? r === "true" ? r = !0 : r === "fase" && (r = !1) : r = +r;
+            Number.isNaN(+s) ? s === "true" ? s = !0 : s === "fase" && (s = !1) : s = +s;
           t({
-            ...i,
-            data: r
+            ...f,
+            data: s
           });
         } else
-          t(i);
+          t(f);
       },
-      s
+      n
     ), this;
   }
-  removeEventListener(e, t, s) {
-    return this.off(e, t, s), this;
+  removeEventListener(e, t, n) {
+    return this.off(e, t, n), this;
   }
   close() {
     return this.ws.close(), this;
   }
 }
-const v = (n, e = "", t) => new Proxy(() => {
+const E = (r, e = "", t) => new Proxy(() => {
 }, {
-  get(s, i, r) {
-    return v(n, `${e}/${i.toString()}`);
+  get(n, f, s) {
+    return E(r, `${e}/${f.toString()}`);
   },
-  apply(s, i, [
-    { $query: r, $fetch: o, $body: w, ...h } = {
+  apply(n, f, [
+    { $query: s, $fetch: i, $body: F, ...w } = {
       $fetch: void 0,
       $query: void 0,
       $body: void 0
     }
   ] = [{}]) {
-    const d = e.lastIndexOf("/"), y = e.slice(d + 1), l = E(n, e.slice(0, d), r);
-    if (y === "subscribe")
-      return new N(
-        l.replace(
-          /^([^]+):\/\//,
-          l.startsWith("https://") ? "wss://" : "ws://"
-        )
-      );
-    const f = w ?? (Object.keys(h).length ? h : void 0), g = typeof f == "object";
-    return fetch(l, {
-      method: y,
-      body: g ? JSON.stringify(f) : f,
-      // ...config.fetch,
-      ...o,
-      headers: f ? {
-        "content-type": g ? "application/json" : "text/plain",
-        //   ...config.fetch?.headers,
-        ...o == null ? void 0 : o.headers
-      } : void 0
-    }).then(async (c) => {
-      var b;
-      let u;
-      switch ((b = c.headers.get("Content-Type")) == null ? void 0 : b.split(";")[0]) {
-        case "application/json":
-          u = await c.json();
-          break;
-        default:
-          u = await c.text().then((a) => Number.isNaN(+a) ? a === "true" ? !0 : a === "false" ? !1 : a : +a);
-      }
-      return c.status > 300 ? {
-        data: u,
-        error: new p(c.status, await u)
-      } : { data: u, error: null };
-    });
+    const p = e.lastIndexOf("/"), g = e.slice(p + 1), d = L(r, e.slice(0, p), s);
+    return g === "subscribe" ? new x(
+      d.replace(
+        /^([^]+):\/\//,
+        d.startsWith("https://") ? "wss://" : "ws://"
+      )
+    ) : (async () => {
+      let c = F ?? (Object.keys(w).length ? w : void 0);
+      const y = typeof c == "object", h = y && N(c);
+      if (h) {
+        const o = new FormData();
+        for (const [a, l] of Object.entries(c))
+          if (l instanceof File)
+            o.append(a, await v(l));
+          else if (l instanceof FileList)
+            for (let u = 0; u < l.length; u++)
+              o.append(
+                a,
+                await v(l[u])
+              );
+          else
+            o.append(a, l);
+        c = o;
+      } else
+        y && (c = JSON.stringify(c));
+      return fetch(d, {
+        method: g,
+        body: c,
+        // ...config.fetch,
+        ...i,
+        headers: c ? h ? i == null ? void 0 : i.headers : {
+          "content-type": y ? "application/json" : "text/plain",
+          ...i == null ? void 0 : i.headers
+        } : i == null ? void 0 : i.headers
+      }).then(async (o) => {
+        var l;
+        let a;
+        switch ((l = o.headers.get("Content-Type")) == null ? void 0 : l.split(";")[0]) {
+          case "application/json":
+            a = await o.json();
+            break;
+          default:
+            a = await o.text().then((u) => Number.isNaN(+u) ? u === "true" ? !0 : u === "false" ? !1 : u : +u);
+        }
+        return o.status > 300 ? {
+          data: a,
+          error: new m(o.status, await a)
+        } : { data: a, error: null };
+      });
+    })();
   }
-}), x = (n, e = {}) => new Proxy(
+}), S = (r, e = {}) => new Proxy(
   {},
   {
-    get(t, s) {
-      return v(n, s);
+    get(t, n) {
+      return E(r, n);
     }
   }
 );
 export {
-  N as EdenWS,
-  x as edenTreaty
+  x as EdenWS,
+  S as edenTreaty
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",
@@ -63,9 +63,9 @@
     }
   },
   "devDependencies": {
-    "@elysiajs/cors": "^0.1.0",
+    "@elysiajs/cors": "^0.3.0",
     "@sinclair/typebox": "^0.25.24",
-    "@types/node": "^18.11.7",
+    "@types/node": "^18.15.5",
     "bun-types": "^0.5.7",
     "elysia": "^0.3.0",
     "eslint": "^8.26.0",

package/src/fetch/index.ts

@@ -19,16 +19,22 @@ export const edenFetch =
         const contentType = options.headers?.['Content-Type']
 
         if (!contentType || contentType === 'application/json')
-            body = JSON.stringify(body)
+            try {
+                body = JSON.stringify(body)
+            } catch (error) {
+                //
+            }
 
         // @ts-ignore
         return fetch(server + endpoint, {
             ...options,
-            headers: {
-                'content-type': 'application/json',
-                ...options.headers
-            },
-            body
+            headers: body
+                ? {
+                      'content-type': 'application/json',
+                      ...options.headers
+                  }
+                : options.headers,
+            body: body as any
         }).then(async (res) => {
             let data
 
@@ -38,13 +44,14 @@ export const edenFetch =
                     break
 
                 default:
-                    data = await res.text().then((data) => {
-                        if (!Number.isNaN(+data)) return +data
-                        if (data === 'true') return true
-                        if (data === 'false') return false
+                    data = await res.text().then((d) => {
+                        if (!Number.isNaN(+d)) return +d
+                        if (d === 'true') return true
+                        if (d === 'false') return false
 
-                        return data
+                        return d
                     })
+                    break
             }
 
             if (res.status > 300)

package/src/treaty/index.ts

@@ -7,6 +7,40 @@ import type { EdenTreaty } from './types'
 
 export type { EdenTreaty } from './types'
 
+// @ts-ignore
+const isFile = (v: any) => {
+    if (typeof FileList === 'undefined') return false
+
+    return v instanceof FileList || v instanceof File
+}
+
+// FormData is 1 level deep
+const hasFile = (obj: Record<string, any>) => {
+    for (let key in obj) {
+        if (isFile(obj[key])) return true
+        else if (
+            Array.isArray(obj[key]) &&
+            (obj[key] as unknown[]).find((x) => isFile(x))
+        )
+            return true
+    }
+
+    return false
+}
+
+// @ts-ignore
+const fileToBlob = (v: File) =>
+    new Promise<Blob>((resolve) => {
+        // @ts-ignore
+        const reader = new FileReader()
+
+        reader.onload = () => {
+            resolve(new Blob([reader.result!], { type: v.type }))
+        }
+
+        reader.readAsArrayBuffer(v)
+    })
+
 export class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
     ws: WebSocket
     url: string
@@ -77,15 +111,11 @@ export class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
                     else if (data === 'true') data = true
                     else if (data === 'fase') data = false
 
-                    // @ts-ignore
                     listener({
                         ...ws,
                         data
-                    })
-                } else {
-                    // @ts-ignore
-                    listener(ws)
-                }
+                    } as any)
+                } else listener(ws as any)
             },
             options
         )
@@ -142,50 +172,77 @@ const createProxy = (
                     )
                 )
 
-            const body =
-                $body ?? (Object.keys(bodyObj).length ? bodyObj : undefined)
-            const isObject = typeof body === 'object'
-
-            return fetch(url, {
-                method,
-                body: isObject ? JSON.stringify(body) : body,
-                // ...config.fetch,
-                ...$fetch,
-                headers: body
-                    ? {
-                          'content-type': isObject
-                              ? 'application/json'
-                              : 'text/plain',
-                          //   ...config.fetch?.headers,
-                          ...$fetch?.['headers']
-                      }
-                    : undefined
-            }).then(async (res) => {
-                let data
-
-                switch (res.headers.get('Content-Type')?.split(';')[0]) {
-                    case 'application/json':
-                        data = await res.json()
-                        break
-
-                    default:
-                        data = await res.text().then((data) => {
-                            if (!Number.isNaN(+data)) return +data
-                            if (data === 'true') return true
-                            if (data === 'false') return false
-
-                            return data
-                        })
-                }
+            return (async () => {
+                let body =
+                    $body ?? (Object.keys(bodyObj).length ? bodyObj : undefined)
+                const isObject = typeof body === 'object'
+                const isFormData = isObject && hasFile(body)
 
-                if (res.status > 300)
-                    return {
-                        data,
-                        error: new EdenFetchError(res.status, await data)
+                if (isFormData) {
+                    const newBody = new FormData()
+
+                    // FormData is 1 level deep
+                    for (const [key, field] of Object.entries(body)) {
+                        // @ts-ignore
+                        if (field instanceof File)
+                            newBody.append(key, await fileToBlob(field as any))
+                        // @ts-ignore
+                        else if (field instanceof FileList) {
+                            // @ts-ignore
+                            for (let i = 0; i < field.length; i++) {
+                                newBody.append(
+                                    key as any,
+                                    await fileToBlob((field as any)[i])
+                                )
+                            }
+                        } else newBody.append(key, field as string)
                     }
 
-                return { data, error: null }
-            })
+                    body = newBody
+                } else if (isObject) body = JSON.stringify(body)
+
+                return fetch(url, {
+                    method,
+                    body,
+                    // ...config.fetch,
+                    ...$fetch,
+                    headers: body
+                        ? isFormData
+                            ? $fetch?.['headers']
+                            : {
+                                  'content-type': isObject
+                                      ? 'application/json'
+                                      : 'text/plain',
+                                  ...$fetch?.['headers']
+                              }
+                        : $fetch?.['headers']
+                }).then(async (res) => {
+                    let data
+
+                    switch (res.headers.get('Content-Type')?.split(';')[0]) {
+                        case 'application/json':
+                            data = await res.json()
+                            break
+
+                        default:
+                            data = await res.text().then((data) => {
+                                if (!Number.isNaN(+data)) return +data
+                                if (data === 'true') return true
+                                if (data === 'false') return false
+
+                                return data
+                            })
+                    }
+
+                    if (res.status > 300)
+                        return {
+                            data,
+                            error: new EdenFetchError(res.status, await data)
+                        }
+
+                    return { data, error: null }
+                })
+            })()
         }
     }) as unknown as Record<string, unknown>
 

package/src/treaty/types.ts

@@ -4,6 +4,12 @@ import type { EdenWS } from './index'
 import type { IsNever, IsUnknown, MapError, UnionToIntersect } from '../types'
 import { EdenFetchError } from '../utils'
 
+type Replace<RecordType, TargetType, GenericType> = {
+    [K in keyof RecordType]: RecordType[K] extends TargetType
+        ? GenericType
+        : RecordType[K]
+}
+
 export namespace EdenTreaty {
     export type Create<App extends Elysia<any>> = App['meta'] extends Record<
         typeof SCHEMA,
@@ -66,7 +72,11 @@ export namespace EdenTreaty {
                                           }
                                     >
                                   : (
-                                        params: Route['body'] & {
+                                        params: Replace<
+                                            Route['body'],
+                                            Blob | Blob[],
+                                            File | FileList
+                                        > & {
                                             $query?: Record<string, string>
                                             $fetch?: RequestInit
                                         }
@@ -137,7 +147,11 @@ export namespace EdenTreaty {
                                       }
                                 >
                               : (
-                                    params: Route['body'] & {
+                                    params: Replace<
+                                        Route['body'],
+                                        Blob | Blob[],
+                                        File | FileList
+                                    > & {
                                         $query?: Record<string, string>
                                         $fetch?: RequestInit
                                     }
@@ -188,8 +202,8 @@ export namespace EdenTreaty {
 
 type NestPath<T extends string, V> = T extends `${infer First}/${infer Rest}`
     ? First extends `:${infer Parameter}`
-        ? Record<string | number | `:${Parameter}`, NestPath<Rest, V>>
+        ? Record<(string & {}) | number | `:${Parameter}`, NestPath<Rest, V>>
         : Record<First, NestPath<Rest, V>>
     : T extends `:${infer Parameter}`
-    ? Record<string | number | T, V>
+    ? Record<(string & {}) | number | T, V>
     : Record<T, V>