@elysiajs/eden 0.5.6 → 0.6.1

package/package.json

@@ -1,86 +1,84 @@
 {
-  "name": "@elysiajs/eden",
-  "version": "0.5.6",
-  "description": "Fully type-safe Elysia client",
-  "author": {
-    "name": "saltyAom",
-    "url": "https://github.com/SaltyAom",
-    "email": "saltyaom@gmail.com"
-  },
-  "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"
+    "name": "@elysiajs/eden",
+    "version": "0.6.1",
+    "description": "Fully type-safe Elysia client",
+    "author": {
+        "name": "saltyAom",
+        "url": "https://github.com/SaltyAom",
+        "email": "saltyaom@gmail.com"
     },
-    "./treaty": {
-      "require": "./dist/treaty.js",
-      "import": "./dist/treaty.mjs",
-      "node": "./dist/treaty.js",
-      "default": "./dist/treaty.js",
-      "types": "./dist/treaty/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"
+        },
+        "./fn": {
+            "require": "./dist/fn.js",
+            "import": "./dist/fn.mjs",
+            "node": "./dist/fn.js",
+            "default": "./dist/fn.js",
+            "types": "./dist/fn/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"
+    "types": "./src/index.ts",
+    "keywords": [
+        "elysia",
+        "eden",
+        "connector"
+    ],
+    "homepage": "https://github.com/elysiajs/elysia-eden",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/elysiajs/elysia-eden"
     },
-    "./fn": {
-      "require": "./dist/fn.js",
-      "import": "./dist/fn.mjs",
-      "node": "./dist/fn.js",
-      "default": "./dist/fn.js",
-      "types": "./dist/fn/index.d.ts"
-    }
-  },
-  "types": "./src/index.ts",
-  "keywords": [
-    "elysia",
-    "eden",
-    "connector"
-  ],
-  "homepage": "https://github.com/elysiajs/elysia-eden",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/elysiajs/elysia-eden"
-  },
-  "bugs": "https://github.com/elysiajs/elysia-eden/issues",
-  "license": "MIT",
-  "scripts": {
-    "dev": "bun run --hot example/index.ts",
-    "test": "bun wiptest",
-    "build": "vite build && tsc",
-    "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"
-  },
-  "peerDependenciesMeta": {
-    "@sinclair/typebox": {
-      "optional": true
+    "bugs": "https://github.com/elysiajs/elysia-eden/issues",
+    "license": "MIT",
+    "scripts": {
+        "dev": "bun run --hot example/index.ts",
+        "test": "bun wiptest",
+        "build": "vite build && tsc",
+        "release": "npm run build && npm run test && npm publish --access public"
+    },
+    "peerDependencies": {
+        "elysia": ">= 0.6.7"
+    },
+    "peerDependenciesMeta": {
+        "@sinclair/typebox": {
+            "optional": true
+        }
+    },
+    "devDependencies": {
+        "@elysiajs/cors": "0.5.0",
+        "@elysiajs/fn": "^0.6.1",
+        "@sinclair/typebox": "^0.26.8",
+        "@types/node": "^18.15.5",
+        "bun-types": "^0.5.8",
+        "elysia": "0.6.10",
+        "eslint": "^8.26.0",
+        "rimraf": "^4.4.1",
+        "typescript": "^5.0.4",
+        "vite": "^4.3.5",
+        "vite-plugin-dts": "^2.3.0"
+    },
+    "dependencies": {
+        "superjson": "^1.12.2"
     }
-  },
-  "devDependencies": {
-    "@elysiajs/cors": "0.5.0",
-    "@elysiajs/fn": "^0.5.2",
-    "@sinclair/typebox": "^0.26.8",
-    "@types/node": "^18.15.5",
-    "bun-types": "^0.5.8",
-    "elysia": "0.5.17",
-    "eslint": "^8.26.0",
-    "rimraf": "^4.4.1",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.5",
-    "vite-plugin-dts": "^2.3.0"
-  },
-  "dependencies": {
-    "superjson": "^1.12.2"
-  }
-}
+}

package/src/fetch/index.ts

@@ -5,7 +5,7 @@ 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> =>
@@ -25,6 +25,8 @@ export const edenFetch =
                 //
             }
 
+        const fetch = config?.fetcher || globalThis.fetch
+
         // @ts-ignore
         return fetch(server + endpoint, {
             ...options,

package/src/fetch/types.ts

@@ -1,16 +1,17 @@
-import type { Elysia, SCHEMA } from 'elysia'
+import type { Elysia } from 'elysia'
 import type { EdenFetchError } from '../utils'
-import type { MapError, IsUnknown, IsNever, AnyTypedRoute } from '../types'
+import type { MapError, IsUnknown, IsNever } from '../types'
 
 export namespace EdenFetch {
-    export type Create<App extends Elysia<any>> = App['meta'] extends Record<
-        typeof SCHEMA,
-        infer Schema extends Record<string, any>
-    >
+    export type Create<App extends Elysia<any, any>> = App['meta'] extends {
+        schema: infer Schema extends Record<string, any>
+    }
         ? EdenFetch.Fn<Schema>
         : 'Please install Elysia before using Eden'
 
-    export interface Config {}
+    export interface Config {
+        fetcher?: typeof globalThis.fetch
+    }
 
     export type Fn<Schema extends Record<string, any>> = <
         Endpoint extends keyof Schema,

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,10 +1,9 @@
-import type { Elysia, EXPOSED } from 'elysia'
+import type { Elysia } from 'elysia'
 
 export namespace EdenFn {
-    export type Create<App extends Elysia<any>> = App['meta'] extends Record<
-        typeof EXPOSED,
-        infer Schema extends Record<string, any>
-    >
+    export type Create<App extends Elysia<any, any>> = App['meta'] extends {
+        exposed: infer Schema extends Record<string, any>
+    }
         ? EdenFn.Compose<Schema>
         : 'Please install Elysia before using Eden'
 
@@ -16,7 +15,7 @@ export namespace EdenFn {
     }
 
     export type Fn<T> = T extends {
-        [EXPOSED]: any
+        exposed: any
         value: infer Value
     }
         ? Asynctify<Value>
@@ -25,6 +24,7 @@ export namespace EdenFn {
     export interface Config {
         fn?: string
         fetch?: Omit<RequestInit, 'body'>
+        fetcher?: typeof globalThis.fetch
     }
 }
 

package/src/fn/utils.ts

@@ -52,6 +52,7 @@ export class Signal {
 
                 const { serialize, deserialize } = await this.sJson
 
+                const fetch = this.config?.fetcher || globalThis.fetch
                 const results = await fetch(
                     `${this.url}${this.config.fn ?? '/~fn'}`,
                     {

package/src/treaty/index.ts

@@ -22,7 +22,7 @@ const isFile = (v: any) => {
 
 // FormData is 1 level deep
 const hasFile = (obj: Record<string, any>) => {
-    for (let key in obj) {
+    for (const key in obj) {
         if (isFile(obj[key])) return true
         else if (
             Array.isArray(obj[key]) &&
@@ -114,7 +114,9 @@ export class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
                     if (start === 47 || start === 123)
                         try {
                             data = JSON.parse(data)
-                        } catch {}
+                        } catch {
+                            // Not Empty
+                        }
                     else if (!Number.isNaN(+data)) data = +data
                     else if (data === 'true') data = true
                     else if (data === 'fase') data = false
@@ -150,9 +152,10 @@ export class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
 
 const createProxy = (
     domain: string,
-    path: string = '',
+    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)
@@ -180,7 +183,7 @@ const createProxy = (
                     )
                 )
 
-            return (async () => {
+            const execute = async () => {
                 let body =
                     $body ?? (Object.keys(bodyObj).length ? bodyObj : undefined)
                 const isObject = typeof body === 'object'
@@ -216,56 +219,72 @@ const createProxy = (
                     body = newBody
                 } else if (isObject) body = JSON.stringify(body)
 
-                return (config.fetcher ?? fetch)(url, {
+                const $headers = {
+                    ...config.$fetch?.headers,
+                    ...$fetch?.headers
+                }
+
+                const response = await (config.fetcher ?? fetch)(url, {
                     method,
                     body,
-                    // ...config.fetch,
+                    ...config.$fetch,
                     ...$fetch,
                     headers: body
                         ? isFormData
-                            ? $fetch?.['headers']
+                            ? $headers
                             : {
                                   'content-type': isObject
                                       ? 'application/json'
                                       : 'text/plain',
-                                  ...$fetch?.['headers']
+                                  ...$headers
                               }
-                        : $fetch?.['headers']
-                }).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((data) => {
-                                if (!Number.isNaN(+data)) return +data
-                                if (data === 'true') return true
-                                if (data === 'false') return false
-
-                                return data
-                            })
+                        : $headers
+                })
+
+                let data
+
+                switch (response.headers.get('Content-Type')?.split(';')[0]) {
+                    case 'application/json':
+                        data = await response.json()
+                        break
+
+                    default:
+                        data = await response.text().then((data) => {
+                            if (!Number.isNaN(+data)) return +data
+                            if (data === 'true') return true
+                            if (data === 'false') return false
+
+                            return data
+                        })
+                }
+
+                if (response.status > 300)
+                    return {
+                        data,
+                        error: new EdenFetchError(response.status, await data),
+                        status: response.status,
+                        raw: response,
+                        headers: response.headers,
+                        retry: execute
                     }
 
-                    if (res.status > 300)
-                        return {
-                            data,
-                            error: new EdenFetchError(res.status, await data)
-                        }
+                return {
+                    data,
+                    status: response.status,
+                    raw: response,
+                    headers: response.headers,
+                    error: null,
+                    retry: execute
+                }
+            }
 
-                    return { data, error: null }
-                })
-            })()
+            return execute()
         }
     }) as unknown as Record<string, unknown>
 
-export const edenTreaty = <App extends Elysia<any>>(
+export const edenTreaty = <App extends Elysia<any, any>>(
     domain: string,
-    config: {
-        fetcher?: typeof fetch
-    } = {
+    config: EdenTreaty.Config = {
         fetcher: fetch
     }
 ): EdenTreaty.Create<App> =>