@elysiajs/eden 0.8.1 → 1.0.0-beta.1

package/dist/types.d.ts

@@ -15,12 +15,24 @@ 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;
-    };
+    body?: unknown;
+    headers?: unknown;
+    query?: unknown;
+    params?: unknown;
+    response: Record<number, unknown>;
 };
+export type Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+export type TreatyToPath<T, Path extends string = ''> = UnionToIntersect<T extends Record<string, unknown> ? {
+    [K in keyof T]: T[K] extends AnyTypedRoute ? {
+        [path in Path]: {
+            [method in K]: T[K];
+        };
+    } : unknown extends T[K] ? {
+        [path in Path]: {
+            [method in K]: T[K];
+        };
+    } : TreatyToPath<T[K], `${Path}/${K & string}`>;
+}[keyof T] : {}>;
 export {};

package/package.json

@@ -1,82 +1,74 @@
 {
-    "name": "@elysiajs/eden",
-    "version": "0.8.1",
-    "description": "Fully type-safe Elysia client",
-    "author": {
-        "name": "saltyAom",
-        "url": "https://github.com/SaltyAom",
-        "email": "saltyaom@gmail.com"
+  "name": "@elysiajs/eden",
+  "version": "1.0.0-beta.1",
+  "description": "Fully type-safe Elysia client",
+  "author": {
+    "name": "saltyAom",
+    "url": "https://github.com/SaltyAom",
+    "email": "saltyaom@gmail.com"
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "node": "./dist/index.js",
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
-    "main": "./dist/index.js",
-    "exports": {
-        ".": {
-            "require": "./dist/index.js",
-            "import": "./dist/index.mjs",
-            "node": "./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",
-            "types": "./dist/treaty/index.d.ts"
-        },
-        "./fetch": {
-            "require": "./dist/fetch.js",
-            "import": "./dist/fetch.mjs",
-            "node": "./dist/fetch.js",
-            "default": "./dist/fetch.js",
-            "types": "./dist/fetch/index.d.ts"
-        }
+    "./treaty": {
+      "require": "./dist/treaty.js",
+      "import": "./dist/treaty.mjs",
+      "node": "./dist/treaty.js",
+      "default": "./dist/treaty.js",
+      "types": "./dist/treaty/index.d.ts"
     },
-    "types": "./src/index.ts",
-    "keywords": [
-        "elysia",
-        "eden",
-        "connector"
-    ],
-    "homepage": "https://github.com/elysiajs/eden",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/elysiajs/eden"
-    },
-    "bugs": "https://github.com/elysiajs/eden/issues",
-    "license": "MIT",
-    "scripts": {
-        "dev": "bun run --watch example/index.ts",
-        "test": "bun test",
-        "build": "rimraf dist && tsup",
-        "release": "npm run build && npm run test && npm publish --access public"
-    },
-    "peerDependencies": {
-        "elysia": ">= 0.8.0"
-    },
-    "peerDependenciesMeta": {
-        "@sinclair/typebox": {
-            "optional": true
-        }
-    },
-    "devDependencies": {
-        "@elysiajs/cors": "0.7.0",
-        "@sinclair/typebox": "^0.31.6",
-        "@types/node": "^18.15.5",
-        "bun-types": "^1.0.1",
-        "elysia": "0.8.0",
-        "esbuild": "^0.19.3",
-        "eslint": "^8.26.0",
-        "rimraf": "^4.4.1",
-        "tsup": "^7.2.0",
-        "typescript": "^5.2.2"
-    },
-    "prettier": {
-        "semi": false,
-        "tabWidth": 4,
-        "singleQuote": true,
-        "trailingComma": "none"
-    },
-    "dependencies": {
-        "superjson": "^2.2.1"
+    "./fetch": {
+      "require": "./dist/fetch.js",
+      "import": "./dist/fetch.mjs",
+      "node": "./dist/fetch.js",
+      "default": "./dist/fetch.js",
+      "types": "./dist/fetch/index.d.ts"
     }
+  },
+  "types": "./dist/index.d.ts",
+  "keywords": [
+    "elysia",
+    "eden",
+    "connector"
+  ],
+  "homepage": "https://github.com/elysiajs/eden",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/elysiajs/eden"
+  },
+  "bugs": "https://github.com/elysiajs/eden/issues",
+  "license": "MIT",
+  "scripts": {
+    "dev": "bun run --watch example/index.ts",
+    "test": "bun test",
+    "build": "rimraf dist && tsup",
+    "release": "npm run build && npm run test && npm publish --access public"
+  },
+  "peerDependencies": {
+    "elysia": ">= 1.0.0-beta.0"
+  },
+  "devDependencies": {
+    "@elysiajs/cors": "0.7.0",
+    "@types/bun": "^1.0.3",
+    "@types/node": "^18.15.5",
+    "elysia": "1.0.0-beta.0",
+    "esbuild": "^0.19.3",
+    "eslint": "^8.26.0",
+    "rimraf": "^4.4.1",
+    "tsup": "^7.2.0",
+    "typescript": "^5.3.2"
+  },
+  "prettier": {
+    "semi": false,
+    "tabWidth": 4,
+    "singleQuote": true,
+    "trailingComma": "none"
+  }
 }

package/dist/chunk-3IC43ZE4.mjs

@@ -1 +0,0 @@
-import{a as L}from"./chunk-Y6SMVGJX.mjs";var W=(n,e,t)=>{if(n.endsWith("/")||(n+="/"),e==="index"&&(e=""),!t||!Object.keys(t).length)return`${n}${e}`;let s="";for(let[c,r]of Object.entries(t))s+=`${c}=${r}&`;return`${n}${e}?${s.slice(0,-1)}`},k=n=>!Number.isNaN(parseInt(n));var F=typeof FileList>"u",K=n=>F?n instanceof Blob:n instanceof FileList||n instanceof File,J=n=>{if(!n)return!1;for(let e in n){if(K(n[e]))return!0;if(Array.isArray(n[e])&&n[e].find(t=>K(t)))return!0}return!1},T=n=>F?n:new Promise(e=>{let t=new FileReader;t.onload=()=>{let s=new File([t.result],n.name,{lastModified:n.lastModified,type:n.type});e(s)},t.readAsArrayBuffer(n)}),$=class{ws;url;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,c=>{if(e==="message"){let r=c.data.toString(),u=r.charCodeAt(0);if(u===47||u===123)try{r=JSON.parse(r)}catch{}else k(r)?r=+r:r==="true"?r=!0:r==="false"&&(r=!1);t({...c,data:r})}else t(c)},s),this}removeEventListener(e,t,s){return this.off(e,t,s),this}close(){return this.ws.close(),this}},j=(n,e="",t)=>new Proxy(()=>{},{get(s,c,r){return j(n,`${e}/${c.toString()}`,t)},apply(s,c,[r,u={}]=[{},{}]){let y=r!==void 0&&(typeof r!="object"||Array.isArray(r))?r:void 0,{$query:I,$fetch:O,$headers:M,$transform:g,getRaw:N,...P}=r??{};y??=P;let w=e.lastIndexOf("/"),E=e.slice(w+1).toUpperCase(),S=W(n,w===-1?"/":e.slice(0,w),Object.assign(u.query??{},I)),C=t.fetcher??fetch,p=t.transform?Array.isArray(t.transform)?t.transform:[t.transform]:void 0,v=g?Array.isArray(g)?g:[g]:void 0;return v&&(p?p=v.concat(p):p=v),E==="SUBSCRIBE"?new $(S.replace(/^([^]+):\/\//,S.startsWith("https://")?"wss://":"ws://")):(async q=>{let f,R={...t.$fetch?.headers,...O?.headers,...u.headers,...M};if(E!=="GET"&&E!=="HEAD"){f=Object.keys(y).length||Array.isArray(y)?y:void 0;let a=typeof f=="object"||Array.isArray(y);if(a&&J(f)){let h=new FormData;for(let[m,o]of Object.entries(f))if(F)h.append(m,o);else if(o instanceof File)h.append(m,await T(o));else if(o instanceof FileList)for(let l=0;l<o.length;l++)h.append(m,await T(o[l]));else if(Array.isArray(o))for(let l=0;l<o.length;l++){let A=o[l];h.append(m,A instanceof File?await T(A):A)}else h.append(m,o);f=h}else R["content-type"]=a?"application/json":"text/plain",f=a?JSON.stringify(f):y}let i=await C(S,{method:E,body:f,...t.$fetch,...u.fetch,...O,headers:R}),b;if(q.getRaw)return i;switch(i.headers.get("Content-Type")?.split(";")[0]){case"application/json":b=await i.json();break;default:b=await i.text().then(a=>k(a)?+a:a==="true"?!0:a==="false"?!1:a)}let D=i.status>=300||i.status<200?new L(i.status,b):null,x={data:b,error:D,response:i,status:i.status,headers:i.headers};if(p)for(let a of p){let d=a(x);d instanceof Promise&&(d=await d),d!=null&&(x=d)}return x})({getRaw:N})}}),_=(n,e={fetcher:fetch})=>new Proxy({},{get(t,s){return j(n,s,e)}});export{$ as a,_ as b};

package/dist/chunk-3KYW6H6M.mjs

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

package/dist/chunk-Y6SMVGJX.mjs

@@ -1 +0,0 @@
-var s=class extends Error{status;value;constructor(e,t){super(),this.status=e,this.value=t}};export{s as a};

package/src/errors.ts

@@ -1,16 +0,0 @@
-import type { serialize, deserialize } from 'superjson'
-
-export class EdenFetchError<
-    Status extends number = number,
-    Value = unknown
-> extends Error {
-    status: Status
-    value: Value
-
-    constructor(status: Status, value: Value) {
-        super()
-
-        this.status = status
-        this.value = value
-    }
-}

package/src/fetch/index.ts

@@ -1,82 +0,0 @@
-import type { Elysia } from 'elysia'
-
-import { EdenFetchError } from '../errors'
-import type { EdenFetch } from './types'
-export type { EdenFetch } from './types'
-
-export const edenFetch =
-    <App extends Elysia<any, any, any, any, any, any>>(
-        server: string,
-        config?: EdenFetch.Config
-    ): EdenFetch.Create<App> =>
-    // @ts-ignore
-    (endpoint: string, { query, params, body, ...options } = {}) => {
-        if (params)
-            Object.entries(params).forEach(([key, value]) => {
-                endpoint = endpoint.replace(`:${key}`, value as string)
-            })
-
-        const contentType = options.headers?.['Content-Type']
-
-        if (!contentType || contentType === 'application/json')
-            try {
-                body = JSON.stringify(body)
-            } catch (error) {
-                //
-            }
-
-        const fetch = config?.fetcher || globalThis.fetch
-        const queryStr = query
-            ? `?${new URLSearchParams(query).toString()}`
-            : ''
-
-        // @ts-ignore
-        const execute = () => fetch(server + endpoint + queryStr, {
-            ...options,
-            method: options.method?.toUpperCase() || 'GET',
-            headers: body
-                ? {
-                      'content-type': 'application/json',
-                      ...options.headers
-                  }
-                : options.headers,
-            body: body as any
-        }).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((d) => {
-                        if (!Number.isNaN(+d)) return +d
-                        if (d === 'true') return true
-                        if (d === 'false') return false
-
-                        return d
-                    })
-                    break
-            }
-
-            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,
-                status: res.status,
-                headers: res.headers,
-                retry: execute
-            }
-        })
-
-        return execute()
-    }

package/src/fetch/types.ts

@@ -1,81 +0,0 @@
-import type { Elysia } from 'elysia'
-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, any, any, any, any, any>> =
-        App extends {
-            schema: infer Schema extends Record<string, any>
-        }
-            ? EdenFetch.Fn<Schema>
-            : 'Please install Elysia before using Eden'
-
-    export interface Config {
-        fetcher?: typeof globalThis.fetch
-    }
-
-    export type Fn<Schema extends Record<string, any>> = <
-        Endpoint extends keyof Schema,
-        Method extends Uppercase<Extract<keyof Schema[Endpoint], string>>,
-        Route extends Schema[Endpoint][Lowercase<Method>]
-    >(
-        endpoint: Endpoint,
-        options: Omit<RequestInit, 'body' | 'method' | 'headers'> &
-            ('GET' extends Method
-                ? {
-                      method?: Method
-                  }
-                : {
-                      method: Method
-                  }) &
-            (IsNever<Route['params']> extends true
-                ? {
-                      params?: Record<never, string>
-                  }
-                : {
-                      params: Route['params']
-                  }) &
-            (IsNever<keyof Route['query']> extends true
-                ? {
-                      query?: Record<never, string>
-                  }
-                : {
-                      query: Route['query']
-                  }) &
-            (undefined extends Route['headers']
-                ? {
-                      headers?: Record<string, string>
-                  }
-                : {
-                      headers: Route['headers']
-                  }) &
-            (IsUnknown<Route['body']> extends false
-                ? { body: Route['body'] }
-                : { body?: unknown })
-    ) => Promise<
-        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/index.ts

@@ -1,7 +0,0 @@
-import type { Elysia } from 'elysia'
-
-import type { EdenTreaty } from './treaty'
-import type { EdenFetch } from './fetch'
-
-export { edenTreaty } from './treaty'
-export { edenFetch } from './fetch'