@efebia/fastify-auto-import 1.0.3 → 1.1.1

package/README.md

@@ -69,8 +69,41 @@ A `fastify-plugin` compatible plugin. Register it with `fastify.register()`.
 | `directory` | `string` | `'src/plugins'` | Directory to scan for route subdirectories, relative to `startingDirectory`. |
 | `routeFile` | `string` | `'routes'` | File name (without extension) to import from each subdirectory. |
 | `excludedDirectories` | `string[]` | `[]` | Subdirectory names to skip. |
+| `recursive` | `boolean` | `false` | Scan nested subdirectories for route files, not just direct children. |
 | `log` | `pino.BaseLogger` | Fastify logger | Logger instance for import errors. |
 
+## Recursive mode
+
+By default the plugin only looks at **direct subdirectories** of `directory`. Set `recursive: true` to walk the entire tree and register every subdirectory that contains a route file, at any depth.
+
+```ts
+await fastify.register(autoImport, {
+  startingDirectory: import.meta.url,
+  directory: 'src/plugins',
+  recursive: true,
+});
+```
+
+Given this structure:
+
+```
+src/plugins/
+  users/
+    routes.ts          ← registered
+    profile/
+      routes.ts        ← registered (nested)
+  orders/
+    routes.ts          ← registered
+    items/
+      routes.ts        ← registered (nested)
+  _shared/
+    utils.ts           ← skipped (no routes file)
+```
+
+Without `recursive`, only `users/routes.ts` and `orders/routes.ts` would be registered. With `recursive: true`, `users/profile/routes.ts` and `orders/items/routes.ts` are picked up as well.
+
+`excludedDirectories` still applies at every depth — a matching directory name is skipped along with all its descendants.
+
 ## License
 
 MIT

package/lib/cjs/globber.d.ts

@@ -5,7 +5,8 @@ export type Globber = {
     startingDirectory: string;
     log?: pino.BaseLogger;
     excludedDirectories?: string[];
+    recursive?: boolean;
 };
 export declare const globFiles: (opts: Required<Globber> & {
     log?: pino.BaseLogger;
-}) => Promise<never[]>;
+}) => Promise<any[]>;

package/lib/cjs/globber.js

@@ -41,7 +41,6 @@ const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = __importStar(require("node:url"));
 const pkg_up_1 = __importDefault(require("pkg-up"));
-const serial_js_1 = require("./serial.js");
 const getPackageType = async (directory) => {
     const nearestPackage = await (0, pkg_up_1.default)({ cwd: directory });
     if (nearestPackage) {
@@ -52,13 +51,57 @@ const getPackageType = async (directory) => {
         return JSON.parse(file).type;
     }
 };
+const collectRecursivePlugins = async (dir, opts) => {
+    const entries = await (0, promises_1.readdir)(dir, { withFileTypes: true });
+    const dirEntries = entries.filter((entry) => entry.isDirectory() && !opts.excludedDirectories.includes(entry.name));
+    const perDirResults = await Promise.all(dirEntries.map(async (entry) => {
+        var _a;
+        const subDir = node_path_1.default.join(dir, entry.name);
+        const subEntries = await (0, promises_1.readdir)(subDir);
+        const routeFileName = opts.routeFile.replace('.js', '');
+        const hasRouteFile = subEntries.some((f) => f === `${routeFileName}.js` || f === `${routeFileName}.ts`);
+        const own = [];
+        if (hasRouteFile) {
+            const osPath = node_path_1.default.join(subDir, opts.packageType === 'module' ? `${routeFileName}.js` : routeFileName);
+            const href = node_url_1.default.pathToFileURL(osPath).href;
+            try {
+                if (opts.packageType === 'module') {
+                    const imported = await Promise.resolve(`${href}`).then(s => __importStar(require(s)));
+                    if (imported.default)
+                        own.push(imported.default);
+                }
+                else {
+                    const imported = require(osPath);
+                    if (imported)
+                        own.push(imported);
+                }
+            }
+            catch (e) {
+                (_a = opts.log) === null || _a === void 0 ? void 0 : _a.error({ error: e, path: osPath }, '@efebia/fastify-auto-import error on importing plugin');
+                throw e;
+            }
+        }
+        const nested = await collectRecursivePlugins(subDir, opts);
+        return [...own, ...nested];
+    }));
+    return perDirResults.flat();
+};
 const globFiles = async (opts) => {
     const packageType = await getPackageType(opts.directory);
     const startingDirectory = packageType === 'module' ? node_path_1.default.dirname((0, node_url_1.fileURLToPath)(opts.startingDirectory)) : opts.startingDirectory;
     const pluginsDirectory = node_path_1.default.join(startingDirectory, opts.directory);
+    if (opts.recursive) {
+        const plugins = await collectRecursivePlugins(pluginsDirectory, {
+            routeFile: opts.routeFile,
+            packageType,
+            excludedDirectories: opts.excludedDirectories,
+            log: opts.log,
+        });
+        return plugins.filter(Boolean);
+    }
     const routesDirectories = await (0, promises_1.readdir)(pluginsDirectory);
     const filteredDirectories = routesDirectories.filter(dir => !opts.excludedDirectories.includes(dir));
-    const importedFiles = await (0, serial_js_1.serial)(filteredDirectories.map((dir) => async () => {
+    const importedFiles = await Promise.all(filteredDirectories.map(async (dir) => {
         var _a;
         const osPath = node_path_1.default.join(pluginsDirectory, dir, packageType === 'module' ? `${opts.routeFile.replace(".js", "")}.js` : opts.routeFile.replace(".js", ""));
         const href = node_url_1.default.pathToFileURL(osPath).href;

package/lib/cjs/index.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
 const globber_js_1 = require("./globber.js");
 const plugin = (0, fastify_plugin_1.default)(async (fastify, opts) => {
-    var _a, _b, _c;
-    const globbedFiles = await (0, globber_js_1.globFiles)(Object.assign(Object.assign({}, opts), { routeFile: (_a = opts.routeFile) !== null && _a !== void 0 ? _a : 'routes', directory: (_b = opts.directory) !== null && _b !== void 0 ? _b : 'src/plugins', log: opts.log || fastify.log, excludedDirectories: (_c = opts.excludedDirectories) !== null && _c !== void 0 ? _c : [] }));
+    var _a, _b, _c, _d;
+    const globbedFiles = await (0, globber_js_1.globFiles)(Object.assign(Object.assign({}, opts), { routeFile: (_a = opts.routeFile) !== null && _a !== void 0 ? _a : 'routes', directory: (_b = opts.directory) !== null && _b !== void 0 ? _b : 'src/plugins', log: opts.log || fastify.log, excludedDirectories: (_c = opts.excludedDirectories) !== null && _c !== void 0 ? _c : [], recursive: (_d = opts.recursive) !== null && _d !== void 0 ? _d : false }));
     await Promise.all(globbedFiles.map(async (globbedFile) => {
         await fastify.register(globbedFile);
     }));

package/lib/esm/globber.d.ts

@@ -5,7 +5,8 @@ export type Globber = {
     startingDirectory: string;
     log?: pino.BaseLogger;
     excludedDirectories?: string[];
+    recursive?: boolean;
 };
 export declare const globFiles: (opts: Required<Globber> & {
     log?: pino.BaseLogger;
-}) => Promise<never[]>;
+}) => Promise<any[]>;

package/lib/esm/globber.js

@@ -2,7 +2,6 @@ import { readFile, readdir } from "node:fs/promises";
 import path from "node:path";
 import url, { fileURLToPath } from "node:url";
 import pkgUp from "pkg-up";
-import { serial } from "./serial.js";
 const getPackageType = async (directory) => {
     const nearestPackage = await pkgUp({ cwd: directory });
     if (nearestPackage) {
@@ -13,13 +12,57 @@ const getPackageType = async (directory) => {
         return JSON.parse(file).type;
     }
 };
+const collectRecursivePlugins = async (dir, opts) => {
+    const entries = await readdir(dir, { withFileTypes: true });
+    const dirEntries = entries.filter((entry) => entry.isDirectory() && !opts.excludedDirectories.includes(entry.name));
+    const perDirResults = await Promise.all(dirEntries.map(async (entry) => {
+        var _a;
+        const subDir = path.join(dir, entry.name);
+        const subEntries = await readdir(subDir);
+        const routeFileName = opts.routeFile.replace('.js', '');
+        const hasRouteFile = subEntries.some((f) => f === `${routeFileName}.js` || f === `${routeFileName}.ts`);
+        const own = [];
+        if (hasRouteFile) {
+            const osPath = path.join(subDir, opts.packageType === 'module' ? `${routeFileName}.js` : routeFileName);
+            const href = url.pathToFileURL(osPath).href;
+            try {
+                if (opts.packageType === 'module') {
+                    const imported = await import(href);
+                    if (imported.default)
+                        own.push(imported.default);
+                }
+                else {
+                    const imported = require(osPath);
+                    if (imported)
+                        own.push(imported);
+                }
+            }
+            catch (e) {
+                (_a = opts.log) === null || _a === void 0 ? void 0 : _a.error({ error: e, path: osPath }, '@efebia/fastify-auto-import error on importing plugin');
+                throw e;
+            }
+        }
+        const nested = await collectRecursivePlugins(subDir, opts);
+        return [...own, ...nested];
+    }));
+    return perDirResults.flat();
+};
 export const globFiles = async (opts) => {
     const packageType = await getPackageType(opts.directory);
     const startingDirectory = packageType === 'module' ? path.dirname(fileURLToPath(opts.startingDirectory)) : opts.startingDirectory;
     const pluginsDirectory = path.join(startingDirectory, opts.directory);
+    if (opts.recursive) {
+        const plugins = await collectRecursivePlugins(pluginsDirectory, {
+            routeFile: opts.routeFile,
+            packageType,
+            excludedDirectories: opts.excludedDirectories,
+            log: opts.log,
+        });
+        return plugins.filter(Boolean);
+    }
     const routesDirectories = await readdir(pluginsDirectory);
     const filteredDirectories = routesDirectories.filter(dir => !opts.excludedDirectories.includes(dir));
-    const importedFiles = await serial(filteredDirectories.map((dir) => async () => {
+    const importedFiles = await Promise.all(filteredDirectories.map(async (dir) => {
         var _a;
         const osPath = path.join(pluginsDirectory, dir, packageType === 'module' ? `${opts.routeFile.replace(".js", "")}.js` : opts.routeFile.replace(".js", ""));
         const href = url.pathToFileURL(osPath).href;

package/lib/esm/index.js

@@ -1,8 +1,8 @@
 import fp from 'fastify-plugin';
 import { globFiles } from './globber.js';
 const plugin = fp(async (fastify, opts) => {
-    var _a, _b, _c;
-    const globbedFiles = await globFiles(Object.assign(Object.assign({}, opts), { routeFile: (_a = opts.routeFile) !== null && _a !== void 0 ? _a : 'routes', directory: (_b = opts.directory) !== null && _b !== void 0 ? _b : 'src/plugins', log: opts.log || fastify.log, excludedDirectories: (_c = opts.excludedDirectories) !== null && _c !== void 0 ? _c : [] }));
+    var _a, _b, _c, _d;
+    const globbedFiles = await globFiles(Object.assign(Object.assign({}, opts), { routeFile: (_a = opts.routeFile) !== null && _a !== void 0 ? _a : 'routes', directory: (_b = opts.directory) !== null && _b !== void 0 ? _b : 'src/plugins', log: opts.log || fastify.log, excludedDirectories: (_c = opts.excludedDirectories) !== null && _c !== void 0 ? _c : [], recursive: (_d = opts.recursive) !== null && _d !== void 0 ? _d : false }));
     await Promise.all(globbedFiles.map(async (globbedFile) => {
         await fastify.register(globbedFile);
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@efebia/fastify-auto-import",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "license": "MIT",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,20 +12,19 @@
     "pkg-up": "^3.1.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.2.5",
     "@types/node": "^18.11.18",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
+    "tsx": "^4.20.3",
     "typescript": "~5.8.3"
   },
   "files": [
     "/lib"
   ],
   "scripts": {
-    "test": "yarn node $(yarn bin jest)",
-    "build:esm": "tsc --module nodenext --moduleResolution nodenext --outDir lib/esm",
-    "build:cjs": "tsc --module commonjs --moduleResolution node --outDir lib/cjs",
-    "build": "yarn build:esm && yarn build:cjs"
+    "build:esm": "tsc -p ./tsconfig.build.json --module nodenext --moduleResolution nodenext --outDir lib/esm",
+    "build:cjs": "tsc -p ./tsconfig.build.json --module commonjs --moduleResolution node --outDir lib/cjs",
+    "build": "yarn build:esm && yarn build:cjs",
+    "test": "node --import tsx --test ./**/*.test.ts",
+    "test:only": "node --import tsx --test-only ./**/*.test.ts"
   },
   "exports": {
     ".": {