@elysiajs/eden 0.6.0 → 0.6.2

package/dist/treaty.mjs

@@ -1,32 +1,34 @@
 var A = Object.defineProperty;
-var j = (r, e, t) => e in r ? A(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var g = (r, e, t) => (j(r, typeof e != "symbol" ? e + "" : e, t), t);
-import { E as B } from "./utils-5a40996f.mjs";
-const P = (r, e, t) => {
-  if (r.endsWith("/") || (r += "/"), e === "index" && (e = ""), !t || !Object.keys(t).length)
-    return `${r}${e}`;
+var O = (s, e, t) => e in s ? A(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
+var b = (s, e, t) => (O(s, typeof e != "symbol" ? e + "" : e, t), t);
+import { E as k } from "./errors-5a40996f.mjs";
+const j = (s, e, t) => {
+  if (s.endsWith("/") || (s += "/"), e === "index" && (e = ""), !t || !Object.keys(t).length)
+    return `${s}${e}`;
   let n = "";
-  for (const [a, s] of Object.entries(t))
-    n += `${a}=${s}&`;
-  return `${r}${e}?${n.slice(0, -1)}`;
-}, v = typeof FileList > "u", N = (r) => v ? r instanceof Blob : r instanceof FileList || r instanceof File, W = (r) => {
-  for (const e in r) {
-    if (N(r[e]))
+  for (const [o, r] of Object.entries(t))
+    n += `${o}=${r}&`;
+  return `${s}${e}?${n.slice(0, -1)}`;
+}, g = typeof FileList > "u", L = (s) => g ? s instanceof Blob : s instanceof FileList || s instanceof File, B = (s) => {
+  if (!s)
+    return !1;
+  for (const e in s) {
+    if (L(s[e]))
       return !0;
-    if (Array.isArray(r[e]) && r[e].find((t) => N(t)))
+    if (Array.isArray(s[e]) && s[e].find((t) => L(t)))
       return !0;
   }
   return !1;
-}, S = (r) => v ? r : new Promise((e) => {
+}, N = (s) => g ? s : new Promise((e) => {
   const t = new FileReader();
   t.onload = () => {
-    e(new Blob([t.result], { type: r.type }));
-  }, t.readAsArrayBuffer(r);
+    e(new Blob([t.result], { type: s.type }));
+  }, t.readAsArrayBuffer(s);
 });
-class J {
+class P {
   constructor(e) {
-    g(this, "ws");
-    g(this, "url");
+    b(this, "ws");
+    b(this, "url");
     this.ws = new WebSocket(e), this.url = e;
   }
   send(e) {
@@ -46,23 +48,23 @@ class J {
   addEventListener(e, t, n) {
     return this.ws.addEventListener(
       e,
-      (a) => {
+      (o) => {
         if (e === "message") {
-          let s = a.data.toString();
-          const f = s.charCodeAt(0);
-          if (f === 47 || f === 123)
+          let r = o.data.toString();
+          const c = r.charCodeAt(0);
+          if (c === 47 || c === 123)
             try {
-              s = JSON.parse(s);
+              r = JSON.parse(r);
             } catch {
             }
           else
-            Number.isNaN(+s) ? s === "true" ? s = !0 : s === "fase" && (s = !1) : s = +s;
+            Number.isNaN(+r) ? r === "true" ? r = !0 : r === "fase" && (r = !1) : r = +r;
           t({
-            ...a,
-            data: s
+            ...o,
+            data: r
           });
         } else
-          t(a);
+          t(o);
       },
       n
     ), this;
@@ -74,104 +76,98 @@ class J {
     return this.ws.close(), this;
   }
 }
-const O = (r, e = "", t) => (
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  new Proxy(() => {
-  }, {
-    get(n, a, s) {
-      return O(r, `${e}/${a.toString()}`, t);
-    },
-    apply(n, a, [
-      { $query: s, $fetch: f, $body: k, ...E } = {
-        $fetch: void 0,
-        $query: void 0,
-        $body: void 0
-      }
-    ] = [{}]) {
-      const F = e.lastIndexOf("/"), $ = e.slice(F + 1), h = P(r, e.slice(0, F), s);
-      if ($ === "subscribe")
-        return new J(
-          h.replace(
-            /^([^]+):\/\//,
-            h.startsWith("https://") ? "wss://" : "ws://"
-          )
-        );
-      const y = async () => {
-        var x, L;
-        let c = k ?? (Object.keys(E).length ? E : void 0);
-        const w = typeof c == "object", m = w && W(c);
-        if (m) {
-          const o = new FormData();
-          for (const [d, l] of Object.entries(c))
-            if (v)
-              o.append(d, l);
+const S = (s, e = "", t) => new Proxy(() => {
+}, {
+  get(n, o, r) {
+    return S(s, `${e}/${o.toString()}`, t);
+  },
+  apply(n, o, [
+    { $query: r, $fetch: c, $headers: $, ...E } = {
+      $fetch: void 0,
+      $headers: void 0,
+      $query: void 0
+    }
+  ] = [{}]) {
+    const F = e.lastIndexOf("/"), h = e.slice(F + 1), w = j(s, e.slice(0, F), r);
+    return h === "subscribe" ? new P(
+      w.replace(
+        /^([^]+):\/\//,
+        w.startsWith("https://") ? "wss://" : "ws://"
+      )
+    ) : (async () => {
+      var m, x;
+      let f;
+      const v = {
+        ...(m = t.$fetch) == null ? void 0 : m.headers,
+        ...c == null ? void 0 : c.headers,
+        ...$
+      };
+      if (h !== "GET" && h !== "HEAD") {
+        f = Object.keys(E).length ? E : void 0;
+        const a = typeof f == "object";
+        if (a && B(f)) {
+          const d = new FormData();
+          for (const [y, l] of Object.entries(f))
+            if (g)
+              d.append(y, l);
             else if (l instanceof File)
-              o.append(
-                d,
-                await S(l)
+              d.append(
+                y,
+                await N(l)
               );
             else if (l instanceof FileList)
-              for (let b = 0; b < l.length; b++)
-                o.append(
-                  d,
-                  await S(l[b])
+              for (let p = 0; p < l.length; p++)
+                d.append(
+                  y,
+                  await N(l[p])
                 );
             else
-              o.append(d, l);
-          c = o;
+              d.append(y, l);
+          f = d;
         } else
-          w && (c = JSON.stringify(c));
-        const p = {
-          ...(x = t.$fetch) == null ? void 0 : x.headers,
-          ...f == null ? void 0 : f.headers
-        }, i = await (t.fetcher ?? fetch)(h, {
-          method: $,
-          body: c,
-          ...t.$fetch,
-          ...f,
-          headers: c ? m ? p : {
-            "content-type": w ? "application/json" : "text/plain",
-            ...p
-          } : p
-        });
-        let u;
-        switch ((L = i.headers.get("Content-Type")) == null ? void 0 : L.split(";")[0]) {
-          case "application/json":
-            u = await i.json();
-            break;
-          default:
-            u = await i.text().then((o) => Number.isNaN(+o) ? o === "true" ? !0 : o === "false" ? !1 : o : +o);
-        }
-        return i.status > 300 ? {
-          data: u,
-          error: new B(i.status, await u),
-          status: i.status,
-          raw: i,
-          headers: i.headers,
-          retry: y
-        } : {
-          data: u,
-          status: i.status,
-          raw: i,
-          headers: i.headers,
-          error: null,
-          retry: y
-        };
+          v["content-type"] = a ? "application/json" : "text/plain", a && (f = JSON.stringify(f));
+      }
+      const i = await (t.fetcher ?? fetch)(w, {
+        method: h,
+        body: f,
+        ...t.$fetch,
+        ...c,
+        headers: v
+      });
+      let u;
+      switch ((x = i.headers.get("Content-Type")) == null ? void 0 : x.split(";")[0]) {
+        case "application/json":
+          u = await i.json();
+          break;
+        default:
+          u = await i.text().then((a) => Number.isNaN(+a) ? a === "true" ? !0 : a === "false" ? !1 : a : +a);
+      }
+      return i.status > 300 ? {
+        data: u,
+        error: new k(i.status, await u),
+        status: i.status,
+        raw: i,
+        headers: i.headers
+      } : {
+        data: u,
+        status: i.status,
+        response: i,
+        headers: i.headers,
+        error: null
       };
-      return y();
-    }
-  })
-), D = (r, e = {
+    })();
+  }
+}), C = (s, e = {
   fetcher: fetch
 }) => new Proxy(
   {},
   {
     get(t, n) {
-      return O(r, n, e);
+      return S(s, n, e);
     }
   }
 );
 export {
-  J as EdenWS,
-  D as edenTreaty
+  P as EdenWS,
+  C as edenTreaty
 };

package/dist/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",
@@ -58,9 +58,7 @@
     "release": "npm run build && npm run test && npm publish --access public"
   },
   "peerDependencies": {
-    "@elysiajs/fn": ">= 0.5.0",
-    "@sinclair/typebox": ">= 0.28.10",
-    "elysia": ">= 0.5.0"
+    "elysia": ">= 0.6.7"
   },
   "peerDependenciesMeta": {
     "@sinclair/typebox": {
@@ -68,16 +66,15 @@
     }
   },
   "devDependencies": {
-    "@elysiajs/cors": "0.5.0",
+    "@elysiajs/cors": "0.6.0",
     "@elysiajs/fn": "^0.6.1",
     "@sinclair/typebox": "^0.26.8",
     "@types/node": "^18.15.5",
-    "bun-types": "^0.5.8",
-    "elysia": "0.6.0",
+    "elysia": "0.6.10",
     "eslint": "^8.26.0",
     "rimraf": "^4.4.1",
     "typescript": "^5.0.4",
-    "vite": "^4.3.5",
+    "vite": "^4.4.9",
     "vite-plugin-dts": "^2.3.0"
   },
   "dependencies": {

package/src/fetch/index.ts

@@ -1,19 +1,19 @@
 import type { Elysia } from 'elysia'
 
-import { EdenFetchError } from '../utils'
+import { EdenFetchError } from '../errors'
 import type { EdenFetch } from './types'
 export type { EdenFetch } from './types'
 
 export const edenFetch =
-    <App extends Elysia<any>>(
+    <App extends Elysia<any, any>>(
         server: string,
         config?: EdenFetch.Config
     ): EdenFetch.Create<App> =>
     // @ts-ignore
-    async (endpoint: string, { params, body, ...options } = {}) => {
+    (endpoint: string, { params, body, ...options } = {}) => {
         if (params)
             Object.entries(params).forEach(([key, value]) => {
-                endpoint = endpoint.replace(`:${key}`, value)
+                endpoint = endpoint.replace(`:${key}`, value as string)
             })
 
         const contentType = options.headers?.['Content-Type']
@@ -28,7 +28,7 @@ export const edenFetch =
         const fetch = config?.fetcher || globalThis.fetch
 
         // @ts-ignore
-        return fetch(server + endpoint, {
+        const execute = () => fetch(server + endpoint, {
             ...options,
             headers: body
                 ? {
@@ -59,9 +59,20 @@ export const edenFetch =
             if (res.status > 300)
                 return {
                     data: null,
+                    status: res.status,
+                    headers: res.headers,
+                    retry: execute,
                     error: new EdenFetchError(res.status, data)
                 }
 
-            return { data, error: null }
+            return {
+                data,
+                error: null,
+                status: res.status,
+                headers: res.headers,
+                retry: execute
+            }
         })
+
+        return execute()
     }

package/src/fetch/types.ts

@@ -1,9 +1,13 @@
 import type { Elysia } from 'elysia'
-import type { EdenFetchError } from '../utils'
+import type { EdenFetchError } from '../errors'
 import type { MapError, IsUnknown, IsNever } from '../types'
 
+type Prettify<T> = {
+    [K in keyof T]: T[K]
+} & {}
+
 export namespace EdenFetch {
-    export type Create<App extends Elysia<any>> = App['meta'] extends {
+    export type Create<App extends Elysia<any, any>> = App['meta'] extends {
         schema: infer Schema extends Record<string, any>
     }
         ? EdenFetch.Fn<Schema>
@@ -34,6 +38,13 @@ export namespace EdenFetch {
                 : {
                       params: Route['params']
                   }) &
+            (IsNever<keyof Route['query']> extends true
+                ? {
+                      query?: Record<never, string>
+                  }
+                : {
+                      query: Route['query']
+                  }) &
             (undefined extends Route['headers']
                 ? {
                       headers?: Record<string, string>
@@ -45,17 +56,25 @@ export namespace EdenFetch {
                 ? { body: Route['body'] }
                 : { body?: unknown })
     ) => Promise<
-        | {
-              data: Awaited<Route['response']['200']>
-              error: null
-          }
-        | {
-              data: null
-              error: MapError<Route['response']> extends infer Errors
-                  ? IsNever<Errors> extends true
-                      ? EdenFetchError<number, string>
-                      : Errors
-                  : EdenFetchError<number, string>
-          }
+        Prettify<
+            (
+                | {
+                      data: Awaited<Route['response']['200']>
+                      error: null
+                  }
+                | {
+                      data: null
+                      error: MapError<Route['response']> extends infer Errors
+                          ? IsNever<Errors> extends true
+                              ? EdenFetchError<number, string>
+                              : Errors
+                          : EdenFetchError<number, string>
+                  }
+            ) & {
+                status: number
+                response: Response
+                headers: Record<string, string>
+            }
+        >
     >
 }

package/src/fn/index.ts

@@ -47,7 +47,7 @@ const createProxy = (
         }
     }) as any
 
-export const edenFn = <App extends Elysia<any>>(
+export const edenFn = <App extends Elysia<any, any>>(
     domain: string,
     config?: EdenFn.Config
 ): EdenFn.Create<App> =>

package/src/fn/types.ts

@@ -1,7 +1,7 @@
 import type { Elysia } from 'elysia'
 
 export namespace EdenFn {
-    export type Create<App extends Elysia<any>> = App['meta'] extends {
+    export type Create<App extends Elysia<any, any>> = App['meta'] extends {
         exposed: infer Schema extends Record<string, any>
     }
         ? EdenFn.Compose<Schema>

package/src/treaty/index.ts

@@ -1,6 +1,6 @@
 import type { Elysia, TypedSchema } from 'elysia'
 
-import { EdenFetchError } from '../utils'
+import { EdenFetchError } from '../errors'
 
 import { composePath } from './utils'
 import type { EdenTreaty } from './types'
@@ -22,6 +22,8 @@ const isFile = (v: any) => {
 
 // FormData is 1 level deep
 const hasFile = (obj: Record<string, any>) => {
+    if (!obj) return false
+
     for (const key in obj) {
         if (isFile(obj[key])) return true
         else if (
@@ -155,7 +157,6 @@ const createProxy = (
     path = '',
     config: EdenTreaty.Config
 ): Record<string, unknown> =>
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
     new Proxy(() => {}, {
         get(target, key, value) {
             return createProxy(domain, `${path}/${key.toString()}`, config)
@@ -164,12 +165,17 @@ const createProxy = (
             target,
             _,
             [
-                { $query, $fetch, $body, ...bodyObj } = {
+                { $query, $fetch, $headers, ...bodyObj } = {
                     $fetch: undefined,
-                    $query: undefined,
-                    $body: undefined
+                    $headers: undefined,
+                    $query: undefined
                 }
-            ]: EdenTreaty.CallOption[] = [{}]
+            ]: {
+                [x: string]: any
+                $fetch?: RequestInit
+                $headers?: HeadersInit
+                $query?: Record<string, string>
+            }[] = [{}]
         ) {
             const i = path.lastIndexOf('/'),
                 method = path.slice(i + 1),
@@ -184,44 +190,54 @@ const createProxy = (
                 )
 
             const execute = async () => {
-                let body =
-                    $body ?? (Object.keys(bodyObj).length ? bodyObj : undefined)
-                const isObject = typeof body === 'object'
-                const isFormData = isObject && hasFile(body)
-
-                if (isFormData) {
-                    const newBody = new FormData()
-
-                    // FormData is 1 level deep
-                    for (const [key, field] of Object.entries(body)) {
-                        if (isServer) {
-                            newBody.append(key, field as any)
-                        } else {
-                            // @ts-ignore
-                            if (field instanceof File)
-                                newBody.append(
-                                    key,
-                                    await fileToBlob(field as any)
-                                )
-                            // @ts-ignore
-                            else if (field instanceof FileList) {
+                let body: any
+
+                const headers = {
+                    ...config.$fetch?.headers,
+                    ...$fetch?.headers,
+                    ...$headers
+                } as Record<string, string>
+
+                if (method !== 'GET' && method !== 'HEAD') {
+                    body = Object.keys(bodyObj).length ? bodyObj : undefined
+                    const isObject = typeof body === 'object'
+                    const isFormData = isObject && hasFile(body)
+
+                    if (isFormData) {
+                        const newBody = new FormData()
+
+                        // FormData is 1 level deep
+                        for (const [key, field] of Object.entries(body)) {
+                            if (isServer) {
+                                newBody.append(key, field as any)
+                            } else {
                                 // @ts-ignore
-                                for (let i = 0; i < field.length; i++) {
+                                if (field instanceof File)
                                     newBody.append(
-                                        key as any,
-                                        await fileToBlob((field as any)[i])
+                                        key,
+                                        await fileToBlob(field as any)
                                     )
-                                }
-                            } else newBody.append(key, field as string)
+                                // @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)
+                            }
                         }
-                    }
 
-                    body = newBody
-                } else if (isObject) body = JSON.stringify(body)
+                        body = newBody
+                    } else {
+                        headers['content-type'] = isObject
+                            ? 'application/json'
+                            : 'text/plain'
 
-                const $headers = {
-                    ...config.$fetch?.headers,
-                    ...$fetch?.headers
+                        if (isObject) body = JSON.stringify(body)
+                    }
                 }
 
                 const response = await (config.fetcher ?? fetch)(url, {
@@ -229,16 +245,7 @@ const createProxy = (
                     body,
                     ...config.$fetch,
                     ...$fetch,
-                    headers: body
-                        ? isFormData
-                            ? $headers
-                            : {
-                                  'content-type': isObject
-                                      ? 'application/json'
-                                      : 'text/plain',
-                                  ...$headers
-                              }
-                        : $headers
+                    headers
                 })
 
                 let data
@@ -265,16 +272,14 @@ const createProxy = (
                         status: response.status,
                         raw: response,
                         headers: response.headers,
-                        retry: execute
                     }
 
                 return {
                     data,
                     status: response.status,
-                    raw: response,
+                    response: response,
                     headers: response.headers,
-                    error: null,
-                    retry: execute
+                    error: null as null
                 }
             }
 
@@ -282,7 +287,7 @@ const createProxy = (
         }
     }) as unknown as Record<string, unknown>
 
-export const edenTreaty = <App extends Elysia<any>>(
+export const edenTreaty = <App extends Elysia<any, any>>(
     domain: string,
     config: EdenTreaty.Config = {
         fetcher: fetch