zibri 2.2.0 → 2.2.1

package/src/preact/string-aware-replace.function.ts

@@ -0,0 +1,157 @@
+/**
+ * Applies a regex replacement to the given text, skipping string literals and comments.
+ * Prevents accidental renaming of identifiers that appear inside strings or comments.
+ * @param text - The text to apply the replacement to.
+ * @param pattern - The pattern to match. Must have the global flag set.
+ * @param replacement - The replacement string.
+ * @returns The text with replacements applied.
+ */
+// eslint-disable-next-line sonar/cognitive-complexity
+export function stringAwareReplace(text: string, pattern: RegExp, replacement: string | ((...args: string[]) => string)): string {
+    let result: string = '';
+    let i: number = 0;
+
+    while (i < text.length) {
+        // Skip normal string literals (single/double quoted)
+        if (text[i] === '"' || text[i] === '\'') {
+            const quote: string = text[i];
+            const end: number = findStringEnd(text, i, quote);
+            result += text.slice(i, end);
+            i = end;
+            continue;
+        }
+
+        // Handle template literals specially: keep literal parts, but process ${...} expressions
+        if (text[i] === '`') {
+            // append opening backtick
+            result += '`';
+            i++; // move past `
+            while (i < text.length) {
+                // escape sequences inside template (preserve as-is)
+                if (text[i] === '\\') {
+                    // copy escaped char and the next char
+                    result += text.slice(i, i + 2);
+                    i += 2;
+                    continue;
+                }
+
+                // found expression start
+                if (text[i] === '$' && text[i + 1] === '{') {
+                    result += '${';
+                    i += 2; // skip ${
+                    // find matching closing brace for this expression
+                    let depth: number = 1;
+                    const exprStart: number = i;
+                    while (i < text.length && depth > 0) {
+                        const ch: string = text[i];
+                        if (ch === '\'' || ch === '"' || ch === '`') {
+                            // we need to skip nested strings inside the expression properly
+                            const endStr: number = findStringEnd(text, i, ch);
+                            i = endStr;
+                            continue;
+                        }
+                        if (ch === '{') {
+                            depth++;
+                        }
+                        else if (ch === '}') {
+                            depth--;
+                        }
+                        i++;
+                    }
+                    const exprEnd: number = i - 1; // position of the closing '}' was i-1
+                    const expr: string = text.slice(exprStart, exprEnd + 0); // slice expression content
+                    // recursively apply replacements inside the expression
+                    const replacedExpr: string = stringAwareReplace(expr, pattern, replacement);
+                    result += replacedExpr;
+                    result += '}';
+                    // i already points after the closing brace
+                    continue;
+                }
+
+                // closing backtick
+                if (text[i] === '`') {
+                    result += '`';
+                    i++;
+                    break;
+                }
+
+                // otherwise copy literal char
+                result += text[i];
+                i++;
+            }
+            continue;
+        }
+
+        // Skip line comments
+        if (text[i] === '/' && text[i + 1] === '/') {
+            const end: number = text.indexOf('\n', i);
+            const commentEnd: number = end === -1 ? text.length : end + 1;
+            result += text.slice(i, commentEnd);
+            i = commentEnd;
+            continue;
+        }
+        // Skip block comments
+        if (text[i] === '/' && text[i + 1] === '*') {
+            const end: number = text.indexOf('*/', i + 2);
+            const commentEnd: number = end === -1 ? text.length : end + 2;
+            result += text.slice(i, commentEnd);
+            i = commentEnd;
+            continue;
+        }
+        // Process next chunk up to the next string/comment
+        const nextSpecial: number = findNextSpecial(text, i);
+        const chunk: string = text.slice(i, nextSpecial);
+        // eslint-disable-next-line sonar/no-all-duplicated-branches
+        result += typeof replacement === 'function'
+            ? chunk.replace(pattern, replacement)
+            : chunk.replace(pattern, replacement);
+        i = nextSpecial;
+    }
+
+    return result;
+}
+
+// eslint-disable-next-line jsdoc/require-jsdoc, sonar/cognitive-complexity
+export function findStringEnd(text: string, start: number, quote: string): number {
+    let i: number = start + 1;
+    while (i < text.length) {
+        if (text[i] === '\\') {
+            i += 2;
+            continue;
+        }
+        if (text[i] === quote) {
+            return i + 1;
+        }
+        // Template literal expressions ${...} — skip past the expression
+        if (quote === '`' && text[i] === '$' && text[i + 1] === '{') {
+            i += 2;
+            let depth: number = 1;
+            while (i < text.length && depth > 0) {
+                if (text[i] === '{') {
+                    depth++;
+                }
+                else if (text[i] === '}') {
+                    depth--;
+                }
+                i++;
+            }
+            continue;
+        }
+        i++;
+    }
+    return i;
+}
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+function findNextSpecial(text: string, start: number): number {
+    for (let i: number = start; i < text.length; i++) {
+        const ch: string = text[i];
+        if (ch === '"' || ch === '\'' || ch === '`') {
+            return i;
+        }
+        if (ch === '/' && (text[i + 1] === '/' || text[i + 1] === '*')) {
+            return i;
+        }
+    }
+    return text.length;
+}

package/src/rate-limiting/rate-limiter.ts

@@ -1,4 +1,4 @@
-import { Ms } from '../utilities';
+import { Ms } from '../utilities/ms';
 
 /**
  * A rate limiter that provides an "isAvailable" method which ensures

package/src/routing/decorators/body.decorator.ts

@@ -1,9 +1,12 @@
-import { PropertyMetadata, Relation } from '../../entity';
+import { PropertyMetadata } from '../../entity/decorators/property.decorator';
 import { BasePropertyMetadata } from '../../entity/models/base-property-metadata.model';
 import { FileSize, fileSizeToBytes } from '../../entity/models/file-property-metadata.model';
-import { MimeType } from '../../http';
-import { Newable, OmitStrict } from '../../types';
-import { BigNumber, MetadataUtilities, Ms } from '../../utilities';
+import { Relation } from '../../entity/models/relation.enum';
+import { MimeType } from '../../http/mime-type.enum';
+import { Newable } from '../../types/newable.type';
+import { OmitStrict } from '../../types/omit-strict.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { Ms } from '../../utilities/ms';
 
 /**
  * Base metadata shared by all possible http request body properties.
@@ -73,7 +76,6 @@ export type BodyMetadataInput = Partial<OmitStrict<BodyMetadata, 'modelClass' |
     baseMaxSize?: FileSize
 };
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Defines a http request body property with the given data.
  * @param modelClass - The model class that defines the body properties structure.

package/src/routing/decorators/controller.decorator.ts

@@ -1,9 +1,8 @@
-import { GlobalRegistry } from '../../global';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
+import { GlobalRegistry } from '../../global/global-registry';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
 import { Route } from '../controller-route-configuration.model';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Marks a controller class to be registered under the provided base route.
  * @param baseRoute - The base route of the controller. Any endpoints inside this class will be prefixed with this.

package/src/routing/decorators/create-http-decorator.function.ts

@@ -1,5 +1,5 @@
-import { HttpMethod } from '../../http';
-import { MetadataUtilities } from '../../utilities';
+import { HttpMethod } from '../../http/http-method.enum';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
 import { Route, ControllerRouteConfiguration } from '../controller-route-configuration.model';
 
 // eslint-disable-next-line jsdoc/require-jsdoc

package/src/routing/decorators/delete.decorator.ts

@@ -2,7 +2,6 @@ import { HttpMethod } from '../../http/http-method.enum';
 import { Route } from '../controller-route-configuration.model';
 import { createHttpDecorator } from './create-http-decorator.function';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Http DELETE endpoint.
  * @param path - The path of the endpoint, defaults to '/'.

package/src/routing/decorators/get.decorator.ts

@@ -1,8 +1,7 @@
-import { HttpMethod } from '../../http';
+import { HttpMethod } from '../../http/http-method.enum';
 import { Route } from '../controller-route-configuration.model';
 import { createHttpDecorator } from './create-http-decorator.function';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Http GET endpoint.
  * @param path - The path of the endpoint, defaults to '/'.

package/src/routing/decorators/param.decorator.ts

@@ -1,6 +1,11 @@
-import { Header } from '../../http';
-import { MetadataUtilities } from '../../utilities';
-import { ArrayParamMetadata, ArrayParamMetadataInput, BooleanParamMetadata, BooleanParamMetadataInput, DateParamMetadata, DateParamMetadataInput, NumberParamMetadata, NumberParamMetadataInput, ObjectParamMetadata, ObjectParamMetadataInput, StringParamMetadata, StringParamMetadataInput } from '../models';
+import { Header } from '../../http/header.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { ArrayParamMetadata, ArrayParamMetadataInput } from '../models/array-param-metadata.model';
+import { BooleanParamMetadata, BooleanParamMetadataInput } from '../models/boolean-param-metadata.model';
+import { DateParamMetadata, DateParamMetadataInput } from '../models/date-param-metadata.model';
+import { NumberParamMetadata, NumberParamMetadataInput } from '../models/number-param-metadata.model';
+import { ObjectParamMetadata, ObjectParamMetadataInput } from '../models/object-param-metadata.model';
+import { StringParamMetadata, StringParamMetadataInput } from '../models/string-param-metadata.model';
 import { createHeaderParamMetadata, createPathParamMetadata, createQueryParamMetadata } from '../param-metdata.helpers';
 
 /**
@@ -71,7 +76,7 @@ export type HeaderParamMetadataInput = StringParamMetadataInput
  */
 // eslint-disable-next-line typescript/no-namespace
 export namespace Param {
-    // eslint-disable-next-line jsdoc/require-returns
+
     /**
      * Marks a path parameter.
      * @param name - The name of the path parameter.
@@ -91,7 +96,6 @@ export namespace Param {
         };
     }
 
-    // eslint-disable-next-line jsdoc/require-returns
     /**
      * Marks a query parameter.
      * @param name - The name of the query parameter.
@@ -111,7 +115,6 @@ export namespace Param {
         };
     }
 
-    // eslint-disable-next-line jsdoc/require-returns
     /**
      * Marks a header parameter.
      * @param name - The name of the header parameter.

package/src/routing/decorators/patch.decorator.ts

@@ -2,7 +2,6 @@ import { HttpMethod } from '../../http/http-method.enum';
 import { Route } from '../controller-route-configuration.model';
 import { createHttpDecorator } from './create-http-decorator.function';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Http PATCH endpoint.
  * @param path - The path of the endpoint, defaults to '/'.

package/src/routing/decorators/post.decorator.ts

@@ -2,7 +2,6 @@ import { HttpMethod } from '../../http/http-method.enum';
 import { Route } from '../controller-route-configuration.model';
 import { createHttpDecorator } from './create-http-decorator.function';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Http POST endpoint.
  * @param path - The path of the endpoint, defaults to '/'.

package/src/routing/models/array-param-metadata.model.ts

@@ -4,8 +4,8 @@ import { DateParamMetadata, DateParamMetadataInput } from './date-param-metadata
 import { NumberParamMetadata, NumberParamMetadataInput } from './number-param-metadata.model';
 import { ObjectParamMetadata, ObjectParamMetadataInput } from './object-param-metadata.model';
 import { StringParamMetadata, StringParamMetadataInput } from './string-param-metadata.model';
-import { ArrayPropertyMetadata } from '../../entity';
-import { OmitStrict } from '../../types';
+import { ArrayPropertyMetadata } from '../../entity/models/array-property-metadata.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Metadata for an item of an array parameter.

package/src/routing/models/boolean-param-metadata.model.ts

@@ -1,6 +1,6 @@
 import { BaseParamMetadata } from './base-param-metadata.model';
-import { BooleanPropertyMetadata } from '../../entity';
-import { OmitStrict } from '../../types';
+import { BooleanPropertyMetadata } from '../../entity/models/boolean-property-metadata.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Metadata for boolean parameters.

package/src/routing/models/crud-controller.model.ts

@@ -1,10 +1,18 @@
-import { Repository } from '../../data-source';
-import { inject, repositoryTokenFor } from '../../di';
+import { Repository } from '../../data-source/repository';
+import { repositoryTokenFor } from '../../di/decorators/inject-repository.decorator';
+import { inject } from '../../di/inject.function';
 import { BaseEntity } from '../../entity/base-entity.model';
-import { HttpStatus } from '../../http';
-import { PaginationResult, Response } from '../../open-api';
-import { DeepPartial, Newable } from '../../types';
-import { Body, Delete, Get, Param, Patch, Post } from '../decorators';
+import { HttpStatus } from '../../http/http-status.enum';
+import { Response } from '../../open-api/decorators/response.decorator';
+import { PaginationResult } from '../../open-api/pagination-result.model';
+import { DeepPartial } from '../../types/deep-partial.type';
+import { Newable } from '../../types/newable.type';
+import { Body } from '../decorators/body.decorator';
+import { Delete } from '../decorators/delete.decorator';
+import { Get } from '../decorators/get.decorator';
+import { Param } from '../decorators/param.decorator';
+import { Patch } from '../decorators/patch.decorator';
+import { Post } from '../decorators/post.decorator';
 
 /**
  * Interface for a CRUD (create, read, update, delete) controller.

package/src/routing/models/date-param-metadata.model.ts

@@ -1,6 +1,6 @@
 import { BaseParamMetadata } from './base-param-metadata.model';
-import { DatePropertyMetadata } from '../../entity';
-import { OmitStrict } from '../../types';
+import { DatePropertyMetadata } from '../../entity/models/date-property-metadata.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Metadata for Date parameters.

package/src/routing/models/number-param-metadata.model.ts

@@ -1,6 +1,6 @@
 import { BaseParamMetadata } from './base-param-metadata.model';
-import { NumberPropertyMetadata } from '../../entity';
-import { OmitStrict } from '../../types';
+import { NumberPropertyMetadata } from '../../entity/models/number-property-metadata.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Metadata for number parameters.

package/src/routing/models/object-param-metadata.model.ts

@@ -1,6 +1,6 @@
 import { BaseParamMetadata } from './base-param-metadata.model';
-import { ObjectPropertyMetadata } from '../../entity';
-import { OmitStrict } from '../../types';
+import { ObjectPropertyMetadata } from '../../entity/models/object-property-metadata.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Metadata for object parameters.

package/src/routing/models/string-param-metadata.model.ts

@@ -1,6 +1,6 @@
 import { BaseParamMetadata } from './base-param-metadata.model';
-import { StringPropertyMetadata } from '../../entity';
-import { OmitStrict } from '../../types';
+import { StringPropertyMetadata } from '../../entity/models/string-property-metadata.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Metadata for string parameters.

package/src/routing/param-metdata.helpers.ts

@@ -1,5 +1,5 @@
-import { PathParamMetadataInput, PathParamMetadata, QueryParamMetadataInput, QueryParamMetadata, HeaderParamMetadataInput, HeaderParamMetadata } from './decorators';
-import { ArrayParamItemMetadata, ArrayParamItemMetadataInput } from './models';
+import { PathParamMetadataInput, PathParamMetadata, QueryParamMetadataInput, QueryParamMetadata, HeaderParamMetadataInput, HeaderParamMetadata } from './decorators/param.decorator';
+import { ArrayParamItemMetadataInput, ArrayParamItemMetadata } from './models/array-param-metadata.model';
 
 /**
  * Creates path parameter metadata for the parameter with the given name and input.

package/src/routing/request.context.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'async_hooks';
 
-import { HttpRequest } from '../http';
+import { HttpRequest } from '../http/http-request.model';
 
 /**
  * The data stored in async local storage.

package/src/routing/resolve-route-params.function.ts

@@ -1,11 +1,16 @@
-import { AuthServiceInterface, CurrentUserMetadata } from '../auth';
-import { HttpRequest } from '../http';
-import { ParserInterface } from '../parsing';
-import { Newable } from '../types';
-import { MetadataUtilities, ObjectUtilities } from '../utilities';
-import { ValidationServiceInterface } from '../validation';
-import { BaseWebsocketConnection, CurrentWebsocketConnectionMetadata, WebsocketRequest } from '../websocket';
-import { BodyMetadata, HeaderParamMetadata, PathParamMetadata, QueryParamMetadata } from './decorators';
+import { AuthServiceInterface } from '../auth/auth-service.interface';
+import { CurrentUserMetadata } from '../auth/decorators/current-user.decorator';
+import { HttpRequest } from '../http/http-request.model';
+import { ParserInterface } from '../parsing/parser.interface';
+import { Newable } from '../types/newable.type';
+import { MetadataUtilities } from '../utilities/metadata.utilities';
+import { ObjectUtilities } from '../utilities/object.utilities';
+import { ValidationServiceInterface } from '../validation/validation-service.interface';
+import { BodyMetadata } from './decorators/body.decorator';
+import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata } from './decorators/param.decorator';
+import { CurrentWebsocketConnectionMetadata } from '../websocket/decorators/current-websocket-connection.decorator';
+import { BaseWebsocketConnection } from '../websocket/models/connection/base-websocket-connection.model';
+import { WebsocketRequest } from '../websocket/models/websocket-request.model';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 export async function resolveRouteParams(

package/src/routing/route-configuration.model.ts

@@ -1,13 +1,21 @@
 import { NextFunction } from 'express';
 
 import { Route } from './controller-route-configuration.model';
-import { HttpRequest, HttpResponse } from '../http';
-import { BodyMetadata, BodyMetadataInput, HeaderParamMetadata, HeaderParamMetadataInput, PathParamMetadata, PathParamMetadataInput, QueryParamMetadata, QueryParamMetadataInput } from './decorators';
+import { ArrayPropertyItemMetadataInput, ArrayPropertyItemMetadata } from '../entity/models/array-property-metadata.model';
 import { HttpMethod } from '../http/http-method.enum';
-import { OpenApiResponse } from '../open-api';
-import { Newable, OmitStrict } from '../types';
-import { ArrayParamMetadata, ArrayParamMetadataInput, BooleanParamMetadata, BooleanParamMetadataInput, DateParamMetadata, DateParamMetadataInput, NumberParamMetadata, NumberParamMetadataInput, ObjectParamMetadata, ObjectParamMetadataInput, StringParamMetadata, StringParamMetadataInput } from './models';
-import { ArrayPropertyItemMetadata, ArrayPropertyItemMetadataInput } from '../entity';
+import { HttpRequest } from '../http/http-request.model';
+import { HttpResponse } from '../http/http-response.model';
+import { OpenApiResponse } from '../open-api/open-api.model';
+import { Newable } from '../types/newable.type';
+import { OmitStrict } from '../types/omit-strict.type';
+import { BodyMetadataInput, BodyMetadata } from './decorators/body.decorator';
+import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata, PathParamMetadataInput, QueryParamMetadataInput, HeaderParamMetadataInput } from './decorators/param.decorator';
+import { ArrayParamMetadataInput, ArrayParamMetadata } from './models/array-param-metadata.model';
+import { BooleanParamMetadataInput, BooleanParamMetadata } from './models/boolean-param-metadata.model';
+import { DateParamMetadataInput, DateParamMetadata } from './models/date-param-metadata.model';
+import { NumberParamMetadataInput, NumberParamMetadata } from './models/number-param-metadata.model';
+import { ObjectParamMetadataInput, ObjectParamMetadata } from './models/object-param-metadata.model';
+import { StringParamMetadataInput, StringParamMetadata } from './models/string-param-metadata.model';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 type PathMetaObjectToParamsObject<PathMetaObject extends Record<string, PathParamMetadata>> = {

package/src/routing/router.interface.ts

@@ -1,7 +1,8 @@
-import { Newable } from '../types';
 import { RouteConfiguration, RouteConfigurationInput } from './route-configuration.model';
 import { ZibriApplication } from '../application';
-import { BodyMetadata, BodyMetadataInput, HeaderParamMetadata, HeaderParamMetadataInput, PathParamMetadata, PathParamMetadataInput, QueryParamMetadata, QueryParamMetadataInput } from './decorators';
+import { Newable } from '../types/newable.type';
+import { BodyMetadataInput, BodyMetadata } from './decorators/body.decorator';
+import { PathParamMetadataInput, QueryParamMetadataInput, HeaderParamMetadataInput, PathParamMetadata, QueryParamMetadata, HeaderParamMetadata } from './decorators/param.decorator';
 
 /**
  * Interface for a router.

package/src/routing/router.ts

@@ -3,24 +3,34 @@ import { Readable } from 'stream';
 import { NextFunction, RequestHandler, Router as ExpressRouter } from 'express';
 
 import { Route, ControllerRouteConfiguration } from './controller-route-configuration.model';
-import { RouterInterface } from './router.interface';
-import { AuthServiceInterface, JwtAuthController } from '../auth';
-import { ZIBRI_DI_TOKENS, inject } from '../di';
-import { MetadataUtilities, Ms } from '../utilities';
+import { BodyMetadata, BodyMetadataInput, resolveMaxBodySize } from './decorators/body.decorator';
+import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata, PathParamMetadataInput, QueryParamMetadataInput, HeaderParamMetadataInput } from './decorators/param.decorator';
 import { MissingBaseRouteError } from './missing-base-route.error';
-import { ZibriApplication } from '../application';
-import { GlobalRegistry } from '../global';
-import { LoggerInterface } from '../logging';
-import { Newable } from '../types';
-import { BodyMetadata, BodyMetadataInput, HeaderParamMetadata, HeaderParamMetadataInput, PathParamMetadata, PathParamMetadataInput, QueryParamMetadata, QueryParamMetadataInput, resolveMaxBodySize } from './decorators';
-import { OpenApiRouteConfiguration, RouteConfiguration, RouteConfigurationInput } from './route-configuration.model';
-import { HttpMethod, HttpRequest, HttpResponse, KnownHeader, MimeType } from '../http';
-import { OpenApiResponse } from '../open-api';
-import { FileResponse, HtmlResponse, ParserInterface } from '../parsing';
-import { ValidationServiceInterface } from '../validation';
 import { createHeaderParamMetadata, createPathParamMetadata, createQueryParamMetadata } from './param-metdata.helpers';
+import { RouterInterface } from './router.interface';
+import { ZibriApplication } from '../application';
 import { runWithRequest } from './request.context';
 import { resolveRouteParams } from './resolve-route-params.function';
+import { OpenApiRouteConfiguration, RouteConfiguration, RouteConfigurationInput } from './route-configuration.model';
+import { AuthServiceInterface } from '../auth/auth-service.interface';
+import { JwtAuthController } from '../auth/strategies/jwt/jwt-auth.controller';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { GlobalRegistry } from '../global/global-registry';
+import { HttpMethod } from '../http/http-method.enum';
+import { HttpRequest } from '../http/http-request.model';
+import { HttpResponse } from '../http/http-response.model';
+import { KnownHeader } from '../http/known-header.enum';
+import { MimeType } from '../http/mime-type.enum';
+import { LoggerInterface } from '../logging/logger.interface';
+import { OpenApiResponse } from '../open-api/open-api.model';
+import { FileResponse } from '../parsing/form-data/file-response.model';
+import { HtmlResponse } from '../parsing/html/html-response.model';
+import { ParserInterface } from '../parsing/parser.interface';
+import { Newable } from '../types/newable.type';
+import { MetadataUtilities } from '../utilities/metadata.utilities';
+import { Ms } from '../utilities/ms';
+import { ValidationServiceInterface } from '../validation/validation-service.interface';
 
 /**
  * Default router implementation of Zibri.
@@ -192,7 +202,7 @@ export class Router implements RouterInterface {
 
         for (const route of routes) {
             const handler: RequestHandler = await this.controllerRouteToRequestHandler(controllerClass, route);
-            const finalRoute: string = `${baseRoute}${route.route}`;
+            const finalRoute: string = baseRoute === '/' ? route.route : `${baseRoute}${route.route}`;
             if (this.allFinalRoutes.includes(`${route.httpMethod.toUpperCase()} ${finalRoute}`)) {
                 throw new Error(
                     `The route "${route.httpMethod.toUpperCase()} ${finalRoute}" has been defined more than once.`,
@@ -201,7 +211,7 @@ export class Router implements RouterInterface {
             }
             this.allFinalRoutes.push(`${route.httpMethod.toUpperCase()} ${finalRoute}`);
             await this.logger.debug(`- mounting ${route.httpMethod.toUpperCase()} ${finalRoute}`);
-            this.expressRouter[route.httpMethod](baseRoute + route.route, handler);
+            this.expressRouter[route.httpMethod](finalRoute, handler);
         }
     }
 

package/src/utilities/compare-versions.function.ts

@@ -1,4 +1,4 @@
-import { Version } from '../types';
+import { Version } from '../types/version.type';
 
 /**
  * Compares the given versions and check if the first one is bigger, equal or smaller than the second one.