zibri 2.2.1 → 2.3.0

package/src/open-api/open-api.service.ts

@@ -3,11 +3,13 @@ import swaggerUi from 'swagger-ui-express';
 import { ZibriApplication } from '../application';
 import { OpenApiServiceInterface } from './open-api-service.interface';
 import { OpenApiDefinition, OpenApiTagObject, OpenApiSecuritySchemeObject, OpenApiPaths, OpenApiResponse, OpenApiOperation, OpenApiResponsesObject, OpenApiResponseObject, OpenApiContentObject, OpenApiSchemaObject, OpenApiSecurityRequirementObject, OpenApiRequestBodyObject, OpenApiParameterLocation, OpenApiParameter } from './open-api.model';
-import { AssetServiceInterface } from '../assets/asset-service.interface';
-import { AuthServiceInterface } from '../auth/auth-service.interface';
+import { type AssetServiceInterface } from '../assets/asset-service.interface';
+import { type AuthServiceInterface } from '../auth/auth-service.interface';
 import { BelongsToMetadata } from '../auth/models/belongs-to-metadata.model';
 import { HasRoleMetadata } from '../auth/models/has-role-metadata.model';
 import { IsLoggedInMetadata } from '../auth/models/is-logged-in-metadata.model';
+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 { BaseEntity } from '../entity/base-entity.model';
@@ -19,19 +21,22 @@ import { OneToOnePropertyMetadata } from '../entity/models/one-to-one-property-m
 import { Relation } from '../entity/models/relation.enum';
 import { OmitClass } from '../entity/omit-class.model';
 import { GlobalRegistry } from '../global/global-registry';
+import { OnAppInit } from '../global/on-app-init.interface';
 import { HttpMethod } from '../http/http-method.enum';
 import { HttpStatus } from '../http/http-status.enum';
 import { KnownHeader } from '../http/known-header.enum';
 import { MimeType } from '../http/mime-type.enum';
-import { LoggerInterface } from '../logging/logger.interface';
+import { type LoggerInterface } from '../logging/logger.interface';
 import { FileResponse } from '../parsing/form-data/file-response.model';
 import { Route, ControllerRouteConfiguration } from '../routing/controller-route-configuration.model';
 import { BodyMetadata } from '../routing/decorators/body.decorator';
+import { ControllerData } from '../routing/decorators/controller.decorator';
 import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata } from '../routing/decorators/param.decorator';
 import { MissingBaseRouteError } from '../routing/missing-base-route.error';
 import { RouteHandler } from '../routing/route-configuration.model';
+import { type RouterInterface } from '../routing/router.interface';
 import { Newable } from '../types/newable.type';
-import { FsUtilities, Path } from '../utilities/fs.utilities';
+import { FsUtilities, FsPath } from '../utilities/fs.utilities';
 import { MetadataUtilities } from '../utilities/metadata.utilities';
 import { ObjectUtilities } from '../utilities/object.utilities';
 
@@ -79,45 +84,48 @@ const defaultDescriptionForHttpStatus: Record<HttpStatus | 'default', string> =
 /**
  * Default open api service implementation of Zibri.
  */
-export class OpenApiService implements OpenApiServiceInterface {
+@Injectable({ register: 'onUse' })
+export class OpenApiService implements OpenApiServiceInterface, OnAppInit {
     // eslint-disable-next-line jsdoc/require-jsdoc
     readonly openApiRoute: Route = '/explorer';
-    private readonly logger: LoggerInterface;
-    private readonly assetService: AssetServiceInterface;
-    private readonly authService: AuthServiceInterface;
-
-    constructor() {
-        this.logger = inject(ZIBRI_DI_TOKENS.LOGGER);
-        this.assetService = inject(ZIBRI_DI_TOKENS.ASSET_SERVICE);
-        this.authService = inject(ZIBRI_DI_TOKENS.AUTH_SERVICE);
-    }
+
+    constructor(
+        @Inject(ZIBRI_DI_TOKENS.LOGGER)
+        private readonly logger: LoggerInterface,
+        @Inject(ZIBRI_DI_TOKENS.ASSET_SERVICE)
+        private readonly assetService: AssetServiceInterface,
+        @Inject(ZIBRI_DI_TOKENS.AUTH_SERVICE)
+        private readonly authService: AuthServiceInterface,
+        @Inject(ZIBRI_DI_TOKENS.ROUTER)
+        private readonly router: RouterInterface
+    ) { }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
-    async attachTo(app: ZibriApplication): Promise<void> {
+    async onAppInit(app: ZibriApplication): Promise<void> {
         const definition: OpenApiDefinition = await this.createOpenApiDefinition(app);
         await this.logger.info(`registers the OpenAPI Explorer at ${this.openApiRoute}`);
 
-        await app.router.register({
+        await this.router.registerRoute({
             httpMethod: HttpMethod.GET,
             route: `${this.openApiRoute}/swagger-ui.css`,
             handler: () => {
-                const filePath: Path = FsUtilities.getPath(this.assetService.publicAssetsPath, 'open-api', 'swagger-ui.css');
+                const filePath: FsPath = FsUtilities.getPath(this.assetService.publicAssetsPath, 'open-api', 'swagger-ui.css');
                 return FileResponse.fromPath(filePath);
             }
         });
-        await app.router.register({
+        await this.router.registerRoute({
             httpMethod: HttpMethod.GET,
             route: `${this.openApiRoute}/swagger-ui-bundle.js`,
             handler: () => {
-                const filePath: Path = FsUtilities.getPath(this.assetService.publicAssetsPath, 'open-api', 'swagger-ui-bundle.js');
+                const filePath: FsPath = FsUtilities.getPath(this.assetService.publicAssetsPath, 'open-api', 'swagger-ui-bundle.js');
                 return FileResponse.fromPath(filePath);
             }
         });
-        await app.router.register({
+        await this.router.registerRoute({
             httpMethod: HttpMethod.GET,
             route: `${this.openApiRoute}/swagger-ui-standalone-preset.js`,
             handler: () => {
-                const filePath: Path = FsUtilities.getPath(
+                const filePath: FsPath = FsUtilities.getPath(
                     this.assetService.publicAssetsPath,
                     'open-api',
                     'swagger-ui-standalone-preset.js'
@@ -125,7 +133,7 @@ export class OpenApiService implements OpenApiServiceInterface {
                 return FileResponse.fromPath(filePath);
             }
         });
-        await app.router.register({
+        await this.router.registerRoute({
             httpMethod: HttpMethod.GET,
             route: `${this.openApiRoute}/swagger-ui-init.js`,
             handler: (_, res) => {
@@ -152,7 +160,7 @@ export class OpenApiService implements OpenApiServiceInterface {
             }
         });
 
-        await app.router.register({
+        await this.router.registerRoute({
             httpMethod: HttpMethod.GET,
             route: `${this.openApiRoute}/custom.js`,
             handler: (_, res) => {
@@ -258,7 +266,7 @@ export class OpenApiService implements OpenApiServiceInterface {
         });
 
         app.use(this.openApiRoute, swaggerUi.serve);
-        await app.router.register({
+        await this.router.registerRoute({
             httpMethod: HttpMethod.GET,
             route: this.openApiRoute,
             handler: swaggerUi.setup(
@@ -304,8 +312,8 @@ export class OpenApiService implements OpenApiServiceInterface {
         const res: OpenApiPaths = {};
 
         for (const controllerClass of app.options.controllers) {
-            const baseRoute: Route | undefined = MetadataUtilities.getControllerBaseRoute(controllerClass);
-            if (!baseRoute) {
+            const controllerData: ControllerData | undefined = MetadataUtilities.getControllerData(controllerClass);
+            if (!controllerData) {
                 throw new MissingBaseRouteError(controllerClass);
             }
 
@@ -328,7 +336,8 @@ export class OpenApiService implements OpenApiServiceInterface {
 
                 const bodyMetadata: BodyMetadata | undefined = MetadataUtilities.getRouteBody(controllerClass, route.controllerMethod);
                 // Ensure an entry exists
-                const fullPath: string = `${baseRoute}${route.route}`.replaceAll(/:([^/]+)/g, '{$1}');
+                const finalRoute: string = controllerData.baseRoute === '/' ? route.route : `${controllerData.baseRoute}${route.route}`;
+                const fullPath: string = finalRoute.replaceAll(/:([^/]+)/g, '{$1}');
                 res[fullPath] ??= {};
 
                 const responses: OpenApiResponse[] = MetadataUtilities.getRouteResponses(controllerClass, route.controllerMethod);
@@ -354,7 +363,7 @@ export class OpenApiService implements OpenApiServiceInterface {
             }
         }
 
-        for (const route of app.router.manuallyRegisteredRoutes.filter(r => r.openApi.useInOpenApi)) {
+        for (const route of this.router.manuallyRegisteredRoutes.filter(r => r.openApi.useInOpenApi)) {
             // Ensure an entry exists
             const fullPath: string = `${route.route}`.replaceAll(/:([^/]+)/g, '{$1}');
             res[fullPath] ??= {};

package/src/parsing/body-parser.interface.ts

@@ -1,4 +1,3 @@
-import { ZibriApplication } from '../application';
 import { HttpRequest } from '../http/http-request.model';
 import { MimeType } from '../http/mime-type.enum';
 import { HttpClientResponse } from '../http-client/http-client-response.model';
@@ -13,10 +12,6 @@ export interface BodyParserInterface {
      * The content type that can be handled by this parser.
      */
     readonly contentType: MimeType,
-    /**
-     * Attaches the body parser to the Zibri application.
-     */
-    attachTo?: (app: ZibriApplication) => Promise<void> | void,
     /**
      * Parses the body of the http request.
      */

package/src/parsing/form-data/file-response.model.ts

@@ -6,7 +6,7 @@ import { LooseFileMimeType } from '../../http/mime-type.enum';
 import { resolveMimeType } from '../../http/mime-type.helpers';
 import { LoggerInterface } from '../../logging/logger.interface';
 import { OmitStrict } from '../../types/omit-strict.type';
-import { FsUtilities, Path } from '../../utilities/fs.utilities';
+import { FsUtilities, FsPath } from '../../utilities/fs.utilities';
 
 /**
  * Data shared by all FileResponses.
@@ -70,8 +70,8 @@ export class FileResponse {
      * @param options - Additional options like file size.
      * @returns A new FileResponse.
      */
-    static async fromPath(p: Path, options?: OmitStrict<PathFileResponseData, 'path'>): Promise<FileResponse> {
-        const fullPath: Path = FsUtilities.resolve(p);
+    static async fromPath(p: FsPath, options?: OmitStrict<PathFileResponseData, 'path'>): Promise<FileResponse> {
+        const fullPath: FsPath = FsUtilities.resolve(p);
         const fileName: string = options?.filename ?? FsUtilities.baseName(fullPath);
         const mimeType: string = options?.mimeType ?? resolveMimeType(fileName);
 

package/src/parsing/form-data/file.model.ts

@@ -1,5 +1,5 @@
 import { Property } from '../../entity/decorators/property.decorator';
-import { type Path } from '../../utilities/fs.utilities';
+import { type FsPath } from '../../utilities/fs.utilities';
 
 /**
  * A resolved file from a multipart/form-data request.
@@ -31,7 +31,7 @@ export class File {
 
     // eslint-disable-next-line jsdoc/require-jsdoc
     @Property.string()
-    path: Path;
+    path: FsPath;
 
     constructor(file: File) {
         this.destination = file.destination;

package/src/parsing/form-data/form-data-body-parser-cleanup.cron-job.ts

@@ -2,15 +2,13 @@ import { Dirent } from 'node:fs';
 
 import { CLEANUP_AT_FILE_NAME } from './form-data.model';
 import { CronJob, InitialCronConfig } from '../../cron/cron-job.model';
-import { Injectable } from '../../di/decorators/injectable.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 { FsUtilities, Path } from '../../utilities/fs.utilities';
+import { FsUtilities, type FsPath } from '../../utilities/fs.utilities';
 
 /**
  * CronJob that cleans up the temp folder of the form data body parser.
  */
-@Injectable()
 export class FormDataBodyParserCleanupCronJob extends CronJob {
     // eslint-disable-next-line jsdoc/require-jsdoc
     initialConfig: InitialCronConfig = {
@@ -19,19 +17,24 @@ export class FormDataBodyParserCleanupCronJob extends CronJob {
         runOnInit: false
     };
 
+    constructor(
+        @Inject(ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER)
+        private readonly tempPath: FsPath
+    ) {
+        super();
+    }
+
     // eslint-disable-next-line jsdoc/require-jsdoc
     async onTick(): Promise<void> {
-        const tempPath: Path = inject(ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER);
-
-        await this.logger.info(`cleans up temp folder ${tempPath}`);
+        await this.logger.info(`cleans up temp folder ${this.tempPath}`);
 
         try {
-            const folders: Dirent[] = await FsUtilities.readdir(tempPath);
+            const folders: Dirent[] = await FsUtilities.readdir(this.tempPath);
 
             let foldersToPreserve: number = 0;
             for (const folder of folders) {
                 try {
-                    const folderPath: Path = FsUtilities.getPath(tempPath, folder.parentPath, folder.name);
+                    const folderPath: FsPath = FsUtilities.getPath(this.tempPath, folder.parentPath, folder.name);
                     const shouldBePreserved: boolean = await this.hasRecentlyBeenCreated(folderPath);
 
                     if (!shouldBePreserved) {
@@ -53,8 +56,8 @@ export class FormDataBodyParserCleanupCronJob extends CronJob {
         }
     }
 
-    private async hasRecentlyBeenCreated(folderPath: Path): Promise<boolean> {
-        const cleanupAtPath: Path = FsUtilities.getPath(folderPath, CLEANUP_AT_FILE_NAME);
+    private async hasRecentlyBeenCreated(folderPath: FsPath): Promise<boolean> {
+        const cleanupAtPath: FsPath = FsUtilities.getPath(folderPath, CLEANUP_AT_FILE_NAME);
         try {
             // Check if the file/folder has been modified within the last 24 hours
             const cleanupAtMs: number = Number(await FsUtilities.readFile(cleanupAtPath));

package/src/parsing/form-data/form-data.body-parser.ts

@@ -8,6 +8,7 @@ import { FormDataBodyParserCleanupCronJob } from './form-data-body-parser-cleanu
 import { FormData, FormDataValue } from './form-data.model';
 import { ZibriApplication } from '../../application';
 import { inject } from '../../di/inject.function';
+import { OnAppInit } from '../../global/on-app-init.interface';
 import { HttpRequest } from '../../http/http-request.model';
 import { MimeType } from '../../http/mime-type.enum';
 import { BodyMetadata } from '../../routing/decorators/body.decorator';
@@ -21,7 +22,7 @@ import { KnownHeader } from '../../http/known-header.enum';
 import { FileExtension, resolveFileExtension } from '../../http/mime-type.helpers';
 import { HttpClientResponse } from '../../http-client/http-client-response.model';
 import { BigNumberUtilities } from '../../utilities/big-number.utilities';
-import { FsUtilities, Path } from '../../utilities/fs.utilities';
+import { FsUtilities, FsPath } from '../../utilities/fs.utilities';
 import { MetadataUtilities } from '../../utilities/metadata.utilities';
 import { UUIDUtilities } from '../../utilities/uuid.utilities';
 import { BodyParser } from '../decorators/body-parser.decorator';
@@ -44,12 +45,12 @@ type ParsedForm = {
  * Body parser for form data.
  */
 @BodyParser()
-export class FormDataBodyParser implements BodyParserInterface {
+export class FormDataBodyParser implements BodyParserInterface, OnAppInit {
     // eslint-disable-next-line jsdoc/require-jsdoc
     readonly contentType: MimeType = MimeType.FORM_DATA;
 
     // eslint-disable-next-line jsdoc/require-jsdoc
-    attachTo(app: ZibriApplication): void {
+    onAppInit(app: ZibriApplication): void {
         app.options.cronJobs.push(FormDataBodyParserCleanupCronJob);
     }
 
@@ -88,7 +89,7 @@ export class FormDataBodyParser implements BodyParserInterface {
             throw new ContentTooLargeError();
         }
 
-        const tempFolder: Path = this.getTempFolder();
+        const tempFolder: FsPath = this.getTempFolder();
 
         try {
             const parsed: ParsedForm = await this.parseMultipartStreamToDisk(stream, headers, tempFolder, metadata);
@@ -107,8 +108,8 @@ export class FormDataBodyParser implements BodyParserInterface {
         }
     }
 
-    private getTempFolder(): Path {
-        const tempPath: Path = inject(ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER);
+    private getTempFolder(): FsPath {
+        const tempPath: FsPath = inject(ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER);
         return FsUtilities.getPath(tempPath, `temp-${UUIDUtilities.generate()}`);
     }
 
@@ -121,7 +122,7 @@ export class FormDataBodyParser implements BodyParserInterface {
         return id;
     }
 
-    private async removeTempFolder(tempFolder: Path): Promise<void> {
+    private async removeTempFolder(tempFolder: FsPath): Promise<void> {
         try {
             await FsUtilities.rm(tempFolder);
         }
@@ -242,7 +243,7 @@ export class FormDataBodyParser implements BodyParserInterface {
     private async parseMultipartStreamToDisk(
         stream: Readable,
         headers: Partial<Record<string, string | undefined>>,
-        tempFolder: Path,
+        tempFolder: FsPath,
         metadata: BodyMetadata
     ): Promise<ParsedForm> {
         const contentType: string | undefined = headers[KnownHeader.CONTENT_TYPE]
@@ -293,7 +294,7 @@ export class FormDataBodyParser implements BodyParserInterface {
 
             bb.on('file', (fieldname: string, fileStream: BusboyFileStream, originalname: string, _: string, mimetype: string) => {
                 const filename: string = this.getTempFileName(mimetype);
-                const destination: Path = FsUtilities.getPath(tempFolder, filename);
+                const destination: FsPath = FsUtilities.getPath(tempFolder, filename);
                 const writeStream: WriteStream = FsUtilities.createWriteStream(destination);
                 let size: number = 0;
 

package/src/parsing/form-data/form-data.model.ts

@@ -1,5 +1,5 @@
 import { File } from './file.model';
-import { FsUtilities, Path } from '../../utilities/fs.utilities';
+import { FsUtilities, FsPath } from '../../utilities/fs.utilities';
 
 /**
  * The raw value that a form-data property has.
@@ -26,9 +26,9 @@ export class FormData<FormDataType extends object> {
      * The temporary folder where all files are cached.
      * Should be deleted after you handled the form data with the cleanup method.
      */
-    readonly tempFolder: Path;
+    readonly tempFolder: FsPath;
 
-    private constructor(value: FormDataType, tempFolder: Path) {
+    private constructor(value: FormDataType, tempFolder: FsPath) {
         this.value = value;
         this.tempFolder = tempFolder;
     }
@@ -42,7 +42,7 @@ export class FormData<FormDataType extends object> {
      */
     static async create<FormDataType extends object>(
         value: FormDataType,
-        tempFolder: Path,
+        tempFolder: FsPath,
         cleanupAfterMs: number
     ): Promise<FormData<FormDataType>> {
         const res: FormData<FormDataType> = new this(value, tempFolder);

package/src/parsing/parser.interface.ts

@@ -1,4 +1,3 @@
-import { ZibriApplication } from '../application';
 import { HttpRequest } from '../http/http-request.model';
 import { HttpClientResponse } from '../http-client/http-client-response.model';
 import { BodyMetadata } from '../routing/decorators/body.decorator';
@@ -27,9 +26,5 @@ export interface ParserInterface {
     /**
      * Parses the header param resolved from the given metadata.
      */
-    parseHeaderParam: (req: HttpRequest | WebsocketRequest | HttpClientResponse, metadata: HeaderParamMetadata) => unknown,
-    /**
-     * Attaches the parser to the Zibri application.
-     */
-    attachTo: (app: ZibriApplication) => Promise<void> | void
+    parseHeaderParam: (req: HttpRequest | WebsocketRequest | HttpClientResponse, metadata: HeaderParamMetadata) => unknown
 }

package/src/parsing/parser.ts

@@ -2,10 +2,11 @@ import assert from 'assert';
 
 import { BodyParserInterface } from './body-parser.interface';
 import { ParserInterface } from './parser.interface';
-import { ZibriApplication } from '../application';
+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 { OnAppInit } from '../global/on-app-init.interface';
 import { HttpRequest, isHttpRequest } from '../http/http-request.model';
 import { KnownHeader } from '../http/known-header.enum';
 import { MimeType } from '../http/mime-type.enum';
@@ -20,6 +21,7 @@ import { parseObject } from './functions/parse-object.function';
 import { parseString } from './functions/parse-string.function';
 import { BodyMetadata } from '../routing/decorators/body.decorator';
 import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata } from '../routing/decorators/param.decorator';
+import { UUIDUtilities } from '../utilities/uuid.utilities';
 import { WebsocketRequest } from '../websocket/models/websocket-request.model';
 
 /**
@@ -40,7 +42,8 @@ type HeaderParamParseFunction = (rawValue: string | undefined, meta: HeaderParam
 /**
  * Default parser implementation of Zibri.
  */
-export class Parser implements ParserInterface {
+@Injectable({ register: 'onUse' })
+export class Parser implements ParserInterface, OnAppInit {
     private readonly logger: LoggerInterface;
     private readonly bodyParsers: BodyParserInterface[] = [];
 
@@ -81,8 +84,11 @@ export class Parser implements ParserInterface {
         }
     };
 
+    private readonly id: string;
+
     constructor() {
         this.logger = inject(ZIBRI_DI_TOKENS.LOGGER);
+        this.id = UUIDUtilities.generate();
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
@@ -123,6 +129,7 @@ export class Parser implements ParserInterface {
         if (metadata.type !== contentType) {
             throw new Error(`Unsupported ${KnownHeader.CONTENT_TYPE}: "${contentType}"`);
         }
+
         const fittingParsers: BodyParserInterface[] = this.bodyParsers.filter(p => p.contentType === contentType);
         if (!fittingParsers.length) {
             throw new Error(`Unsupported ${KnownHeader.CONTENT_TYPE}: "${contentType}"`);
@@ -140,13 +147,12 @@ export class Parser implements ParserInterface {
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
-    async attachTo(app: ZibriApplication): Promise<void> {
+    async onAppInit(): Promise<void> {
         await this.logger.info(`registers ${GlobalRegistry.bodyParsers.length} request body parsers:`);
         for (const parserClass of GlobalRegistry.bodyParsers) {
             const parser: BodyParserInterface = inject(parserClass);
             this.bodyParsers.push(parser);
             await this.logger.info(`  - ${parserClass.name} (${parser.contentType})`);
-            await parser.attachTo?.(app);
         }
     }
 }

package/src/plugin/invoicing/invoicing.plugin.ts

@@ -1,7 +1,6 @@
-/* eslint-disable jsdoc/require-jsdoc */
-import { ZIBRI_INVOICING_DI_TOKENS } from './invoicing.tokens';
 import { DiTokenProviderRecord, providersFromTokenRecord } from '../../di/models/di-token.model';
 import { ZibriPlugin } from '../plugin.model';
+import { ZIBRI_INVOICING_PLUGIN_DI_TOKENS } from './invoicing.tokens';
 import { Invoice } from './models/invoice.model';
 import { InvoicingOptionsInput } from './models/invoicing-options-input.model';
 import { InvoicingOptions } from './models/invoicing-options.model';
@@ -9,10 +8,12 @@ import { NumberInvoices } from './models/number-invoices.model';
 import { InvoiceCalcService } from './services/invoice-calc.service';
 import { InvoiceNumberService } from './services/invoice-number.service';
 import { InvoicePdfService } from './services/invoice-pdf.service';
+import { ZibriApplication } from '../../application';
 import { NoProviderError } from '../../di/errors/no-provider.error';
 import { inject } from '../../di/inject.function';
 import { DiProvider } from '../../di/models/di-provider.model';
 import { validateEntitiesRegistered } from '../../utilities/validate-entities-registered.function';
+import { validateTokensRegistered } from '../../utilities/validate-tokens-registered.function';
 import { PeppolConformanceService } from './services/conformance/en16931/peppol-conformance.service';
 import { XRechnungConformanceService } from './services/conformance/en16931/x-rechnung-conformance.service';
 
@@ -20,7 +21,7 @@ import { XRechnungConformanceService } from './services/conformance/en16931/x-re
  * Plugin that includes everything for handling invoices.
  */
 export class ZibriInvoicingPlugin extends ZibriPlugin {
-    private readonly defaultDiProviders: DiTokenProviderRecord<typeof ZIBRI_INVOICING_DI_TOKENS> = {
+    private readonly defaultDiProviders: DiTokenProviderRecord<typeof ZIBRI_INVOICING_PLUGIN_DI_TOKENS> = {
         INVOICE_NUMBER_SERVICE: { useClass: InvoiceNumberService },
         INVOICE_PDF_SERVICE: { useClass: InvoicePdfService },
         INVOICE_CALC_SERVICE: { useClass: InvoiceCalcService },
@@ -29,12 +30,12 @@ export class ZibriInvoicingPlugin extends ZibriPlugin {
         },
         OPTIONS_INPUT: {
             useFactory: () => {
-                throw new NoProviderError(ZIBRI_INVOICING_DI_TOKENS.OPTIONS_INPUT, []);
+                throw new NoProviderError(ZIBRI_INVOICING_PLUGIN_DI_TOKENS.OPTIONS_INPUT, []);
             }
         },
         OPTIONS: {
             useFactory: () => {
-                const input: InvoicingOptionsInput = inject(ZIBRI_INVOICING_DI_TOKENS.OPTIONS_INPUT);
+                const input: InvoicingOptionsInput = inject(ZIBRI_INVOICING_PLUGIN_DI_TOKENS.OPTIONS_INPUT);
                 const res: InvoicingOptions = {
                     footerFontSize: 10,
                     images: undefined,
@@ -78,10 +79,12 @@ export class ZibriInvoicingPlugin extends ZibriPlugin {
 
     };
 
-    providers: DiProvider<unknown>[] = providersFromTokenRecord(ZIBRI_INVOICING_DI_TOKENS, this.defaultDiProviders);
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    providers: DiProvider<unknown>[] = providersFromTokenRecord(ZIBRI_INVOICING_PLUGIN_DI_TOKENS, this.defaultDiProviders);
 
-    validate(): void {
-        validateEntitiesRegistered(this.constructor.name, Invoice, NumberInvoices);
-        inject(ZIBRI_INVOICING_DI_TOKENS.OPTIONS);
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    validate(app: ZibriApplication): void {
+        validateEntitiesRegistered(this.constructor.name, app, Invoice, NumberInvoices);
+        validateTokensRegistered(this.constructor.name, ZIBRI_INVOICING_PLUGIN_DI_TOKENS);
     }
 }

package/src/plugin/invoicing/invoicing.tokens.ts

@@ -12,7 +12,7 @@ import { InjectionToken } from '../../di/models/injection-token.model';
  * The dependency injection tokens used by the ZibriInvoicingPlugin.
  */
 // eslint-disable-next-line typescript/typedef
-export const ZIBRI_INVOICING_DI_TOKENS = {
+export const ZIBRI_INVOICING_PLUGIN_DI_TOKENS = {
     // eslint-disable-next-line typescript/no-explicit-any
     INVOICE_NUMBER_SERVICE: invoicingToken<InvoiceNumberServiceInterface<any>>('zi.invoicing.invoice_number_service'),
     OPTIONS_INPUT: invoicingToken<InvoicingOptionsInput>('zi.invoicing.options_input'),

package/src/plugin/invoicing/models/invoice.model.ts

@@ -8,7 +8,7 @@ import { type CurrencyCode } from '../../../localization/models/currency-code.mo
 /**
  * Contains information about an invoice.
  */
-@Entity()
+@Entity({ allowOrphan: true })
 export class Invoice extends BaseEntity {
     /**
      * The unique invoice number for this invoice.

package/src/plugin/invoicing/models/number-invoices.model.ts

@@ -5,7 +5,7 @@ import { Property } from '../../../entity/decorators/property.decorator';
 /**
  * Contains the information about how many invoices have been created in a specific year.
  */
-@Entity()
+@Entity({ allowOrphan: true })
 export class NumberInvoices extends BaseEntity {
     /**
      * The id of the recipient of the invoice.

package/src/plugin/invoicing/services/conformance/en16931/en16931-conformance.service.ts

@@ -2,7 +2,7 @@ import { Inject } from '../../../../../di/decorators/inject.decorator';
 import { PdfDocumentDefinition, PdfAttachmentDefinition, PdfDocument } from '../../../../../document/pdf.utilities';
 import { XML, XmlUtilities } from '../../../../../document/xml.utilities';
 import { MimeType } from '../../../../../http/mime-type.enum';
-import { ZIBRI_INVOICING_DI_TOKENS } from '../../../invoicing.tokens';
+import { ZIBRI_INVOICING_PLUGIN_DI_TOKENS } from '../../../invoicing.tokens';
 import { InvoiceItem } from '../../../models/invoice-item.model';
 import { Invoice } from '../../../models/invoice.model';
 import { type InvoicingOptions } from '../../../models/invoicing-options.model';
@@ -26,9 +26,9 @@ export abstract class EN16931ConformanceService implements InvoiceConformanceSer
     abstract readonly documentContextId: EN16931DocumentContextId;
 
     constructor(
-        @Inject(ZIBRI_INVOICING_DI_TOKENS.OPTIONS)
+        @Inject(ZIBRI_INVOICING_PLUGIN_DI_TOKENS.OPTIONS)
         protected readonly options: InvoicingOptions,
-        @Inject(ZIBRI_INVOICING_DI_TOKENS.INVOICE_CALC_SERVICE)
+        @Inject(ZIBRI_INVOICING_PLUGIN_DI_TOKENS.INVOICE_CALC_SERVICE)
         private readonly invoiceCalcService: InvoiceCalcServiceInterface<Invoice>
     ) {}