zibri 2.1.7 → 2.2.1

package/src/data-source/models/options/find-all-paginated-options.model.ts

@@ -1,7 +1,7 @@
 
 import { FindAllOptions } from './find-all-options.model';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { OmitStrict } from '../../../types';
+import { OmitStrict } from '../../../types/omit-strict.type';
 
 /**
  * Options for finding entities in paginated form.

package/src/data-source/models/options/find-by-id-options.model.ts

@@ -1,6 +1,6 @@
 import { FindOneOptions } from './find-one-options.model';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { OmitStrict } from '../../../types';
+import { OmitStrict } from '../../../types/omit-strict.type';
 
 /**
  * Options for finding a single entity by its id.

package/src/data-source/models/options/find-one-options.model.ts

@@ -1,6 +1,6 @@
 import { BaseRepositoryOptions } from './base-repository-options.model';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { Where } from '../where';
+import { Where } from '../where/where-filter.model';
 
 /**
  * Options for finding a single entity.

package/src/data-source/models/where/where-filter-to-find-options-where-function.test.ts

@@ -4,7 +4,8 @@ import { EqualOperator, FindOptionsWhere, FindOperator, Equal, Raw } from 'typeo
 
 import { whereFilterToFindOptionsWhere } from './where-filter-to-find-options-where.function';
 import { Where } from './where-filter.model';
-import { Address, User } from '../../../__testing__';
+import { Address } from '../../../__testing__/mocks/entities/address.model';
+import { User } from '../../../__testing__/mocks/entities/user.entity';
 
 describe('whereFilterToFindOptionsWhere - primitive filters', () => {
     it('string equality', () => {

package/src/data-source/models/where/where-filter-to-find-options-where.function.ts

@@ -7,10 +7,16 @@ import { NumberWhereFilter } from './number-where-filter.model';
 import { ObjectWhereFilter } from './object-where-filter.model';
 import { StringWhereFilter } from './string-where-filter.model';
 import { WhereFilter, Where, WhereFilterProperty } from './where-filter.model';
-import { ManyToOnePropertyMetadata, ObjectPropertyMetadata, OneToOnePropertyMetadata, PropertyMetadata, Relation } from '../../../entity';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { ExcludeStrict, Newable } from '../../../types';
-import { MetadataUtilities } from '../../../utilities';
+import { PropertyMetadata } from '../../../entity/decorators/property.decorator';
+import { ManyToOnePropertyMetadata } from '../../../entity/models/many-to-one-property-metadata.model';
+import { ObjectPropertyMetadata } from '../../../entity/models/object-property-metadata.model';
+import { OneToOnePropertyMetadata } from '../../../entity/models/one-to-one-property-metadata.model';
+import { Relation } from '../../../entity/models/relation.enum';
+import { ExcludeStrict } from '../../../types/exclude-strict.type';
+import { Newable } from '../../../types/newable.type';
+import { MetadataUtilities } from '../../../utilities/metadata.utilities';
+import { ObjectUtilities } from '../../../utilities/object.utilities';
 
 /**
  * Transforms the given Zibri where filter to typeorm's FindOptionsWhere.
@@ -45,7 +51,7 @@ function singleWhereFilterToFindOptionsWhere<T extends Object>(
     properties: Record<string, PropertyMetadata>
 ): ToFindOptionsWhere<T> {
     const res: ToFindOptionsWhere<T> = {};
-    for (const key of Object.keys(filter) as (keyof WhereFilter<T>)[]) {
+    for (const key of ObjectUtilities.keys(filter)) {
         const prop: WhereFilterProperty<T[typeof key]> | WhereFilterProperty<T[typeof key]>[] | undefined = filter[key];
         if (prop === undefined) {
             continue;
@@ -148,7 +154,7 @@ const whereFilterKeysRecord: Record<WhereFilterKeys, WhereFilterKeys> = {
     isIncludedIn: 'isIncludedIn'
 };
 
-const whereFilterKeys: WhereFilterKeys[] = Object.values(whereFilterKeysRecord);
+const whereFilterKeys: WhereFilterKeys[] = ObjectUtilities.values(whereFilterKeysRecord);
 
 /**
  * Transforms a single where filter property to a typeorm FindOperator.
@@ -176,13 +182,13 @@ function singlePropertyToFindOperator<T>(
     }
 
     const operators: FindOperator<unknown>[] = [];
-    const filterKeys: (keyof WhereFilterProperty<T>)[] = Object.keys(property) as (keyof WhereFilterProperty<T>)[];
+    const filterKeys: (keyof (WhereFilterProperty<T> & {}))[] = ObjectUtilities.keys(property);
     if (!filterKeys.length) {
         throw new Error('Empty where filter');
     }
     for (const key of filterKeys) {
         if (!isWhereFilterKey(key)) {
-            throw new Error(`Unknown key "${key.toString()}" on where filer ${property}`);
+            throw new Error(`Unknown key "${key.toString()}" on where filter ${property}`);
         }
         const value: unknown = (property as Record<WhereFilterKeys, unknown>)[key];
 

package/src/data-source/repository.test.ts

@@ -1,15 +1,17 @@
 import { beforeAll, afterAll, describe, it, expect } from '@jest/globals';
 import { PostgreSqlContainer, StartedPostgreSqlContainer } from '@testcontainers/postgresql';
 
-import { DataSource } from './decorators';
-import { inject } from '../di';
-import { PostgresDataSource, PostgresOptions } from './data-sources';
-import { MigrationEntity } from './migration';
-import { POSTGRES_TEST_IMAGE } from '../__testing__';
-import { BaseEntity } from '../entity/base-entity.model';
-import { Newable, OmitStrict } from '../types';
+import { POSTGRES_TEST_IMAGE } from '../__testing__/constants';
+import { PostgresDataSource, PostgresOptions } from './data-sources/postgres-data-source.model';
+import { DataSource } from './decorators/data-source.decorator';
+import { MigrationEntity } from './migration/migration-entity.model';
 import { Repository } from './repository';
-import { Entity, Property } from '../entity';
+import { inject } from '../di/inject.function';
+import { BaseEntity } from '../entity/base-entity.model';
+import { Entity } from '../entity/decorators/entity.decorator';
+import { Property } from '../entity/decorators/property.decorator';
+import { Newable } from '../types/newable.type';
+import { OmitStrict } from '../types/omit-strict.type';
 
 @Entity()
 class VisitStats extends BaseEntity {

package/src/data-source/repository.ts

@@ -1,17 +1,29 @@
 import { Repository as TORepository, FindOptionsWhere, EntityManager, QueryFailedError as TOQueryFailedError } from 'typeorm';
 
-import { inject, ZIBRI_DI_TOKENS } from '../di';
-import { NotFoundError } from '../error-handling';
-import { LoggerInterface } from '../logging';
-import { DeepPartial, Newable } from '../types';
-import { Transaction } from './transaction';
-import { ArrayPropertyMetadata, PropertyMetadata, Relation } from '../entity';
-import { CreateAllOptions, CreateOptions, DeleteAllOptions, DeleteByIdOptions, FindAllOptions, FindAllPaginatedOptions, FindByIdOptions, FindOneOptions, UpdateAllOptions, UpdateByIdOptions, Where } from './models';
+import { QueryFailedError } from './query-failed.error';
 import { BaseEntity } from '../entity/base-entity.model';
-import { PaginationResult } from '../open-api';
-import { MetadataUtilities } from '../utilities';
+import { Transaction } from './transaction/transaction.model';
+import { PropertyMetadata } from '../entity/decorators/property.decorator';
+import { ArrayPropertyMetadata } from '../entity/models/array-property-metadata.model';
+import { Relation } from '../entity/models/relation.enum';
+import { LoggerInterface } from '../logging/logger.interface';
+import { PaginationResult } from '../open-api/pagination-result.model';
+import { DeepPartial } from '../types/deep-partial.type';
+import { Newable } from '../types/newable.type';
+import { MetadataUtilities } from '../utilities/metadata.utilities';
 import { whereFilterToFindOptionsWhere } from './models/where/where-filter-to-find-options-where.function';
-import { QueryFailedError } from './query-failed.error';
+import { NotFoundError } from '../error-handling/errors/not-found.error';
+import { CreateAllOptions } from './models/options/create-all-options.model';
+import { CreateOptions } from './models/options/create-options.model';
+import { DeleteAllOptions } from './models/options/delete-all-options.model';
+import { DeleteByIdOptions } from './models/options/delete-by-id-options.model';
+import { FindAllOptions } from './models/options/find-all-options.model';
+import { FindAllPaginatedOptions } from './models/options/find-all-paginated-options.model';
+import { FindByIdOptions } from './models/options/find-by-id-options.model';
+import { FindOneOptions } from './models/options/find-one-options.model';
+import { UpdateAllOptions } from './models/options/update-all-options.model';
+import { UpdateByIdOptions } from './models/options/update-by-id-options.model';
+import { Where } from './models/where/where-filter.model';
 
 /**
  * A repository that handles data source related things for its entity.
@@ -21,12 +33,13 @@ export class Repository<
     CreateData extends DeepPartial<T> = DeepPartial<T>,
     UpdateData extends DeepPartial<T> = DeepPartial<T>
 > {
-    // eslint-disable-next-line jsdoc/require-jsdoc
-    protected readonly logger: LoggerInterface;
     private readonly typeOrmRepository: TORepository<T>;
 
-    constructor(protected readonly entityClass: Newable<T>, repo: TORepository<T> | Repository<T>) {
-        this.logger = inject(ZIBRI_DI_TOKENS.LOGGER);
+    constructor(
+        protected readonly entityClass: Newable<T>,
+        repo: TORepository<T> | Repository<T>,
+        protected readonly logger: LoggerInterface
+    ) {
         this.typeOrmRepository = repo instanceof Repository ? repo.typeOrmRepository : repo;
     }
 

package/src/data-source/transaction/transaction.test.ts

@@ -2,15 +2,16 @@ import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
 import { PostgreSqlContainer } from '@testcontainers/postgresql';
 import { StartedTestContainer } from 'testcontainers';
 
-import { POSTGRES_TEST_IMAGE } from '../../__testing__';
-import { Entity, Property } from '../../entity';
+import { POSTGRES_TEST_IMAGE } from '../../__testing__/constants';
 import { BaseEntity } from '../../entity/base-entity.model';
-import { Newable } from '../../types';
-import { PostgresDataSource, PostgresOptions } from '../data-sources';
-import { DataSource } from '../decorators';
 import { Repository } from '../repository';
 import { Transaction } from './transaction.model';
-import { MigrationEntity } from '../migration';
+import { Entity } from '../../entity/decorators/entity.decorator';
+import { Property } from '../../entity/decorators/property.decorator';
+import { Newable } from '../../types/newable.type';
+import { PostgresDataSource, PostgresOptions } from '../data-sources/postgres-data-source.model';
+import { DataSource } from '../decorators/data-source.decorator';
+import { MigrationEntity } from '../migration/migration-entity.model';
 
 @Entity()
 class Item {

package/src/di/decorators/inject-repository.decorator.ts

@@ -1,18 +1,23 @@
+import { Repository } from '../../data-source/repository';
 import { BaseEntity } from '../../entity/base-entity.model';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
-import { DiToken } from '../models';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { DiToken } from '../models/di-token.model';
+import { InjectionToken } from '../models/injection-token.model';
+
+const allRepositoryTokens: Record<string, DiToken<Repository<BaseEntity>>> = {};
 
 /**
  * Gets the repository token for the provided entity class.
  * @param entity - The entity class to resolve the repository token for.
  * @returns The DI token.
  */
-export function repositoryTokenFor<T extends BaseEntity>(entity: Newable<T>): string {
-    return `Repository<${entity.name}>`;
+export function repositoryTokenFor<T extends Newable<BaseEntity>>(entity: T): DiToken<Repository<InstanceType<T>>> {
+    const key: string = `Repository<${entity.name}>`;
+    allRepositoryTokens[key] ??= new InjectionToken(key);
+    return allRepositoryTokens[key] as DiToken<Repository<InstanceType<T>>>;
 }
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Marks the parameter to be injected as a Repository of the provided class.
  * @param entityClass - The class of which the Repository should be injected.

package/src/di/decorators/inject.decorator.ts

@@ -1,7 +1,7 @@
-import { MetadataUtilities } from '../../utilities';
-import { DiToken } from '../models';
 
-// eslint-disable-next-line jsdoc/require-returns
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { DiToken } from '../models/di-token.model';
+
 /**
  * Marks the parameter to be injected.
  * @param token - The token that should be used to inject the parameter.

package/src/di/decorators/injectable.decorator.ts

@@ -1,9 +1,8 @@
-import { GlobalRegistry } from '../../global';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
-import { DiToken } from '../models';
+import { GlobalRegistry } from '../../global/global-registry';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { DiToken } from '../models/di-token.model';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Marks a class to be injectable.
  * @param token - An optional token where the marked class should be registered under instead of the class.

package/src/di/default/zibri-di-providers.default.ts

@@ -1,33 +1,37 @@
 /* eslint-disable jsdoc/require-jsdoc */
 import os from 'node:os';
-import path from 'node:path';
 
-import { ZIBRI_DI_TOKENS } from './zibri-di-tokens.default';
-import { AssetService, AssetServiceInterface } from '../../assets';
-import { AuthService, AuthServiceInterface, UserService, UserServiceInterface, TwoFactorService, TwoFactorServiceInterface } from '../../auth';
-import { BackupService, BackupServiceInterface } from '../../backup';
-import { CronService, CronServiceInterface } from '../../cron';
-import { DataSourceService, DataSourceServiceInterface } from '../../data-source';
-import { EmailConfigInput, EmailService, EmailServiceInterface, MailingListService, MailingListServiceInterface } from '../../email';
-import { errorHandler, GlobalErrorHandler } from '../../error-handling';
-import { HttpRequest } from '../../http';
-import { HttpClient, HttpClientInterface } from '../../http-client';
-import { FormatDateFn, FormatPercentFn, FormatPriceFn, LocalizeOptions, LocalizeOptionsInput } from '../../localization';
 import { formatDate } from '../../localization/formatting/format-date.function';
 import { formatPercent } from '../../localization/formatting/format-percent.function';
 import { formatPrice } from '../../localization/formatting/format-price.function';
-import { BaseLoggerTransportConfig, Logger, LoggerInterface, LoggerTransport, LogLevel } from '../../logging';
-import { MetricsServiceInterface, PrometheusMetricsService } from '../../metrics';
-import { MultithreadingOptions, MultithreadingService, MultithreadingServiceInterface } from '../../multithreading';
-import { OpenApiService, OpenApiServiceInterface } from '../../open-api';
-import { Parser, ParserInterface } from '../../parsing';
-import { getCurrentRequest, Router, RouterInterface } from '../../routing';
-import { OmitStrict } from '../../types';
-import { Ms } from '../../utilities';
-import { ValidationService, ValidationServiceInterface } from '../../validation';
-import { WebsocketOptions, WebsocketService, WebsocketServiceInterface } from '../../websocket';
 import { inject } from '../inject.function';
-import { DiProvider } from '../models';
+import { ZIBRI_DI_TOKENS } from './zibri-di-tokens.default';
+import { AssetService } from '../../assets/asset.service';
+import { TwoFactorService } from '../../auth/2fa/two-factor.service';
+import { AuthService } from '../../auth/auth.service';
+import { UserService } from '../../auth/user/user.service';
+import { BackupService } from '../../backup/backup.service';
+import { CronService } from '../../cron/cron.service';
+import { DataSourceService } from '../../data-source/data-source.service';
+import { EmailService } from '../../email/email.service';
+import { MailingListService } from '../../email/mailing-list/mailing-list.service';
+import { errorHandler } from '../../error-handling/error-handler';
+import { HttpClient } from '../../http-client/http-client';
+import { LocalizeOptionsInput } from '../../localization/models/localize-options.model';
+import { LogLevel } from '../../logging/log-level.enum';
+import { Logger } from '../../logging/logger';
+import { LoggerTransport } from '../../logging/transport/logger-transport.model';
+import { PrometheusMetricsService } from '../../metrics/metrics.service';
+import { MultithreadingService } from '../../multithreading/services/multithreading.service';
+import { OpenApiService } from '../../open-api/open-api.service';
+import { Parser } from '../../parsing/parser';
+import { getCurrentRequest } from '../../routing/request.context';
+import { Router } from '../../routing/router';
+import { FsUtilities } from '../../utilities/fs.utilities';
+import { Ms } from '../../utilities/ms';
+import { ValidationService } from '../../validation/validation.service';
+import { WebsocketService } from '../../websocket/services/websocket.service';
+import { DiTokenProviderRecord } from '../models/di-token.model';
 
 const allThreads: number = os.availableParallelism();
 
@@ -39,65 +43,16 @@ const availableThreads: number = allThreads - reserveThreadsLibUv - reserveThrea
 const maxThreads: number = Math.max(1, availableThreads - 1);
 const maxPriorityThreads: number = availableThreads <= 1 ? 0 : 1;
 
-type ZibriDiProvider<T> = OmitStrict<DiProvider<T>, 'token'>;
-
-type ZibriDiProviders = {
-    [ZIBRI_DI_TOKENS.ROUTER]: ZibriDiProvider<RouterInterface>,
-    [ZIBRI_DI_TOKENS.LOGGER]: ZibriDiProvider<LoggerInterface>,
-    [ZIBRI_DI_TOKENS.LOGGER_TRANSPORTS]: ZibriDiProvider<LoggerTransport<BaseLoggerTransportConfig>[]>,
-    [ZIBRI_DI_TOKENS.LOGGER_CLEANUP_AFTER_MS]: ZibriDiProvider<Record<LogLevel, number>>,
-    [ZIBRI_DI_TOKENS.METRICS_SERVICE]: ZibriDiProvider<MetricsServiceInterface>,
-    [ZIBRI_DI_TOKENS.ASSET_SERVICE]: ZibriDiProvider<AssetServiceInterface>,
-    [ZIBRI_DI_TOKENS.BACKUP_SERVICE]: ZibriDiProvider<BackupServiceInterface>,
-    [ZIBRI_DI_TOKENS.GLOBAL_ERROR_HANDLER]: ZibriDiProvider<GlobalErrorHandler>,
-    [ZIBRI_DI_TOKENS.OPEN_API_SERVICE]: ZibriDiProvider<OpenApiServiceInterface>,
-    [ZIBRI_DI_TOKENS.PARSER]: ZibriDiProvider<ParserInterface>,
-    [ZIBRI_DI_TOKENS.VALIDATION_SERVICE]: ZibriDiProvider<ValidationServiceInterface>,
-    [ZIBRI_DI_TOKENS.DATA_SOURCE_SERVICE]: ZibriDiProvider<DataSourceServiceInterface>,
-    [ZIBRI_DI_TOKENS.AUTH_SERVICE]: ZibriDiProvider<AuthServiceInterface>,
-    [ZIBRI_DI_TOKENS.TWO_FACTOR_SERVICE]: ZibriDiProvider<TwoFactorServiceInterface>,
-    [ZIBRI_DI_TOKENS.OTP_HEADER]: ZibriDiProvider<string>,
-    [ZIBRI_DI_TOKENS.OTP_LENGTH]: ZibriDiProvider<number>,
-    [ZIBRI_DI_TOKENS.USER_SERVICE]: ZibriDiProvider<UserServiceInterface>,
-    [ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_SECRET]: ZibriDiProvider<string | undefined>,
-    [ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_SECRET]: ZibriDiProvider<string | undefined>,
-    [ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_EXPIRES_IN_MS]: ZibriDiProvider<number>,
-    [ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_EXPIRES_IN_MS]: ZibriDiProvider<number>,
-    [ZIBRI_DI_TOKENS.JWT_PASSWORD_RESET_TOKEN_EXPIRES_IN_MS]: ZibriDiProvider<number>,
-    [ZIBRI_DI_TOKENS.JWT_CONFIRM_PASSWORD_RESET_URL]: ZibriDiProvider<string | undefined>,
-    [ZIBRI_DI_TOKENS.CRON_SERVICE]: ZibriDiProvider<CronServiceInterface>,
-    [ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER]: ZibriDiProvider<string>,
-    [ZIBRI_DI_TOKENS.LOCALIZE_OPTIONS_INPUT]: ZibriDiProvider<LocalizeOptionsInput>,
-    [ZIBRI_DI_TOKENS.LOCALIZE_OPTIONS]: ZibriDiProvider<LocalizeOptions>,
-    [ZIBRI_DI_TOKENS.FORMAT_DATE]: ZibriDiProvider<FormatDateFn>,
-    [ZIBRI_DI_TOKENS.FORMAT_PRICE]: ZibriDiProvider<FormatPriceFn>,
-    [ZIBRI_DI_TOKENS.FORMAT_PERCENT]: ZibriDiProvider<FormatPercentFn>,
-    [ZIBRI_DI_TOKENS.EMAIL_SERVICE]: ZibriDiProvider<EmailServiceInterface>,
-    [ZIBRI_DI_TOKENS.EMAIL_CONFIG]: ZibriDiProvider<EmailConfigInput | undefined>,
-    [ZIBRI_DI_TOKENS.MAILING_LIST_SERVICE]: ZibriDiProvider<MailingListServiceInterface | undefined>,
-    [ZIBRI_DI_TOKENS.MAILING_LIST_SUBSCRIPTION_CONFIRMATION_TOKEN_EXPIRES_IN_MS]: ZibriDiProvider<number>,
-    [ZIBRI_DI_TOKENS.CURRENT_REQUEST]: ZibriDiProvider<HttpRequest>,
-    [ZIBRI_DI_TOKENS.MULTITHREADING_OPTIONS]: ZibriDiProvider<MultithreadingOptions>,
-    [ZIBRI_DI_TOKENS.MULTITHREADING_SERVICE]: ZibriDiProvider<MultithreadingServiceInterface>,
-    // eslint-disable-next-line typescript/no-explicit-any
-    [ZIBRI_DI_TOKENS.WEBSOCKET_SERVICE]: ZibriDiProvider<WebsocketServiceInterface<any>>,
-    [ZIBRI_DI_TOKENS.WEBSOCKET_OPTIONS]: ZibriDiProvider<WebsocketOptions>,
-    [ZIBRI_DI_TOKENS.HTTP_CLIENT]: ZibriDiProvider<HttpClientInterface>
-};
-
-export const ZIBRI_DI_PROVIDERS: Record<
-    typeof ZIBRI_DI_TOKENS[keyof typeof ZIBRI_DI_TOKENS],
-    ZibriDiProvider<unknown>
-> = {
-    [ZIBRI_DI_TOKENS.ROUTER]: { useClass: Router },
-    [ZIBRI_DI_TOKENS.LOGGER]: { useClass: Logger },
-    [ZIBRI_DI_TOKENS.LOGGER_TRANSPORTS]: {
+export const ZIBRI_DI_PROVIDERS: DiTokenProviderRecord<typeof ZIBRI_DI_TOKENS> = {
+    ROUTER: { useClass: Router },
+    LOGGER: { useClass: Logger },
+    LOGGER_TRANSPORTS: {
         useFactory: () => [
             LoggerTransport.console(LogLevel.INFO),
             LoggerTransport.db(LogLevel.INFO)
         ]
     },
-    [ZIBRI_DI_TOKENS.LOGGER_CLEANUP_AFTER_MS]: {
+    LOGGER_CLEANUP_AFTER_MS: {
         useFactory: () => ({
             [LogLevel.DEBUG]: Ms.WEEK * 2,
             [LogLevel.INFO]: Ms.WEEK * 2,
@@ -106,30 +61,31 @@ export const ZIBRI_DI_PROVIDERS: Record<
             [LogLevel.CRITICAL]: Ms.WEEK * 2
         })
     },
-    [ZIBRI_DI_TOKENS.METRICS_SERVICE]: { useClass: PrometheusMetricsService },
-    [ZIBRI_DI_TOKENS.ASSET_SERVICE]: { useClass: AssetService },
-    [ZIBRI_DI_TOKENS.BACKUP_SERVICE]: { useClass: BackupService },
-    [ZIBRI_DI_TOKENS.GLOBAL_ERROR_HANDLER]: { useFactory: () => errorHandler },
-    [ZIBRI_DI_TOKENS.OPEN_API_SERVICE]: { useClass: OpenApiService },
-    [ZIBRI_DI_TOKENS.PARSER]: { useClass: Parser },
-    [ZIBRI_DI_TOKENS.VALIDATION_SERVICE]: { useClass: ValidationService },
-    [ZIBRI_DI_TOKENS.DATA_SOURCE_SERVICE]: { useClass: DataSourceService },
-    [ZIBRI_DI_TOKENS.AUTH_SERVICE]: { useFactory: () => new AuthService() },
-    [ZIBRI_DI_TOKENS.TWO_FACTOR_SERVICE]: { useFactory: () => new TwoFactorService() },
-    [ZIBRI_DI_TOKENS.OTP_HEADER]: { useFactory: () => 'X-Authorization-OTP' },
-    [ZIBRI_DI_TOKENS.OTP_LENGTH]: { useFactory: () => 6 },
-    [ZIBRI_DI_TOKENS.USER_SERVICE]: { useFactory: () => new UserService() },
-    [ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_SECRET]: { useFactory: () => undefined },
-    [ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_SECRET]: { useFactory: () => undefined },
-    [ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_EXPIRES_IN_MS]: { useFactory: () => Ms.HOUR },
-    [ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_EXPIRES_IN_MS]: { useFactory: () => 100 * Ms.DAY },
-    [ZIBRI_DI_TOKENS.CRON_SERVICE]: { useClass: CronService },
-    [ZIBRI_DI_TOKENS.EMAIL_SERVICE]: { useClass: EmailService },
-    [ZIBRI_DI_TOKENS.MAILING_LIST_SERVICE]: { useClass: MailingListService },
-    [ZIBRI_DI_TOKENS.MAILING_LIST_SUBSCRIPTION_CONFIRMATION_TOKEN_EXPIRES_IN_MS]: { useFactory: () => Ms.DAY },
-    [ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER]: { useFactory: () => path.join(__dirname, 'temp') },
-    [ZIBRI_DI_TOKENS.LOCALIZE_OPTIONS_INPUT]: { useFactory: () => ({}) },
-    [ZIBRI_DI_TOKENS.LOCALIZE_OPTIONS]: {
+    METRICS_SERVICE: { useClass: PrometheusMetricsService },
+    ASSET_SERVICE: { useClass: AssetService },
+    BACKUP_SERVICE: { useClass: BackupService },
+    GLOBAL_ERROR_HANDLER: { useFactory: () => errorHandler },
+    ERROR_PAGE_TEMPLATE: { useFactory: () => undefined },
+    OPEN_API_SERVICE: { useClass: OpenApiService },
+    PARSER: { useClass: Parser },
+    VALIDATION_SERVICE: { useClass: ValidationService },
+    DATA_SOURCE_SERVICE: { useClass: DataSourceService },
+    AUTH_SERVICE: { useFactory: () => new AuthService() },
+    TWO_FACTOR_SERVICE: { useFactory: () => new TwoFactorService() },
+    OTP_HEADER: { useFactory: () => 'X-Authorization-OTP' },
+    OTP_LENGTH: { useFactory: () => 6 },
+    USER_SERVICE: { useFactory: () => new UserService() },
+    JWT_ACCESS_TOKEN_SECRET: { useFactory: () => undefined },
+    JWT_REFRESH_TOKEN_SECRET: { useFactory: () => undefined },
+    JWT_ACCESS_TOKEN_EXPIRES_IN_MS: { useFactory: () => Ms.HOUR },
+    JWT_REFRESH_TOKEN_EXPIRES_IN_MS: { useFactory: () => 100 * Ms.DAY },
+    CRON_SERVICE: { useClass: CronService },
+    EMAIL_SERVICE: { useClass: EmailService },
+    MAILING_LIST_SERVICE: { useClass: MailingListService },
+    MAILING_LIST_SUBSCRIPTION_CONFIRMATION_TOKEN_EXPIRES_IN_MS: { useFactory: () => Ms.DAY },
+    FILE_UPLOAD_TEMP_FOLDER: { useFactory: () => FsUtilities.getPath(__dirname, 'temp') },
+    LOCALIZE_OPTIONS_INPUT: { useFactory: () => ({}) },
+    LOCALIZE_OPTIONS: {
         useFactory: () => {
             const input: LocalizeOptionsInput = inject(ZIBRI_DI_TOKENS.LOCALIZE_OPTIONS_INPUT);
             return {
@@ -139,14 +95,14 @@ export const ZIBRI_DI_PROVIDERS: Record<
             };
         }
     },
-    [ZIBRI_DI_TOKENS.FORMAT_DATE]: { useFactory: () => formatDate },
-    [ZIBRI_DI_TOKENS.FORMAT_PRICE]: { useFactory: () => formatPrice },
-    [ZIBRI_DI_TOKENS.FORMAT_PERCENT]: { useFactory: () => formatPercent },
-    [ZIBRI_DI_TOKENS.EMAIL_CONFIG]: { useFactory: () => undefined },
-    [ZIBRI_DI_TOKENS.JWT_PASSWORD_RESET_TOKEN_EXPIRES_IN_MS]: { useFactory: () => 300000 },
-    [ZIBRI_DI_TOKENS.JWT_CONFIRM_PASSWORD_RESET_URL]: { useFactory: () => undefined },
-    [ZIBRI_DI_TOKENS.CURRENT_REQUEST]: { useFactory: () => getCurrentRequest() },
-    [ZIBRI_DI_TOKENS.MULTITHREADING_OPTIONS]: {
+    FORMAT_DATE: { useFactory: () => formatDate },
+    FORMAT_PRICE: { useFactory: () => formatPrice },
+    FORMAT_PERCENT: { useFactory: () => formatPercent },
+    EMAIL_CONFIG: { useFactory: () => undefined },
+    JWT_PASSWORD_RESET_TOKEN_EXPIRES_IN_MS: { useFactory: () => 300000 },
+    JWT_CONFIRM_PASSWORD_RESET_URL: { useFactory: () => undefined },
+    CURRENT_REQUEST: { useFactory: () => getCurrentRequest() },
+    MULTITHREADING_OPTIONS: {
         useFactory: () => ({
             maxThreads,
             maxPriorityThreads,
@@ -154,8 +110,8 @@ export const ZIBRI_DI_PROVIDERS: Record<
             defaultTimeoutPriorityMs: Ms.MINUTE * 5
         })
     },
-    [ZIBRI_DI_TOKENS.MULTITHREADING_SERVICE]: { useClass: MultithreadingService },
-    [ZIBRI_DI_TOKENS.WEBSOCKET_SERVICE]: { useClass: WebsocketService },
-    [ZIBRI_DI_TOKENS.WEBSOCKET_OPTIONS]: { useFactory: () => ({ timeoutInMs: Ms.SECOND * 5, isAllowedToConnect: () => true }) },
-    [ZIBRI_DI_TOKENS.HTTP_CLIENT]: { useClass: HttpClient }
-} satisfies ZibriDiProviders;
+    MULTITHREADING_SERVICE: { useClass: MultithreadingService },
+    WEBSOCKET_SERVICE: { useClass: WebsocketService },
+    WEBSOCKET_OPTIONS: { useFactory: () => ({ timeoutInMs: Ms.SECOND * 5, isAllowedToConnect: () => true }) },
+    HTTP_CLIENT: { useClass: HttpClient }
+};

package/src/di/default/zibri-di-tokens.default.ts

@@ -1,47 +1,88 @@
+import { AssetServiceInterface } from '../../assets/asset-service.interface';
+import { TwoFactorServiceInterface } from '../../auth/2fa/two-factor-service.interface';
+import { AuthServiceInterface } from '../../auth/auth-service.interface';
+import { UserServiceInterface } from '../../auth/user/user-service.interface';
+import { BackupServiceInterface } from '../../backup/backup-service.interface';
+import { CronServiceInterface } from '../../cron/cron-service.interface';
+import { DataSourceServiceInterface } from '../../data-source/data-source-service.interface';
+import { EmailServiceInterface } from '../../email/email-service.interface';
+import { MailingListServiceInterface } from '../../email/mailing-list/mailing-list-service.interface';
+import { EmailConfigInput } from '../../email/models/email-config.model';
+import { GlobalErrorHandler, ErrorPageTemplate } from '../../error-handling/error-handler.model';
+import { HttpRequest } from '../../http/http-request.model';
+import { HttpClientInterface } from '../../http-client/http-client.interface';
+import { FormatDateFn } from '../../localization/formatting/format-date-fn.model';
+import { FormatPercentFn } from '../../localization/formatting/format-percent-fn.model';
+import { FormatPriceFn } from '../../localization/formatting/format-price-fn.model';
+import { LocalizeOptionsInput, LocalizeOptions } from '../../localization/models/localize-options.model';
+import { LogLevel } from '../../logging/log-level.enum';
+import { LoggerInterface } from '../../logging/logger.interface';
+import { LoggerTransport, BaseLoggerTransportConfig } from '../../logging/transport/logger-transport.model';
+import { MetricsServiceInterface } from '../../metrics/metrics-service.interface';
+import { MultithreadingOptions } from '../../multithreading/models/multithreading-options.model';
+import { MultithreadingServiceInterface } from '../../multithreading/services/multithreading-service.interface';
+import { OpenApiServiceInterface } from '../../open-api/open-api-service.interface';
+import { ParserInterface } from '../../parsing/parser.interface';
+import { RouterInterface } from '../../routing/router.interface';
+import { Path } from '../../utilities/fs.utilities';
+import { ValidationServiceInterface } from '../../validation/validation-service.interface';
+import { WebsocketOptions } from '../../websocket/models/websocket-options.model';
+import { WebsocketServiceInterface } from '../../websocket/services/websocket-service.interface';
+import { TokenRecord } from '../models/di-token.model';
+import { InjectionToken } from '../models/injection-token.model';
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+function ziToken<T = never>(k: `zi.${string}`): InjectionToken<T> {
+    return new InjectionToken<T>(k);
+}
 
 /**
  * Injection Tokens used and provided by Zibri.
  */
 // eslint-disable-next-line typescript/typedef
 export const ZIBRI_DI_TOKENS = {
-    ROUTER: 'zi.router',
-    LOGGER: 'zi.logger',
-    LOGGER_TRANSPORTS: 'zi.logger_transports',
-    LOGGER_CLEANUP_AFTER_MS: 'zi.logger_cleanup_after_ms',
-    METRICS_SERVICE: 'zi.metrics_service',
-    ASSET_SERVICE: 'zi.asset_service',
-    BACKUP_SERVICE: 'zi.backup_service',
-    GLOBAL_ERROR_HANDLER: 'zi.global_error_handler',
-    OPEN_API_SERVICE: 'zi.open_api_service',
-    AUTH_SERVICE: 'zi.auth_service',
-    TWO_FACTOR_SERVICE: 'zi.two_factor_service',
-    OTP_HEADER: 'zi.otp_header',
-    OTP_LENGTH: 'zi.otp_length',
-    PARSER: 'zi.parser_service',
-    VALIDATION_SERVICE: 'zi.validation_service',
-    DATA_SOURCE_SERVICE: 'zi.data_source_service',
-    JWT_ACCESS_TOKEN_SECRET: 'zi.jwt_access_token_secret',
-    JWT_ACCESS_TOKEN_EXPIRES_IN_MS: 'zi.jwt_access_token_expires_in_ms',
-    JWT_REFRESH_TOKEN_SECRET: 'zi.jwt_refresh_token_secret',
-    JWT_REFRESH_TOKEN_EXPIRES_IN_MS: 'zi.jwt_refresh_token_expires_in_ms',
-    JWT_PASSWORD_RESET_TOKEN_EXPIRES_IN_MS: 'zi.jwt_password_reset_token_expires_in_ms',
-    JWT_CONFIRM_PASSWORD_RESET_URL: 'zi.jwt_confirm_password_reset_url',
-    MAILING_LIST_SUBSCRIPTION_CONFIRMATION_TOKEN_EXPIRES_IN_MS: 'zi.mailing_list_subscription_confirmation_token_expires_in_ms',
-    USER_SERVICE: 'zi.user_service',
-    CRON_SERVICE: 'zi.cron_service',
-    FILE_UPLOAD_TEMP_FOLDER: 'zi.file_upload_temp_folder',
-    LOCALIZE_OPTIONS_INPUT: 'zi.localize_options_input',
-    LOCALIZE_OPTIONS: 'zi.localize_options',
-    FORMAT_DATE: 'zi.format_date',
-    FORMAT_PRICE: 'zi.format_price',
-    FORMAT_PERCENT: 'zi.format_percent',
-    EMAIL_SERVICE: 'zi.email_service',
-    EMAIL_CONFIG: 'zi.email_config',
-    MAILING_LIST_SERVICE: 'zi.mailing_list_service',
-    CURRENT_REQUEST: 'zi.current_request',
-    MULTITHREADING_SERVICE: 'zi.multithreading_service',
-    MULTITHREADING_OPTIONS: 'zi.multithreading_options',
-    WEBSOCKET_SERVICE: 'zi.websocket_service',
-    WEBSOCKET_OPTIONS: 'zi.websocket_options',
-    HTTP_CLIENT: 'zi.http_client'
-} as const satisfies Record<string, `zi.${string}`>;
+    ROUTER: ziToken<RouterInterface>('zi.router'),
+    LOGGER: ziToken<LoggerInterface>('zi.logger'),
+    LOGGER_TRANSPORTS: ziToken<LoggerTransport<BaseLoggerTransportConfig>[]>('zi.logger_transports'),
+    LOGGER_CLEANUP_AFTER_MS: ziToken<Record<LogLevel, number>>('zi.logger_cleanup_after_ms'),
+    METRICS_SERVICE: ziToken<MetricsServiceInterface>('zi.metrics_service'),
+    ASSET_SERVICE: ziToken<AssetServiceInterface>('zi.asset_service'),
+    BACKUP_SERVICE: ziToken<BackupServiceInterface>('zi.backup_service'),
+    GLOBAL_ERROR_HANDLER: ziToken<GlobalErrorHandler>('zi.global_error_handler'),
+    ERROR_PAGE_TEMPLATE: ziToken<ErrorPageTemplate | undefined>('zi.error_page_template'),
+    OPEN_API_SERVICE: ziToken<OpenApiServiceInterface>('zi.open_api_service'),
+    AUTH_SERVICE: ziToken<AuthServiceInterface>('zi.auth_service'),
+    TWO_FACTOR_SERVICE: ziToken<TwoFactorServiceInterface>('zi.two_factor_service'),
+    OTP_HEADER: ziToken<string>('zi.otp_header'),
+    OTP_LENGTH: ziToken<number>('zi.otp_length'),
+    PARSER: ziToken<ParserInterface>('zi.parser_service'),
+    VALIDATION_SERVICE: ziToken<ValidationServiceInterface>('zi.validation_service'),
+    DATA_SOURCE_SERVICE: ziToken<DataSourceServiceInterface>('zi.data_source_service'),
+    JWT_ACCESS_TOKEN_SECRET: ziToken<string | undefined>('zi.jwt_access_token_secret'),
+    JWT_ACCESS_TOKEN_EXPIRES_IN_MS: ziToken<number>('zi.jwt_access_token_expires_in_ms'),
+    JWT_REFRESH_TOKEN_SECRET: ziToken<string | undefined>('zi.jwt_refresh_token_secret'),
+    JWT_REFRESH_TOKEN_EXPIRES_IN_MS: ziToken<number>('zi.jwt_refresh_token_expires_in_ms'),
+    JWT_PASSWORD_RESET_TOKEN_EXPIRES_IN_MS: ziToken<number>('zi.jwt_password_reset_token_expires_in_ms'),
+    JWT_CONFIRM_PASSWORD_RESET_URL: ziToken<string | undefined>('zi.jwt_confirm_password_reset_url'),
+    MAILING_LIST_SUBSCRIPTION_CONFIRMATION_TOKEN_EXPIRES_IN_MS: ziToken<number>(
+        'zi.mailing_list_subscription_confirmation_token_expires_in_ms'
+    ),
+    USER_SERVICE: ziToken<UserServiceInterface>('zi.user_service'),
+    CRON_SERVICE: ziToken<CronServiceInterface>('zi.cron_service'),
+    FILE_UPLOAD_TEMP_FOLDER: ziToken<Path>('zi.file_upload_temp_folder'),
+    LOCALIZE_OPTIONS_INPUT: ziToken<LocalizeOptionsInput>('zi.localize_options_input'),
+    LOCALIZE_OPTIONS: ziToken<LocalizeOptions>('zi.localize_options'),
+    FORMAT_DATE: ziToken<FormatDateFn>('zi.format_date'),
+    FORMAT_PRICE: ziToken<FormatPriceFn>('zi.format_price'),
+    FORMAT_PERCENT: ziToken<FormatPercentFn>('zi.format_percent'),
+    EMAIL_SERVICE: ziToken<EmailServiceInterface>('zi.email_service'),
+    EMAIL_CONFIG: ziToken<EmailConfigInput | undefined>('zi.email_config'),
+    MAILING_LIST_SERVICE: ziToken<MailingListServiceInterface | undefined>('zi.mailing_list_service'),
+    CURRENT_REQUEST: ziToken<HttpRequest>('zi.current_request'),
+    MULTITHREADING_SERVICE: ziToken<MultithreadingServiceInterface>('zi.multithreading_service'),
+    MULTITHREADING_OPTIONS: ziToken<MultithreadingOptions>('zi.multithreading_options'),
+    // eslint-disable-next-line typescript/no-explicit-any
+    WEBSOCKET_SERVICE: ziToken<WebsocketServiceInterface<any>>('zi.websocket_service'),
+    WEBSOCKET_OPTIONS: ziToken<WebsocketOptions>('zi.websocket_options'),
+    HTTP_CLIENT: ziToken<HttpClientInterface>('zi.http_client')
+} as const satisfies TokenRecord;