@elysiajs/eden 0.6.2 → 0.6.3

package/dist/fetch/index.js

@@ -1,7 +1,7 @@
 import { EdenFetchError } from '../errors';
 export const edenFetch = (server, config) => 
 // @ts-ignore
-(endpoint, { params, body, ...options } = {}) => {
+(endpoint, { query, params, body, ...options } = {}) => {
     if (params)
         Object.entries(params).forEach(([key, value]) => {
             endpoint = endpoint.replace(`:${key}`, value);
@@ -15,8 +15,11 @@ export const edenFetch = (server, config) =>
             //
         }
     const fetch = config?.fetcher || globalThis.fetch;
+    const queryStr = query
+        ? `?${new URLSearchParams(query).toString()}`
+        : '';
     // @ts-ignore
-    const execute = () => fetch(server + endpoint, {
+    const execute = () => fetch(server + endpoint + queryStr, {
         ...options,
         headers: body
             ? {

package/dist/fetch/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fetch/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAI1C,MAAM,CAAC,MAAM,SAAS,GAClB,CACI,MAAc,EACd,MAAyB,EACJ,EAAE;AAC3B,aAAa;AACb,CAAC,QAAgB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;IACpD,IAAI,MAAM;QACN,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,EAAE,EAAE,KAAe,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAA;IAEN,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,CAAA;IAErD,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,kBAAkB;QAClD,IAAI;YACA,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;SAC9B;QAAC,OAAO,KAAK,EAAE;YACZ,EAAE;SACL;IAEL,MAAM,KAAK,GAAG,MAAM,EAAE,OAAO,IAAI,UAAU,CAAC,KAAK,CAAA;IAEjD,aAAa;IACb,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,EAAE;QAC3C,GAAG,OAAO;QACV,OAAO,EAAE,IAAI;YACT,CAAC,CAAC;gBACI,cAAc,EAAE,kBAAkB;gBAClC,GAAG,OAAO,CAAC,OAAO;aACrB;YACH,CAAC,CAAC,OAAO,CAAC,OAAO;QACrB,IAAI,EAAE,IAAW;KACpB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,IAAI,CAAA;QAER,QAAQ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;YACpD,KAAK,kBAAkB;gBACnB,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;gBACvB,MAAK;YAET;gBACI,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAAE,OAAO,CAAC,CAAC,CAAA;oBAChC,IAAI,CAAC,KAAK,MAAM;wBAAE,OAAO,IAAI,CAAA;oBAC7B,IAAI,CAAC,KAAK,OAAO;wBAAE,OAAO,KAAK,CAAA;oBAE/B,OAAO,CAAC,CAAA;gBACZ,CAAC,CAAC,CAAA;gBACF,MAAK;SACZ;QAED,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG;YAChB,OAAO;gBACH,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,KAAK,EAAE,OAAO;gBACd,KAAK,EAAE,IAAI,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC;aAC9C,CAAA;QAEL,OAAO;YACH,IAAI;YACJ,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,KAAK,EAAE,OAAO;SACjB,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,OAAO,OAAO,EAAE,CAAA;AACpB,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fetch/index.ts"],"names":[],"mappings":"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"}

package/dist/fetch.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("./errors-a2cfc56a.js"),p=(f,n)=>(u,{params:h,body:a,...s}={})=>{var i;h&&Object.entries(h).forEach(([e,t])=>{u=u.replace(`:${e}`,t)});const l=(i=s.headers)==null?void 0:i["Content-Type"];if(!l||l==="application/json")try{a=JSON.stringify(a)}catch{}const d=(n==null?void 0:n.fetcher)||globalThis.fetch,c=()=>d(f+u,{...s,headers:a?{"content-type":"application/json",...s.headers}:s.headers,body:a}).then(async e=>{var o;let t;switch((o=e.headers.get("Content-Type"))==null?void 0:o.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,status:e.status,headers:e.headers,retry:c,error:new y.EdenFetchError(e.status,t)}:{data:t,error:null,status:e.status,headers:e.headers,retry:c}});return c()};exports.edenFetch=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("./errors-a2cfc56a.js"),S=(d,n)=>(c,{query:h,params:l,body:a,...s}={})=>{var o;l&&Object.entries(l).forEach(([e,t])=>{c=c.replace(`:${e}`,t)});const i=(o=s.headers)==null?void 0:o["Content-Type"];if(!i||i==="application/json")try{a=JSON.stringify(a)}catch{}const y=(n==null?void 0:n.fetcher)||globalThis.fetch,p=h?`?${new URLSearchParams(h).toString()}`:"",u=()=>y(d+c+p,{...s,headers:a?{"content-type":"application/json",...s.headers}:s.headers,body:a}).then(async e=>{var f;let t;switch((f=e.headers.get("Content-Type"))==null?void 0:f.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,status:e.status,headers:e.headers,retry:u,error:new j.EdenFetchError(e.status,t)}:{data:t,error:null,status:e.status,headers:e.headers,retry:u}});return u()};exports.edenFetch=S;

package/dist/fetch.mjs

@@ -1,52 +1,52 @@
-import { E as y } from "./errors-5a40996f.mjs";
-const j = (o, n) => (
+import { E as j } from "./errors-5a40996f.mjs";
+const E = (p, n) => (
   // @ts-ignore
-  (h, { params: c, body: a, ...s } = {}) => {
-    var i;
-    c && Object.entries(c).forEach(([e, t]) => {
-      h = h.replace(`:${e}`, t);
+  (c, { query: u, params: l, body: a, ...s } = {}) => {
+    var f;
+    l && Object.entries(l).forEach(([t, e]) => {
+      c = c.replace(`:${t}`, e);
     });
-    const l = (i = s.headers) == null ? void 0 : i["Content-Type"];
-    if (!l || l === "application/json")
+    const i = (f = s.headers) == null ? void 0 : f["Content-Type"];
+    if (!i || i === "application/json")
       try {
         a = JSON.stringify(a);
       } catch {
       }
-    const p = (n == null ? void 0 : n.fetcher) || globalThis.fetch, u = () => p(o + h, {
+    const y = (n == null ? void 0 : n.fetcher) || globalThis.fetch, d = u ? `?${new URLSearchParams(u).toString()}` : "", h = () => y(p + c + d, {
       ...s,
       headers: a ? {
         "content-type": "application/json",
         ...s.headers
       } : s.headers,
       body: a
-    }).then(async (e) => {
-      var f;
-      let t;
-      switch ((f = e.headers.get("Content-Type")) == null ? void 0 : f.split(";")[0]) {
+    }).then(async (t) => {
+      var o;
+      let e;
+      switch ((o = t.headers.get("Content-Type")) == null ? void 0 : o.split(";")[0]) {
         case "application/json":
-          t = await e.json();
+          e = await t.json();
           break;
         default:
-          t = await e.text().then((r) => Number.isNaN(+r) ? r === "true" ? !0 : r === "false" ? !1 : r : +r);
+          e = await t.text().then((r) => Number.isNaN(+r) ? r === "true" ? !0 : r === "false" ? !1 : r : +r);
           break;
       }
-      return e.status > 300 ? {
+      return t.status > 300 ? {
         data: null,
-        status: e.status,
-        headers: e.headers,
-        retry: u,
-        error: new y(e.status, t)
+        status: t.status,
+        headers: t.headers,
+        retry: h,
+        error: new j(t.status, e)
       } : {
-        data: t,
+        data: e,
         error: null,
-        status: e.status,
-        headers: e.headers,
-        retry: u
+        status: t.status,
+        headers: t.headers,
+        retry: h
       };
     });
-    return u();
+    return h();
   }
 );
 export {
-  j as edenFetch
+  E as edenFetch
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",
@@ -79,5 +79,11 @@
   },
   "dependencies": {
     "superjson": "^1.12.2"
+  },
+  "prettier": {
+    "semi": false,
+    "tabWidth": 4,
+    "singleQuote": true,
+    "trailingComma": "none"
   }
-}
+}

package/src/fetch/index.ts

@@ -10,7 +10,7 @@ export const edenFetch =
         config?: EdenFetch.Config
     ): EdenFetch.Create<App> =>
     // @ts-ignore
-    (endpoint: string, { params, body, ...options } = {}) => {
+    (endpoint: string, { query, params, body, ...options } = {}) => {
         if (params)
             Object.entries(params).forEach(([key, value]) => {
                 endpoint = endpoint.replace(`:${key}`, value as string)
@@ -26,9 +26,12 @@ export const edenFetch =
             }
 
         const fetch = config?.fetcher || globalThis.fetch
+        const queryStr = query
+            ? `?${new URLSearchParams(query).toString()}`
+            : ''
 
         // @ts-ignore
-        const execute = () => fetch(server + endpoint, {
+        const execute = () => fetch(server + endpoint + queryStr, {
             ...options,
             headers: body
                 ? {