@elysiajs/eden 0.2.0-rc.7 → 0.2.0-rc.9

package/dist/types.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="bun-types" />
 import type { Elysia, SCHEMA, TypedRoute, IsPathParameter } from 'elysia';
 import type { EdenWS } from '.';
+declare type IsAny<T> = unknown extends T ? [T] extends [object] ? true : false : false;
 export declare type Eden<App extends Elysia<any>> = App['store'] extends {
-    [key in typeof SCHEMA]: any;
-} ? UnionToIntersection<CreateEden<App['store'][typeof SCHEMA]>> : never;
+    [key in typeof SCHEMA]: infer Schema extends Record<string, Record<string, TypedRoute>>;
+} ? IsAny<Elysia> extends true ? 'Please installed Elysia before using Eden' : UnionToIntersection<Schema> : never;
 export interface EdenCall {
     [x: string]: any;
     $fetch?: RequestInit;
@@ -17,11 +18,7 @@ declare type TypedRouteToParams<Route extends TypedRoute> = (Route['body'] exten
 } : {});
 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 ? {
     [key in A]: CreateEden<Server, B, Full>;
-} : {
-    [x: string]: CreateEden<Server, B, Full>;
-} & {
-    $params: `Expected path parameters ':${A}', replace this with any string`;
-} : // Iterate until last string then catch method
+} : 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]]: keyof TypedRouteToParams<Server[Full][key extends string ? Uppercase<key> : key]> extends never ? key extends 'subscribe' ? unknown extends NonNullable<Server[Full][key]['query']> ? (params?: {
@@ -50,9 +47,7 @@ export declare type CreateEden<Server extends Record<string, Record<string, Type
             200: infer ReturnedType;
         } ? ReturnedType : unknown>;
     } : never;
-} & (Path extends `:${infer params}` ? {
-    $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`> : {});
 declare 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.2.0-rc.7",
+  "version": "0.2.0-rc.9",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@elysiajs/cors": "^0.1.0",
-    "@elysiajs/websocket": "^0.2.1",
+    "@elysiajs/websocket": "^0.2.6-rc.0",
     "@sinclair/typebox": "^0.25.21",
     "@types/node": "^18.11.7",
     "bun-types": "^0.3.0",

package/src/types.ts

@@ -3,10 +3,18 @@ import type { TObject } from '@sinclair/typebox'
 
 import type { EdenWS } from '.'
 
+type IsAny<T> = unknown extends T
+    ? [T] extends [object]
+        ? true
+        : false
+    : false
+
 export type Eden<App extends Elysia<any>> = App['store'] extends {
-    [key in typeof SCHEMA]: any
+    [key in typeof SCHEMA]: infer Schema extends Record<string, Record<string, TypedRoute>>
 }
-    ? UnionToIntersection<CreateEden<App['store'][typeof SCHEMA]>>
+    ? IsAny<Elysia> extends true
+        ? 'Please installed Elysia before using Eden'
+        : UnionToIntersection<Schema>
     : never
 
 export interface EdenCall {
@@ -50,11 +58,11 @@ export type CreateEden<
         ? {
               [key in A]: CreateEden<Server, B, Full>
           }
-        : {
-              [x: string]: CreateEden<Server, B, Full>
-          } & {
-              $params: `Expected path parameters ':${A}', replace this with any string`
-          }
+        : 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 ''
@@ -139,9 +147,10 @@ export type CreateEden<
                 }
               : never
       } & (Path extends `:${infer params}`
-          ? {
-                $params: `Expected path parameters ':${params}', replace this with any string`
-            }
+          ? Record<
+                `$${params}`,
+                `Expected path parameters ':${params}', replace this with any string`
+            >
           : {})
 
 // https://stackoverflow.com/questions/59623524/typescript-how-to-map-type-keys-to-camelcase