zibri 2.2.0 → 2.3.0

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 { type 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.
@@ -114,6 +117,14 @@ export abstract class CronJob {
         await this.initTask();
     }
 
+    /**
+     * Shuts down the cron job.
+     * Should be called from the cron service BeforeAppShutdown hook.
+     */
+    async shutdown(): Promise<void> {
+        await this.task?.stop();
+    }
+
     /**
      * Initializes the node cron task.
      */

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

@@ -1,4 +1,3 @@
-import { Newable } from '../types';
 import { CronJob } from './cron-job.model';
 import { CronUpdateData } from './cron.service';
 
@@ -10,10 +9,6 @@ export interface CronServiceInterface {
      * The cron jobs that are registered.
      */
     readonly cronJobs: CronJob[],
-    /**
-     * Initializes all cron jobs.
-     */
-    init: (cronJobs: Newable<CronJob>[]) => Promise<void>,
     /**
      * Schedules the given cron job.
      */

package/src/cron/cron.service.ts

@@ -1,9 +1,16 @@
-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 { ZibriApplication } from '../application';
+import { Inject } from '../di/decorators/inject.decorator';
+import { Injectable } from '../di/decorators/injectable.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 { AfterAppInit } from '../global/after-app-init.interface';
+import { BeforeAppShutdown } from '../global/before-app-shutdown.interface';
+import { type LoggerInterface } from '../logging/logger.interface';
+import { OmitStrict } from '../types/omit-strict.type';
 
 /**
  * Data that can be used to update a cron job.
@@ -13,21 +20,19 @@ export type CronUpdateData = Partial<OmitStrict<CronJobEntity, 'id' | 'cron' | '
 /**
  * Default cron service implementation of Zibri.
  */
-export class CronService implements CronServiceInterface {
-
-    /**
-     * A logger.
-     */
-    protected readonly logger: LoggerInterface;
+@Injectable({ register: 'onUse' })
+export class CronService implements CronServiceInterface, AfterAppInit, BeforeAppShutdown {
     // eslint-disable-next-line jsdoc/require-jsdoc
     readonly cronJobs: CronJob[] = [];
 
-    constructor() {
-        this.logger = inject(ZIBRI_DI_TOKENS.LOGGER);
-    }
+    constructor(
+        @Inject(ZIBRI_DI_TOKENS.LOGGER)
+        private readonly logger: LoggerInterface
+    ) {}
 
     // eslint-disable-next-line jsdoc/require-jsdoc
-    async init(cronJobs: Newable<CronJob>[]): Promise<void> {
+    async afterAppInit({ options }: ZibriApplication): Promise<void> {
+        const { cronJobs } = options;
         if (this.cronJobs.length) {
             throw new Error('has already been initialized');
         }
@@ -35,6 +40,7 @@ export class CronService implements CronServiceInterface {
             await this.logger.info(`registers ${cronJobs.length} ${cronJobs.length > 1 ? 'cron jobs' : 'cron job'}`);
         }
         for (const cronJobClass of cronJobs) {
+            register({ token: cronJobClass, useClass: cronJobClass });
             const cronJob: CronJob = inject(cronJobClass);
             await cronJob.init();
             await this.logger.info(`  -  ${cronJobClass.name} (${cronJob.active ? 'active' : 'not active'})`);
@@ -42,6 +48,11 @@ export class CronService implements CronServiceInterface {
         }
     }
 
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    async beforeAppShutdown(): Promise<void> {
+        await Promise.all(this.cronJobs.map(j => j.shutdown()));
+    }
+
     // eslint-disable-next-line jsdoc/require-jsdoc
     async schedule(cronJob: CronJob): Promise<void> {
         await cronJob.init();

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.interface.ts

@@ -1,9 +1,7 @@
+import { AfterAppShutdown } from '../global/after-app-shutdown.interface';
+import { BeforeAppInit } from '../global/before-app-init.interface';
+
 /**
  * Interface for a data source service.
  */
-export interface DataSourceServiceInterface {
-    /**
-     * Initializes all data sources.
-     */
-    init: () => Promise<void>
-}
+export interface DataSourceServiceInterface extends BeforeAppInit, AfterAppShutdown {}

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

@@ -1,57 +1,53 @@
-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, Payment } from '../plugin';
-import { Newable } from '../types';
-import { validateEntitiesRegistered } from '../utilities';
+import { ZibriApplication } from '../application';
 import { DataSourceInterface } from './data-sources/data-source.interface';
+import { Inject } from '../di/decorators/inject.decorator';
+import { Injectable } from '../di/decorators/injectable.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 { type LoggerInterface } from '../logging/logger.interface';
+import { MetadataUtilities } from '../utilities/metadata.utilities';
+import { validateEntitiesRegistered } from '../utilities/validate-entities-registered.function';
 
 /**
  * Default data source service implementation of Zibri.
  */
+@Injectable({ register: 'onUse' })
 export class DataSourceService implements DataSourceServiceInterface {
-    private readonly logger: LoggerInterface;
+    private readonly dataSources: DataSourceInterface[] = [];
 
-    private readonly allowedOrphans: Newable<BaseEntity>[] = [
-        JwtRefreshToken,
-        JwtCredentials,
-        PasswordResetToken,
-        OtpCredentials,
-        MailingList,
-        MailingListSubscriber,
-        Log,
-        BackupResourceEntity,
-        BackupEntity,
-        NumberInvoices,
-        Invoice,
-        Payment
-    ];
-
-    constructor() {
-        this.logger = inject(ZIBRI_DI_TOKENS.LOGGER);
-    }
+    constructor(
+        @Inject(ZIBRI_DI_TOKENS.LOGGER)
+        private readonly logger: LoggerInterface
+    ) { }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
-    async init(): Promise<void> {
-        if (GlobalRegistry.dataSourceClasses.length) {
-            // eslint-disable-next-line stylistic/max-len
-            await this.logger.info(`initializes ${GlobalRegistry.dataSourceClasses.length} ${GlobalRegistry.dataSourceClasses.length > 1 ? 'data sources' : 'data source'}`);
+    async beforeAppInit(app: ZibriApplication): Promise<void> {
+        const { dataSources } = app.options;
+        if (dataSources.length) {
+            await this.logger.info(`initializes ${dataSources.length} ${dataSources.length > 1 ? 'data sources' : 'data source'}`);
         }
 
-        for (const dataSourceClass of GlobalRegistry.dataSourceClasses) {
+        for (const dataSourceClass of dataSources) {
             const dataSource: DataSourceInterface = inject(dataSourceClass);
+            if (!MetadataUtilities.getFilePath(dataSourceClass)) {
+                throw new Error(`The data source ${dataSourceClass.name} is not decorated with @DataSource.`);
+            }
+            this.dataSources.push(dataSource);
             await this.logger.info(`  - ${dataSourceClass.name} (${dataSource.entities.length} entities)`);
             await dataSource.init();
         }
 
         validateEntitiesRegistered(
             this.constructor.name,
-            ...GlobalRegistry.entityClasses.filter(e => !this.allowedOrphans.includes(e))
+            app,
+            ...GlobalRegistry.entityClasses.filter(e => !(MetadataUtilities.getEntityMetadata(e)?.allowOrphan ?? false))
         );
     }
+
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    async afterAppShutdown(): Promise<void> {
+        await Promise.all(this.dataSources.map(ds => ds.shutDown()));
+    }
 }

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.
@@ -28,6 +29,12 @@ export interface DataSourceInterface extends BackupResourceInterface {
      */
     init: () => Promise<void>,
 
+    /**
+     * Shuts down the data source.
+     * Should be called from the data source service AfterAppShutdown hook.
+     */
+    shutDown: () => Promise<void>,
+
     /**
      * Gets a repository to manage the provided entity class in the data source.
      * @param cls - The entity class to get the repository for.
@@ -77,4 +84,34 @@ export interface DataSourceInterface extends BackupResourceInterface {
         },
         transaction: Transaction
     ) => Promise<void>
+}
+
+/**
+ * Checks whether or not the given value is a data source.
+ * @param value - The value to check.
+ * @returns True if all keys of the DataSourceInterface are present, false otherwise.
+ */
+export function isDataSource(value: unknown): value is DataSourceInterface {
+    if (typeof value !== 'object') {
+        return false;
+    }
+    if (value == undefined) {
+        return false;
+    }
+
+    const keys: (keyof DataSourceInterface)[] = [
+        'addPropertyToEntity',
+        'changePropertyOfEntity',
+        'createBackupData',
+        'entities',
+        'getRepository',
+        'init',
+        'migrations',
+        'restoreBackup',
+        'runMigrations',
+        'shutDown',
+        'startTransaction'
+    ];
+
+    return !keys.find(key => !(key in value));
 }

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

@@ -9,21 +9,36 @@ import { OnDeleteType } from 'typeorm/metadata/types/OnDeleteType.js';
 import { OnUpdateType } from 'typeorm/metadata/types/OnUpdateType.js';
 
 import { DataSourceInterface } from './data-source.interface';
-import { ChangeSetEntity, ChangeSetRepository, isChangeSetEntityNewable, isSoftDeleteEntityNewable, SoftDeleteEntity, SoftDeleteRepository } from '../../change-sets';
-import { inject, repositoryTokenFor, ZIBRI_DI_TOKENS } from '../../di';
+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 { Inject } from '../../di/decorators/inject.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 { Relation } from '../../entity/models/relation.enum';
+import { StringPropertyMetadata } from '../../entity/models/string-property-metadata.model';
+import { GlobalRegistry } from '../../global/global-registry';
+import { type 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 { Migration, MigrationEntity } from '../migration';
-import { ColumnType, DataSourceOptions } from '../models';
+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
@@ -78,14 +93,11 @@ export abstract class PostgresDataSource implements DataSourceInterface {
      * The internal typeorm data source.
      */
     protected ds?: TODataSource;
-    /**
-     * A logger.
-     */
-    protected readonly logger: LoggerInterface;
 
-    constructor() {
-        this.logger = inject(ZIBRI_DI_TOKENS.LOGGER);
-    }
+    constructor(
+        @Inject(ZIBRI_DI_TOKENS.LOGGER)
+        private readonly logger: LoggerInterface
+    ) { }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
     createBackupData(): Readable {
@@ -152,6 +164,12 @@ export abstract class PostgresDataSource implements DataSourceInterface {
             throw new Error('The postgres data source has already been initialized.');
         }
 
+        if (this.options.username === 'postgres' && this.options.password === 'password') {
+            await this.logger.warn(
+                `The data source "${this.constructor.name}" uses the default credentials, you probably want to change that.`
+            );
+        }
+
         for (const entityClass of this.entities) {
             register({
                 token: repositoryTokenFor(entityClass),
@@ -176,6 +194,11 @@ export abstract class PostgresDataSource implements DataSourceInterface {
         }
     }
 
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    async shutDown(): Promise<void> {
+        await this.ds?.destroy();
+    }
+
     /**
      * Gets entity schemas for the entities of this data source.
      * @returns Typeorm entity schemas.
@@ -371,12 +394,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
@@ -413,6 +444,7 @@ export abstract class PostgresDataSource implements DataSourceInterface {
     async runMigrations(): Promise<void> {
         await this.createMigrationTableIfNotExists();
 
+        // we need to dynamically inject here because the repositories aren't ready in the constructor.
         const migrationsRepository: Repository<MigrationEntity> = inject(repositoryTokenFor(MigrationEntity));
         const finishedMigrationVersions: string[] = (await migrationsRepository.findAll()).map(m => m.version);
         const allMigrations: MigrationWithName[] = this.migrations.map(m => ({ migration: inject(m), name: m.name }));

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

@@ -1,9 +1,7 @@
-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';
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Marks a class to be a data source.
  */
@@ -12,10 +10,10 @@ export function DataSource(): ClassDecorator {
         // eslint-disable-next-line unicorn/error-message
         const stack: string = new Error().stack ?? '';
         MetadataUtilities.setFilePath(target, stack);
+
         GlobalRegistry.injectables.push({
             token: target as unknown as Newable<unknown>,
             useClass: target as unknown as Newable<unknown>
         });
-        GlobalRegistry.dataSourceClasses.push(target as unknown as Newable<DataSourceInterface>);
     };
 }

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,20 +2,24 @@ 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')
+@Entity({ tableName: 'item' })
 class LegacyItem {
     @Property.string({ primary: true })
     id!: string;
@@ -33,7 +37,7 @@ class LegacyDbDataSource extends PostgresDataSource {
     entities: Newable<BaseEntity>[] = [MigrationEntity, LegacyItem];
 }
 
-@Entity('item')
+@Entity({ tableName: 'item' })
 class Item {
     @Property.string({ primary: true })
     id!: string;

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.

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,15 @@ 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';
 
 /**