@elysiajs/eden 0.3.0-beta.1 → 0.3.0-beta.2

package/dist/index.mjs

@@ -105,32 +105,35 @@ class S {
     return this.ws.close(), this;
   }
 }
-const w = (i, t, e) => new Proxy((...s) => {
-}, {
-  get(s, o, n) {
-    return w(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":
+const w = (i, t, e) => (
+  // @ts-ignore
+  new Proxy((...s) => {
+  }, {
+    get(s, o, n) {
+      return w(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);
-        case "$set":
-          return e.setConfig(r);
-        case "$clone":
-          return w(i, [], e.clone(r));
+        switch (t[0]) {
+          case "toJSON":
+            return s(n);
+          case "$set":
+            return e.setConfig(r);
+          case "$clone":
+            return w(i, [], e.clone(r));
+        }
       }
+      return e.run(t, n).then((a) => {
+        if (a instanceof Error)
+          throw a;
+        return a;
+      });
     }
-    return e.run(t, n).then((a) => {
-      if (a instanceof Error)
-        throw a;
-      return a;
-    });
-  }
-}), j = (i, t = "", e) => new Proxy(() => {
+  })
+), j = (i, t = "", e) => new Proxy(() => {
 }, {
   get(s, o, n) {
     return j(i, `${t}/${o.toString()}`, e);

package/dist/types.d.ts

@@ -1,22 +1,24 @@
 /// <reference types="bun-types" />
-import type { Elysia, SCHEMA, TypedRoute, IsPathParameter, EXPOSED } from 'elysia';
+import type { Elysia, SCHEMA, IsPathParameter, EXPOSED, AnyTypedSchema } from 'elysia';
 import type { EdenWS } from '.';
 import { type EdenFetchError } from './utils';
-declare type Promisify<T extends (...args: any[]) => any> = T extends (...args: infer Args) => infer Return ? Return extends Promise<any> ? T : (...args: Args) => Promise<Return> : never;
-declare type Asynctify<T> = T extends infer Fn extends (...args: any) => any ? Promisify<Fn> : T extends Record<string, any> ? {
+export type IsAny<T> = 0 extends 1 & T ? true : false;
+export type IsUnknown<T> = IsAny<T> extends true ? false : unknown extends T ? true : 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;
-declare type EdenFn<T> = T extends {
+type EdenFn<T> = T extends {
     [EXPOSED]: any;
     value: infer Value;
 } ? Asynctify<Value> : Asynctify<T>;
-declare type CreateEdenFn<Exposed extends Record<string, any>> = EdenFn<Exposed> & {
+type CreateEdenFn<Exposed extends Record<string, any>> = EdenFn<Exposed> & {
     $set(config: EdenConfig): void;
     $clone(config?: EdenConfig): CreateEdenFn<Exposed>;
 };
-export declare type Eden<App extends Elysia<any>> = App['meta'] extends {
-    [key in typeof SCHEMA]: infer Schema extends Record<string, Record<string, TypedRoute>>;
-} ? UnionToIntersection<CreateEden<Schema>> & {
+export type Eden<App extends Elysia<any>> = App['meta'] extends {
+    [key in typeof SCHEMA]: infer Schema extends Record<string, Record<string, AnyTypedSchema>>;
+} ? UnionToIntersection<CreateEden<Schema, Exclude<keyof Schema, number | symbol>>> & {
     $fn: CreateEdenFn<App['meta'][typeof EXPOSED]>;
 } : 'Please install Elysia before using Eden';
 export interface EdenCall {
@@ -24,61 +26,47 @@ export interface EdenCall {
     $fetch?: RequestInit;
     $query?: Record<string, string | boolean | number>;
 }
-export declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
-declare type Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
-declare 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 declare type CreateEden<Server extends Record<string, Record<string, TypedRoute>>, 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}` ? IsPathParameter<A> extends never ? {
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+export type MergeUnionObjects<T> = {} & {
+    [P in keyof T]: T[P];
+};
+export type CreateEden<Server extends Record<string, Record<string, AnyTypedSchema>>, Path extends string, Full extends string = ''> = Path extends `/${infer Start}` ? CreateEden<Server, Start, Path> : Path extends `${infer A}/${infer B}` ? 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 '' ? 'index' : Path extends `:${infer params}` ? string : Path | CamelCase<Path>]: Full extends keyof Server ? {
-        [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?: {
+} : Record<string, CreateEden<Server, B, Full>> & Record<`$${A}`, `Expected path parameters ':${A}', replace this with any string`> : {
+    [key in Path extends '' ? 'index' : Path | CamelCase<Path>]: Full extends keyof Server ? {
+        [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 AnyTypedSchema ? IsUnknown<Route['body']> extends true ? (params?: {
             $query?: EdenCall['$query'];
             $fetch?: EdenCall['$fetch'];
         }) => Promise<Route['response'] extends {
             200: infer ReturnedType;
-        } ? ReturnedType | MapError<Route['response']> : unknown> : (params: Prettify<TypedRouteToParams<Route> & {
+        } ? ReturnedType | MapError<Route['response']> : unknown> : (params: MergeUnionObjects<Route['body'] & {
             $query?: EdenCall['$query'];
             $fetch?: EdenCall['$fetch'];
         }>) => Promise<Route['response'] extends {
             200: infer ReturnedType;
-        } ? ReturnedType | MapError<Route['response']> : unknown> : key extends 'subscribe' ? [
-            Server[Full][key],
-            Server[Full][key]['query']
-        ] extends [
-            infer Route extends TypedRoute,
-            infer Query extends TypedRoute['query']
-        ] ? unknown extends NonNullable<Query> ? (params?: {
+        } ? ReturnedType | MapError<Route['response']> : unknown> : key extends 'subscribe' ? Server[Full][key] extends infer Route extends AnyTypedSchema ? IsUnknown<Route['query']> extends true ? (params?: {
             $query?: EdenCall['$query'];
-        }) => EdenWS<Route> : Query extends NonNullable<Query> ? (params: {
-            $query: Query;
+        }) => EdenWS<Route> : Route['query'] extends NonNullable<Route['query']> ? (params: {
+            $query: Route['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`> : {});
-declare type CamelCase<S extends string> = S extends `${infer P1}-${infer P2}${infer P3}` ? `${Lowercase<P1>}${Uppercase<P2>}${CamelCase<P3>}` : Lowercase<S>;
+};
+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 declare type EdenWSEvent<K extends keyof WebSocketEventMap, Data = unknown> = K extends 'message' ? EdenWSOnMessage<Data> : WebSocketEventMap[K];
+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'>;
 }
-declare type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N ? Acc[number] : Enumerate<N, [...Acc, Acc['length']]>;
-declare type Range<F extends number, T extends number> = Exclude<Enumerate<T>, Enumerate<F>>;
-declare type ErrorRange = Range<300, 599>;
-declare type MapError<T extends Record<number, unknown>> = [
+type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N ? Acc[number] : Enumerate<N, [...Acc, Acc['length']]>;
+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>> = [
     {
         [K in keyof T]-?: K extends ErrorRange ? K : never;
     }[keyof T]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.3.0-beta.1",
+  "version": "0.3.0-beta.2",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",

package/src/index.ts

@@ -1,12 +1,11 @@
-import type { Elysia, TypedSchema, HTTPMethod } from 'elysia'
+import type { Elysia, TypedSchema } from 'elysia'
 
 import type {
     CreateEden,
     Eden,
     EdenCall,
     EdenConfig,
-    EdenWSEvent,
-    UnionToIntersection
+    EdenWSEvent
 } from './types'
 import { composePath, EdenFetchError, Signal } from './utils'
 

package/src/types.ts

@@ -1,19 +1,20 @@
 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
+export type IsAny<T> = 0 extends 1 & T ? true : false
+
+export type IsUnknown<T> = IsAny<T> extends true
+    ? false
+    : unknown extends T
+    ? true
     : false
 
 type Promisify<T extends (...args: any[]) => any> = T extends (
@@ -47,10 +48,12 @@ type CreateEdenFn<Exposed extends Record<string, any>> = EdenFn<Exposed> & {
 export type Eden<App extends Elysia<any>> = App['meta'] extends {
     [key in typeof SCHEMA]: infer Schema extends Record<
         string,
-        Record<string, TypedRoute>
+        Record<string, AnyTypedSchema>
     >
 }
-    ? UnionToIntersection<CreateEden<Schema>> & {
+    ? UnionToIntersection<
+          CreateEden<Schema, Exclude<keyof Schema, number | symbol>>
+      > & {
           $fn: CreateEdenFn<App['meta'][typeof EXPOSED]>
       }
     : 'Please install Elysia before using Eden'
@@ -61,37 +64,18 @@ export interface EdenCall {
     $query?: Record<string, string | boolean | number>
 }
 
-export type UnionToIntersection<U> = (
-    U extends any ? (k: U) => void : never
-) extends (k: infer I) => void
+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 MergeUnionObjects<T> = {} & { [P in keyof T]: T[P] }
 
 export type CreateEden<
-    Server extends Record<string, Record<string, TypedRoute>>,
+    Server extends Record<string, Record<string, AnyTypedSchema>>,
     // pathnames are always string
-    Path extends string = keyof Server extends string ? keyof Server : never,
+    Path extends string,
     Full extends string = ''
 > = Path extends `/${infer Start}`
     ? CreateEden<Server, Start, Path>
@@ -111,17 +95,15 @@ export type CreateEden<
           [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']
+                        : keyof Server[Full]]: Server[Full][key extends string
+                        ? Uppercase<key>
+                        : key] extends infer Route extends AnyTypedSchema
+                        ? IsUnknown<Route['body']> extends true
                             ? (params?: {
                                   $query?: EdenCall['$query']
                                   $fetch?: EdenCall['$fetch']
@@ -135,8 +117,8 @@ export type CreateEden<
                                       : unknown
                               >
                             : (
-                                  params: Prettify<
-                                      TypedRouteToParams<Route> & {
+                                  params: MergeUnionObjects<
+                                      Route['body'] & {
                                           $query?: EdenCall['$query']
                                           $fetch?: EdenCall['$fetch']
                                       }
@@ -152,19 +134,17 @@ export type CreateEden<
                               >
                         : 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>
+                          Server[Full][key] extends infer Route extends AnyTypedSchema
+                            ? IsUnknown<Route['query']> extends true
                                 ? (params?: {
                                       $query?: EdenCall['$query']
                                   }) => EdenWS<Route>
-                                : Query extends NonNullable<Query>
-                                ? (params: { $query: Query }) => EdenWS<Route>
+                                : Route['query'] extends NonNullable<
+                                      Route['query']
+                                  >
+                                ? (params: {
+                                      $query: Route['query']
+                                  }) => EdenWS<Route>
                                 : (params?: {
                                       $query?: EdenCall['$query']
                                   }) => EdenWS<Route>
@@ -172,12 +152,13 @@ export type CreateEden<
                         : never
                 }
               : never
-      } & (Path extends `:${infer params}`
-          ? Record<
-                `$${params}`,
-                `Expected path parameters ':${params}', replace this with any string`
-            >
-          : {})
+      }
+// & (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> =