zibri 2.2.0 → 2.2.1

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

@@ -1,25 +1,36 @@
-import { createWriteStream, WriteStream } from 'fs';
-import { mkdir, rm } from 'fs/promises';
-import path from 'path';
+import { WriteStream } from 'node:fs';
 import { Readable } from 'stream';
 import { pipeline } from 'stream/promises';
 
 import { Busboy, BusboyFileStream } from '@fastify/busboy';
 
-import { File } from './file.model';
-import { ZibriApplication } from '../../application';
-import { inject, ZIBRI_DI_TOKENS } from '../../di';
-import { ContentTooLargeError } from '../../error-handling';
-import { FileExtension, HttpRequest, KnownHeader, MimeType, resolveFileExtension } from '../../http';
-import { HttpClientResponse } from '../../http-client';
-import { BodyMetadata } from '../../routing';
-import { BodyParserInterface } from '../body-parser.interface';
-import { BodyParser } from '../decorators';
 import { FormDataBodyParserCleanupCronJob } from './form-data-body-parser-cleanup.cron-job';
 import { FormData, FormDataValue } from './form-data.model';
-import { PropertyMetadata, Relation } from '../../entity';
-import { BigNumberUtilities, MetadataUtilities, UUIDUtilities } from '../../utilities';
-import { parseArray, parseBoolean, parseDate, parseNumber, parseObject, parseString } from '../functions';
+import { ZibriApplication } from '../../application';
+import { inject } from '../../di/inject.function';
+import { HttpRequest } from '../../http/http-request.model';
+import { MimeType } from '../../http/mime-type.enum';
+import { BodyMetadata } from '../../routing/decorators/body.decorator';
+import { BodyParserInterface } from '../body-parser.interface';
+import { File } from './file.model';
+import { ZIBRI_DI_TOKENS } from '../../di/default/zibri-di-tokens.default';
+import { PropertyMetadata } from '../../entity/decorators/property.decorator';
+import { Relation } from '../../entity/models/relation.enum';
+import { ContentTooLargeError } from '../../error-handling/errors/content-too-large.error';
+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 { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { UUIDUtilities } from '../../utilities/uuid.utilities';
+import { BodyParser } from '../decorators/body-parser.decorator';
+import { parseArray } from '../functions/parse-array.function';
+import { parseBoolean } from '../functions/parse-boolean.function';
+import { parseDate } from '../functions/parse-date.function';
+import { parseNumber } from '../functions/parse-number.function';
+import { parseObject } from '../functions/parse-object.function';
+import { parseString } from '../functions/parse-string.function';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 type ParsedForm = {
@@ -77,7 +88,7 @@ export class FormDataBodyParser implements BodyParserInterface {
             throw new ContentTooLargeError();
         }
 
-        const tempFolder: string = this.getTempFolder();
+        const tempFolder: Path = this.getTempFolder();
 
         try {
             const parsed: ParsedForm = await this.parseMultipartStreamToDisk(stream, headers, tempFolder, metadata);
@@ -96,9 +107,9 @@ export class FormDataBodyParser implements BodyParserInterface {
         }
     }
 
-    private getTempFolder(): string {
-        const tempPath: string = inject(ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER);
-        return path.join(tempPath, `temp-${UUIDUtilities.generate()}`);
+    private getTempFolder(): Path {
+        const tempPath: Path = inject(ZIBRI_DI_TOKENS.FILE_UPLOAD_TEMP_FOLDER);
+        return FsUtilities.getPath(tempPath, `temp-${UUIDUtilities.generate()}`);
     }
 
     private getTempFileName(mimetype: string): string {
@@ -110,9 +121,9 @@ export class FormDataBodyParser implements BodyParserInterface {
         return id;
     }
 
-    private async removeTempFolder(tempFolder: string): Promise<void> {
+    private async removeTempFolder(tempFolder: Path): Promise<void> {
         try {
-            await rm(tempFolder, { recursive: true });
+            await FsUtilities.rm(tempFolder);
         }
         catch {
             // Do nothing
@@ -231,13 +242,13 @@ export class FormDataBodyParser implements BodyParserInterface {
     private async parseMultipartStreamToDisk(
         stream: Readable,
         headers: Partial<Record<string, string | undefined>>,
-        tempFolder: string,
+        tempFolder: Path,
         metadata: BodyMetadata
     ): Promise<ParsedForm> {
         const contentType: string | undefined = headers[KnownHeader.CONTENT_TYPE]
             ?? headers[KnownHeader.CONTENT_TYPE.toLowerCase()];
 
-        await mkdir(tempFolder, { recursive: true });
+        await FsUtilities.mkdir(tempFolder);
 
         return await new Promise<ParsedForm>((resolve, reject) => {
             const bb: Busboy = Busboy({ headers: { 'content-type': contentType ?? 'string' } });
@@ -282,8 +293,8 @@ 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: string = path.join(tempFolder, filename);
-                const writeStream: WriteStream = createWriteStream(destination);
+                const destination: Path = FsUtilities.getPath(tempFolder, filename);
+                const writeStream: WriteStream = FsUtilities.createWriteStream(destination);
                 let size: number = 0;
 
                 fileStream.on('data', (chunk: Buffer) => {
@@ -343,11 +354,9 @@ export class FormDataBodyParser implements BodyParserInterface {
                 }));
             });
 
-            // eslint-disable-next-line typescript/no-misused-promises
-            bb.on('finish', async () => {
+            bb.on('finish', () => {
                 try {
-                    await Promise.all(filePromises);
-                    resolve({ fields, filesMap });
+                    void Promise.all(filePromises).then(() => resolve({ fields, filesMap }));
                 }
                 catch (error) {
                     reject(error);

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

@@ -1,7 +1,5 @@
-import { rm, writeFile } from 'fs/promises';
-import path from 'path';
-
 import { File } from './file.model';
+import { FsUtilities, Path } from '../../utilities/fs.utilities';
 
 /**
  * The raw value that a form-data property has.
@@ -28,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: string;
+    readonly tempFolder: Path;
 
-    private constructor(value: FormDataType, tempFolder: string) {
+    private constructor(value: FormDataType, tempFolder: Path) {
         this.value = value;
         this.tempFolder = tempFolder;
     }
@@ -44,14 +42,13 @@ export class FormData<FormDataType extends object> {
      */
     static async create<FormDataType extends object>(
         value: FormDataType,
-        tempFolder: string,
+        tempFolder: Path,
         cleanupAfterMs: number
     ): Promise<FormData<FormDataType>> {
         const res: FormData<FormDataType> = new this(value, tempFolder);
-        await writeFile(
-            path.join(res.tempFolder, CLEANUP_AT_FILE_NAME),
-            `${Date.now() + cleanupAfterMs}`,
-            { encoding: 'utf8' }
+        await FsUtilities.createFile(
+            FsUtilities.getPath(res.tempFolder, CLEANUP_AT_FILE_NAME),
+            `${Date.now() + cleanupAfterMs}`
         );
         return res;
     }
@@ -61,7 +58,7 @@ export class FormData<FormDataType extends object> {
      */
     async cleanup(): Promise<void> {
         try {
-            await rm(this.tempFolder, { recursive: true });
+            await FsUtilities.rm(this.tempFolder);
         }
         catch {
             // do nothing

package/src/parsing/functions/parse-array.function.ts

@@ -3,8 +3,8 @@ import { parseDate } from './parse-date.function';
 import { parseNumber } from './parse-number.function';
 import { parseObject } from './parse-object.function';
 import { parseString } from './parse-string.function';
-import { ArrayPropertyItemMetadata } from '../../entity';
-import { ArrayParamItemMetadata } from '../../routing';
+import { ArrayPropertyItemMetadata } from '../../entity/models/array-property-metadata.model';
+import { ArrayParamItemMetadata } from '../../routing/models/array-param-metadata.model';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 export function parseArray(

package/src/parsing/functions/parse-array.test.ts

@@ -2,7 +2,7 @@
 import { describe, expect, it } from '@jest/globals';
 
 import { parseArray } from './parse-array.function';
-import { ArrayParamMetadata } from '../../routing';
+import { ArrayParamMetadata } from '../../routing/models/array-param-metadata.model';
 
 describe('parseArray', () => {
     const meta: ArrayParamMetadata = {

package/src/parsing/functions/parse-date.function.ts

@@ -1,4 +1,4 @@
-import { isDate } from '../../utilities';
+import { isDate } from '../../utilities/is-date.function';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 export function parseDate(rawValue: unknown): unknown {

package/src/parsing/functions/parse-number.function.ts

@@ -1,4 +1,4 @@
-import { isNumeric } from '../../utilities';
+import { isNumeric } from '../../utilities/is-numeric.function';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 export function parseNumber(rawValue: unknown): unknown {

package/src/parsing/functions/parse-object.function.ts

@@ -1,12 +1,13 @@
-
 import { parseArray } from './parse-array.function';
 import { parseBoolean } from './parse-boolean.function';
 import { parseDate } from './parse-date.function';
 import { parseNumber } from './parse-number.function';
 import { parseString } from './parse-string.function';
-import { PropertyMetadata, Relation } from '../../entity';
-import { Newable } from '../../types';
-import { MetadataUtilities, ObjectUtilities } from '../../utilities';
+import { PropertyMetadata } from '../../entity/decorators/property.decorator';
+import { Relation } from '../../entity/models/relation.enum';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { ObjectUtilities } from '../../utilities/object.utilities';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 export function parseObject(

package/src/parsing/functions/parse-object.test.ts

@@ -2,7 +2,7 @@
 import { describe, expect, it } from '@jest/globals';
 
 import { parseObject } from './parse-object.function';
-import { Property } from '../../entity';
+import { Property } from '../../entity/decorators/property.decorator';
 
 class Dummy {}
 

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

@@ -1,12 +1,16 @@
-import { BadRequestError, ContentTooLargeError } from '../../error-handling';
-import { HttpRequest, KnownHeader, MimeType } from '../../http';
-import { HttpClientResponse } from '../../http-client';
-import { BodyMetadata } from '../../routing';
-import { BigNumber, BigNumberUtilities } from '../../utilities';
-import { WebsocketRequest } from '../../websocket';
+import { BadRequestError } from '../../error-handling/errors/bad-request.error';
+import { ContentTooLargeError } from '../../error-handling/errors/content-too-large.error';
+import { HttpRequest } from '../../http/http-request.model';
+import { KnownHeader } from '../../http/known-header.enum';
+import { MimeType } from '../../http/mime-type.enum';
+import { HttpClientResponse } from '../../http-client/http-client-response.model';
+import { BodyMetadata } from '../../routing/decorators/body.decorator';
+import { BigNumberUtilities } from '../../utilities/big-number.utilities';
+import { WebsocketRequest } from '../../websocket/models/websocket-request.model';
 import { BodyParserInterface } from '../body-parser.interface';
-import { BodyParser } from '../decorators';
-import { parseArray, parseObject } from '../functions';
+import { BodyParser } from '../decorators/body-parser.decorator';
+import { parseArray } from '../functions/parse-array.function';
+import { parseObject } from '../functions/parse-object.function';
 
 /**
  * Body parser for json.

package/src/parsing/parser.interface.ts

@@ -1,8 +1,9 @@
 import { ZibriApplication } from '../application';
-import { HttpRequest } from '../http';
-import { HttpClientResponse } from '../http-client';
-import { BodyMetadata, HeaderParamMetadata, PathParamMetadata, QueryParamMetadata } from '../routing';
-import { WebsocketRequest } from '../websocket';
+import { HttpRequest } from '../http/http-request.model';
+import { HttpClientResponse } from '../http-client/http-client-response.model';
+import { BodyMetadata } from '../routing/decorators/body.decorator';
+import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata } from '../routing/decorators/param.decorator';
+import { WebsocketRequest } from '../websocket/models/websocket-request.model';
 
 /**
  * Interface for a parser.

package/src/parsing/parser.ts

@@ -1,16 +1,26 @@
 import assert from 'assert';
 
-import { inject, ZIBRI_DI_TOKENS } from '../di';
-import { GlobalRegistry } from '../global';
 import { BodyParserInterface } from './body-parser.interface';
-import { HttpRequest, isHttpRequest, isMimeType, KnownHeader, MimeType } from '../http';
 import { ParserInterface } from './parser.interface';
-import { HttpClientResponse, isHttpClientResponse } from '../http-client';
-import { LoggerInterface } from '../logging';
-import { BodyMetadata, HeaderParamMetadata, PathParamMetadata, QueryParamMetadata } from '../routing';
-import { parseArray, parseBoolean, parseDate, parseNumber, parseObject, parseString } from './functions';
 import { ZibriApplication } from '../application';
-import { WebsocketRequest } from '../websocket';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { GlobalRegistry } from '../global/global-registry';
+import { HttpRequest, isHttpRequest } from '../http/http-request.model';
+import { KnownHeader } from '../http/known-header.enum';
+import { MimeType } from '../http/mime-type.enum';
+import { isMimeType } from '../http/mime-type.helpers';
+import { HttpClientResponse, isHttpClientResponse } from '../http-client/http-client-response.model';
+import { LoggerInterface } from '../logging/logger.interface';
+import { parseArray } from './functions/parse-array.function';
+import { parseBoolean } from './functions/parse-boolean.function';
+import { parseDate } from './functions/parse-date.function';
+import { parseNumber } from './functions/parse-number.function';
+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 { WebsocketRequest } from '../websocket/models/websocket-request.model';
 
 /**
  * Function for parsing path parameters.

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

@@ -1,11 +1,20 @@
 /* eslint-disable jsdoc/require-jsdoc */
 import { ZIBRI_INVOICING_DI_TOKENS } from './invoicing.tokens';
-import { Invoice, InvoicingOptions, InvoicingOptionsInput, NumberInvoices } from './models';
-import { InvoiceCalcService, InvoiceNumberService, InvoicePdfService, PeppolConformanceService, XRechnungConformanceService } from './services';
-import { DiProvider, DiTokenProviderRecord, inject, providersFromTokenRecord } from '../../di';
-import { NoProviderError } from '../../di/errors';
-import { validateEntitiesRegistered } from '../../utilities';
+import { DiTokenProviderRecord, providersFromTokenRecord } from '../../di/models/di-token.model';
 import { ZibriPlugin } from '../plugin.model';
+import { Invoice } from './models/invoice.model';
+import { InvoicingOptionsInput } from './models/invoicing-options-input.model';
+import { InvoicingOptions } from './models/invoicing-options.model';
+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 { 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 { PeppolConformanceService } from './services/conformance/en16931/peppol-conformance.service';
+import { XRechnungConformanceService } from './services/conformance/en16931/x-rechnung-conformance.service';
 
 /**
  * Plugin that includes everything for handling invoices.

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

@@ -1,7 +1,12 @@
 /* eslint-disable jsdoc/require-jsdoc */
-import { InvoicingOptions, InvoicingOptionsInput } from './models';
-import { InvoiceCalcServiceInterface, InvoiceNumberServiceInterface, InvoicePdfServiceInterface, InvoiceConformanceServiceInterface } from './services';
-import { InjectionToken, TokenRecord } from '../../di';
+import { InvoicingOptionsInput } from './models/invoicing-options-input.model';
+import { InvoicingOptions } from './models/invoicing-options.model';
+import { InvoiceConformanceServiceInterface } from './services/conformance/invoice-conformance-service.interface';
+import { InvoiceCalcServiceInterface } from './services/invoice-calc-service.interface';
+import { InvoiceNumberServiceInterface } from './services/invoice-number-service.interface';
+import { InvoicePdfServiceInterface } from './services/invoice-pdf-service.interface';
+import { TokenRecord } from '../../di/models/di-token.model';
+import { InjectionToken } from '../../di/models/injection-token.model';
 
 /**
  * The dependency injection tokens used by the ZibriInvoicingPlugin.

package/src/plugin/invoicing/models/amount-unit.model.ts

@@ -1,5 +1,4 @@
-
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * Information about the unit of the amount value.

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

@@ -1,4 +1,4 @@
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * The invoice address, which can be either a private or a company address.

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

@@ -1,6 +1,6 @@
 import { AmountUnit } from './amount-unit.model';
 import { Vat } from './vat.model';
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * Contains information about a single item of an invoice.

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

@@ -1,8 +1,9 @@
 import { InvoiceAddress } from './invoice-address.model';
 import { InvoiceItem } from './invoice-item.model';
-import { Entity, Property } from '../../../entity';
 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';
 
 /**
  * Contains information about an invoice.

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

@@ -1,5 +1,5 @@
 import { CompanyInfo } from './company-info.model';
-import { PdfImageDefinition } from '../../../document';
+import { PdfImageDefinition } from '../../../document/pdf.utilities';
 
 /**
  * Options used throughout the plugin.

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

@@ -1,5 +1,6 @@
-import { Entity, Property } from '../../../entity';
 import { BaseEntity } from '../../../entity/base-entity.model';
+import { Entity } from '../../../entity/decorators/entity.decorator';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * Contains the information about how many invoices have been created in a specific year.

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

@@ -1,4 +1,4 @@
-import { Property } from '../../../entity';
+import { Property } from '../../../entity/decorators/property.decorator';
 
 /**
  * S = standard rate

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

@@ -1,8 +1,12 @@
-import { Inject } from '../../../../../di';
-import { PdfAttachmentDefinition, PdfDocument, PdfDocumentDefinition, XML, XmlUtilities } from '../../../../../document';
-import { MimeType } from '../../../../../http';
+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 { Invoice, InvoiceItem, type InvoicingOptions, Vat } from '../../../models';
+import { InvoiceItem } from '../../../models/invoice-item.model';
+import { Invoice } from '../../../models/invoice.model';
+import { type InvoicingOptions } from '../../../models/invoicing-options.model';
+import { Vat } from '../../../models/vat.model';
 import { type InvoiceCalcServiceInterface } from '../../invoice-calc-service.interface';
 import { InvoiceConformance, InvoiceConformanceServiceInterface } from '../invoice-conformance-service.interface';
 

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

@@ -1,19 +1,21 @@
-
-import { mkdir, writeFile } from 'fs/promises';
-import path from 'path';
-
 import { afterAll, beforeAll, describe, it } from '@jest/globals';
 import { PostgreSqlContainer } from '@testcontainers/postgresql';
 import { StartedTestContainer } from 'testcontainers';
 
 import { PeppolConformanceService } from './peppol-conformance.service';
-import { POSTGRES_TEST_IMAGE, testFileFolder } from '../../../../../__testing__';
-import { DataSource, MigrationEntity, Repository, PostgresDataSource, PostgresOptions } from '../../../../../data-source';
-import { XML } 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 { XML } from '../../../../../document/xml.utilities';
 import { BaseEntity } from '../../../../../entity/base-entity.model';
-import { Newable, OmitStrict } from '../../../../../types';
-import { Ms } from '../../../../../utilities';
-import { InvoicingOptions, Invoice } from '../../../models';
+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';
 import { InvoiceCalcService } from '../../invoice-calc.service';
 
 const invoicingOptions: InvoicingOptions = {
@@ -91,7 +93,7 @@ let repo: Repository<Invoice, OmitStrict<Invoice, 'id'>>;
 
 describe('generateXml', () => {
     beforeAll(async () => {
-        await mkdir(testFileFolder, { recursive: true });
+        await FsUtilities.mkdir(testFileFolder);
         container = await new PostgreSqlContainer(POSTGRES_TEST_IMAGE)
             .withDatabase('db')
             .withUsername('postgres')
@@ -153,6 +155,6 @@ describe('generateXml', () => {
 
         const xml: XML = await conformanceService.generateXml(invoice);
         const xmlString: string = xml.end({ prettyPrint: true });
-        await writeFile(path.join(testFileFolder, 'peppol.xml'), xmlString);
+        await FsUtilities.upsertFile(FsUtilities.getPath(testFileFolder, 'peppol.xml'), xmlString);
     });
 });

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

@@ -1,4 +1,4 @@
-import { Injectable } from '../../../../../di';
+import { Injectable } from '../../../../../di/decorators/injectable.decorator';
 import { InvoiceConformance } from '../invoice-conformance-service.interface';
 import { EN16931ConformanceService, EN16931DocumentContextId } from './en16931-conformance.service';
 

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

@@ -1,19 +1,21 @@
-
-import { mkdir, writeFile } from 'fs/promises';
-import path from 'path';
-
 import { afterAll, beforeAll, describe, it } from '@jest/globals';
 import { PostgreSqlContainer } from '@testcontainers/postgresql';
 import { StartedTestContainer } from 'testcontainers';
 
 import { XRechnungConformanceService } from './x-rechnung-conformance.service';
-import { POSTGRES_TEST_IMAGE, testFileFolder } from '../../../../../__testing__';
-import { DataSource, MigrationEntity, Repository, PostgresDataSource, PostgresOptions } from '../../../../../data-source';
-import { XML } 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 { XML } from '../../../../../document/xml.utilities';
 import { BaseEntity } from '../../../../../entity/base-entity.model';
-import { Newable, OmitStrict } from '../../../../../types';
-import { Ms } from '../../../../../utilities';
-import { InvoicingOptions, Invoice } from '../../../models';
+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';
 import { InvoiceCalcService } from '../../invoice-calc.service';
 
 const invoicingOptions: InvoicingOptions = {
@@ -91,7 +93,7 @@ let repo: Repository<Invoice, OmitStrict<Invoice, 'id'>>;
 
 describe('generateXml', () => {
     beforeAll(async () => {
-        await mkdir(testFileFolder, { recursive: true });
+        await FsUtilities.mkdir(testFileFolder);
         container = await new PostgreSqlContainer(POSTGRES_TEST_IMAGE)
             .withDatabase('db')
             .withUsername('postgres')
@@ -153,6 +155,6 @@ describe('generateXml', () => {
 
         const xml: XML = await conformanceService.generateXml(invoice);
         const xmlString: string = xml.end({ prettyPrint: true });
-        await writeFile(path.join(testFileFolder, 'xrechnung.xml'), xmlString);
+        await FsUtilities.upsertFile(FsUtilities.getPath(testFileFolder, 'xrechnung.xml'), xmlString);
     });
 });

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

@@ -1,4 +1,4 @@
-import { Injectable } from '../../../../../di';
+import { Injectable } from '../../../../../di/decorators/injectable.decorator';
 import { InvoiceConformance } from '../invoice-conformance-service.interface';
 import { EN16931ConformanceService, EN16931DocumentContextId } from './en16931-conformance.service';
 

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

@@ -1,5 +1,5 @@
-import { PdfDocument, PdfDocumentDefinition } from '../../../../document';
-import { Invoice as BaseInvoice } from '../../models';
+import { PdfDocument, PdfDocumentDefinition } from '../../../../document/pdf.utilities';
+import { Invoice as BaseInvoice } from '../../models/invoice.model';
 
 /**
  * Defines the different conformance types.

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

@@ -1,6 +1,8 @@
 
-import { BigNumber } from '../../../utilities';
-import { Invoice as BaseInvoice, InvoiceItem, Vat } from '../models';
+import { BigNumber } from '../../../utilities/big-number.utilities';
+import { InvoiceItem } from '../models/invoice-item.model';
+import { Invoice as BaseInvoice } from '../models/invoice.model';
+import { Vat } from '../models/vat.model';
 
 /**
  * Handles calculating anything regarding invoices.

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

@@ -1,7 +1,8 @@
 import { describe, expect, it } from '@jest/globals';
 
-import { Invoice, InvoiceItem } from '../models';
 import { InvoiceCalcService } from './invoice-calc.service';
+import { InvoiceItem } from '../models/invoice-item.model';
+import { Invoice } from '../models/invoice.model';
 
 const invoiceItem: InvoiceItem = {
     name: '',

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

@@ -1,7 +1,9 @@
 
-import { BigNumber, BigNumberUtilities } from '../../../utilities';
-import { Invoice as BaseInvoice, Invoice, InvoiceItem, Vat } from '../models';
 import { InvoiceCalcServiceInterface } from './invoice-calc-service.interface';
+import { BigNumberUtilities } from '../../../utilities/big-number.utilities';
+import { InvoiceItem } from '../models/invoice-item.model';
+import { Invoice as BaseInvoice, Invoice } from '../models/invoice.model';
+import { Vat } from '../models/vat.model';
 
 /**
  * Default implementation of the invoice calculation service.

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

@@ -1,5 +1,5 @@
-import { Transaction } from '../../../data-source';
-import { InvoiceAddress } from '../models';
+import { Transaction } from '../../../data-source/transaction/transaction.model';
+import { InvoiceAddress } from '../models/invoice-address.model';
 
 /**
  * Handles generating unique and consecutive numbers for invoices.