@elysiajs/eden 0.5.1 → 0.5.3

package/dist/fetch/index.d.ts

@@ -0,0 +1,4 @@
+import type { Elysia } from 'elysia';
+import type { EdenFetch } from './types';
+export type { EdenFetch } from './types';
+export declare const edenFetch: <App extends Elysia<any>>(server: string, config?: EdenFetch.Config) => EdenFetch.Create<App>;

package/dist/fetch/types.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="bun-types" />
+import type { Elysia, SCHEMA } from 'elysia';
+import type { EdenFetchError } from '../utils';
+import type { MapError, IsUnknown, IsNever } from '../types';
+export declare namespace EdenFetch {
+    type Create<App extends Elysia<any>> = App['meta'] extends Record<typeof SCHEMA, infer Schema extends Record<string, any>> ? EdenFetch.Fn<Schema> : 'Please install Elysia before using Eden';
+    interface Config {
+    }
+    type Fn<Schema extends Record<string, any>> = <Endpoint extends keyof Schema, Method extends Extract<keyof Schema[Endpoint], string>, Route extends Schema[Endpoint][Method]>(endpoint: Endpoint, options: Omit<RequestInit, 'body' | 'method' | 'headers'> & ('get' extends Method ? {
+        method?: Uppercase<Method>;
+    } : {
+        method: Uppercase<Method>;
+    }) & (IsNever<keyof Route['params']> extends true ? {
+        params?: Record<never, string>;
+    } : {
+        params: Route['params'];
+    }) & (undefined extends Route['headers'] ? {
+        headers?: Record<string, string>;
+    } : {
+        headers: Route['headers'];
+    }) & (IsUnknown<Route['body']> extends false ? {
+        body: Route['body'];
+    } : {
+        body?: unknown;
+    })) => 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/fn/index.d.ts

@@ -0,0 +1,4 @@
+import type { Elysia } from 'elysia';
+import type { EdenFn } from './types';
+export type { EdenFn } from './types';
+export declare const edenFn: <App extends Elysia<any>>(domain: string, config?: EdenFn.Config) => EdenFn.Create<App>;

package/dist/fn/types.d.ts

@@ -0,0 +1,24 @@
+/// <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';
+    interface Config {
+    }
+    type Compose<Exposed extends Record<string, any>> = Fn<Exposed> & {
+        $set(config: Config): void;
+        $clone(config?: Config): Compose<Exposed>;
+    };
+    type Fn<T> = T extends {
+        [EXPOSED]: any;
+        value: infer Value;
+    } ? Asynctify<Value> : Asynctify<T>;
+    interface Config {
+        fn?: string;
+        fetch?: Omit<RequestInit, 'body'>;
+    }
+}
+type Promisify<T extends (...args: any[]) => any> = T extends (...args: infer Args) => infer Return ? Return extends Promise<any> ? T : (...args: Args) => Promise<Return> : never;
+type Asynctify<T> = T extends infer Fn extends (...args: any) => any ? Promisify<Fn> : T extends Record<string, any> ? {
+    [K in keyof T]: EdenFn.Fn<T[K]>;
+} : never;
+export {};

package/dist/fn/utils.d.ts

@@ -0,0 +1,13 @@
+import type { EdenFn } from './types';
+export declare class Signal {
+    private url;
+    private config;
+    private pendings;
+    private operation;
+    private isFetching;
+    private sJson;
+    constructor(url: string, config?: EdenFn.Config);
+    setConfig(config: EdenFn.Config): void;
+    clone(config?: EdenFn.Config): Signal;
+    run(procedure: string[], params: any): Promise<any>;
+}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export { edenTreaty } from './treaty';
+export { edenFetch } from './fetch';
+export { edenFn } from './fn';

package/dist/treaty/index.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="bun-types" />
+import type { Elysia, TypedSchema } from 'elysia';
+import type { EdenTreaty } from './types';
+export type { EdenTreaty } from './types';
+export declare class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
+    ws: WebSocket;
+    url: string;
+    constructor(url: string);
+    send(data: Schema['body'] | Schema['body'][]): this;
+    on<K extends keyof WebSocketEventMap>(type: K, listener: (event: EdenTreaty.WSEvent<K, Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
+    off<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | EventListenerOptions): this;
+    subscribe(onMessage: (event: EdenTreaty.WSEvent<'message', Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
+    addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (event: EdenTreaty.WSEvent<K, Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
+    removeEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | EventListenerOptions): this;
+    close(): this;
+}
+export declare const edenTreaty: <App extends Elysia<any>>(domain: string, config?: {}) => EdenTreaty.Create<App>;

package/dist/treaty/utils.d.ts

@@ -0,0 +1 @@
+export declare const composePath: (domain: string, path: string, query: Record<string, string> | undefined) => string;

package/dist/treaty.js

@@ -1 +1 @@
-"use strict";var N=Object.defineProperty;var O=(r,e,t)=>e in r?N(r,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[e]=t;var w=(r,e,t)=>(O(r,typeof e!="symbol"?e+"":e,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("./utils-a2cfc56a.js"),j=(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)}`},v=r=>typeof FileList>"u"?!1:r instanceof FileList||r instanceof File,k=r=>{for(let e in r){if(v(r[e]))return!0;if(Array.isArray(r[e])&&r[e].find(t=>v(t)))return!0}return!1},E=r=>new Promise(e=>{const t=new FileReader;t.onload=()=>{e(new Blob([t.result],{type:r.type}))},t.readAsArrayBuffer(r)});class F{constructor(e){w(this,"ws");w(this,"url");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 S=(r,e="",t)=>new Proxy(()=>{},{get(n,f,s){return S(r,`${e}/${f.toString()}`)},apply(n,f,[{$query:s,$fetch:i,$body:L,...g}={$fetch:void 0,$query:void 0,$body:void 0}]=[{}]){const p=e.lastIndexOf("/"),h=e.slice(p+1),d=j(r,e.slice(0,p),s);return h==="subscribe"?new F(d.replace(/^([^]+):\/\//,d.startsWith("https://")?"wss://":"ws://")):(async()=>{let c=L??(Object.keys(g).length?g:void 0);const y=typeof c=="object",b=y&&k(c);if(b){const o=new FormData;for(const[a,l]of Object.entries(c))if(l instanceof File)o.append(a,await E(l));else if(l instanceof FileList)for(let u=0;u<l.length;u++)o.append(a,await E(l[u]));else o.append(a,l);c=o}else y&&(c=JSON.stringify(c));return fetch(d,{method:h,body:c,...i,headers:c?b?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.EdenFetchError(o.status,await a)}:{data:a,error:null}})})()}}),x=(r,e={})=>new Proxy({},{get(t,n){return S(r,n)}});exports.EdenWS=F;exports.edenTreaty=x;
+"use strict";var O=Object.defineProperty;var m=(r,e,t)=>e in r?O(r,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[e]=t;var w=(r,e,t)=>(m(r,typeof e!="symbol"?e+"":e,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("./utils-a2cfc56a.js"),k=(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)}`},p=typeof FileList>"u",S=r=>p?r instanceof Blob:r instanceof FileList||r instanceof File,x=r=>{for(let e in r){if(S(r[e]))return!0;if(Array.isArray(r[e])&&r[e].find(t=>S(t)))return!0}return!1},E=r=>p?r:new Promise(e=>{const t=new FileReader;t.onload=()=>{e(new Blob([t.result],{type:r.type}))},t.readAsArrayBuffer(r)});class F{constructor(e){w(this,"ws");w(this,"url");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 L=(r,e="",t)=>new Proxy(()=>{},{get(n,f,s){return L(r,`${e}/${f.toString()}`)},apply(n,f,[{$query:s,$fetch:i,$body:N,...g}={$fetch:void 0,$query:void 0,$body:void 0}]=[{}]){const h=e.lastIndexOf("/"),b=e.slice(h+1),d=k(r,e.slice(0,h),s);return b==="subscribe"?new F(d.replace(/^([^]+):\/\//,d.startsWith("https://")?"wss://":"ws://")):(async()=>{let c=N??(Object.keys(g).length?g:void 0);const y=typeof c=="object",v=y&&x(c);if(v){const o=new FormData;for(const[a,l]of Object.entries(c))if(p)o.append(a,l);else if(l instanceof File)o.append(a,await E(l));else if(l instanceof FileList)for(let u=0;u<l.length;u++)o.append(a,await E(l[u]));else o.append(a,l);c=o}else y&&(c=JSON.stringify(c));return fetch(d,{method:b,body:c,...i,headers:c?v?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 j.EdenFetchError(o.status,await a)}:{data:a,error:null}})})()}}),A=(r,e={})=>new Proxy({},{get(t,n){return L(r,n)}});exports.EdenWS=F;exports.edenTreaty=A;

package/dist/treaty.mjs

@@ -1,6 +1,6 @@
-var L = Object.defineProperty;
-var N = (r, e, t) => e in r ? L(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var w = (r, e, t) => (N(r, typeof e != "symbol" ? e + "" : e, t), t);
+var N = Object.defineProperty;
+var S = (r, e, t) => e in r ? N(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var p = (r, e, t) => (S(r, typeof e != "symbol" ? e + "" : e, t), t);
 import { E as x } from "./utils-5a40996f.mjs";
 const O = (r, e, t) => {
   if (r.endsWith("/") || (r += "/"), e === "index" && (e = ""), !t || !Object.keys(t).length)
@@ -9,24 +9,24 @@ const O = (r, e, t) => {
   for (const [f, s] of Object.entries(t))
     n += `${f}=${s}&`;
   return `${r}${e}?${n.slice(0, -1)}`;
-}, v = (r) => typeof FileList > "u" ? !1 : r instanceof FileList || r instanceof File, S = (r) => {
+}, w = typeof FileList > "u", E = (r) => w ? r instanceof Blob : r instanceof FileList || r instanceof File, k = (r) => {
   for (let e in r) {
-    if (v(r[e]))
+    if (E(r[e]))
       return !0;
-    if (Array.isArray(r[e]) && r[e].find((t) => v(t)))
+    if (Array.isArray(r[e]) && r[e].find((t) => E(t)))
       return !0;
   }
   return !1;
-}, E = (r) => new Promise((e) => {
+}, F = (r) => w ? r : new Promise((e) => {
   const t = new FileReader();
   t.onload = () => {
     e(new Blob([t.result], { type: r.type }));
   }, t.readAsArrayBuffer(r);
 });
-class k {
+class A {
   constructor(e) {
-    w(this, "ws");
-    w(this, "url");
+    p(this, "ws");
+    p(this, "url");
     this.ws = new WebSocket(e), this.url = e;
   }
   send(e) {
@@ -74,37 +74,42 @@ class k {
     return this.ws.close(), this;
   }
 }
-const F = (r, e = "", t) => new Proxy(() => {
+const m = (r, e = "", t) => new Proxy(() => {
 }, {
   get(n, f, s) {
-    return F(r, `${e}/${f.toString()}`);
+    return m(r, `${e}/${f.toString()}`);
   },
   apply(n, f, [
-    { $query: s, $fetch: i, $body: m, ...p } = {
+    { $query: s, $fetch: i, $body: L, ...g } = {
       $fetch: void 0,
       $query: void 0,
       $body: void 0
     }
   ] = [{}]) {
-    const g = e.lastIndexOf("/"), h = e.slice(g + 1), d = O(r, e.slice(0, g), s);
-    return h === "subscribe" ? new k(
+    const h = e.lastIndexOf("/"), b = e.slice(h + 1), d = O(r, e.slice(0, h), s);
+    return b === "subscribe" ? new A(
       d.replace(
         /^([^]+):\/\//,
         d.startsWith("https://") ? "wss://" : "ws://"
       )
     ) : (async () => {
-      let c = m ?? (Object.keys(p).length ? p : void 0);
-      const y = typeof c == "object", b = y && S(c);
-      if (b) {
+      let c = L ?? (Object.keys(g).length ? g : void 0);
+      const y = typeof c == "object", v = y && k(c);
+      if (v) {
         const o = new FormData();
         for (const [a, l] of Object.entries(c))
-          if (l instanceof File)
-            o.append(a, await E(l));
+          if (w)
+            o.append(a, l);
+          else if (l instanceof File)
+            o.append(
+              a,
+              await F(l)
+            );
           else if (l instanceof FileList)
             for (let u = 0; u < l.length; u++)
               o.append(
                 a,
-                await E(l[u])
+                await F(l[u])
               );
           else
             o.append(a, l);
@@ -112,11 +117,11 @@ const F = (r, e = "", t) => new Proxy(() => {
       } else
         y && (c = JSON.stringify(c));
       return fetch(d, {
-        method: h,
+        method: b,
         body: c,
         // ...config.fetch,
         ...i,
-        headers: c ? b ? i == null ? void 0 : i.headers : {
+        headers: c ? v ? 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
@@ -141,11 +146,11 @@ const F = (r, e = "", t) => new Proxy(() => {
   {},
   {
     get(t, n) {
-      return F(r, n);
+      return m(r, n);
     }
   }
 );
 export {
-  k as EdenWS,
+  A as EdenWS,
   P as edenTreaty
 };

package/dist/types.d.ts

@@ -0,0 +1,25 @@
+import type { EdenFetchError } from './utils';
+type Range<F extends number, T extends number> = Exclude<Enumerate<T>, Enumerate<F>>;
+type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N ? Acc[number] : Enumerate<N, [...Acc, Acc['length']]>;
+type ErrorRange = Range<300, 599>;
+export type MapError<T extends Record<number, unknown>> = [
+    {
+        [K in keyof T]-?: K extends ErrorRange ? K : never;
+    }[keyof T]
+] extends [infer A extends number] ? {
+    [K in A]: EdenFetchError<K, T[K]>;
+}[A] : false;
+export type UnionToIntersect<U> = (U extends unknown ? (arg: U) => 0 : never) extends (arg: infer I) => 0 ? I : never;
+export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsNever<T> = [T] extends [never] ? true : false;
+export type IsUnknown<T> = IsAny<T> extends true ? false : unknown extends T ? true : false;
+export type AnyTypedRoute = {
+    body: unknown;
+    headers: Record<string, any> | undefined;
+    query: Record<string, any> | undefined;
+    params: Record<string, any> | undefined;
+    response: Record<string, unknown> & {
+        '200': unknown;
+    };
+};
+export {};

package/dist/utils.d.ts

@@ -0,0 +1,5 @@
+export declare class EdenFetchError<Status extends number = number, Value = unknown> extends Error {
+    status: Status;
+    value: Value;
+    constructor(status: Status, value: Value);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",
@@ -13,25 +13,29 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs",
       "node": "./dist/index.js",
-      "default": "./dist/index.js"
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./treaty": {
       "require": "./dist/treaty.js",
       "import": "./dist/treaty.mjs",
       "node": "./dist/treaty.js",
-      "default": "./dist/treaty.js"
+      "default": "./dist/treaty.js",
+      "types": "./dist/treaty/index.d.ts"
     },
     "./fetch": {
       "require": "./dist/fetch.js",
       "import": "./dist/fetch.mjs",
       "node": "./dist/fetch.js",
-      "default": "./dist/fetch.js"
+      "default": "./dist/fetch.js",
+      "types": "./dist/fetch/index.d.ts"
     },
     "./fn": {
       "require": "./dist/fn.js",
       "import": "./dist/fn.mjs",
       "node": "./dist/fn.js",
-      "default": "./dist/fn.js"
+      "default": "./dist/fn.js",
+      "types": "./dist/fn/index.d.ts"
     }
   },
   "types": "./src/index.ts",
@@ -50,7 +54,7 @@
   "scripts": {
     "dev": "bun run --hot example/index.ts",
     "test": "bun wiptest",
-    "build": "vite build",
+    "build": "vite build && tsc",
     "release": "npm run build && npm run test && npm publish --access public"
   },
   "peerDependencies": {
@@ -69,7 +73,7 @@
     "@sinclair/typebox": "^0.26.8",
     "@types/node": "^18.15.5",
     "bun-types": "^0.5.8",
-    "elysia": "0.5.0",
+    "elysia": "0.5.17",
     "eslint": "^8.26.0",
     "rimraf": "^4.4.1",
     "typescript": "^5.0.4",

package/src/treaty/index.ts

@@ -7,12 +7,17 @@ import type { EdenTreaty } from './types'
 
 export type { EdenTreaty } from './types'
 
-const isFile = (v: any) => {
-    // @ts-ignore
-    if (typeof FileList === 'undefined') return false
+// @ts-ignore
+const isServer = typeof FileList === 'undefined'
 
+const isFile = (v: any) => {
     // @ts-ignore
-    return v instanceof FileList || v instanceof File
+    if (isServer) {
+        return v instanceof Blob
+    } else {
+        // @ts-ignore
+        return v instanceof FileList || v instanceof File
+    }
 }
 
 // FormData is 1 level deep
@@ -31,16 +36,18 @@ const hasFile = (obj: Record<string, any>) => {
 
 // @ts-ignore
 const fileToBlob = (v: File) =>
-    new Promise<Blob>((resolve) => {
-        // @ts-ignore
-        const reader = new FileReader()
+    isServer
+        ? v
+        : new Promise<Blob>((resolve) => {
+              // @ts-ignore
+              const reader = new FileReader()
 
-        reader.onload = () => {
-            resolve(new Blob([reader.result!], { type: v.type }))
-        }
+              reader.onload = () => {
+                  resolve(new Blob([reader.result!], { type: v.type }))
+              }
 
-        reader.readAsArrayBuffer(v)
-    })
+              reader.readAsArrayBuffer(v)
+          })
 
 export class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
     ws: WebSocket
@@ -184,19 +191,26 @@ const createProxy = (
 
                     // 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) {
+                        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