zibri 2.2.0 → 2.2.1

package/src/plugin/invoicing/services/invoice-number.service.test.ts

@@ -1,16 +1,22 @@
 /* eslint-disable cspell/spellchecker */
-
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
 import { PostgreSqlContainer } from '@testcontainers/postgresql';
 import { StartedTestContainer } from 'testcontainers';
 
 import { InvoiceCalcService } from './invoice-calc.service';
 import { InvoiceNumberService } from './invoice-number.service';
-import { POSTGRES_TEST_IMAGE } from '../../../__testing__';
-import { DataSource, MigrationEntity, Repository, PostgresDataSource, PostgresOptions } from '../../../data-source';
+import { POSTGRES_TEST_IMAGE } from '../../../__testing__/constants';
+import { PostgresDataSource, PostgresOptions } from '../../../data-source/data-sources/postgres-data-source.model';
+import { DataSource } from '../../../data-source/decorators/data-source.decorator';
+import { MigrationEntity } from '../../../data-source/migration/migration-entity.model';
+import { Repository } from '../../../data-source/repository';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { Newable, OmitStrict } from '../../../types';
-import { Invoice, InvoiceAddress, InvoicingOptions, NumberInvoices } from '../models';
+import { Newable } from '../../../types/newable.type';
+import { OmitStrict } from '../../../types/omit-strict.type';
+import { InvoiceAddress } from '../models/invoice-address.model';
+import { Invoice } from '../models/invoice.model';
+import { InvoicingOptions } from '../models/invoicing-options.model';
+import { NumberInvoices } from '../models/number-invoices.model';
 
 const currentYear: string = new Date()
     .getFullYear()

package/src/plugin/invoicing/services/invoice-number.service.ts

@@ -1,10 +1,15 @@
-import { InvoiceNumberServiceInterface } from './invoice-number-service.interface';
-import { Repository, Transaction } from '../../../data-source';
-import { Inject, InjectRepository } from '../../../di';
-import { ConflictError } from '../../../error-handling';
-import { OmitStrict } from '../../../types';
 import { ZIBRI_INVOICING_DI_TOKENS } from '../invoicing.tokens';
-import { Invoice, InvoiceAddress, type InvoicingOptions, NumberInvoices } from '../models';
+import { InvoiceNumberServiceInterface } from './invoice-number-service.interface';
+import { Repository } from '../../../data-source/repository';
+import { Transaction } from '../../../data-source/transaction/transaction.model';
+import { InjectRepository } from '../../../di/decorators/inject-repository.decorator';
+import { Inject } from '../../../di/decorators/inject.decorator';
+import { ConflictError } from '../../../error-handling/errors/conflict.error';
+import { OmitStrict } from '../../../types/omit-strict.type';
+import { InvoiceAddress } from '../models/invoice-address.model';
+import { Invoice } from '../models/invoice.model';
+import { type InvoicingOptions } from '../models/invoicing-options.model';
+import { NumberInvoices } from '../models/number-invoices.model';
 
 /**
  * Default implementation of the invoice number service.

package/src/plugin/invoicing/services/invoice-pdf-service.interface.ts

@@ -1,7 +1,6 @@
-
-import { PdfDocument } from '../../../document';
-import { Invoice as BaseInvoice } from '../models';
-import { InvoiceConformance } from './conformance';
+import { InvoiceConformance } from './conformance/invoice-conformance-service.interface';
+import { PdfDocument } from '../../../document/pdf.utilities';
+import { Invoice as BaseInvoice } from '../models/invoice.model';
 
 /**
  * Handles generating pdf invoice files.

package/src/plugin/invoicing/services/invoice-pdf.service.test.ts

@@ -1,24 +1,28 @@
-import { createWriteStream, WriteStream } from 'node:fs';
-import { mkdir } from 'node:fs/promises';
-import path from 'node:path';
+import { WriteStream } from 'node:fs';
 
 import { afterAll, beforeAll, describe, it } from '@jest/globals';
 import { PostgreSqlContainer } from '@testcontainers/postgresql';
 import { StartedTestContainer } from 'testcontainers';
 
+import { XRechnungConformanceService } from './conformance/en16931/x-rechnung-conformance.service';
 import { InvoiceCalcService } from './invoice-calc.service';
 import { InvoicePdfService } from './invoice-pdf.service';
-import { POSTGRES_TEST_IMAGE, testFileFolder } from '../../../__testing__';
-import { DataSource, MigrationEntity, Repository, PostgresDataSource, PostgresOptions } from '../../../data-source';
-import { PdfDocument } from '../../../document';
+import { POSTGRES_TEST_IMAGE, testFileFolder } from '../../../__testing__/constants';
+import { PostgresDataSource, PostgresOptions } from '../../../data-source/data-sources/postgres-data-source.model';
+import { DataSource } from '../../../data-source/decorators/data-source.decorator';
+import { MigrationEntity } from '../../../data-source/migration/migration-entity.model';
+import { Repository } from '../../../data-source/repository';
+import { PdfDocument } from '../../../document/pdf.utilities';
 import { BaseEntity } from '../../../entity/base-entity.model';
 import { formatDate } from '../../../localization/formatting/format-date.function';
 import { formatPercent } from '../../../localization/formatting/format-percent.function';
 import { formatPrice } from '../../../localization/formatting/format-price.function';
-import { Newable, OmitStrict } from '../../../types';
-import { Ms } from '../../../utilities';
-import { Invoice, InvoicingOptions } from '../models';
-import { XRechnungConformanceService } from './conformance';
+import { Newable } from '../../../types/newable.type';
+import { OmitStrict } from '../../../types/omit-strict.type';
+import { FsUtilities } from '../../../utilities/fs.utilities';
+import { Ms } from '../../../utilities/ms';
+import { Invoice } from '../models/invoice.model';
+import { InvoicingOptions } from '../models/invoicing-options.model';
 
 const invoicingOptions: InvoicingOptions = {
     footerFontSize: 10,
@@ -103,7 +107,7 @@ let repo: Repository<Invoice, OmitStrict<Invoice, 'id'>>;
 
 describe('createInvoicePdf', () => {
     beforeAll(async () => {
-        await mkdir(testFileFolder, { recursive: true });
+        await FsUtilities.mkdir(testFileFolder);
         container = await new PostgreSqlContainer(POSTGRES_TEST_IMAGE)
             .withDatabase('db')
             .withUsername('postgres')
@@ -165,8 +169,8 @@ describe('createInvoicePdf', () => {
 
         const pdf: PdfDocument = await invoicePdfService.generateInvoicePdf(invoice, 'x-rechnung');
 
-        const out1: WriteStream = createWriteStream(path.join(testFileFolder, `${invoice.number}-stream-1.pdf`));
-        const out2: WriteStream = createWriteStream(path.join(testFileFolder, `${invoice.number}-stream-2.pdf`));
+        const out1: WriteStream = FsUtilities.createWriteStream(FsUtilities.getPath(testFileFolder, `${invoice.number}-stream-1.pdf`));
+        const out2: WriteStream = FsUtilities.createWriteStream(FsUtilities.getPath(testFileFolder, `${invoice.number}-stream-2.pdf`));
 
         pdf.pipe(out1);
         pdf.pipe(out2);

package/src/plugin/invoicing/services/invoice-pdf.service.ts

@@ -1,13 +1,16 @@
-
-import { InvoiceConformance, InvoiceConformanceServiceInterface } from './conformance';
-import { InvoicePdfServiceInterface } from './invoice-pdf-service.interface';
-import { Inject, ZIBRI_DI_TOKENS } from '../../../di';
-import { PdfColumnDefinition, PdfContentDefinition, PdfContentSize, PdfDocument, PdfDocumentDefinition, PdfTableCellDefinition, PdfUtilities } from '../../../document';
-import type { FormatDateFn, FormatPercentFn, FormatPriceFn } from '../../../localization';
-import { BigNumber } from '../../../utilities';
-import { Invoice, type InvoicingOptions, Vat } from '../models';
+import { InvoiceConformanceServiceInterface, InvoiceConformance } from './conformance/invoice-conformance-service.interface';
 import { type InvoiceCalcServiceInterface } from './invoice-calc-service.interface';
+import { InvoicePdfServiceInterface } from './invoice-pdf-service.interface';
+import { Inject } from '../../../di/decorators/inject.decorator';
+import { ZIBRI_DI_TOKENS } from '../../../di/default/zibri-di-tokens.default';
+import { PdfContentDefinition, PdfColumnDefinition, PdfDocument, PdfDocumentDefinition, PdfUtilities, PdfTableCellDefinition, PdfContentSize } from '../../../document/pdf.utilities';
+import { type FormatDateFn } from '../../../localization/formatting/format-date-fn.model';
+import { type FormatPercentFn } from '../../../localization/formatting/format-percent-fn.model';
+import { type FormatPriceFn } from '../../../localization/formatting/format-price-fn.model';
 import { ZIBRI_INVOICING_DI_TOKENS } from '../invoicing.tokens';
+import { Invoice } from '../models/invoice.model';
+import { type InvoicingOptions } from '../models/invoicing-options.model';
+import { Vat } from '../models/vat.model';
 
 /**
  * Default implementation of the invoice pdf service.

package/src/plugin/payment/models/payment-plugin-options-input.model.ts

@@ -1,7 +1,7 @@
-import { AnyObject } from '../../../entity';
-import { PaymentProviderInterface } from '../providers';
 import { PaymentMethod } from './payment-method.model';
 import { PaymentPluginOptions } from './payment-plugin-options.model';
+import { AnyObject } from '../../../entity/any-object.model';
+import { PaymentProviderInterface } from '../providers/payment-provider.interface';
 
 /**
  * Input for configuring the payment plugin.

package/src/plugin/payment/models/payment-plugin-options.model.ts

@@ -1,6 +1,6 @@
-import { AnyObject } from '../../../entity';
-import { PaymentProviderInterface } from '../providers';
 import { PaymentMethod } from './payment-method.model';
+import { AnyObject } from '../../../entity/any-object.model';
+import { PaymentProviderInterface } from '../providers/payment-provider.interface';
 
 /**
  * Configuration for the payment plugin.

package/src/plugin/payment/models/payment.model.ts

@@ -1,8 +1,10 @@
 import { type PaymentMethod } from './payment-method.model';
 import { PaymentStatus } from './payment-status.enum';
-import { AnyObject, Entity, Property } from '../../../entity';
+import { AnyObject } from '../../../entity/any-object.model';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { type CurrencyCode } from '../../../localization';
+import { Entity } from '../../../entity/decorators/entity.decorator';
+import { Property } from '../../../entity/decorators/property.decorator';
+import { type CurrencyCode } from '../../../localization/models/currency-code.model';
 
 /**
  * Entity for an payment that has been made.

package/src/plugin/payment/payment.plugin.ts

@@ -1,7 +1,13 @@
-import { Payment, PaymentMethod, PaymentPluginOptions, PaymentPluginOptionsInput } from './models';
+import { PaymentMethod } from './models/payment-method.model';
+import { PaymentPluginOptionsInput } from './models/payment-plugin-options-input.model';
+import { PaymentPluginOptions } from './models/payment-plugin-options.model';
+import { Payment } from './models/payment.model';
 import { DefaultPaymentProviderArray, ZIBRI_PAYMENT_DI_TOKENS } from './payment.tokens';
-import { DiProvider, DiTokenProviderRecord, inject, NoProviderError, providersFromTokenRecord } from '../../di';
-import { validateEntitiesRegistered } from '../../utilities';
+import { NoProviderError } from '../../di/errors/no-provider.error';
+import { inject } from '../../di/inject.function';
+import { DiProvider } from '../../di/models/di-provider.model';
+import { DiTokenProviderRecord, providersFromTokenRecord } from '../../di/models/di-token.model';
+import { validateEntitiesRegistered } from '../../utilities/validate-entities-registered.function';
 import { ZibriPlugin } from '../plugin.model';
 
 /**

package/src/plugin/payment/payment.tokens.ts

@@ -1,8 +1,10 @@
 /* eslint-disable jsdoc/require-jsdoc */
-import { PaymentMethod, PaymentPluginOptionsInput } from './models';
-import { PaymentProviderInterface } from './providers';
-import { InjectionToken, TokenRecord } from '../../di';
-import { AnyObject } from '../../entity';
+import { PaymentMethod } from './models/payment-method.model';
+import { PaymentPluginOptionsInput } from './models/payment-plugin-options-input.model';
+import { PaymentProviderInterface } from './providers/payment-provider.interface';
+import { TokenRecord } from '../../di/models/di-token.model';
+import { InjectionToken } from '../../di/models/injection-token.model';
+import { AnyObject } from '../../entity/any-object.model';
 
 export type DefaultPaymentProviderArray = PaymentProviderInterface<
     PaymentMethod[],

package/src/plugin/payment/providers/pay-pal/pay-pal-client.ts

@@ -1,8 +1,10 @@
 import { PayPalProviderOptions } from './pay-pal.payment-provider';
-import { inject, ZIBRI_DI_TOKENS } from '../../../../di';
-import { Property } from '../../../../entity';
-import { KnownHeader, MimeType } from '../../../../http';
-import { HttpClientInterface } from '../../../../http-client';
+import { ZIBRI_DI_TOKENS } from '../../../../di/default/zibri-di-tokens.default';
+import { inject } from '../../../../di/inject.function';
+import { Property } from '../../../../entity/decorators/property.decorator';
+import { KnownHeader } from '../../../../http/known-header.enum';
+import { MimeType } from '../../../../http/mime-type.enum';
+import { HttpClientInterface } from '../../../../http-client/http-client.interface';
 
 /**
  * The intent of the new payment.

package/src/plugin/payment/providers/pay-pal/pay-pal.payment-provider.ts

@@ -1,8 +1,11 @@
-import { AuthorizationCaptureResp, CaptureOrderResp, GetOrderResp, PayPalCapture, PayPalClient, RefundCaptureResp } from './pay-pal-client';
-import { Repository } from '../../../../data-source';
-import { inject, repositoryTokenFor } from '../../../../di';
-import { KnownPaymentMethod, Payment, PaymentStatus } from '../../models';
 import { PaymentProviderInterface } from '../payment-provider.interface';
+import { AuthorizationCaptureResp, CaptureOrderResp, GetOrderResp, PayPalCapture, PayPalClient, RefundCaptureResp } from './pay-pal-client';
+import { Repository } from '../../../../data-source/repository';
+import { repositoryTokenFor } from '../../../../di/decorators/inject-repository.decorator';
+import { inject } from '../../../../di/inject.function';
+import { KnownPaymentMethod } from '../../models/payment-method.model';
+import { PaymentStatus } from '../../models/payment-status.enum';
+import { Payment } from '../../models/payment.model';
 
 /**
  * The environment of the pay-pal client.

package/src/plugin/payment/providers/payment-provider.interface.ts

@@ -1,5 +1,6 @@
-import { AnyObject } from '../../../entity';
-import { Payment, PaymentMethod } from '../models';
+import { AnyObject } from '../../../entity/any-object.model';
+import { PaymentMethod } from '../models/payment-method.model';
+import { Payment } from '../models/payment.model';
 
 /**
  * Interface for a payment provider.

package/src/plugin/payment/services/payment-service.interface.ts

@@ -1,7 +1,7 @@
-import { AnyObject } from '../../../entity';
-import { PaymentMethod } from '../models';
-import { PaymentProviderInterface } from '../providers';
-import { AllowedCancellationMethods, AllowedRefundMethods, AllowedReservationMethods, PaymentDataForMethod, PaymentForMethod, PaymentReservationForMethod, ValidatedPaymentDataForMethod } from './payment-service.types';
+import { PaymentDataForMethod, ValidatedPaymentDataForMethod, PaymentForMethod, AllowedReservationMethods, PaymentReservationForMethod, AllowedCancellationMethods, AllowedRefundMethods } from './payment-service.types';
+import { AnyObject } from '../../../entity/any-object.model';
+import { PaymentMethod } from '../models/payment-method.model';
+import { PaymentProviderInterface } from '../providers/payment-provider.interface';
 
 /**
  * Interface for a payment service.

package/src/plugin/payment/services/payment-service.types.ts

@@ -1,7 +1,9 @@
 /* eslint-disable unusedImports/no-unused-vars */
-import { AnyObject } from '../../../entity';
-import { Payment, PaymentMethod, PaymentPluginOptions } from '../models';
-import { PaymentProviderInterface } from '../providers';
+import { AnyObject } from '../../../entity/any-object.model';
+import { PaymentMethod } from '../models/payment-method.model';
+import { PaymentPluginOptions } from '../models/payment-plugin-options.model';
+import { Payment } from '../models/payment.model';
+import { PaymentProviderInterface } from '../providers/payment-provider.interface';
 
 /**
  * Helper: pick the provider *instance* (from the P tuple) for the given method M.
@@ -46,18 +48,18 @@ export type PaymentDataForMethod<
         Record<Methods[number], boolean>
     >[]
 >
-  = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-      infer _SM,
-      infer PaymentDataMap,
-      infer _ValidatedMap,
-      infer _ProviderPaymentData,
-      infer _ProviderReservationPaymentData,
-      infer _CS,
-      infer _RS,
-      infer _ReservationSupport
-  >
-      ? PaymentDataMap[M]
-      : never;
+    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
+        infer _SM,
+        infer PaymentDataMap,
+        infer _ValidatedMap,
+        infer _ProviderPaymentData,
+        infer _ProviderReservationPaymentData,
+        infer _CS,
+        infer _RS,
+        infer _ReservationSupport
+    >
+        ? PaymentDataMap[M]
+        : never;
 
 /**
  * ValidatedPaymentDataForMethod: the validated/normalized data type returned by validatePaymentData.
@@ -78,18 +80,18 @@ export type ValidatedPaymentDataForMethod<
         Record<Methods[number], boolean>
     >[]
 >
-  = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-      infer _SM,
-      infer _PaymentDataMap,
-      infer ValidatedMap,
-      infer _ProviderPaymentData,
-      infer _ProviderReservationPaymentData,
-      infer _CS,
-      infer _RS,
-      infer _ReservationSupport
-  >
-      ? ValidatedMap[M]
-      : never;
+    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
+        infer _SM,
+        infer _PaymentDataMap,
+        infer ValidatedMap,
+        infer _ProviderPaymentData,
+        infer _ProviderReservationPaymentData,
+        infer _CS,
+        infer _RS,
+        infer _ReservationSupport
+    >
+        ? ValidatedMap[M]
+        : never;
 
 /**
  * The payment entity type used for payments.
@@ -110,18 +112,18 @@ export type PaymentForMethod<
         Record<Methods[number], boolean>
     >[]
 >
-  = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-      infer _SM,
-      infer _PaymentDataMap,
-      infer _ValidatedMap,
-      infer ProviderPaymentDataMap,
-      infer _ProviderReservationPaymentData,
-      infer _CS,
-      infer _RS,
-      infer _ReservationSupport
-  >
-      ? Payment<M, ProviderPaymentDataMap[M]>
-      : never;
+    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
+        infer _SM,
+        infer _PaymentDataMap,
+        infer _ValidatedMap,
+        infer ProviderPaymentDataMap,
+        infer _ProviderReservationPaymentData,
+        infer _CS,
+        infer _RS,
+        infer _ReservationSupport
+    >
+        ? Payment<M, ProviderPaymentDataMap[M]>
+        : never;
 
 /**
  * The payment entity type used for reservation payments.
@@ -142,18 +144,18 @@ export type PaymentReservationForMethod<
         Record<Methods[number], boolean>
     >[]
 >
-  = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-      infer _SM,
-      infer _PaymentDataMap,
-      infer _ValidatedMap,
-      infer _ProviderPaymentDataMap,
-      infer ProviderReservationPaymentDataMap,
-      infer _CS,
-      infer _RS,
-      infer _ReservationSupport
-  >
-      ? Payment<M, ProviderReservationPaymentDataMap[M]>
-      : never;
+    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
+        infer _SM,
+        infer _PaymentDataMap,
+        infer _ValidatedMap,
+        infer _ProviderPaymentDataMap,
+        infer ProviderReservationPaymentDataMap,
+        infer _CS,
+        infer _RS,
+        infer _ReservationSupport
+    >
+        ? Payment<M, ProviderReservationPaymentDataMap[M]>
+        : never;
 
 /**
  * Filters to all methods that are allowed for reservation.

package/src/plugin/payment/services/payment.service.ts

@@ -1,12 +1,17 @@
-import { Inject, InjectRepository, ZIBRI_DI_TOKENS } from '../../../di';
-import { AnyObject } from '../../../entity';
-import { type LoggerInterface } from '../../../logging';
-import { Payment, PaymentMethod, PaymentStatus, type PaymentPluginOptions } from '../models';
-import { ZIBRI_PAYMENT_DI_TOKENS } from '../payment.tokens';
-import { PaymentProviderInterface } from '../providers';
 import { PaymentServiceInterface } from './payment-service.interface';
-import { AllowedCancellationMethods, AllowedRefundMethods, AllowedReservationMethods, PaymentDataForMethod, PaymentForMethod, PaymentReservationForMethod, ValidatedPaymentDataForMethod } from './payment-service.types';
-import { Repository } from '../../../data-source';
+import { PaymentDataForMethod, ValidatedPaymentDataForMethod, PaymentForMethod, AllowedReservationMethods, PaymentReservationForMethod, AllowedCancellationMethods, AllowedRefundMethods } from './payment-service.types';
+import { Repository } from '../../../data-source/repository';
+import { InjectRepository } from '../../../di/decorators/inject-repository.decorator';
+import { Inject } from '../../../di/decorators/inject.decorator';
+import { ZIBRI_DI_TOKENS } from '../../../di/default/zibri-di-tokens.default';
+import { AnyObject } from '../../../entity/any-object.model';
+import { type LoggerInterface } from '../../../logging/logger.interface';
+import { PaymentMethod } from '../models/payment-method.model';
+import { type PaymentPluginOptions } from '../models/payment-plugin-options.model';
+import { PaymentStatus } from '../models/payment-status.enum';
+import { Payment } from '../models/payment.model';
+import { ZIBRI_PAYMENT_DI_TOKENS } from '../payment.tokens';
+import { PaymentProviderInterface } from '../providers/payment-provider.interface';
 
 /**
  * Default payment service implementation of zibri.

package/src/plugin/plugin.model.ts

@@ -1,9 +1,9 @@
 import { ZibriApplication } from '../application';
-import { AuthStrategies } from '../auth';
-import { CronJob } from '../cron';
-import { DiProvider } from '../di';
-import { BodyParserInterface } from '../parsing';
-import { Newable } from '../types';
+import { AuthStrategies } from '../auth/strategies/auth-strategies.model';
+import { CronJob } from '../cron/cron-job.model';
+import { DiProvider } from '../di/models/di-provider.model';
+import { BodyParserInterface } from '../parsing/body-parser.interface';
+import { Newable } from '../types/newable.type';
 
 /**
  * A bundle of providers, controllers, cronJobs, bodyParsers and authStrategies.