@efebia/fastify-auto-import 0.0.2 → 1.0.1

package/lib/{globber.js → cjs/globber.js}

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,11 +41,15 @@ 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_1 = require("./serial");
+const serial_js_1 = require("./serial.js");
 const getPackageType = async (directory) => {
     const nearestPackage = await (0, pkg_up_1.default)({ cwd: directory });
     if (nearestPackage) {
-        return require(nearestPackage).type;
+        if ('require' in global) {
+            return require(nearestPackage).type;
+        }
+        const file = await (0, promises_1.readFile)(nearestPackage, { encoding: 'utf-8' });
+        return JSON.parse(file).type;
     }
 };
 const globFiles = async (opts) => {
@@ -44,20 +58,20 @@ const globFiles = async (opts) => {
     const pluginsDirectory = node_path_1.default.join(startingDirectory, opts.directory);
     const routesDirectories = await (0, promises_1.readdir)(pluginsDirectory);
     const filteredDirectories = routesDirectories.filter(dir => !opts.excludedDirectories.includes(dir));
-    const importedFiles = await (0, serial_1.serial)(filteredDirectories.map((dir) => async () => {
+    const importedFiles = await (0, serial_js_1.serial)(filteredDirectories.map((dir) => async () => {
         var _a;
-        var _b;
         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;
         try {
             if (packageType === "module") {
-                const importedPlugin = await (_a = href, Promise.resolve().then(() => __importStar(require(_a))));
+                const importedPlugin = await Promise.resolve(`${href}`).then(s => __importStar(require(s)));
                 return importedPlugin.default;
             }
             return require(osPath);
         }
         catch (e) {
-            (_b = opts.log) === null || _b === void 0 ? void 0 : _b.error({ error: e, path: osPath }, "@efebia/fastify-auto-import error on importing plugin");
+            console.log(e);
+            (_a = opts.log) === null || _a === void 0 ? void 0 : _a.error({ error: e, path: osPath }, "@efebia/fastify-auto-import error on importing plugin");
             return null;
         }
     }));

package/lib/cjs/index.d.ts

@@ -0,0 +1,3 @@
+import { Globber } from './globber.js';
+declare const plugin: import("fastify").FastifyPluginCallback<Globber, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
+export default plugin;

package/lib/cjs/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+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 : [] }));
+    await Promise.all(globbedFiles.map(async (globbedFile) => {
+        await fastify.register(globbedFile);
+    }));
+}, {
+    name: '@efebia/fastify-auto-import',
+    fastify: '5.x'
+});
+exports.default = plugin;

package/lib/esm/globber.d.ts

@@ -0,0 +1,11 @@
+import pino from "pino";
+export type Globber = {
+    directory?: string;
+    routeFile?: string;
+    startingDirectory: string;
+    log?: pino.BaseLogger;
+    excludedDirectories?: string[];
+};
+export declare const globFiles: (opts: Required<Globber> & {
+    log?: pino.BaseLogger;
+}) => Promise<never[]>;

package/lib/esm/globber.js

@@ -0,0 +1,40 @@
+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) {
+        if ('require' in global) {
+            return require(nearestPackage).type;
+        }
+        const file = await readFile(nearestPackage, { encoding: 'utf-8' });
+        return JSON.parse(file).type;
+    }
+};
+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);
+    const routesDirectories = await readdir(pluginsDirectory);
+    const filteredDirectories = routesDirectories.filter(dir => !opts.excludedDirectories.includes(dir));
+    const importedFiles = await serial(filteredDirectories.map((dir) => async () => {
+        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;
+        try {
+            if (packageType === "module") {
+                const importedPlugin = await import(href);
+                return importedPlugin.default;
+            }
+            return require(osPath);
+        }
+        catch (e) {
+            console.log(e);
+            (_a = opts.log) === null || _a === void 0 ? void 0 : _a.error({ error: e, path: osPath }, "@efebia/fastify-auto-import error on importing plugin");
+            return null;
+        }
+    }));
+    return importedFiles.filter((e) => e);
+};

package/lib/esm/index.d.ts

@@ -0,0 +1,3 @@
+import { Globber } from './globber.js';
+declare const plugin: import("fastify").FastifyPluginCallback<Globber, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
+export default plugin;

package/lib/esm/index.js

@@ -0,0 +1,13 @@
+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 : [] }));
+    await Promise.all(globbedFiles.map(async (globbedFile) => {
+        await fastify.register(globbedFile);
+    }));
+}, {
+    name: '@efebia/fastify-auto-import',
+    fastify: '5.x'
+});
+export default plugin;

package/lib/esm/serial.d.ts

@@ -0,0 +1 @@
+export declare const serial: <TResult>(funcs: (() => Promise<TResult>)[]) => Promise<never[]>;

package/lib/esm/serial.js

@@ -0,0 +1,4 @@
+const concat = (list) => Array.prototype.concat.bind(list);
+const promiseConcat = (f) => (x) => f().then(concat(x));
+const promiseReduce = (acc, x) => acc.then(promiseConcat(x));
+export const serial = (funcs) => funcs.reduce(promiseReduce, Promise.resolve([]));

package/package.json

@@ -1,26 +1,36 @@
 {
   "name": "@efebia/fastify-auto-import",
-  "version": "0.0.2",
+  "version": "1.0.1",
   "license": "MIT",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "type": "module",
   "dependencies": {
-    "fastify-plugin": "^4.4.0",
+    "fastify": "^5.3.0",
+    "fastify-plugin": "^5.0.1",
     "pino": "^8.8.0",
     "pkg-up": "^3.1.0"
   },
   "devDependencies": {
     "@types/jest": "^29.2.5",
     "@types/node": "^18.11.18",
-    "fastify": "^4.11.0",
     "jest": "^29.3.1",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.9.4"
+    "typescript": "~5.8.3"
   },
   "files": [
     "/lib"
   ],
   "scripts": {
     "test": "yarn node $(yarn bin jest)",
-    "build": "tsc"
+    "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"
   },
-  "main": "./lib"
+  "exports": {
+    ".": {
+      "require": "./lib/cjs/index.js",
+      "import": "./lib/esm/index.js"
+    }
+  }
 }

package/lib/index.d.ts

@@ -1,3 +0,0 @@
-import { Globber } from './globber';
-declare const _default: import("fastify").FastifyPluginAsync<Globber, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
-export = _default;

package/lib/index.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
-const globber_1 = require("./globber");
-module.exports = (0, fastify_plugin_1.default)(async (fastify, opts) => {
-    var _a, _b, _c;
-    const globbedFiles = await (0, globber_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 : [] }));
-    await Promise.all(globbedFiles.map(async (globbedFile) => {
-        await fastify.register(globbedFile);
-    }));
-}, {
-    name: '@efebia/fastify-auto-import',
-    fastify: '4.x'
-});