zibri 2.1.7 → 2.2.1

package/src/auth/models/base-user.model.ts

@@ -1,6 +1,7 @@
-import { Property } from '../../entity';
 import { BaseEntity } from '../../entity/base-entity.model';
-import { AnyEnum, Newable } from '../../types';
+import { Property } from '../../entity/decorators/property.decorator';
+import { AnyEnum } from '../../types/any-enum.type';
+import { Newable } from '../../types/newable.type';
 
 /**
  * Common properties shared by all users.

package/src/auth/models/belongs-to-metadata.model.ts

@@ -1,7 +1,7 @@
-import { AuthStrategies } from '../strategies';
 import { SkipAuthMetadata } from './skip-auth-metadata.model';
 import { BaseEntity } from '../../entity/base-entity.model';
-import { Newable } from '../../types';
+import { Newable } from '../../types/newable.type';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * Metadata for the \@Auth.belongsTo decorator.

package/src/auth/models/has-role-metadata.model.ts

@@ -1,5 +1,5 @@
-import { AuthStrategies } from '../strategies';
 import { SkipAuthMetadata } from './skip-auth-metadata.model';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * Metadata for the \@Auth.hasRole decorator.

package/src/auth/models/is-logged-in-metadata.model.ts

@@ -1,5 +1,5 @@
-import { AuthStrategies } from '../strategies';
 import { SkipAuthMetadata } from './skip-auth-metadata.model';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * Metadata for the \@Auth.isLoggedIn decorator.

package/src/auth/models/is-not-logged-in-metadata.model.ts

@@ -1,5 +1,5 @@
-import { AuthStrategies } from '../strategies';
 import { SkipAuthMetadata } from './skip-auth-metadata.model';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * Metadata for the \@Auth.isNotLoggedIn decorator.

package/src/auth/models/password-reset-token.model.ts

@@ -1,5 +1,7 @@
-import { Entity, OmitClass, Property } from '../../entity';
 import { BaseEntity } from '../../entity/base-entity.model';
+import { Entity } from '../../entity/decorators/entity.decorator';
+import { Property } from '../../entity/decorators/property.decorator';
+import { OmitClass } from '../../entity/omit-class.model';
 
 /**
  * A short lived token used to confirm a password reset.

package/src/auth/models/require-2fa-metadata.model.ts

@@ -1,5 +1,5 @@
-import { TwoFactorMethods } from '../2fa';
 import { SkipAuthMetadata } from './skip-auth-metadata.model';
+import { TwoFactorMethods } from '../2fa/two-factor-methods.model';
 
 /**
  * Metadata for the \@Auth.require2fa decorator.

package/src/auth/models/user-repositories.model.ts

@@ -1,5 +1,5 @@
 import { BaseUser } from './base-user.model';
-import { Newable } from '../../types';
+import { Newable } from '../../types/newable.type';
 import { UserRepositoryInterface } from '../user/user-repository.interface';
 
 /**

package/src/auth/strategies/auth-strategies.model.ts

@@ -1,5 +1,5 @@
-import { AuthStrategyInterface } from '.';
-import { Newable } from '../../types';
+import { AuthStrategyInterface } from './auth-strategy.interface';
+import { Newable } from '../../types/newable.type';
 import { BaseUser } from '../models/base-user.model';
 
 /**

package/src/auth/strategies/auth-strategy.interface.ts

@@ -1,9 +1,9 @@
 import { BaseEntity } from '../../entity/base-entity.model';
-import { HttpRequest } from '../../http';
-import { OpenApiSecuritySchemeObject } from '../../open-api';
-import { Newable } from '../../types';
-import { WebsocketRequest } from '../../websocket';
-import { BaseUser } from '../models';
+import { HttpRequest } from '../../http/http-request.model';
+import { OpenApiSecuritySchemeObject } from '../../open-api/open-api.model';
+import { Newable } from '../../types/newable.type';
+import { WebsocketRequest } from '../../websocket/models/websocket-request.model';
+import { BaseUser } from '../models/base-user.model';
 
 /**
  * Interface for an auth strategy.

package/src/auth/strategies/jwt/encoded-jwt-access-token.model.ts

@@ -1,7 +1,7 @@
 import { JwtHeader } from 'jsonwebtoken';
 
 import { JwtAccessTokenPayload } from './jwt-access-token-payload.model';
-import { BaseUser } from '../../models';
+import { BaseUser } from '../../models/base-user.model';
 
 /**
  * An encoded jwt access token.

package/src/auth/strategies/jwt/jwt-access-token-payload.model.ts

@@ -1,4 +1,4 @@
-import { BaseUser } from '../../models';
+import { BaseUser } from '../../models/base-user.model';
 
 /**
  * The payload of a jwt access token.

package/src/auth/strategies/jwt/jwt-auth-data.model.ts

@@ -1,5 +1,5 @@
 import { Jwt } from './jwt.model';
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * The authentication data that gets returned when logging in or refreshing the login.

package/src/auth/strategies/jwt/jwt-auth.controller.ts

@@ -3,15 +3,20 @@ import { JwtConfirmPasswordResetData } from './jwt-confirm-password-reset-data.m
 import { JwtCredentialsDto } from './jwt-credentials.model';
 import { JwtRefreshLoginData } from './jwt-refresh-login-data.model';
 import { JwtAuthStrategy } from './jwt.auth-strategy';
-import { Repository } from '../../../data-source';
-import { Inject, InjectRepository, ZIBRI_DI_TOKENS } from '../../../di';
-import { Property } from '../../../entity';
-import { Response } from '../../../open-api';
-import { Body, Controller, Post } from '../../../routing';
+import { Repository } from '../../../data-source/repository';
+import { InjectRepository } from '../../../di/decorators/inject-repository.decorator';
+import { Inject } from '../../../di/decorators/inject.decorator';
+import { ZIBRI_DI_TOKENS } from '../../../di/default/zibri-di-tokens.default';
+import { Property } from '../../../entity/decorators/property.decorator';
+import { Response } from '../../../open-api/decorators/response.decorator';
+import { Body } from '../../../routing/decorators/body.decorator';
+import { Controller } from '../../../routing/decorators/controller.decorator';
+import { Post } from '../../../routing/decorators/post.decorator';
 import { AuthControllerInterface } from '../../auth-controller.interface';
 import { type AuthServiceInterface } from '../../auth-service.interface';
-import { BaseUser, PasswordResetToken } from '../../models';
-import { type UserServiceInterface } from '../../user';
+import { BaseUser } from '../../models/base-user.model';
+import { PasswordResetToken } from '../../models/password-reset-token.model';
+import { type UserServiceInterface } from '../../user/user-service.interface';
 
 class JwtRequestPasswordResetInput {
     @Property.string({ format: 'email' })

package/src/auth/strategies/jwt/jwt-confirm-password-reset-data.model.ts

@@ -1,4 +1,4 @@
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * The data used to confirm a password reset.

package/src/auth/strategies/jwt/jwt-credentials.model.ts

@@ -1,6 +1,8 @@
-import { Entity, Property, OmitClass } from '../../../entity';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { BaseUser } from '../../models';
+import { Entity } from '../../../entity/decorators/entity.decorator';
+import { Property } from '../../../entity/decorators/property.decorator';
+import { OmitClass } from '../../../entity/omit-class.model';
+import { BaseUser } from '../../models/base-user.model';
 
 /**
  * The credentials used by the jwt auth strategy.

package/src/auth/strategies/jwt/jwt-refresh-login-data.model.ts

@@ -1,4 +1,4 @@
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * The data used to refresh a login inside the jwt auth strategy.

package/src/auth/strategies/jwt/jwt-refresh-token-payload.model.ts

@@ -1,4 +1,4 @@
-import { BaseUser } from '../../models';
+import { BaseUser } from '../../models/base-user.model';
 
 /**
  * The payload of the jwt refresh token.

package/src/auth/strategies/jwt/jwt-refresh-token.model.ts

@@ -1,5 +1,7 @@
-import { Entity, OmitClass, Property } from '../../../entity';
 import { BaseEntity } from '../../../entity/base-entity.model';
+import { Entity } from '../../../entity/decorators/entity.decorator';
+import { Property } from '../../../entity/decorators/property.decorator';
+import { OmitClass } from '../../../entity/omit-class.model';
 
 /**
  * The jwt refresh token that gets stored in the data source.

package/src/auth/strategies/jwt/jwt-request-password-reset-data.model.ts

@@ -1,5 +1,5 @@
-import { QueueEmailData } from '../../../email';
-import { BaseUser } from '../../models';
+import { QueueEmailData } from '../../../email/models/create-email-data.model';
+import { BaseUser } from '../../models/base-user.model';
 
 /**
  * The data used by the jwt auth strategy to request a password reset.

package/src/auth/strategies/jwt/jwt.auth-strategy.ts

@@ -10,21 +10,30 @@ import { JwtRefreshTokenPayload } from './jwt-refresh-token-payload.model';
 import { JwtRefreshToken, JwtRefreshTokenCreateDto } from './jwt-refresh-token.model';
 import { JwtRequestPasswordResetData } from './jwt-request-password-reset-data.model';
 import { JwtUtilities } from './jwt.utilities';
-import { Repository } from '../../../data-source';
-import { inject, repositoryTokenFor, ZIBRI_DI_TOKENS } from '../../../di';
-import { EmailPriority, EmailServiceInterface } from '../../../email';
+import { Repository } from '../../../data-source/repository';
+import { repositoryTokenFor } from '../../../di/decorators/inject-repository.decorator';
+import { ZIBRI_DI_TOKENS } from '../../../di/default/zibri-di-tokens.default';
+import { NoProviderError } from '../../../di/errors/no-provider.error';
+import { inject } from '../../../di/inject.function';
+import { EmailServiceInterface } from '../../../email/email-service.interface';
+import { EmailPriority } from '../../../email/models/email-priority.enum';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { TooManyRequestsError, UnauthorizedError } from '../../../error-handling';
-import { GlobalRegistry } from '../../../global';
-import { renderEmailTemplate } from '../../../handlebars';
-import { HttpRequest } from '../../../http';
-import { OpenApiSecuritySchemeObject } from '../../../open-api';
-import { Newable } from '../../../types';
-import { Ms, UUIDUtilities, validateEntitiesRegistered } from '../../../utilities';
-import { WebsocketRequest } from '../../../websocket';
+import { TooManyRequestsError } from '../../../error-handling/errors/too-many-requests.error';
+import { UnauthorizedError } from '../../../error-handling/errors/unauthorized.error';
+import { GlobalRegistry } from '../../../global/global-registry';
+import { renderEmailTemplate } from '../../../handlebars/render-template.function';
+import { HttpRequest } from '../../../http/http-request.model';
+import { OpenApiSecuritySchemeObject } from '../../../open-api/open-api.model';
+import { Newable } from '../../../types/newable.type';
+import { Ms } from '../../../utilities/ms';
+import { UUIDUtilities } from '../../../utilities/uuid.utilities';
+import { validateEntitiesRegistered } from '../../../utilities/validate-entities-registered.function';
+import { WebsocketRequest } from '../../../websocket/models/websocket-request.model';
 import { HashUtilities } from '../../hash.utilities';
-import { BaseUser, PasswordResetToken, PasswordResetTokenCreateData } from '../../models';
-import { UserServiceInterface, NO_USER_REPOSITORIES_PROVIDED_ERROR_MESSAGE } from '../../user';
+import { BaseUser } from '../../models/base-user.model';
+import { PasswordResetToken, PasswordResetTokenCreateData } from '../../models/password-reset-token.model';
+import { UserServiceInterface } from '../../user/user-service.interface';
+import { NO_USER_REPOSITORIES_PROVIDED_ERROR_MESSAGE } from '../../user/user.service';
 import { AuthStrategyInterface } from '../auth-strategy.interface';
 
 /**
@@ -77,14 +86,26 @@ implements AuthStrategyInterface<
     }
 
     constructor() {
-        this.accessTokenSecret = inject(ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_SECRET);
+        const accessTokenSecret: string | undefined = inject(ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_SECRET);
+        if (!accessTokenSecret) {
+            throw new NoProviderError(ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_SECRET, [JwtAuthStrategy]);
+        }
+        const refreshTokenSecret: string | undefined = inject(ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_SECRET);
+        if (!refreshTokenSecret) {
+            throw new NoProviderError(ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_SECRET, [JwtAuthStrategy]);
+        }
+        const confirmPasswordResetUrl: string | undefined = inject(ZIBRI_DI_TOKENS.JWT_CONFIRM_PASSWORD_RESET_URL);
+        if (!confirmPasswordResetUrl) {
+            throw new NoProviderError(ZIBRI_DI_TOKENS.JWT_CONFIRM_PASSWORD_RESET_URL, [JwtAuthStrategy]);
+        }
+        this.accessTokenSecret = accessTokenSecret;
         this.accessTokenExpiresInMs = inject(ZIBRI_DI_TOKENS.JWT_ACCESS_TOKEN_EXPIRES_IN_MS);
-        this.refreshTokenSecret = inject(ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_SECRET);
+        this.refreshTokenSecret = refreshTokenSecret;
         this.refreshTokenExpiresInMs = inject(ZIBRI_DI_TOKENS.JWT_REFRESH_TOKEN_EXPIRES_IN_MS);
         this.passwordResetTokenExpiresInMs = inject(ZIBRI_DI_TOKENS.JWT_PASSWORD_RESET_TOKEN_EXPIRES_IN_MS);
         this.userService = inject(ZIBRI_DI_TOKENS.USER_SERVICE);
         this.emailService = inject(ZIBRI_DI_TOKENS.EMAIL_SERVICE);
-        this.confirmPasswordResetUrl = inject(ZIBRI_DI_TOKENS.JWT_CONFIRM_PASSWORD_RESET_URL);
+        this.confirmPasswordResetUrl = confirmPasswordResetUrl;
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc

package/src/auth/strategies/jwt/jwt.model.ts

@@ -1,4 +1,4 @@
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * A Jwt, consisting of the token value and the expiration date.

package/src/auth/user/user-repository.interface.ts

@@ -1,4 +1,4 @@
-import { BaseUser } from '../models';
+import { BaseUser } from '../models/base-user.model';
 
 /**
  * Interface for a User Repository.

package/src/auth/user/user-service.interface.ts

@@ -1,4 +1,4 @@
-import { BaseUser } from '../models';
+import { BaseUser } from '../models/base-user.model';
 
 /**
  * Interface for a user service.

package/src/auth/user/user.service.ts

@@ -1,8 +1,8 @@
-import { inject } from '../../di';
-import { NotFoundError } from '../../error-handling';
-import { GlobalRegistry } from '../../global';
-import { BaseUser } from '../models';
 import { UserServiceInterface } from './user-service.interface';
+import { inject } from '../../di/inject.function';
+import { NotFoundError } from '../../error-handling/errors/not-found.error';
+import { GlobalRegistry } from '../../global/global-registry';
+import { BaseUser } from '../models/base-user.model';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 export const NO_USER_REPOSITORIES_PROVIDED_ERROR_MESSAGE: string = 'No user repositories have been provided.';

package/src/backup/backup-entity.model.ts

@@ -1,9 +1,11 @@
-import { inject, ZIBRI_DI_TOKENS } from '../di';
-import { Entity, Property } from '../entity';
 import { BackupResourceEntity, BackupResourceEntityCreateData } from './backup-resource-entity.model';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
 import { BaseEntity } from '../entity/base-entity.model';
-import { FormatDateFn } from '../localization';
-import { OmitStrict } from '../types';
+import { Entity } from '../entity/decorators/entity.decorator';
+import { Property } from '../entity/decorators/property.decorator';
+import { FormatDateFn } from '../localization/formatting/format-date-fn.model';
+import { OmitStrict } from '../types/omit-strict.type';
 
 /**
  * The entity of a single backup.

package/src/backup/backup-resource-entity.model.ts

@@ -1,7 +1,8 @@
-import { Entity, Property } from '../entity';
 import { BackupEntity } from './backup-entity.model';
 import { BaseEntity } from '../entity/base-entity.model';
-import { OmitStrict } from '../types';
+import { Entity } from '../entity/decorators/entity.decorator';
+import { Property } from '../entity/decorators/property.decorator';
+import { OmitStrict } from '../types/omit-strict.type';
 
 /**
  * A single resource entity.

package/src/backup/backup-service.interface.ts

@@ -2,11 +2,12 @@ import { Readable } from 'node:stream';
 
 import { BehaviorSubject } from 'rxjs';
 
-import { Newable, OmitStrict } from '../types';
 import { BackupEntity, BackupEntityCreateData } from './backup-entity.model';
 import { BackupResourceEntity } from './backup-resource-entity.model';
 import { BackupResourceInterface } from './backup-resource.interface';
-import { BackupTransportInterface } from './transports';
+import { Newable } from '../types/newable.type';
+import { OmitStrict } from '../types/omit-strict.type';
+import { BackupTransportInterface } from './transports/backup-transport.interface';
 
 /**
  * The data needed to create a new backup.

package/src/backup/backup-service.test.ts

@@ -1,25 +1,25 @@
-import { rm } from 'fs/promises';
-import path from 'path';
-
 import { beforeAll, afterAll, describe, it, expect } from '@jest/globals';
 import { PostgreSqlContainer, StartedPostgreSqlContainer } from '@testcontainers/postgresql';
 
-import { BackupService } from './backup.service';
-import { POSTGRES_TEST_IMAGE, testFileFolder } from '../__testing__';
 import { BackupEntity } from './backup-entity.model';
 import { BackupResourceEntity } from './backup-resource-entity.model';
+import { BackupServiceInterface } from './backup-service.interface';
+import { POSTGRES_TEST_IMAGE, testFileFolder } from '../__testing__/constants';
+import { Backup } from './decorators/backup-resource.decorator';
+import { FsBackupTransport } from './transports/fs.backup-transport';
+import { PostgresDataSource, PostgresOptions } from '../data-source/data-sources/postgres-data-source.model';
 import { DataSource } from '../data-source/decorators/data-source.decorator';
 import { MigrationEntity } from '../data-source/migration/migration-entity.model';
 import { Repository } from '../data-source/repository';
-import { inject, ZIBRI_DI_TOKENS } from '../di';
-import { Entity, Property } from '../entity';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
 import { BaseEntity } from '../entity/base-entity.model';
-import { Newable } from '../types';
-import { Backup } from './decorators/backup-resource.decorator';
-import { FsBackupTransport } from './transports';
-import { PostgresDataSource, PostgresOptions } from '../data-source';
+import { Entity } from '../entity/decorators/entity.decorator';
+import { Property } from '../entity/decorators/property.decorator';
+import { Newable } from '../types/newable.type';
+import { FsUtilities, Path } from '../utilities/fs.utilities';
 
-const backupFsFolder: string = path.join(testFileFolder, 'backups');
+const backupFsFolder: Path = FsUtilities.getPath(testFileFolder, 'backups');
 
 @Entity()
 class Item {
@@ -57,10 +57,10 @@ describe('Create and restore postgres backup', () => {
     let itemRepository: Repository<Item>;
     let backupRepository: Repository<BackupEntity>;
     let container: StartedPostgreSqlContainer;
-    let backupService: BackupService;
+    let backupService: BackupServiceInterface;
 
     beforeAll(async () => {
-        await rm(backupFsFolder, { recursive: true, force: true });
+        await FsUtilities.rm(backupFsFolder);
         container = await new PostgreSqlContainer(POSTGRES_TEST_IMAGE)
             .withDatabase('db')
             .withUsername('postgres')

package/src/backup/backup.service.ts

@@ -2,18 +2,23 @@ import { Readable } from 'node:stream';
 
 import { BehaviorSubject } from 'rxjs';
 
-import { PostgresDataSource, Repository } from '../data-source';
-import { inject, repositoryTokenFor, ZIBRI_DI_TOKENS } from '../di';
-import { GlobalRegistry } from '../global';
-import { LoggerInterface } from '../logging';
-import { Newable } from '../types';
-import { chunkedPromiseAll, MetadataUtilities, validateEntitiesRegistered } from '../utilities';
 import { BackupEntity, BackupEntityCreateData } from './backup-entity.model';
 import { BackupResourceEntity, BackupResourceEntityCreateData } from './backup-resource-entity.model';
 import { BackupResourceInterface } from './backup-resource.interface';
 import { BackupCreateData, BackupServiceInterface } from './backup-service.interface';
-import { BackupResourceMetadata } from './decorators';
-import { BackupTransportInterface } from './transports';
+import { PostgresDataSource } from '../data-source/data-sources/postgres-data-source.model';
+import { repositoryTokenFor } from '../di/decorators/inject-repository.decorator';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { GlobalRegistry } from '../global/global-registry';
+import { LoggerInterface } from '../logging/logger.interface';
+import { Newable } from '../types/newable.type';
+import { MetadataUtilities } from '../utilities/metadata.utilities';
+import { PromiseUtilities } from '../utilities/promise.utilities';
+import { validateEntitiesRegistered } from '../utilities/validate-entities-registered.function';
+import { BackupResourceMetadata } from './decorators/backup-resource-metadata.model';
+import { BackupTransportInterface } from './transports/backup-transport.interface';
+import { Repository } from '../data-source/repository';
 
 /**
  * Default implementation of the backup service.
@@ -80,7 +85,7 @@ export class BackupService implements BackupServiceInterface {
 
         const groupedEntities: Record<string, BackupEntity[]> = this.groupEntitiesById(entitiesToSync);
         const mergedEntities: BackupEntity[] = this.mergeEntities(groupedEntities);
-        await chunkedPromiseAll(mergedEntities.map(e => this.backupRepository.create(e, { allowId: true })));
+        await PromiseUtilities.allChunked(mergedEntities, e => this.backupRepository.create(e, { allowId: true }));
     }
 
     private mergeEntities(groupedEntities: Record<string, BackupEntity[]>): BackupEntity[] {

package/src/backup/decorators/backup-resource-metadata.model.ts

@@ -1,4 +1,4 @@
-import { BackupTransportInterface } from '../transports';
+import { BackupTransportInterface } from '../transports/backup-transport.interface';
 
 /**
  * The metadata for a resource marked with \@Backup.

package/src/backup/decorators/backup-resource.decorator.ts

@@ -1,12 +1,11 @@
 
 import { BackupResourceMetadata, BackupResourceMetadataInput } from './backup-resource-metadata.model';
-import { DiToken } from '../../di';
-import { GlobalRegistry } from '../../global';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
+import { DiToken } from '../../di/models/di-token.model';
+import { GlobalRegistry } from '../../global/global-registry';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
 import { BackupResourceInterface } from '../backup-resource.interface';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Marks a resource that should be backed up. Needs to implement "BackupResourceInterface".
  * @param metadata - The metadata to set.

package/src/backup/transports/fs.backup-transport.ts

@@ -1,13 +1,12 @@
-import { createReadStream, createWriteStream, Dirent } from 'fs';
-import { mkdir, readdir, readFile, rm, writeFile } from 'fs/promises';
-import path from 'path';
+import { Dirent } from 'node:fs';
 import { Readable } from 'stream';
 import { pipeline } from 'stream/promises';
 
 import { BackupTransportInterface } from './backup-transport.interface';
-import { inject, ZIBRI_DI_TOKENS } from '../../di';
-import { LoggerInterface } from '../../logging';
-import { pathExists } from '../../utilities';
+import { ZIBRI_DI_TOKENS } from '../../di/default/zibri-di-tokens.default';
+import { inject } from '../../di/inject.function';
+import { LoggerInterface } from '../../logging/logger.interface';
+import { FsUtilities, Path } from '../../utilities/fs.utilities';
 import { BackupEntity } from '../backup-entity.model';
 import { BackupResourceEntity } from '../backup-resource-entity.model';
 
@@ -22,15 +21,15 @@ export class FsBackupTransport implements BackupTransportInterface {
         return inject(ZIBRI_DI_TOKENS.LOGGER);
     }
 
-    constructor(readonly name: string, protected readonly backupBasePath: string) {}
+    constructor(readonly name: string, protected readonly backupBasePath: Path) {}
 
     // eslint-disable-next-line jsdoc/require-jsdoc
     async resolveBackups(existingEntities: BackupEntity[]): Promise<BackupEntity[]> {
-        if (!await pathExists(this.backupBasePath)) {
+        if (!await FsUtilities.exists(this.backupBasePath)) {
             return [];
         }
 
-        const nodes: Dirent<string>[] = await readdir(this.backupBasePath, { withFileTypes: true });
+        const nodes: Dirent<string>[] = await FsUtilities.readdir(this.backupBasePath);
         const res: BackupEntity[] = (await Promise.all(nodes.map(async node => {
             if (!node.isDirectory()) {
                 return;
@@ -38,12 +37,12 @@ export class FsBackupTransport implements BackupTransportInterface {
             if (existingEntities.map(e => e.name).includes(node.name)) {
                 return;
             }
-            const p: string = path.join(node.parentPath, node.name, METADATA_FILENAME);
-            if (!await pathExists(p)) {
+            const p: Path = FsUtilities.getPath(node.parentPath, node.name, METADATA_FILENAME);
+            if (!await FsUtilities.exists(p)) {
                 await this.logger.warn(`Could not find the metadata file needed to resolve a backup: "${p}"`);
                 return;
             }
-            const json: string = await readFile(p, 'utf8');
+            const json: string = await FsUtilities.readFile(p);
             return JSON.parse(json) as BackupEntity;
         }))).filter(b => b != undefined);
         return res;
@@ -51,37 +50,37 @@ export class FsBackupTransport implements BackupTransportInterface {
 
     // eslint-disable-next-line jsdoc/require-jsdoc
     async storeData(data: Readable, backup: BackupEntity, resource: BackupResourceEntity): Promise<void> {
-        const p: string = this.getResourcePath(backup, resource);
-        await mkdir(this.getBackupPath(backup), { recursive: true });
-        await writeFile(this.getBackupMetadataPath(backup), JSON.stringify(backup), 'utf8');
+        const p: Path = this.getResourcePath(backup, resource);
+        await FsUtilities.mkdir(this.getBackupPath(backup));
+        await FsUtilities.createFile(this.getBackupMetadataPath(backup), JSON.stringify(backup));
 
         await pipeline(
             data,
-            createWriteStream(p)
+            FsUtilities.createWriteStream(p)
         );
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
     retrieveData(backup: BackupEntity, resource: BackupResourceEntity): Readable | Promise<Readable> {
-        const p: string = this.getResourcePath(backup, resource);
-        return createReadStream(p);
+        const p: Path = this.getResourcePath(backup, resource);
+        return FsUtilities.createReadStream(p);
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
     async deleteData(backup: BackupEntity, resource: BackupResourceEntity): Promise<void> {
-        const p: string = this.getResourcePath(backup, resource);
-        await rm(p, { recursive: true });
+        const p: Path = this.getResourcePath(backup, resource);
+        await FsUtilities.rm(p);
     }
 
-    private getResourcePath(backup: BackupEntity, resource: BackupResourceEntity): string {
-        return path.join(this.getBackupPath(backup), resource.name);
+    private getResourcePath(backup: BackupEntity, resource: BackupResourceEntity): Path {
+        return FsUtilities.getPath(this.getBackupPath(backup), resource.name);
     }
 
-    private getBackupPath(backup: BackupEntity): string {
-        return path.join(this.backupBasePath, backup.name);
+    private getBackupPath(backup: BackupEntity): Path {
+        return FsUtilities.getPath(this.backupBasePath, backup.name);
     }
 
-    private getBackupMetadataPath(backup: BackupEntity): string {
-        return path.join(this.getBackupPath(backup), METADATA_FILENAME);
+    private getBackupMetadataPath(backup: BackupEntity): Path {
+        return FsUtilities.getPath(this.getBackupPath(backup), METADATA_FILENAME);
     }
 }