elysia-autoload 1.3.0 → 1.4.0

package/README.md

@@ -2,8 +2,6 @@
 
 Plugin for [Elysia](https://elysiajs.com/) which autoload all routes in directory and code-generate types for [Eden](https://elysiajs.com/eden/overview.html) with [`Bun.build`](#bun-build-usage) support!
 
-**Currently, Eden types generation is broken!!** Feels free to send PR
-
 ## Installation
 
 ### Start new project with [create-elysiajs](https://github.com/kravetsone/create-elysiajs)
@@ -124,14 +122,14 @@ export type ElysiaApp = typeof app;
 ```ts
 // client.ts
 
-import { edenTreaty } from "@elysiajs/eden";
+import { treaty } from "@elysiajs/eden";
 
 // Routes are a global type so you don't need to import it.
 
-const app = edenTreaty<Routes>("http://localhost:3002");
+const app = treaty<Routes>("http://localhost:3002");
 
 const { data } = await app.test["some-path-param"].get({
-    $query: {
+    query: {
         key: 2,
     },
 });
@@ -149,15 +147,13 @@ import type Route0 from "./routes/index";
 import type Route1 from "./routes/test/[some]/index";
 
 declare global {
-    export type Routes = ElysiaWithBaseUrl<"/api", ReturnType<typeof Route0>> &
-        ElysiaWithBaseUrl<"/api/test/:some", ReturnType<typeof Route1>>;
+    export type Routes = ElysiaWithBaseUrl<"/api", typeof Route0> &
+        ElysiaWithBaseUrl<"/api/test/:some", typeof Route1>;
 }
 ```
 
 Example of app with types code-generation you can see in [example](https://github.com/kravetsone/elysia-autoload/tree/main/example)
 
-**Currently, Eden types generation is broken!!**
-
 ### [Bun build](https://bun.sh/docs/bundler) usage
 
 You can use this plugin with [`Bun.build`](https://bun.sh/docs/bundler), thanks to [esbuild-plugin-autoload](https://github.com/kravetsone/esbuild-plugin-autoload)!

package/dist/index.d.ts

@@ -1,23 +1,22 @@
-import Elysia, { RouteBase, LocalHook, InputSchema, RouteSchema, SingletonBase, BaseMacro, Elysia as Elysia$1 } from 'elysia';
+import Elysia, { RouteBase, RouteSchema, AnyElysia, LocalHook, InputSchema, SingletonBase, BaseMacro, Elysia as Elysia$1 } from 'elysia';
 
 type PathToObject<Path extends string, Type extends RouteBase> = Path extends `${infer Head}/${infer Rest}` ? Head extends "" ? PathToObject<Rest, Type> : {
     [K in Head]: PathToObject<Rest, Type>;
 } : {
     [K in Path]: Type;
 };
-type RouteEndType = Record<string, {
-    body: any;
-    params: any;
-    query: any;
-    headers: any;
-    response: any;
-}>;
+declare namespace ElysiaMatch {
+    type RouteEnd = Record<string, RouteSchema>;
+    type Fx = (...args: any[]) => AnyElysia;
+    type All = AnyElysia | Fx;
+    type Extract<T extends All> = T extends Fx ? ReturnType<T> : T;
+}
 type FlattenIndexRoutes<T> = T extends object ? {
-    [K in keyof T as K extends "index" ? T[K] extends RouteEndType ? never : K : K]: FlattenIndexRoutes<T[K]>;
+    [K in keyof T as K extends "index" ? T[K] extends ElysiaMatch.RouteEnd ? never : K : K]: FlattenIndexRoutes<T[K]>;
 } & (T extends {
     index: infer I;
-} ? I extends RouteEndType ? FlattenIndexRoutes<I> : T : T) : T;
-type ElysiaWithBaseUrl<BaseUrl extends string, ElysiaType extends Elysia<any, any, any, any, any, any, any, any>> = ElysiaType extends Elysia<infer BasePath, infer Scoped, infer Singleton, infer Definitions, infer Metadata, infer Routes, infer Ephemeral, infer Volatile> ? Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, FlattenIndexRoutes<PathToObject<BaseUrl, Routes>>, Ephemeral, Volatile> : never;
+} ? I extends ElysiaMatch.RouteEnd ? FlattenIndexRoutes<I> : T : T) : T;
+type ElysiaWithBaseUrl<BaseUrl extends string, ElysiaType extends ElysiaMatch.All> = ElysiaMatch.Extract<ElysiaType> extends Elysia<infer BasePath, infer Scoped, infer Singleton, infer Definitions, infer Metadata, infer Routes, infer Ephemeral, infer Volatile> ? Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, FlattenIndexRoutes<PathToObject<BaseUrl, Routes>>, Ephemeral, Volatile> : never;
 type SoftString<T extends string> = T | (string & {});
 
 type SchemaHandler = ({ path, url, }: {

package/dist/index.js

@@ -3,8 +3,7 @@ import path from 'node:path';
 import { Elysia } from 'elysia';
 
 function getPath(dir) {
-  if (path.isAbsolute(dir))
-    return dir;
+  if (path.isAbsolute(dir)) return dir;
   if (path.isAbsolute(process.argv[1]))
     return path.join(process.argv[1], "..", dir);
   return path.join(process.cwd(), process.argv[1], "..", dir);
@@ -48,13 +47,11 @@ function sortByNestedParams(routes) {
   return routes.sort((a, b) => getParamsCount(a) - getParamsCount(b));
 }
 function fixSlashes(prefix) {
-  if (!prefix?.endsWith("/"))
-    return prefix;
+  if (!prefix?.endsWith("/")) return prefix;
   return prefix.slice(0, -1);
 }
 function addRelativeIfNotDot(path2) {
-  if (path2.at(0) !== ".")
-    return `./${path2}`;
+  if (path2.at(0) !== ".") return `./${path2}`;
   return path2;
 }
 
@@ -106,8 +103,7 @@ async function autoload(options = {}) {
     const fullPath = path.join(directoryPath, filePath);
     const file = await import(fullPath);
     const importName = typeof getImportName === "string" ? getImportName : getImportName(file);
-    if (!file[importName] && options?.skipImportErrors)
-      continue;
+    if (!file[importName] && options?.skipImportErrors) continue;
     if (!file[importName])
       throw new Error(`${filePath} don't provide export ${importName}`);
     const url = transformToUrl(filePath);
@@ -119,14 +115,13 @@ async function autoload(options = {}) {
       plugin.group(url, groupOptions, (app) => app.use(importedValue()));
     if (importedValue instanceof Elysia)
       plugin.group(url, groupOptions, (app) => app.use(importedValue));
-    if (types)
-      paths.push(fullPath.replace(directoryPath, ""));
+    if (types) paths.push([fullPath.replace(directoryPath, ""), importName]);
   }
   if (types) {
     for await (const outputPath of types.output) {
       const outputAbsolutePath = getPath(outputPath);
       const imports = paths.map(
-        (x, index) => `import type Route${index} from "${addRelativeIfNotDot(
+        ([x, exportName], index) => `import type ${exportName === "default" ? `Route${index}` : `{ ${exportName} as Route${index} }`} from "${addRelativeIfNotDot(
           path.relative(
             path.dirname(outputAbsolutePath),
             directoryPath + x.replace(".ts", "").replace(".tsx", "")
@@ -141,7 +136,7 @@ async function autoload(options = {}) {
           "",
           !types.useExport ? "declare global {" : "",
           `    export type ${types.typeName} = ${paths.map(
-            (x, index) => `ElysiaWithBaseUrl<"${((prefix?.endsWith("/") ? prefix.slice(0, -1) : prefix) ?? "") + transformToUrl(x) || "/"}", ReturnType<typeof Route${index}>>`
+            ([x], index) => `ElysiaWithBaseUrl<"${((prefix?.endsWith("/") ? prefix.slice(0, -1) : prefix) ?? "") + transformToUrl(x) || "/"}", typeof Route${index}>`
           ).join("\n              & ")}`,
           !types.useExport ? "}" : ""
         ].join("\n")

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "elysia-autoload",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"author": "kravetsone",
 	"type": "module",
 	"types": "./dist/index.d.ts",
@@ -29,18 +29,17 @@
 	"scripts": {
 		"prepublishOnly": "bun test && bunx pkgroll",
 		"lint": "bunx @biomejs/biome check src",
-		"lint:fix": "bun lint --apply",
-		"prepare": "bunx husky"
+		"lint:fix": "bun lint --apply"
 	},
 	"files": ["dist"],
 	"devDependencies": {
-		"@biomejs/biome": "1.8.3",
-		"@elysiajs/eden": "^1.1.0",
-		"@elysiajs/swagger": "^1.1.0",
-		"@types/bun": "^1.1.6",
-		"elysia": "^1.1.2",
-		"pkgroll": "^2.1.1",
-		"typescript": "^5.5.3"
+		"@biomejs/biome": "1.9.2",
+		"@elysiajs/eden": "^1.1.3",
+		"@elysiajs/swagger": "^1.1.1",
+		"@types/bun": "^1.1.9",
+		"elysia": "^1.1.13",
+		"pkgroll": "^2.5.0",
+		"typescript": "^5.6.2"
 	},
 	"peerDependencies": {
 		"elysia": "^1.1.0"