zibri 2.1.7 → 2.2.1

package/src/change-sets/{change-set-repository.model.ts → change-set-repository.ts}

@@ -3,16 +3,31 @@ import { isDeepStrictEqual } from 'util';
 
 import { Repository as TORepository } from 'typeorm';
 
-import { BaseRepositoryOptions, CreateAllOptions, CreateOptions, UpdateAllOptions, UpdateByIdOptions, Where } from '../data-source';
+import { AuthServiceInterface } from '../auth/auth-service.interface';
+import { ChangeSetEntity } from './models/change-set-entity.model';
+import { ChangeSetType } from './models/change-set-type.enum';
+import { ChangeSet, CreateChangeSetData } from './models/change-set.model';
+import { BaseUser } from '../auth/models/base-user.model';
+import { BaseRepositoryOptions } from '../data-source/models/options/base-repository-options.model';
+import { CreateAllOptions } from '../data-source/models/options/create-all-options.model';
+import { CreateOptions } from '../data-source/models/options/create-options.model';
+import { UpdateAllOptions } from '../data-source/models/options/update-all-options.model';
+import { UpdateByIdOptions } from '../data-source/models/options/update-by-id-options.model';
+import { Where } from '../data-source/models/where/where-filter.model';
 import { Repository } from '../data-source/repository';
-import { DeepPartial, Newable } from '../types';
-import { ChangeSet, ChangeSetEntity, ChangeSetType, CreateChangeSetData, NewChange } from './models';
-import { AuthServiceInterface, BaseUser } from '../auth';
-import { inject, repositoryTokenFor, ZIBRI_DI_TOKENS } from '../di';
-import { PropertyMetadata } from '../entity';
-import { BadRequestError } from '../error-handling';
-import { HttpRequest } from '../http';
-import { chunkedPromiseAll, MetadataUtilities } from '../utilities';
+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 { PropertyMetadata } from '../entity/decorators/property.decorator';
+import { BadRequestError } from '../error-handling/errors/bad-request.error';
+import { HttpRequest } from '../http/http-request.model';
+import { LoggerInterface } from '../logging/logger.interface';
+import { Newable } from '../types/newable.type';
+import { MetadataUtilities } from '../utilities/metadata.utilities';
+import { ObjectUtilities } from '../utilities/object.utilities';
+import { PromiseUtilities } from '../utilities/promise.utilities';
+import { NewChange } from './models/change.model';
+import { DeepPartial } from '../types/deep-partial.type';
 
 /**
  * The result for resetting a change set on an entity.
@@ -50,12 +65,12 @@ export class ChangeSetRepository<
         return inject(ZIBRI_DI_TOKENS.AUTH_SERVICE);
     }
 
-    constructor(entityClass: Newable<T>, repo: TORepository<T> | Repository<T>) {
-        super(entityClass, repo);
+    constructor(entityClass: Newable<T>, repo: TORepository<T> | Repository<T>, logger: LoggerInterface) {
+        super(entityClass, repo, logger);
 
         this.keysToExcludeFromChangeSets = ['changeSets'];
         const props: Record<string, PropertyMetadata> = MetadataUtilities.getModelProperties(entityClass);
-        for (const [key, m] of Object.entries(props)) {
+        for (const [key, m] of ObjectUtilities.entries(props)) {
             if (m.excludeFromChangeSets) {
                 this.keysToExcludeFromChangeSets.push(key as keyof T);
             }
@@ -311,8 +326,9 @@ export class ChangeSetRepository<
         options?: BaseRepositoryOptions
     ): Promise<number> {
         const entitiesToRollback: T[] = await this.findAll({ where: where, ...options });
-        await chunkedPromiseAll(
-            entitiesToRollback.map(e => this.rollbackToDate(e, date, createChangeSet, preserveCreateChangeSet, options))
+        await PromiseUtilities.allChunked(
+            entitiesToRollback,
+            e => this.rollbackToDate(e, date, createChangeSet, preserveCreateChangeSet, options)
         );
         return entitiesToRollback.length;
     }

package/src/change-sets/models/change-set-entity.model.ts

@@ -1,8 +1,7 @@
-
 import { ChangeSet } from './change-set.model';
 import { BaseEntity } from '../../entity/base-entity.model';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
 
 /**
  * An entity that can be handled by the ChangeSetRepository.

package/src/change-sets/models/change-set.model.ts

@@ -1,9 +1,10 @@
 
 import { ChangeSetType } from './change-set-type.enum';
 import { Change, NewChange } from './change.model';
-import { Entity, Property } from '../../entity';
 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 change set.

package/src/change-sets/models/change.model.ts

@@ -1,7 +1,8 @@
 import { ChangeSet } from './change-set.model';
-import { Entity, Property } from '../../entity';
 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';
 
 /**
  * Defines a single value change of an change set.

package/src/change-sets/models/soft-delete-entity.model.ts

@@ -1,6 +1,6 @@
 import { ChangeSetEntity, isChangeSetEntityNewable } from './change-set-entity.model';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
 
 /**
  * An entity that can be handled by the SoftDeleteRepository.

package/src/change-sets/models/soft-delete-find-all-options.model.ts

@@ -1,7 +1,7 @@
 import { SoftDeleteEntity } from './soft-delete-entity.model';
 import { SoftDeleteWhere } from './soft-delete-where.model';
-import { FindAllOptions } from '../../data-source';
-import { OmitStrict } from '../../types';
+import { FindAllOptions } from '../../data-source/models/options/find-all-options.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Options for finding multiple soft delete entities.

package/src/change-sets/models/soft-delete-find-all-paginated-options.model.ts

@@ -1,7 +1,7 @@
 import { SoftDeleteEntity } from './soft-delete-entity.model';
 import { SoftDeleteWhere } from './soft-delete-where.model';
-import { FindAllPaginatedOptions } from '../../data-source';
-import { OmitStrict } from '../../types';
+import { FindAllPaginatedOptions } from '../../data-source/models/options/find-all-paginated-options.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Options for finding soft delete entities in paginated form.

package/src/change-sets/models/soft-delete-find-by-id-options.model.ts

@@ -1,5 +1,5 @@
 import { SoftDeleteEntity } from './soft-delete-entity.model';
-import { FindByIdOptions } from '../../data-source';
+import { FindByIdOptions } from '../../data-source/models/options/find-by-id-options.model';
 
 /**
  * Options for finding a single soft delete entity by its id.

package/src/change-sets/models/soft-delete-find-one-options.model.ts

@@ -1,7 +1,7 @@
 import { SoftDeleteEntity } from './soft-delete-entity.model';
 import { SoftDeleteWhere } from './soft-delete-where.model';
-import { FindOneOptions } from '../../data-source';
-import { OmitStrict } from '../../types';
+import { FindOneOptions } from '../../data-source/models/options/find-one-options.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Options for finding a single entity.

package/src/change-sets/models/soft-delete-update-all-options.model.ts

@@ -1,4 +1,4 @@
-import { UpdateAllOptions } from '../../data-source';
+import { UpdateAllOptions } from '../../data-source/models/options/update-all-options.model';
 
 /**
  * Options for updating multiple soft delete entities at once.

package/src/change-sets/models/soft-delete-update-by-id-options.model.ts

@@ -1,4 +1,4 @@
-import { UpdateByIdOptions } from '../../data-source';
+import { UpdateByIdOptions } from '../../data-source/models/options/update-by-id-options.model';
 
 /**
  * Options for updating a soft delete entity by its id.

package/src/change-sets/models/soft-delete-where.model.ts

@@ -1,6 +1,6 @@
 import { SoftDeleteEntity } from './soft-delete-entity.model';
-import { WhereFilter } from '../../data-source';
-import { OmitStrict } from '../../types';
+import { WhereFilter } from '../../data-source/models/where/where-filter.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * A single where filter for a soft delete entity.

package/src/change-sets/soft-delete-repository.ts

@@ -1,11 +1,24 @@
 import { Repository as TORepository } from 'typeorm';
 
-import { DeepPartial, Newable } from '../types';
-import { ChangeSetRepository } from './change-set-repository.model';
-import { ChangeSetType, SoftDeleteEntity, SoftDeleteFindAllOptions, SoftDeleteFindAllPaginatedOptions, SoftDeleteFindByIdOptions, SoftDeleteFindOneOptions, SoftDeleteUpdateAllOptions, SoftDeleteUpdateByIdOptions, SoftDeleteWhere } from './models';
-import { DeleteAllOptions, DeleteByIdOptions, Repository, Where } from '../data-source';
-import { NotFoundError } from '../error-handling';
-import { PaginationResult } from '../open-api';
+import { ChangeSetRepository } from './change-set-repository';
+import { SoftDeleteEntity } from './models/soft-delete-entity.model';
+import { DeleteAllOptions } from '../data-source/models/options/delete-all-options.model';
+import { DeleteByIdOptions } from '../data-source/models/options/delete-by-id-options.model';
+import { Repository } from '../data-source/repository';
+import { PaginationResult } from '../open-api/pagination-result.model';
+import { DeepPartial } from '../types/deep-partial.type';
+import { Newable } from '../types/newable.type';
+import { ChangeSetType } from './models/change-set-type.enum';
+import { SoftDeleteFindAllOptions } from './models/soft-delete-find-all-options.model';
+import { SoftDeleteFindAllPaginatedOptions } from './models/soft-delete-find-all-paginated-options.model';
+import { SoftDeleteFindByIdOptions } from './models/soft-delete-find-by-id-options.model';
+import { SoftDeleteFindOneOptions } from './models/soft-delete-find-one-options.model';
+import { SoftDeleteUpdateAllOptions } from './models/soft-delete-update-all-options.model';
+import { SoftDeleteUpdateByIdOptions } from './models/soft-delete-update-by-id-options.model';
+import { SoftDeleteWhere } from './models/soft-delete-where.model';
+import { Where } from '../data-source/models/where/where-filter.model';
+import { NotFoundError } from '../error-handling/errors/not-found.error';
+import { LoggerInterface } from '../logging/logger.interface';
 
 /**
  * Options for deleting a soft delete entity by its id.
@@ -40,8 +53,8 @@ export class SoftDeleteRepository<
 
     protected override readonly keysToExcludeFromChangeSets: (keyof T)[] = ['changeSets', 'deleted'];
 
-    constructor(entityClass: Newable<T>, repo: TORepository<T> | Repository<T>) {
-        super(entityClass, repo);
+    constructor(entityClass: Newable<T>, repo: TORepository<T> | Repository<T>, logger: LoggerInterface) {
+        super(entityClass, repo, logger);
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc

package/src/cron/cron-job-entity.model.ts

@@ -1,6 +1,7 @@
-import { Entity, Property } from '../entity';
 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';
 
 /**
  * The cron job entity that is stored in the db.

package/src/cron/cron-job.model.ts

@@ -1,14 +1,17 @@
 
 import cron, { ScheduledTask } from 'node-cron';
 
-import { Repository } from '../data-source';
-import { inject, repositoryTokenFor, ZIBRI_DI_TOKENS } from '../di';
-import { OmitStrict } from '../types';
 import { CreateCronJobEntityData, CronJobEntity } from './cron-job-entity.model';
-import { unknownToErrorString } from '../error-handling/unknown-to-error-string.function';
-import { LoggerInterface } from '../logging';
 import { CronUpdateData } from './cron.service';
-import { Ms, UUIDUtilities } from '../utilities';
+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 { inject } from '../di/inject.function';
+import { unknownToErrorString } from '../error-handling/unknown-to-error-string.function';
+import { LoggerInterface } from '../logging/logger.interface';
+import { OmitStrict } from '../types/omit-strict.type';
+import { Ms } from '../utilities/ms';
+import { UUIDUtilities } from '../utilities/uuid.utilities';
 
 /**
  * The full initial configuration of a cron job.

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

@@ -1,6 +1,6 @@
-import { Newable } from '../types';
 import { CronJob } from './cron-job.model';
 import { CronUpdateData } from './cron.service';
+import { Newable } from '../types/newable.type';
 
 /**
  * Interface for a cron service.

package/src/cron/cron.service.ts

@@ -1,9 +1,11 @@
-import { inject, ZIBRI_DI_TOKENS } from '../di';
-import { LoggerInterface } from '../logging';
-import { Newable, OmitStrict } from '../types';
 import { CronJobEntity } from './cron-job-entity.model';
 import { CronJob } from './cron-job.model';
 import { CronServiceInterface } from './cron-service.interface';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { LoggerInterface } from '../logging/logger.interface';
+import { Newable } from '../types/newable.type';
+import { OmitStrict } from '../types/omit-strict.type';
 
 /**
  * Data that can be used to update a cron job.

package/src/data-source/cascade-delete.test.ts

@@ -1,14 +1,20 @@
 import { beforeAll, afterAll, describe, it, expect } from '@jest/globals';
 import { PostgreSqlContainer, StartedPostgreSqlContainer } from '@testcontainers/postgresql';
 
-import { DataSource } from './decorators';
-import { inject } from '../di';
-import { BaseEntity } from '../entity/base-entity.model';
-import { Newable } from '../types';
-import { MigrationEntity } from './migration';
 import { Repository } from './repository';
-import { Child, Company, mockCreateUserData, Parent, POSTGRES_TEST_IMAGE, Profile, Role, User, UserCreateData } from '../__testing__';
-import { PostgresDataSource, PostgresOptions } from './data-sources';
+import { BaseEntity } from '../entity/base-entity.model';
+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 { POSTGRES_TEST_IMAGE } from '../__testing__/constants';
+import { Child } from '../__testing__/mocks/entities/child.entity';
+import { Company } from '../__testing__/mocks/entities/company.entity';
+import { Parent } from '../__testing__/mocks/entities/parent.entity';
+import { Profile } from '../__testing__/mocks/entities/profile.entity';
+import { Role } from '../__testing__/mocks/entities/role.entity';
+import { User, UserCreateData, mockCreateUserData } from '../__testing__/mocks/entities/user.entity';
+import { inject } from '../di/inject.function';
+import { Newable } from '../types/newable.type';
 
 @DataSource()
 class TestDataSource extends PostgresDataSource {

package/src/data-source/data-source.service.ts

@@ -1,15 +1,24 @@
-import { GlobalRegistry } from '../global';
 import { DataSourceServiceInterface } from './data-source-service.interface';
-import { JwtCredentials, PasswordResetToken, JwtRefreshToken, OtpCredentials } from '../auth';
-import { BackupEntity, BackupResourceEntity } from '../backup';
-import { inject, ZIBRI_DI_TOKENS } from '../di';
-import { MailingList, MailingListSubscriber } from '../email';
 import { BaseEntity } from '../entity/base-entity.model';
-import { Log, LoggerInterface } from '../logging';
-import { Invoice, NumberInvoices } from '../plugin';
-import { Newable } from '../types';
-import { validateEntitiesRegistered } from '../utilities';
 import { DataSourceInterface } from './data-sources/data-source.interface';
+import { OtpCredentials } from '../auth/2fa/methods/otp/otp-credentials.model';
+import { PasswordResetToken } from '../auth/models/password-reset-token.model';
+import { JwtCredentials } from '../auth/strategies/jwt/jwt-credentials.model';
+import { JwtRefreshToken } from '../auth/strategies/jwt/jwt-refresh-token.model';
+import { BackupEntity } from '../backup/backup-entity.model';
+import { BackupResourceEntity } from '../backup/backup-resource-entity.model';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { MailingListSubscriber } from '../email/mailing-list/models/mailing-list-subscriber.model';
+import { MailingList } from '../email/mailing-list/models/mailing-list.model';
+import { GlobalRegistry } from '../global/global-registry';
+import { Log } from '../logging/log.model';
+import { LoggerInterface } from '../logging/logger.interface';
+import { Invoice } from '../plugin/invoicing/models/invoice.model';
+import { NumberInvoices } from '../plugin/invoicing/models/number-invoices.model';
+import { Payment } from '../plugin/payment/models/payment.model';
+import { Newable } from '../types/newable.type';
+import { validateEntitiesRegistered } from '../utilities/validate-entities-registered.function';
 
 /**
  * Default data source service implementation of Zibri.
@@ -28,7 +37,8 @@ export class DataSourceService implements DataSourceServiceInterface {
         BackupResourceEntity,
         BackupEntity,
         NumberInvoices,
-        Invoice
+        Invoice,
+        Payment
     ];
 
     constructor() {

package/src/data-source/data-sources/data-source.interface.ts

@@ -1,13 +1,14 @@
 import { IsolationLevel } from 'typeorm/driver/types/IsolationLevel';
 
-import { BackupResourceInterface } from '../../backup';
-import { PropertyMetadata, PropertyMetadataInput, RelationMetadata } from '../../entity';
+import { BackupResourceInterface } from '../../backup/backup-resource.interface';
 import { BaseEntity } from '../../entity/base-entity.model';
+import { PropertyMetadataInput, PropertyMetadata, RelationMetadata } from '../../entity/decorators/property.decorator';
 import { FilePropertyMetadata } from '../../entity/models/file-property-metadata.model';
-import { ExcludeStrict, Newable } from '../../types';
-import { Migration } from '../migration';
+import { ExcludeStrict } from '../../types/exclude-strict.type';
+import { Newable } from '../../types/newable.type';
+import { Migration } from '../migration/migration.model';
 import { Repository } from '../repository';
-import { Transaction } from '../transaction';
+import { Transaction } from '../transaction/transaction.model';
 
 /**
  * Definition for a data source.

package/src/data-source/data-sources/postgres-data-source.model.ts

@@ -2,27 +2,42 @@ import { ChildProcessByStdio, spawn } from 'node:child_process';
 import { PassThrough, Readable, Writable } from 'node:stream';
 
 import { DataSource as TODataSource, Repository as TORepository, EntityMetadata as TOEntityMetadata, EntitySchema, EntitySchemaColumnOptions, QueryRunner, EntitySchemaRelationOptions, Table, TableColumnOptions, TableColumn, EntityTarget } from 'typeorm';
-import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import { IsolationLevel } from 'typeorm/driver/types/IsolationLevel';
-import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
-import { OnDeleteType } from 'typeorm/metadata/types/OnDeleteType';
-import { OnUpdateType } from 'typeorm/metadata/types/OnUpdateType';
-
-import { DataSourceInterface } from '.';
-import { ChangeSetEntity, ChangeSetRepository, isChangeSetEntityNewable, isSoftDeleteEntityNewable, SoftDeleteEntity, SoftDeleteRepository } from '../../change-sets';
-import { inject, repositoryTokenFor, ZIBRI_DI_TOKENS } from '../../di';
+import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions.js';
+import { IsolationLevel } from 'typeorm/driver/types/IsolationLevel.js';
+import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata.js';
+import { OnDeleteType } from 'typeorm/metadata/types/OnDeleteType.js';
+import { OnUpdateType } from 'typeorm/metadata/types/OnUpdateType.js';
+
+import { DataSourceInterface } from './data-source.interface';
+import { ChangeSetRepository } from '../../change-sets/change-set-repository';
+import { isChangeSetEntityNewable, ChangeSetEntity } from '../../change-sets/models/change-set-entity.model';
+import { isSoftDeleteEntityNewable, SoftDeleteEntity } from '../../change-sets/models/soft-delete-entity.model';
+import { SoftDeleteRepository } from '../../change-sets/soft-delete-repository';
+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 { register } from '../../di/register.function';
-import { EntityMetadata, PropertyMetadata, PropertyMetadataInput, Relation, RelationMetadata, StringPropertyMetadata } from '../../entity';
 import { BaseEntity } from '../../entity/base-entity.model';
+import { EntityMetadata } from '../../entity/decorators/entity.decorator';
+import { PropertyMetadata, PropertyMetadataInput, RelationMetadata } from '../../entity/decorators/property.decorator';
 import { FilePropertyMetadata } from '../../entity/models/file-property-metadata.model';
-import { GlobalRegistry } from '../../global';
-import { LoggerInterface } from '../../logging';
-import { ExcludeStrict, Newable, OmitStrict, Version } from '../../types';
-import { compareVersion, MetadataUtilities } from '../../utilities';
-import { Migration, MigrationEntity } from '../migration';
-import { ColumnType, DataSourceOptions } from '../models';
+import { Relation } from '../../entity/models/relation.enum';
+import { StringPropertyMetadata } from '../../entity/models/string-property-metadata.model';
+import { GlobalRegistry } from '../../global/global-registry';
+import { LoggerInterface } from '../../logging/logger.interface';
+import { ExcludeStrict } from '../../types/exclude-strict.type';
+import { Newable } from '../../types/newable.type';
+import { OmitStrict } from '../../types/omit-strict.type';
+import { Version } from '../../types/version.type';
+import { compareVersion } from '../../utilities/compare-versions.function';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { ObjectUtilities } from '../../utilities/object.utilities';
+import { MigrationEntity } from '../migration/migration-entity.model';
+import { Migration } from '../migration/migration.model';
+import { ColumnType } from '../models/column-type.model';
+import { DataSourceOptions } from '../models/data-source-options.model';
 import { Repository } from '../repository';
-import { Transaction } from '../transaction';
+import { Transaction } from '../transaction/transaction.model';
 import { TypeOrmTransaction } from '../transaction/typeorm-transaction.model';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
@@ -197,7 +212,7 @@ export abstract class PostgresDataSource implements DataSourceInterface {
         }
         const props: Record<string, PropertyMetadata> = MetadataUtilities.getModelProperties(cls);
 
-        const numberOfPrimaryKeys: number = Object.values(props).filter(d => (d as StringPropertyMetadata).primary).length;
+        const numberOfPrimaryKeys: number = ObjectUtilities.values(props).filter(d => (d as StringPropertyMetadata).primary).length;
         if (numberOfPrimaryKeys === 0) {
             throw new Error(`no primary key specified for entity "${cls.name}".`);
         }
@@ -207,7 +222,7 @@ export abstract class PostgresDataSource implements DataSourceInterface {
 
         const columns: Record<string, EntitySchemaColumnOptions> = {};
         const relations: Record<string, EntitySchemaRelationOptions> = {};
-        for (const [key, m] of Object.entries(props)) {
+        for (const [key, m] of ObjectUtilities.entries(props)) {
             if (
                 m.type === Relation.MANY_TO_ONE
                 || m.type === Relation.ONE_TO_MANY
@@ -351,7 +366,7 @@ export abstract class PostgresDataSource implements DataSourceInterface {
                     ...metadata,
                     type: metadata.format === 'uuid' || metadata.primary ? 'uuid' : this.columnTypeMapping[metadata.type],
                     length: metadata.maxLength,
-                    enum: metadata.enum ? Object.values(metadata.enum) : undefined,
+                    enum: metadata.enum ? ObjectUtilities.values(metadata.enum) : undefined,
                     default: undefined
                 };
             }
@@ -370,12 +385,20 @@ export abstract class PostgresDataSource implements DataSourceInterface {
         const repo: TORepository<T> = this.ds.getRepository(cls);
 
         if (isSoftDeleteEntityNewable(cls)) {
-            return new SoftDeleteRepository(cls, repo as unknown as TORepository<SoftDeleteEntity>) as unknown as Repository<T>;
+            return new SoftDeleteRepository(
+                cls,
+                repo as unknown as TORepository<SoftDeleteEntity>,
+                this.logger
+            ) as unknown as Repository<T>;
         }
         if (isChangeSetEntityNewable(cls)) {
-            return new ChangeSetRepository(cls, repo as unknown as TORepository<ChangeSetEntity>) as unknown as Repository<T>;
+            return new ChangeSetRepository(
+                cls,
+                repo as unknown as TORepository<ChangeSetEntity>,
+                this.logger
+            ) as unknown as Repository<T>;
         }
-        return new Repository(cls, repo);
+        return new Repository(cls, repo, this.logger);
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
@@ -478,7 +501,7 @@ export abstract class PostgresDataSource implements DataSourceInterface {
             ...columnMetadata,
             ...newColumn,
             enum: 'enum' in newColumn && newColumn.enum
-                ? Object.values(newColumn.enum).map(v => String(v))
+                ? ObjectUtilities.values(newColumn.enum).map(v => String(v))
                 : columnMetadata.enum
                     ? columnMetadata.enum.map(v => String(v))
                     : undefined,

package/src/data-source/decorators/data-source.decorator.ts

@@ -1,9 +1,8 @@
-import { GlobalRegistry } from '../../global';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
-import { DataSourceInterface } from '../data-sources';
+import { GlobalRegistry } from '../../global/global-registry';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { DataSourceInterface } from '../data-sources/data-source.interface';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Marks a class to be a data source.
  */

package/src/data-source/migration/migration-entity.model.ts

@@ -1,6 +1,7 @@
-import { Entity, Property } from '../../entity';
 import { BaseEntity } from '../../entity/base-entity.model';
-import { type Version } from '../../types';
+import { Entity } from '../../entity/decorators/entity.decorator';
+import { Property } from '../../entity/decorators/property.decorator';
+import { type Version } from '../../types/version.type';
 
 /**
  * The migration entity that is stored in the db.

package/src/data-source/migration/migration.model.ts

@@ -1,9 +1,11 @@
 import { MigrationEntity } from './migration-entity.model';
-import { inject, repositoryTokenFor } from '../../di';
-import { Newable, Version } from '../../types';
-import { DataSourceInterface } from '../data-sources';
+import { repositoryTokenFor } from '../../di/decorators/inject-repository.decorator';
+import { inject } from '../../di/inject.function';
+import { Newable } from '../../types/newable.type';
+import { Version } from '../../types/version.type';
+import { DataSourceInterface } from '../data-sources/data-source.interface';
 import { Repository } from '../repository';
-import { Transaction } from '../transaction';
+import { Transaction } from '../transaction/transaction.model';
 
 /**
  * Base class for a data source migration.

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

@@ -2,18 +2,22 @@ import { beforeAll, afterAll, describe, it, expect } from '@jest/globals';
 import { PostgreSqlContainer, StartedPostgreSqlContainer } from '@testcontainers/postgresql';
 import { Table, TableColumn } from 'typeorm';
 
-import { inject, Injectable, InjectRepository } from '../../di';
-import { Entity, Property } from '../../entity';
-import { BaseEntity } from '../../entity/base-entity.model';
-import { Newable, Version } from '../../types';
-import { Transaction } from '../transaction';
+import { MigrationEntity } from './migration-entity.model';
 import { Migration } from './migration.model';
-import { DataSource } from '../decorators';
+import { POSTGRES_TEST_IMAGE } from '../../__testing__/constants';
+import { InjectRepository } from '../../di/decorators/inject-repository.decorator';
+import { Injectable } from '../../di/decorators/injectable.decorator';
+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 { GlobalRegistry } from '../../global/global-registry';
+import { Newable } from '../../types/newable.type';
+import { Version } from '../../types/version.type';
+import { PostgresDataSource, PostgresOptions } from '../data-sources/postgres-data-source.model';
+import { DataSource } from '../decorators/data-source.decorator';
 import { Repository } from '../repository';
-import { MigrationEntity } from './migration-entity.model';
-import { POSTGRES_TEST_IMAGE } from '../../__testing__';
-import { GlobalRegistry } from '../../global';
-import { PostgresDataSource, PostgresOptions } from '../data-sources';
+import { Transaction } from '../transaction/transaction.model';
 
 @Entity('item')
 class LegacyItem {

package/src/data-source/models/options/base-repository-options.model.ts

@@ -1,4 +1,4 @@
-import { Transaction } from '../../transaction';
+import { Transaction } from '../../transaction/transaction.model';
 
 /**
  * Base options that are shared by all repository methods.

package/src/data-source/models/options/count-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 counting entities.

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

@@ -1,6 +1,6 @@
 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 deleting multiple entities.

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

@@ -2,7 +2,7 @@ import { FindManyOptions } from 'typeorm';
 
 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 multiple entities.