elysia-autoload 0.1.7 → 0.1.9

package/README.md

@@ -2,6 +2,8 @@
 
 Plugin for [Elysia](https://elysiajs.com/) which autoload all routes in directory and code-generate types for [Eden](https://elysiajs.com/eden/overview.html)
 
+**Currently, Eden types generation is broken!!**
+
 ## Installation
 
 ### Start new project with [create-elysiajs](https://github.com/kravetsone/create-elysiajs)
@@ -102,7 +104,7 @@ const app = new Elysia()
                 output: "./routes.ts",
                 typeName: "Routes",
             }, // or pass true for use default params
-        }),
+        })
     )
     .listen(3000);
 
@@ -152,7 +154,7 @@ const app = new Elysia()
                     },
                 };
             },
-        }),
+        })
     )
     .use(swagger());
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import Elysia from "elysia";
+import { Elysia } from "elysia";
 type TSchemaHandler = ({ path, url, }: {
     path: string;
     url: string;
@@ -15,13 +15,24 @@ export interface IAutoloadOptions {
     schema?: TSchemaHandler;
     types?: ITypesOptions | true;
 }
-export declare function autoload({ pattern, dir, prefix, schema, types, }?: IAutoloadOptions): Promise<Elysia<string, {
-    request: {};
+export declare function autoload(options?: IAutoloadOptions): () => Promise<Elysia<string, false, {
+    decorator: {};
     store: {};
     derive: {};
     resolve: {};
 }, {
     type: {};
     error: {};
-}, {}, {}, {}, false>>;
+}, {
+    schema: {};
+    macro: {};
+}, {}, {
+    derive: {};
+    resolve: {};
+    schema: {};
+}, {
+    derive: {};
+    resolve: {};
+    schema: {};
+}>>;
 export * from "./types";

package/dist/index.js

@@ -21,66 +21,64 @@ const elysia_1 = require("elysia");
 const utils_1 = require("./utils");
 const TYPES_OUTPUT_DEFAULT = "./routes-types.ts";
 const TYPES_TYPENAME_DEFAULT = "Routes";
-async function autoload({ pattern, dir, prefix, schema, types, } = {}) {
-    const directoryPath = (0, utils_1.getPath)(dir || "./routes");
-    if (!(0, node_fs_1.existsSync)(directoryPath))
-        throw new Error(`Directory ${directoryPath} doesn't exists`);
-    if (!(0, node_fs_1.statSync)(directoryPath).isDirectory())
-        throw new Error(`${directoryPath} isn't a directory`);
-    const app = new elysia_1.default({
-        name: "elysia-autoload",
-        prefix: prefix?.endsWith("/") ? prefix.slice(0, -1) : prefix,
-        seed: {
-            pattern,
-            dir,
-            prefix,
-            types,
-        },
-    });
-    const glob = new Bun.Glob(pattern || "**/*.{ts,tsx,js,jsx,mjs,cjs}");
-    const files = await Array.fromAsync(glob.scan({
-        cwd: directoryPath,
-    }));
-    const paths = [];
-    for await (const path of (0, utils_1.sortByNestedParams)(files)) {
-        const fullPath = (0, node_path_1.join)(directoryPath, path);
-        const file = await Promise.resolve(`${(0, node_path_1.join)(directoryPath, path)}`).then(s => require(s));
-        if (!file.default)
-            throw new Error(`${path} don't provide export default`);
-        const url = (0, utils_1.transformToUrl)(path);
-        const groupOptions = schema ? schema({ path, url }) : {};
-        // Типы свойства "body" несовместимы.
-        // Тип "string | TSchema | undefined" не может быть назначен для типа "TSchema | undefined".
-        // Тип "string" не может быть назначен для типа "TSchema".ts(2345)
-        app.group(url, 
-        // @ts-expect-error why....
-        groupOptions, file.default);
-        if (types)
-            paths.push(fullPath.replace(directoryPath, ""));
-    }
-    if (types) {
-        const imports = paths.map((x, index) => `import type Route${index} from "${(directoryPath + x.replace(".ts", "").replace(".tsx", "")).replace(/\\/gu, "/")}";`);
-        for await (const outputPath of types === true || !types.output
-            ? [TYPES_OUTPUT_DEFAULT]
-            : Array.isArray(types.output)
-                ? types.output
-                : [types.output]) {
-            await Bun.write((0, utils_1.getPath)(outputPath), [
-                `import type { ElysiaWithBaseUrl } from "elysia-autoload";`,
-                imports.join("\n"),
-                "",
-                types === true || !types.useExport ? "declare global {" : "",
-                `    export type ${types === true || !types.typeName
-                    ? TYPES_TYPENAME_DEFAULT
-                    : types.typeName} = ${paths
-                    .map((x, index) => `ElysiaWithBaseUrl<"${((prefix?.endsWith("/") ? prefix.slice(0, -1) : prefix) ??
-                    "") + (0, utils_1.transformToUrl)(x) || "/"}", ReturnType<typeof Route${index}>>`)
-                    .join("\n              & ")}`,
-                types === true || !types.useExport ? "}" : "",
-            ].join("\n"));
+function autoload(options = {}) {
+    return async () => {
+        const { pattern, dir, prefix, schema, types } = options;
+        const directoryPath = (0, utils_1.getPath)(dir || "./routes");
+        if (!(0, node_fs_1.existsSync)(directoryPath))
+            throw new Error(`Directory ${directoryPath} doesn't exists`);
+        if (!(0, node_fs_1.statSync)(directoryPath).isDirectory())
+            throw new Error(`${directoryPath} isn't a directory`);
+        const plugin = new elysia_1.Elysia({
+            name: "elysia-autoload",
+            prefix: (0, utils_1.fixSlashes)(prefix),
+            seed: {
+                pattern,
+                dir,
+                prefix,
+                types,
+            },
+        });
+        const glob = new Bun.Glob(pattern || "**/*.{ts,tsx,js,jsx,mjs,cjs}");
+        const files = await Array.fromAsync(glob.scan({
+            cwd: directoryPath,
+        }));
+        const paths = [];
+        for await (const path of (0, utils_1.sortByNestedParams)(files)) {
+            const fullPath = (0, node_path_1.join)(directoryPath, path);
+            const file = await Promise.resolve(`${fullPath}`).then(s => require(s));
+            if (!file.default)
+                throw new Error(`${path} doesn't provide default export`);
+            const url = (0, utils_1.transformToUrl)(path);
+            const groupOptions = schema ? schema({ path, url }) : {};
+            plugin.group(url, groupOptions, file.default);
+            if (types)
+                paths.push(fullPath.replace(directoryPath, ""));
         }
-    }
-    return app;
+        if (types) {
+            const imports = paths.map((x, index) => `import type Route${index} from "${(directoryPath + x.replace(".ts", "").replace(".tsx", "")).replace(/\\/gu, "/")}";`);
+            for await (const outputPath of types === true || !types.output
+                ? [TYPES_OUTPUT_DEFAULT]
+                : Array.isArray(types.output)
+                    ? types.output
+                    : [types.output]) {
+                await Bun.write((0, utils_1.getPath)(outputPath), [
+                    `import type { ElysiaWithBaseUrl } from "elysia-autoload";`,
+                    imports.join("\n"),
+                    "",
+                    types === true || !types.useExport ? "declare global {" : "",
+                    `    export type ${types === true || !types.typeName
+                        ? TYPES_TYPENAME_DEFAULT
+                        : types.typeName} = ${paths
+                        .map((x, index) => `ElysiaWithBaseUrl<"${((prefix?.endsWith("/") ? prefix.slice(0, -1) : prefix) ??
+                        "") + (0, utils_1.transformToUrl)(x) || "/"}", ReturnType<typeof Route${index}>>`)
+                        .join("\n              & ")}`,
+                    types === true || !types.useExport ? "}" : "",
+                ].join("\n"));
+            }
+        }
+        return plugin;
+    };
 }
 exports.autoload = autoload;
 __exportStar(require("./types"), exports);

package/dist/types.d.ts

@@ -4,5 +4,5 @@ type RemoveLastChar<T extends string> = T extends `${infer V}/` ? V : T;
 type RoutesWithPrefix<Routes extends RouteBase, Prefix extends string> = {
     [K in keyof Routes as `${Prefix}${RemoveLastChar<K & string>}`]: Routes[K];
 };
-export type ElysiaWithBaseUrl<BaseUrl extends string, ElysiaType extends Elysia> = ElysiaType extends Elysia<infer BasePath, infer Decorators, infer Definitions, infer ParentSchema, infer Macro, infer Routes, infer Scoped> ? Elysia<BasePath, Decorators, Definitions, ParentSchema, Macro, RoutesWithPrefix<Routes, BaseUrl>, Scoped> : never;
+export 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, RoutesWithPrefix<Routes, BaseUrl>, Ephemeral, Volatile> : never;
 export {};

package/dist/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function getPath(dir: string): string;
 export declare function transformToUrl(path: string): string;
 export declare function sortByNestedParams(routes: string[]): string[];
+export declare function fixSlashes(prefix?: string): string | undefined;

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByNestedParams = exports.transformToUrl = exports.getPath = void 0;
+exports.fixSlashes = exports.sortByNestedParams = exports.transformToUrl = exports.getPath = void 0;
 const node_path_1 = require("node:path");
 function getPath(dir) {
     if ((0, node_path_1.isAbsolute)(dir))
@@ -49,3 +49,9 @@ function sortByNestedParams(routes) {
     return routes.sort((a, b) => getParamsCount(a) - getParamsCount(b));
 }
 exports.sortByNestedParams = sortByNestedParams;
+function fixSlashes(prefix) {
+    if (!prefix?.endsWith("/"))
+        return prefix;
+    return prefix.slice(0, -1);
+}
+exports.fixSlashes = fixSlashes;

package/package.json

@@ -1,43 +1,43 @@
-{
-    "name": "elysia-autoload",
-    "version": "0.1.7",
-    "author": "kravetsone",
-    "type": "commonjs",
-    "main": "dist/index.js",
-    "description": "Plugin for Elysia which autoload all routes in directory and code-generate types for Eden",
-    "homepage": "https://github.com/kravetsone/elysia-autoload",
-    "keywords": [
-        "bun",
-        "elysia",
-        "autoimports",
-        "autoload",
-        "nextjs",
-        "filerouter",
-        "autoroutes",
-        "eden",
-        "treaty",
-        "trpc",
-        "codegeneration"
-    ],
-    "scripts": {
-        "prepublishOnly": "bun test && rm -rf dist && tsc",
-        "lint": "bunx @biomejs/biome check src",
-        "lint:fix": "bun lint --apply",
-        "prepare": "husky"
-    },
-    "files": [
-        "dist"
-    ],
-    "devDependencies": {
-        "@biomejs/biome": "1.6.0",
-        "@elysiajs/eden": "^0.8.1",
-        "@elysiajs/swagger": "^0.8.5",
-        "@types/bun": "^1.0.8",
-        "elysia": "^0.8.17",
-        "typescript": "^5.4.2",
-        "husky": "^9.0.11"
-    },
-    "peerDependencies": {
-        "elysia": "^0.8.0"
-    }
-}
+{
+    "name": "elysia-autoload",
+    "version": "0.1.9",
+    "author": "kravetsone",
+    "type": "commonjs",
+    "main": "dist/index.js",
+    "description": "Plugin for Elysia which autoload all routes in directory and code-generate types for Eden",
+    "homepage": "https://github.com/kravetsone/elysia-autoload",
+    "keywords": [
+        "bun",
+        "elysia",
+        "autoimports",
+        "autoload",
+        "nextjs",
+        "filerouter",
+        "autoroutes",
+        "eden",
+        "treaty",
+        "trpc",
+        "codegeneration"
+    ],
+    "scripts": {
+        "prepublishOnly": "bun test && rm -rf dist && tsc",
+        "lint": "bunx @biomejs/biome check src",
+        "lint:fix": "bun lint --apply",
+        "prepare": "husky"
+    },
+    "files": [
+        "dist"
+    ],
+    "devDependencies": {
+        "@biomejs/biome": "1.6.1",
+        "@elysiajs/eden": "^1.0.4",
+        "@elysiajs/swagger": "^1.0.2",
+        "@types/bun": "^1.0.8",
+        "elysia": "^1.0.5",
+        "typescript": "^5.4.2",
+        "husky": "^9.0.11"
+    },
+    "peerDependencies": {
+        "elysia": "^1.0.0"
+    }
+}