@elysiajs/eden 0.3.0-exp-230224.1831 → 0.3.0-rc.1

package/src/treaty/utils.ts

@@ -0,0 +1,15 @@
+export const composePath = (
+    domain: string,
+    path: string,
+    query: Record<string, string> | undefined
+) => {
+    if (!domain.endsWith('/')) domain += '/'
+    if (path === 'index') path = ''
+
+    if (!query || !Object.keys(query).length) return `${domain}${path}`
+
+    let q = ''
+    for (const [key, value] of Object.entries(query)) q += `${key}=${value}&`
+
+    return `${domain}${path}?${q.slice(0, -1)}`
+}

package/src/types.ts

@@ -1,204 +1,18 @@
 import type {
     Elysia,
     SCHEMA,
-    TypedRoute,
     IsPathParameter,
-    EXPOSED
+    EXPOSED,
+    AnyTypedSchema
 } from 'elysia'
-import type { TObject } from '@sinclair/typebox'
 
-import type { EdenWS } from '.'
-import { type EdenFetchError, type Signal } from './utils'
+import type { EdenFetchError } from './utils'
 
-type IsAny<T> = unknown extends T
-    ? [T] extends [object]
-        ? true
-        : false
-    : false
-
-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<T[K]>
-      }
-    : never
-
-type EdenFn<T> = T extends {
-    [EXPOSED]: any
-    value: infer Value
-}
-    ? Asynctify<Value>
-    : Asynctify<T>
-
-type CreateEdenFn<Exposed extends Record<string, any>> = EdenFn<Exposed> & {
-    $set(config: EdenConfig): void
-    $clone(config?: EdenConfig): CreateEdenFn<Exposed>
-}
-
-export type Eden<App extends Elysia<any>> = App['meta'] extends {
-    [key in typeof SCHEMA]: infer Schema extends Record<
-        string,
-        Record<string, TypedRoute>
-    >
-}
-    ? UnionToIntersection<CreateEden<Schema>> & {
-          $fn: CreateEdenFn<App['meta'][typeof EXPOSED]>
-      }
-    : 'Please install Elysia before using Eden'
-
-export interface EdenCall {
-    [x: string]: any
-    $fetch?: RequestInit
-    $query?: Record<string, string | boolean | number>
-}
-
-export type UnionToIntersection<U> = (
-    U extends any ? (k: U) => void : never
-) extends (k: infer I) => void
-    ? I
-    : never
-
-// https://twitter.com/mattpocockuk/status/1622730173446557697?s=20
-type Prettify<T> = {
-    [K in keyof T]: T[K]
-} & {}
-
-type TypedRouteToParams<Route extends TypedRoute> =
-    (Route['body'] extends NonNullable<Route['body']>
-        ? Route['body'] extends Record<any, any>
-            ? Route['body']
-            : {
-                  $body: Route['body']
-              }
-        : {}) &
-        (Route['query'] extends NonNullable<Route['query']>
-            ? unknown extends Route['query']
-                ? {}
-                : {
-                      $query: Route['query']
-                  }
-            : {})
-
-export type CreateEden<
-    Server extends Record<string, Record<string, TypedRoute>>,
-    // pathnames are always string
-    Path extends string = keyof Server extends string ? keyof Server : never,
-    Full extends string = ''
-> = Path extends `/${infer Start}`
-    ? CreateEden<Server, Start, Path>
-    : Path extends `${infer A}/${infer B}`
-    ? // If path parameters, accept any string
-      IsPathParameter<A> extends never
-        ? {
-              [key in A]: CreateEden<Server, B, Full>
-          }
-        : Record<string, CreateEden<Server, B, Full>> &
-              Record<
-                  `$${A}`,
-                  `Expected path parameters ':${A}', replace this with any string`
-              >
-    : // Iterate until last string then catch method
-      {
-          [key in Path extends ''
-              ? // If end with empty, then return as index
-                'index'
-              : Path extends `:${infer params}`
-              ? string
-              : Path | CamelCase<Path>]: Full extends keyof Server
-              ? {
-                    // Check if is method
-                    [key in keyof Server[Full] extends string
-                        ? Lowercase<keyof Server[Full]>
-                        : keyof Server[Full]]: [
-                        Server[Full][key extends string ? Uppercase<key> : key]
-                    ] extends [infer Route extends TypedRoute]
-                        ? undefined extends Route['body']
-                            ? (params?: {
-                                  $query?: EdenCall['$query']
-                                  $fetch?: EdenCall['$fetch']
-                              }) => Promise<
-                                  Route['response'] extends {
-                                      200: infer ReturnedType
-                                  }
-                                      ?
-                                            | ReturnedType
-                                            | MapError<Route['response']>
-                                      : unknown
-                              >
-                            : (
-                                  params: Prettify<
-                                      TypedRouteToParams<Route> & {
-                                          $query?: EdenCall['$query']
-                                          $fetch?: EdenCall['$fetch']
-                                      }
-                                  >
-                              ) => Promise<
-                                  Route['response'] extends {
-                                      200: infer ReturnedType
-                                  }
-                                      ?
-                                            | ReturnedType
-                                            | MapError<Route['response']>
-                                      : unknown
-                              >
-                        : key extends 'subscribe'
-                        ? // Since subscribe key is only a lower letter
-                          [
-                              Server[Full][key],
-                              Server[Full][key]['query']
-                          ] extends [
-                              infer Route extends TypedRoute,
-                              infer Query extends TypedRoute['query']
-                          ]
-                            ? unknown extends NonNullable<Query>
-                                ? (params?: {
-                                      $query?: EdenCall['$query']
-                                  }) => EdenWS<Route>
-                                : Query extends NonNullable<Query>
-                                ? (params: { $query: Query }) => EdenWS<Route>
-                                : (params?: {
-                                      $query?: EdenCall['$query']
-                                  }) => EdenWS<Route>
-                            : never
-                        : never
-                }
-              : never
-      } & (Path extends `:${infer params}`
-          ? Record<
-                `$${params}`,
-                `Expected path parameters ':${params}', replace this with any string`
-            >
-          : {})
-
-// https://stackoverflow.com/questions/59623524/typescript-how-to-map-type-keys-to-camelcase
-type CamelCase<S extends string> =
-    S extends `${infer P1}-${infer P2}${infer P3}`
-        ? `${Lowercase<P1>}${Uppercase<P2>}${CamelCase<P3>}`
-        : Lowercase<S>
-
-export interface EdenWSOnMessage<Data = unknown> extends MessageEvent {
-    data: Data
-    rawData: MessageEvent['data']
-}
-
-export type EdenWSEvent<
-    K extends keyof WebSocketEventMap,
-    Data = unknown
-> = K extends 'message' ? EdenWSOnMessage<Data> : WebSocketEventMap[K]
-
-export interface EdenConfig {
-    fn?: string
-    fetch?: Omit<RequestInit, 'body'>
-}
+// https://stackoverflow.com/a/39495173
+type Range<F extends number, T extends number> = Exclude<
+    Enumerate<T>,
+    Enumerate<F>
+>
 
 type Enumerate<
     N extends number,
@@ -207,15 +21,9 @@ type Enumerate<
     ? Acc[number]
     : Enumerate<N, [...Acc, Acc['length']]>
 
-// https://stackoverflow.com/a/39495173
-type Range<F extends number, T extends number> = Exclude<
-    Enumerate<T>,
-    Enumerate<F>
->
-
 type ErrorRange = Range<300, 599>
 
-type MapError<T extends Record<number, unknown>> = [
+export type MapError<T extends Record<number, unknown>> = [
     {
         [K in keyof T]-?: K extends ErrorRange ? K : never
     }[keyof T]
@@ -224,3 +32,34 @@ type MapError<T extends Record<number, unknown>> = [
           [K in A]: EdenFetchError<K, T[K]>
       }[A]
     : false
+
+// https://twitter.com/mattpocockuk/status/1622730173446557697?s=20
+type Prettify<T> = {
+    [K in keyof T]: T[K]
+} & {}
+
+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
+    }
+}

package/src/utils.ts

@@ -1,5 +1,4 @@
 import type { serialize, deserialize } from 'superjson'
-import type { EdenCall, EdenConfig } from './types'
 
 export class EdenFetchError<
     Status extends number = number,
@@ -15,107 +14,3 @@ export class EdenFetchError<
         this.value = value
     }
 }
-
-
-const camelToDash = (str: string) =>
-    str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`)
-
-export const composePath = (
-    domain: string,
-    path: string,
-    query: EdenCall['$query'] | undefined
-) => {
-    if (!domain.endsWith('/')) domain += '/'
-    path = camelToDash(path.replace(/index/g, ''))
-
-    if (!query || !Object.keys(query).length) return `${domain}${path}`
-
-    let q = ''
-    for (const [key, value] of Object.entries(query)) q += `${key}=${value}&`
-
-    return `${domain}${path}?${q.slice(0, -1)}`
-}
-
-export class Signal {
-    private url: string
-    private config: EdenConfig
-
-    private pendings: Array<{ n: string[] } | { n: string[]; p: any }> = []
-    private operation: Promise<any[]> | null = null
-    private isFetching = false
-
-    private sJson: Promise<{
-        serialize: typeof serialize
-        deserialize: typeof deserialize
-    }>
-
-    constructor(url: string, config: EdenConfig) {
-        this.url = url
-        this.config = config
-
-        this.sJson = import('superjson').then((superJson) => {
-            return {
-                serialize: superJson.serialize,
-                deserialize: superJson.deserialize
-            }
-        })
-    }
-
-    setConfig(config: EdenConfig) {
-        this.config = config
-    }
-
-    clone(config?: EdenConfig) {
-        return new Signal(this.url, config ?? this.config)
-    }
-
-    async run(procedure: string[], params: any) {
-        const current = +this.pendings.length
-        this.pendings.push(
-            params !== undefined
-                ? { n: procedure, p: params }
-                : { n: procedure }
-        )
-
-        if (this.isFetching) return this.operation?.then((x) => x[current])
-        this.isFetching = true
-
-        this.operation = new Promise((resolve) => {
-            setTimeout(async () => {
-                const requests = [...this.pendings]
-                this.pendings = []
-
-                const { serialize, deserialize } = await this.sJson
-
-                const results = await fetch(
-                    `${this.url}${this.config.fn ?? '/~fn'}`,
-                    {
-                        method: 'POST',
-                        ...this.config.fetch,
-                        headers: {
-                            'content-type': 'elysia/fn',
-                            ...this.config.fetch?.headers
-                        },
-                        body: JSON.stringify(serialize(requests))
-                    }
-                )
-
-                if (results.status === 200)
-                    resolve(results.json().then((x) => deserialize(x as any)))
-                else
-                    resolve(
-                        Array(requests.length).fill(
-                            new Error(await results.text())
-                        )
-                    )
-            }, 33)
-        })
-
-        const result = await this.operation.then((results) => results[current])
-
-        this.operation = null
-        this.isFetching = false
-
-        return result
-    }
-}

package/dist/index.umd.js

@@ -1 +0,0 @@
-(function(h,d){typeof exports=="object"&&typeof module<"u"?d(exports):typeof define=="function"&&define.amd?define(["exports"],d):(h=typeof globalThis<"u"?globalThis:h||self,d(h["@elysia/eden"]={}))})(this,function(h){"use strict";class d extends Error{constructor(t,e){super(),this.status=t,this.value=e}}const N=i=>i.replace(/[A-Z]/g,t=>`-${t.toLowerCase()}`),P=(i,t,e)=>{if(i.endsWith("/")||(i+="/"),t=N(t.replace(/index/g,"")),!e||!Object.keys(e).length)return`${i}${t}`;let s="";for(const[o,n]of Object.entries(e))s+=`${o}=${n}&`;return`${i}${t}?${s.slice(0,-1)}`};class v{constructor(t,e){this.pendings=[],this.operation=null,this.isFetching=!1,this.url=t,this.config=e,this.sJson=import("superjson").then(s=>({serialize:s.serialize,deserialize:s.deserialize}))}setConfig(t){this.config=t}clone(t){return new v(this.url,t??this.config)}async run(t,e){var n;const s=+this.pendings.length;if(this.pendings.push(e!==void 0?{n:t,p:e}:{n:t}),this.isFetching)return(n=this.operation)==null?void 0:n.then(r=>r[s]);this.isFetching=!0,this.operation=new Promise(r=>{setTimeout(async()=>{var u;const a=[...this.pendings];this.pendings=[];const{serialize:p,deserialize:w}=await this.sJson,l=await fetch(`${this.url}${this.config.fn??"/~fn"}`,{method:"POST",...this.config.fetch,headers:{"content-type":"elysia/fn",...(u=this.config.fetch)==null?void 0:u.headers},body:JSON.stringify(p(a))});l.status===200?r(l.json().then(f=>w(f))):r(Array(a.length).fill(new Error(await l.text())))},33)});const o=await this.operation.then(r=>r[s]);return this.operation=null,this.isFetching=!1,o}}class j{constructor(t){this.ws=new WebSocket(t),this.url=t}send(t){return Array.isArray(t)?(t.forEach(e=>this.send(e)),this):(this.ws.send(typeof t=="object"?JSON.stringify(t):t.toString()),this)}on(t,e,s){return this.addEventListener(t,e,s)}off(t,e,s){return this.ws.removeEventListener(t,e,s),this}addEventListener(t,e,s){return this.ws.addEventListener(t,o=>{if(t==="message"){let n=o.data.toString();const r=n.charCodeAt(0);if(r===47||r===123)try{n=JSON.parse(n)}catch{}else Number.isNaN(+n)?n==="true"?n=!0:n==="fase"&&(n=!1):n=+n;e({...o,data:n})}else e(o)},s),this}removeEventListener(t,e,s){return this.off(t,e,s),this}close(){return this.ws.close(),this}}const b=(i,t,e)=>new Proxy((...s)=>{},{get(s,o,n){return b(i,[...t,o],e)},apply(s,o,n){const r=n[0];if(t.length===1){if(t[0]in Object.prototype||t[0]in Promise.prototype)return s(n);switch(t[0]){case"toJSON":return s(n);case"$set":return e.setConfig(r);case"$clone":return b(i,[],e.clone(r))}}return e.run(t,n).then(a=>{if(a instanceof Error)throw a;return a})}}),S=(i,t="",e)=>new Proxy(()=>{},{get(s,o,n){return S(i,`${t}/${o.toString()}`,e)},apply(s,o,[{$query:n,$fetch:r,$body:a,...p}={$fetch:void 0,$query:void 0,$body:void 0}]=[{}]){var E;const w=t.lastIndexOf("/"),l=t.slice(w+1),u=P(i,t.slice(0,w),n);if(l==="subscribe")return new j(u.replace(/^([^]+):\/\//,u.startsWith("https://")?"wss://":"ws://"));const f=a??(Object.keys(p).length?p:void 0),x=typeof f=="object";return fetch(u,{method:l,body:x?JSON.stringify(f):f,...e.fetch,...r,headers:f?{"content-type":x?"application/json":"text/plain",...(E=e.fetch)==null?void 0:E.headers,...r==null?void 0:r.headers}:void 0}).then(async c=>{var $,O;if(c.status>300){let y;if(($=c.headers.get("content-type"))!=null&&$.includes("application/json"))try{y=await c.json()}catch{y=await c.text()}else y=await c.text();return new d(c.status,y)}if((O=c.headers.get("content-type"))!=null&&O.includes("application/json"))try{return await c.json()}catch{}let g=await c.text();return Number.isNaN(+g)?g==="true"?!0:g==="false"?!1:g:+g})}}),m=(i,t={})=>new Proxy({},{get(e,s){return s==="$fn"?b(i,[],new v(i,t)):S(i,s,t)}});h.EdenWS=j,h.eden=m,Object.defineProperty(h,Symbol.toStringTag,{value:"Module"})});