@athenna/http 4.8.0 → 4.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@athenna/http",
-    "version": "4.8.0",
+    "version": "4.9.0",
     "description": "The Athenna Http server. Built on top of fastify.",
     "license": "MIT",
     "author": "João Lenon <lenon@athenna.io>",
@@ -67,12 +67,12 @@
         "#tests": "./tests/index.js"
     },
     "devDependencies": {
-        "@athenna/artisan": "^4.10.0",
-        "@athenna/common": "^4.11.0",
+        "@athenna/artisan": "^4.12.0",
+        "@athenna/common": "^4.15.4",
         "@athenna/config": "^4.4.0",
-        "@athenna/ioc": "^4.4.0",
-        "@athenna/logger": "^4.4.0",
-        "@athenna/test": "^4.7.0",
+        "@athenna/ioc": "^4.4.3",
+        "@athenna/logger": "^4.5.0",
+        "@athenna/test": "^4.8.0",
         "@athenna/view": "^4.3.0",
         "@fastify/cors": "^8.1.1",
         "@fastify/helmet": "^10.0.2",
@@ -201,9 +201,6 @@
             "terminator": "./templates/terminator.edge",
             "command": "@athenna/artisan/templates/command.edge"
         },
-        "preloads": [],
-        "services": [],
-        "providers": [],
         "controllers": [
             "#tests/fixtures/controllers/HelloController",
             "#tests/fixtures/controllers/AnnotatedController"
@@ -227,17 +224,6 @@
             "#tests/fixtures/middlewares/AnnotatedGlobalMiddleware",
             "#tests/fixtures/middlewares/AnnotatedGlobalInterceptor",
             "#tests/fixtures/middlewares/AnnotatedGlobalTerminator"
-        ],
-        "commands": {
-            "route:list": {
-                "path": "#src/commands/RouteListCommand",
-                "route": "./tests/fixtures/routes/http.js",
-                "kernel": "./tests/fixtures/kernels/HttpKernel.js"
-            },
-            "make:controller": "#src/commands/MakeControllerCommand",
-            "make:interceptor": "#src/commands/MakeInterceptorCommand",
-            "make:middleware": "#src/commands/MakeMiddlewareCommand",
-            "make:terminator": "#src/commands/MakeTerminatorCommand"
-        }
+        ]
     }
 }

package/src/commands/RouteListCommand.d.ts

@@ -19,4 +19,8 @@ export declare class RouteListCommand extends BaseCommand {
      * Get the http kernel module from RC file or resolve the default one.
      */
     private getHttpKernel;
+    /**
+     * Get the meta URL of the project.
+     */
+    private getMeta;
 }

package/src/commands/RouteListCommand.js

@@ -6,6 +6,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+import { sep } from 'node:path';
 import { Config } from '@athenna/config';
 import { Module } from '@athenna/common';
 import { BaseCommand } from '@athenna/artisan';
@@ -45,7 +46,7 @@ export class RouteListCommand extends BaseCommand {
      * Resolve the http routes file.
      */
     async resolveRoute() {
-        await Module.resolve(Config.get('rc.commands.route:list.route', '#routes/http'), Config.get('rc.meta'));
+        await Module.resolve(Config.get('rc.commands.route:list.route', '#routes/http'), this.getMeta());
     }
     /**
      * Get the http kernel module from RC file or resolve the default one.
@@ -54,6 +55,12 @@ export class RouteListCommand extends BaseCommand {
         if (!Config.exists('rc.commands.route:list.kernel')) {
             return HttpKernel;
         }
-        return Module.resolve(Config.get('rc.commands.route:list.kernel'), Config.get('rc.meta'));
+        return Module.resolve(Config.get('rc.commands.route:list.kernel'), this.getMeta());
+    }
+    /**
+     * Get the meta URL of the project.
+     */
+    getMeta() {
+        return Config.get('rc.meta', Path.toHref(Path.pwd() + sep));
     }
 }

package/src/kernels/HttpKernel.d.ts

@@ -70,10 +70,6 @@ export declare class HttpKernel {
      * server methods.
      */
     private getGlobalMiddlewareAliasAndHandler;
-    /**
-     * Resolve the import path by meta URL and import it.
-     */
-    private resolvePath;
     /**
      * Register the controllers using the meta information
      * defined by annotations.
@@ -83,4 +79,8 @@ export declare class HttpKernel {
      * Get the configuration for the given key.
      */
     private getConfig;
+    /**
+     * Get the meta URL of the project.
+     */
+    private getMeta;
 }

package/src/kernels/HttpKernel.js

@@ -11,7 +11,7 @@ import { Server } from '#src';
 import { debug } from '#src/debug';
 import { Log } from '@athenna/logger';
 import { Config } from '@athenna/config';
-import { isAbsolute, resolve } from 'node:path';
+import { sep, isAbsolute, resolve } from 'node:path';
 import { Annotation } from '@athenna/ioc';
 import { File, Exec, Module, String } from '@athenna/common';
 import { HttpExceptionHandler } from '#src/handlers/HttpExceptionHandler';
@@ -117,7 +117,7 @@ export class HttpKernel {
     async registerControllers() {
         const controllers = Config.get('rc.controllers', []);
         await Exec.concurrently(controllers, async (path) => {
-            const Controller = await this.resolvePath(path);
+            const Controller = await Module.resolve(path, this.getMeta());
             if (Annotation.isAnnotated(Controller)) {
                 this.registerUsingMeta(Controller);
                 return;
@@ -133,7 +133,7 @@ export class HttpKernel {
     async registerMiddlewares() {
         const middlewares = Config.get('rc.middlewares', []);
         await Exec.concurrently(middlewares, async (path) => {
-            const Middleware = await this.resolvePath(path);
+            const Middleware = await Module.resolve(path, this.getMeta());
             if (Annotation.isAnnotated(Middleware)) {
                 this.registerUsingMeta(Middleware);
                 return;
@@ -152,7 +152,7 @@ export class HttpKernel {
     async registerNamedMiddlewares() {
         const namedMiddlewares = Config.get('rc.namedMiddlewares', {});
         await Exec.concurrently(Object.keys(namedMiddlewares), async (key) => {
-            const Middleware = await this.resolvePath(namedMiddlewares[key]);
+            const Middleware = await Module.resolve(namedMiddlewares[key], this.getMeta());
             if (Annotation.isAnnotated(Middleware)) {
                 this.registerUsingMeta(Middleware);
                 return;
@@ -168,7 +168,7 @@ export class HttpKernel {
     async registerGlobalMiddlewares() {
         const globalMiddlewares = Config.get('rc.globalMiddlewares', []);
         await Exec.concurrently(globalMiddlewares, async (path) => {
-            const Middleware = await this.resolvePath(path);
+            const Middleware = await Module.resolve(path, this.getMeta());
             if (Annotation.isAnnotated(Middleware)) {
                 this.registerUsingMeta(Middleware);
                 return;
@@ -191,7 +191,7 @@ export class HttpKernel {
             Server.setErrorHandler(handler.handle.bind(handler));
             return;
         }
-        const Handler = await this.resolvePath(path);
+        const Handler = await Module.resolve(path, this.getMeta());
         debug('Using custom exception handler %s in HttpKernel.', Handler.name);
         const handler = new Handler();
         Server.setErrorHandler(handler.handle.bind(handler));
@@ -201,7 +201,7 @@ export class HttpKernel {
      */
     async registerRoutes(path) {
         if (path.startsWith('#')) {
-            await this.resolvePath(path);
+            await Module.resolve(path, this.getMeta());
             return;
         }
         if (!isAbsolute(path)) {
@@ -210,7 +210,7 @@ export class HttpKernel {
         if (!(await File.exists(path))) {
             return;
         }
-        await this.resolvePath(path);
+        await Module.resolve(path, this.getMeta());
     }
     /**
      * Fabricate the named middlewares aliases.
@@ -264,12 +264,6 @@ export class HttpKernel {
             };
         }
     }
-    /**
-     * Resolve the import path by meta URL and import it.
-     */
-    resolvePath(path) {
-        return Module.resolve(`${path}?version=${Math.random()}`, Config.get('rc.meta'));
-    }
     /**
      * Register the controllers using the meta information
      * defined by annotations.
@@ -302,4 +296,10 @@ export class HttpKernel {
         }
         return config;
     }
+    /**
+     * Get the meta URL of the project.
+     */
+    getMeta() {
+        return Config.get('rc.meta', Path.toHref(Path.pwd() + sep));
+    }
 }