@elysiajs/eden 0.3.0-rc.1 → 0.3.0-rc.2

package/README.md

@@ -1,15 +1,11 @@
 # @elysiajs/eden
-Fully type-safe Elysia client.
+Fully type-safe Elysia client refers to the [documentation](https://elysiajs.com/plugins/eden/overview)
 
 ## Installation
 ```bash
-bun add @elysiajs/eden
-bun add -d elysia
+bun add elysia @elysiajs/eden
 ```
 
-### note
-Eden requires type definition from elysia to infer type accurately, it's recommended to install elysia as devDependencies with the same version as your API.
-
 ## Example
 ```typescript
 // server.ts
@@ -31,20 +27,20 @@ const app = new Elysia()
 export type App = typeof app
 
 // client.ts
-import { eden } from '@elysiajs/eden'
+import { edenTreaty } from '@elysiajs/eden'
 import type { App } from './server'
 
-const client = eden<App>('http://localhost:8080')
+const app = edenTreaty<App>('http://localhost:8080')
 
-// return: Hi Elysia (fully type-safe)
-client.index.get().then(console.log)
+// data: Hi Elysia (fully type-safe)
+const { data: pong } = app.index.get()
 
-// return: 1895
-client.id.1895.get().then(console.log)
+// data: 1895
+const { data: id } = client.id.1895.get()
 
-// return: { id: 1895, name: 'Skadi' }
-client.mirror.post({
+// data: { id: 1895, name: 'Skadi' }
+const { data: nendoroid } = app.mirror.post({
     id: 1895,
     name: 'Skadi'
-}).then(console.log)
+})
 ```

package/dist/fetch/types.d.ts

@@ -22,5 +22,11 @@ export declare namespace EdenFetch {
         body: Route['body'];
     } : {
         body?: unknown;
-    })) => Promise<Route['response']['200']> | (MapError<Route['response']> extends infer Errors ? IsNever<Errors> extends true ? EdenFetchError<number, string> : Errors : never);
+    })) => Promise<{
+        data: 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>;
+    }>;
 }

package/dist/fetch.js

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

package/dist/fetch.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.3.0-rc.1",
+  "version": "0.3.0-rc.2",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",

package/src/fetch/index.ts

@@ -30,15 +30,15 @@ export const edenFetch =
             },
             body
         }).then(async (res) => {
-            let data: Promise<unknown>
+            let data
 
             switch (res.headers.get('Content-Type')?.split(';')[0]) {
                 case 'application/json':
-                    data = res.json()
+                    data = await res.json()
                     break
 
                 default:
-                    data = res.text().then((data) => {
+                    data = await res.text().then((data) => {
                         if (!Number.isNaN(+data)) return +data
                         if (data === 'true') return true
                         if (data === 'false') return false
@@ -48,8 +48,11 @@ export const edenFetch =
             }
 
             if (res.status > 300)
-                return new EdenFetchError(res.status, await data)
+                return {
+                    data: null,
+                    error: new EdenFetchError(res.status, data)
+                }
 
-            return data
+            return { data, error: null }
         })
     }

package/src/fetch/types.ts

@@ -43,11 +43,18 @@ export namespace EdenFetch {
             (IsUnknown<Route['body']> extends false
                 ? { body: Route['body'] }
                 : { body?: unknown })
-    ) =>
-        | Promise<Route['response']['200']>
-        | (MapError<Route['response']> extends infer Errors
-              ? IsNever<Errors> extends true
-                  ? EdenFetchError<number, string>
-                  : Errors
-              : never)
+    ) => Promise<
+        | {
+              data: 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>
+          }
+    >
 }