zibri 2.2.0 → 2.2.1

package/src/index.ts

@@ -1,42 +1,433 @@
 // eslint-disable-next-line eslintImport/no-unassigned-import
 import 'reflect-metadata';
 
+// application
 export * from './application';
 export * from './application-options.model';
-export * from './auth';
-export * from './di';
-export * from './routing';
-export * from './error-handling';
-export * from './assets';
-export * from './global';
-export * from './logging';
-export * from './open-api';
-export * from './entity';
+
+// auth
+export * from './auth/decorators/auth.decorator';
+export * from './auth/decorators/user-repo.decorator';
+export * from './auth/decorators/current-user.decorator';
+
+export * from './auth/models/is-logged-in-metadata.model';
+export * from './auth/models/base-user.model';
+export * from './auth/models/user-repositories.model';
+export * from './auth/models/has-role-metadata.model';
+export * from './auth/models/is-not-logged-in-metadata.model';
+export * from './auth/models/belongs-to-metadata.model';
+export * from './auth/models/skip-auth-metadata.model';
+export * from './auth/models/password-reset-token.model';
+export * from './auth/models/require-2fa-metadata.model';
+
+export * from './auth/auth-service.interface';
+export * from './auth/auth.service';
+export * from './auth/hash.utilities';
+export * from './auth/auth-controller.interface';
+
+export * from './auth/strategies/jwt/jwt-access-token-payload.model';
+export * from './auth/strategies/jwt/jwt.auth-strategy';
+export * from './auth/strategies/jwt/jwt.utilities';
+export * from './auth/strategies/jwt/encoded-jwt-access-token.model';
+export * from './auth/strategies/jwt/jwt-credentials.model';
+export * from './auth/strategies/jwt/jwt-auth-data.model';
+export * from './auth/strategies/jwt/jwt.model';
+export * from './auth/strategies/jwt/jwt-refresh-token-payload.model';
+export * from './auth/strategies/jwt/jwt-refresh-token.model';
+export * from './auth/strategies/jwt/jwt-request-password-reset-data.model';
+export * from './auth/strategies/jwt/jwt-confirm-password-reset-data.model';
+export * from './auth/strategies/jwt/jwt-auth.controller';
+
+export * from './auth/strategies/auth-strategy.interface';
+export * from './auth/strategies/auth-strategies.model';
+
+export * from './auth/user/user-repository.interface';
+export * from './auth/user/user-service.interface';
+export * from './auth/user/user.service';
+
+export * from './auth/2fa/two-factor-service.interface';
+export * from './auth/2fa/two-factor.service';
+export * from './auth/2fa/two-factor-methods.model';
+
+export * from './auth/2fa/methods/two-factor-method.interface';
+export * from './auth/2fa/methods/otp/otp.two-factor-method';
+export * from './auth/2fa/methods/otp/otp-credentials.model';
+export * from './auth/2fa/methods/otp/otp.utilities';
+
+// di
+export * from './di/decorators/injectable.decorator';
+export * from './di/decorators/inject.decorator';
+export * from './di/decorators/inject-repository.decorator';
+
+export * from './di/models/di-token.model';
+export * from './di/models/di-provider.model';
+export * from './di/models/injection-token.model';
+
+export * from './di/default/zibri-di-tokens.default';
+
+export * from './di/inject.function';
+
+export * from './di/errors/get-dependency-stack-trace.function';
+export * from './di/errors/no-provider.error';
+
+// routing
+export * from './routing/router';
+export * from './routing/router.interface';
+export * from './routing/controller-route-configuration.model';
+export * from './routing/route-configuration.model';
+
+export * from './routing/decorators/controller.decorator';
+export * from './routing/decorators/get.decorator';
+export * from './routing/decorators/post.decorator';
+export * from './routing/decorators/delete.decorator';
+export * from './routing/decorators/patch.decorator';
+export * from './routing/decorators/param.decorator';
+export * from './routing/decorators/body.decorator';
+
+export * from './routing/models/string-param-metadata.model';
+export * from './routing/models/number-param-metadata.model';
+export * from './routing/models/boolean-param-metadata.model';
+export * from './routing/models/date-param-metadata.model';
+export * from './routing/models/object-param-metadata.model';
+export * from './routing/models/array-param-metadata.model';
+export * from './routing/models/crud-controller.model';
+
+export * from './routing/request.context';
+
+// error handling
+export * from './error-handling/error-handler';
+export * from './error-handling/error-handler.model';
+export * from './error-handling/is-error.function';
+
+export * from './error-handling/errors/http.error';
+export * from './error-handling/errors/internal-server.error';
+export * from './error-handling/errors/not-found.error';
+export * from './error-handling/errors/unmatched-route.error';
+export * from './error-handling/errors/bad-request.error';
+export * from './error-handling/errors/validation.error';
+export * from './error-handling/errors/unauthorized.error';
+export * from './error-handling/errors/too-many-requests.error';
+export * from './error-handling/errors/conflict.error';
+export * from './error-handling/errors/missing-entities.error';
+export * from './error-handling/errors/content-too-large.error';
+
+// assets
+export * from './assets/asset-service.interface';
+export * from './assets/asset.service';
+
+// global
+export * from './global/global-registry';
+
+// logging
+export * from './logging/logger.interface';
+export * from './logging/logger';
+export * from './logging/log.model';
+export * from './logging/log-level.enum';
+export * from './logging/logged-error.model';
+export * from './logging/error-to-logged-error.function';
+
+export * from './logging/transport/logger-transport.model';
+
+// openapi
+export * from './open-api/open-api.service';
+export * from './open-api/open-api-service.interface';
+export * from './open-api/open-api.model';
+export * from './open-api/pagination-result.model';
+
+export * from './open-api/decorators/response.decorator';
+
+// entity
+export * from './entity/omit-class.model';
+export * from './entity/intersection-class.model';
+export * from './entity/partial-class.model';
+export * from './entity/pick-class.model';
+export * from './entity/any-object.model';
 export * from './entity/base-entity.model';
+
+export * from './entity/decorators/entity.decorator';
+export * from './entity/decorators/property.decorator';
+
+export * from './entity/models/string-property-metadata.model';
+export * from './entity/models/number-property-metadata.model';
+export * from './entity/models/object-property-metadata.model';
+export * from './entity/models/array-property-metadata.model';
+export * from './entity/models/date-property-metadata.model';
+export * from './entity/models/boolean-property-metadata.model';
+export * from './entity/models/many-to-one-property-metadata.model';
+export * from './entity/models/one-to-many-property-metadata.model';
+export * from './entity/models/one-to-one-property-metadata.model';
+export * from './entity/models/many-to-many-property-metadata.model';
+export * from './entity/models/relation.enum';
+export * from './entity/models/unknown-property-metadata.model';
 export * from './entity/models/file-property-metadata.model';
-export * from './parsing';
-export * from './http';
-export * from './validation';
-export * from './data-source';
-export * from './cron';
-export * from './email';
-export * from './rate-limiting';
-export * from './handlebars';
-export * from './metrics';
-export * from './change-sets';
-export * from './plugin';
-export * from './localization';
-export * from './multithreading';
-export * from './websocket';
-export * from './backup';
-export * from './http-client';
 
+export * from './entity/generation/generate-entity-files.function';
+export * from './entity/generation/providers/entity-generation-provider.interface';
+export * from './entity/generation/providers/open-api-url.provider';
+export * from './entity/generation/providers/open-api-file.provider';
+
+// parsing
+export * from './parsing/body-parser.interface';
+export * from './parsing/parser';
+export * from './parsing/parser.interface';
+
+export * from './parsing/decorators/body-parser.decorator';
+
+export * from './parsing/json/json.body-parser';
+export * from './parsing/html/html-response.model';
+export * from './parsing/form-data/form-data.body-parser';
+export * from './parsing/form-data/form-data.model';
+export * from './parsing/form-data/file.model';
+export * from './parsing/form-data/file-response.model';
+
+// http
+export * from './http/http-method.enum';
+export * from './http/http-status.enum';
+export * from './http/mime-type.enum';
+export * from './http/known-header.enum';
+export * from './http/header.type';
+export * from './http/http-request.model';
+export * from './http/http-response.model';
+export * from './http/mime-type.helpers';
+
+// validation
+export * from './validation/validation-problem.model';
+export * from './validation/validation-service.interface';
+export * from './validation/validation.service';
+
+// data source
+export * from './data-source/data-source.service';
+export * from './data-source/data-source-service.interface';
+export * from './data-source/repository';
+export * from './data-source/query-failed.error';
+
+export * from './data-source/decorators/data-source.decorator';
+
+export * from './data-source/data-sources/data-source.interface';
+export * from './data-source/data-sources/postgres-data-source.model';
+
+export * from './data-source/transaction/transaction.model';
+
+export * from './data-source/models/data-source-options.model';
+export * from './data-source/models/column-type.model';
+
+export * from './data-source/models/options/base-repository-options.model';
+export * from './data-source/models/options/create-options.model';
+export * from './data-source/models/options/create-all-options.model';
+export * from './data-source/models/options/delete-all-options.model';
+export * from './data-source/models/options/delete-by-id-options.model';
+export * from './data-source/models/options/find-all-options.model';
+export * from './data-source/models/options/find-all-paginated-options.model';
+export * from './data-source/models/options/find-by-id-options.model';
+export * from './data-source/models/options/find-one-options.model';
+export * from './data-source/models/options/update-all-options.model';
+export * from './data-source/models/options/update-by-id-options.model';
+export * from './data-source/models/options/count-options.model';
+
+export * from './data-source/models/where/where-filter.model';
+export * from './data-source/models/where/array-where-filter.model';
+export * from './data-source/models/where/boolean-where-filter.model';
+export * from './data-source/models/where/date-where-filter.model';
+export * from './data-source/models/where/number-where-filter.model';
+export * from './data-source/models/where/object-where-filter.model';
+export * from './data-source/models/where/string-where-filter.model';
+
+export * from './data-source/migration/migration.model';
+export * from './data-source/migration/migration-entity.model';
+
+// cron
+export * from './cron/cron-job-entity.model';
+export * from './cron/cron-job.model';
+export * from './cron/cron-service.interface';
+export * from './cron/cron.service';
+
+// email
+export * from './email/email-service.interface';
+export * from './email/email.service';
+
+export * from './email/models/email-attachment.model';
+export * from './email/models/email.model';
+export * from './email/models/email-status.enum';
+export * from './email/models/email-priority.enum';
+export * from './email/models/create-email-data.model';
+export * from './email/models/email-config.model';
+
+// mailing list
+export * from './email/mailing-list/mailing-list-service.interface';
+export * from './email/mailing-list/mailing-list.service';
+
+export * from './email/mailing-list/models/mailing-list-subscriber.model';
+export * from './email/mailing-list/models/mailing-list.model';
+export * from './email/mailing-list/models/mailing-list-subscription-confirmation-token.model';
+export * from './email/mailing-list/models/update-mailing-list-preferences.model';
+
+// rate limiting
+export * from './rate-limiting/rate-limiter';
+
+// handlebars
+export * from './handlebars/generate-handlebar-type-files.function';
+export * from './handlebars/render-template.function';
+export * from './handlebars/handlebar.utilities';
+
+// preact
+export * from './preact/preact.utilities';
+export * from './preact/preact-component.model';
+export * from './preact/generate-client-scripts.function';
+
+export * from './preact/hooks/on-client.hook';
+export * from './preact/hooks/on-server.hook';
+
+// metrics
+export * from './metrics/metrics-service.interface';
+export * from './metrics/metrics.service';
+export * from './metrics/counter.interface';
+export * from './metrics/gauge.interface';
+export * from './metrics/histogram.interface';
+export * from './metrics/metric-type.enum';
+export * from './metrics/metric.model';
+
+// change sets
+export * from './change-sets/change-set-repository';
+export * from './change-sets/soft-delete-repository';
+
+export * from './change-sets/models/change-set-entity.model';
+export * from './change-sets/models/change-set-type.enum';
+export * from './change-sets/models/change-set.model';
+export * from './change-sets/models/change.model';
+export * from './change-sets/models/soft-delete-entity.model';
+export * from './change-sets/models/soft-delete-find-all-options.model';
+export * from './change-sets/models/soft-delete-find-by-id-options.model';
+export * from './change-sets/models/soft-delete-find-one-options.model';
+export * from './change-sets/models/soft-delete-where.model';
+export * from './change-sets/models/soft-delete-find-all-paginated-options.model';
+export * from './change-sets/models/soft-delete-update-all-options.model';
+export * from './change-sets/models/soft-delete-update-by-id-options.model';
+
+// document
+export * from './document/pdf.utilities';
+export * from './document/xml.utilities';
+
+// plugin
+export * from './plugin/plugin.model';
+
+// plugin invoicing
+export * from './plugin/invoicing/invoicing.plugin';
+export * from './plugin/invoicing/invoicing.tokens';
+
+export * from './plugin/invoicing/services/invoice-number-service.interface';
+export * from './plugin/invoicing/services/invoice-number.service';
+export * from './plugin/invoicing/services/invoice-pdf-service.interface';
+export * from './plugin/invoicing/services/invoice-pdf.service';
+export * from './plugin/invoicing/services/invoice-calc-service.interface';
+export * from './plugin/invoicing/services/invoice-calc.service';
+
+export * from './plugin/invoicing/services/conformance/invoice-conformance-service.interface';
+export * from './plugin/invoicing/services/conformance/en16931/x-rechnung-conformance.service';
+export * from './plugin/invoicing/services/conformance/en16931/en16931-conformance.service';
+export * from './plugin/invoicing/services/conformance/en16931/peppol-conformance.service';
+
+export * from './plugin/invoicing/models/invoicing-options.model';
+export * from './plugin/invoicing/models/invoice-address.model';
+export * from './plugin/invoicing/models/amount-unit.model';
+export * from './plugin/invoicing/models/number-invoices.model';
+export * from './plugin/invoicing/models/invoice.model';
+export * from './plugin/invoicing/models/invoice-item.model';
+export * from './plugin/invoicing/models/invoicing-options-input.model';
+export * from './plugin/invoicing/models/vat.model';
+export * from './plugin/invoicing/models/company-info.model';
+
+// plugin payment
+export * from './plugin/payment/payment.plugin';
+export * from './plugin/payment/payment.tokens';
+
+export * from './plugin/payment/models/payment-plugin-options-input.model';
+export * from './plugin/payment/models/payment-plugin-options.model';
+export * from './plugin/payment/models/payment-method.model';
+export * from './plugin/payment/models/payment.model';
+export * from './plugin/payment/models/payment-status.enum';
+
+export * from './plugin/payment/services/payment-service.interface';
+export * from './plugin/payment/services/payment-service.types';
+export * from './plugin/payment/services/payment.service';
+
+export * from './plugin/payment/providers/payment-provider.interface';
+
+export * from './plugin/payment/providers/pay-pal/pay-pal.payment-provider';
+
+// localization
+export * from './localization/formatting/format-date-fn.model';
+export * from './localization/formatting/format-percent-fn.model';
+export * from './localization/formatting/format-price-fn.model';
+
+export * from './localization/models/currency-code.model';
+export * from './localization/models/language-code.model';
+export * from './localization/models/localize-options.model';
+
+// multithreading
+export * from './multithreading/models/multithreading-options.model';
+export * from './multithreading/models/thread-job-message.model';
+export * from './multithreading/models/thread-job-status.enum';
+export * from './multithreading/models/base-thread-job-worker-data.model';
+export * from './multithreading/models/thread-job-data.model';
+export * from './multithreading/models/thread-job-function.model';
+export * from './multithreading/models/thread-job-entity.model';
+
+export * from './multithreading/services/multithreading-service.interface';
+export * from './multithreading/services/multithreading.service';
+export * from './multithreading/services/thread-job';
+export * from './multithreading/services/thread-job-worker';
+export * from './multithreading/services/worker/helpers';
+
+// websocket
+export * from './websocket/services/websocket-service.interface';
+export * from './websocket/services/websocket.service';
+
+export * from './websocket/models/websocket-controller-route-configuration.model';
+export * from './websocket/models/websocket-request.model';
+export * from './websocket/models/websocket-response.model';
+export * from './websocket/models/websocket-event.enum';
+export * from './websocket/models/websocket-channel.model';
+export * from './websocket/models/websocket-channel.model';
+export * from './websocket/models/websocket-message.model';
+export * from './websocket/models/websocket-options.model';
+
+export * from './websocket/models/connection/base-websocket-connection.model';
+export * from './websocket/models/connection/socket-io-websocket-connection.model';
+
+export * from './websocket/decorators/websocket-body.decorator';
+export * from './websocket/decorators/websocket-controller.decorator';
+export * from './websocket/decorators/websocket-route.decorator';
+export * from './websocket/decorators/current-websocket-connection.decorator';
+
+// backup
+export * from './backup/backup-entity.model';
+export * from './backup/backup.service';
+export * from './backup/backup-service.interface';
+export * from './backup/backup-resource.interface';
+export * from './backup/backup-resource-entity.model';
+
+export * from './backup/transports/backup-transport.interface';
+export * from './backup/transports/fs.backup-transport';
+
+export * from './backup/decorators/backup-resource-metadata.model';
+export * from './backup/decorators/backup-resource.decorator';
+
+// http client
+export * from './http-client/http-client';
+export * from './http-client/http-client.interface';
+export * from './http-client/http-client-response.model';
+
+// types
 export * from './types/newable.type';
 export * from './types/version.type';
+
+// utilities
 export * from './utilities/compare-versions.function';
 export * from './utilities/is-version.function';
 export * from './utilities/promise.utilities';
 export * from './utilities/ms';
 export * from './utilities/big-number.utilities';
 export * from './utilities/validate-entities-registered.function';
-export * from './utilities/uuid.utilities';
+export * from './utilities/uuid.utilities';
+export * from './utilities/mask.utilities';
+export * from './utilities/fs.utilities';

package/src/localization/formatting/format-date-fn.model.ts

@@ -1,4 +1,4 @@
-import { LanguageCode } from '../models';
+import { LanguageCode } from '../models/language-code.model';
 
 /**
  * Function for formatting dates.

package/src/localization/formatting/format-date.function.ts

@@ -1,6 +1,7 @@
-import { inject, ZIBRI_DI_TOKENS } from '../../di';
-import { LanguageCode, LocalizeOptions } from '../models';
 import { FormatDateFn } from './format-date-fn.model';
+import { ZIBRI_DI_TOKENS } from '../../di/default/zibri-di-tokens.default';
+import { inject } from '../../di/inject.function';
+import { LanguageCode } from '../models/language-code.model';
 
 /**
  * Default implementation for formatting dates.
@@ -11,7 +12,7 @@ import { FormatDateFn } from './format-date-fn.model';
 export const formatDate: FormatDateFn = (
     date: Date,
     includeTime: boolean = false,
-    language: LanguageCode = inject<LocalizeOptions>(ZIBRI_DI_TOKENS.LOCALIZE_OPTIONS).language
+    language: LanguageCode = inject(ZIBRI_DI_TOKENS.LOCALIZE_OPTIONS).language
 ) => {
     if (includeTime) {
         return new Date(date).toLocaleDateString(

package/src/localization/formatting/format-price-fn.model.ts

@@ -1,5 +1,6 @@
-import { BigNumber } from '../../utilities';
-import { CurrencyCode, LanguageCode } from '../models';
+import { BigNumber } from '../../utilities/big-number.utilities';
+import { CurrencyCode } from '../models/currency-code.model';
+import { LanguageCode } from '../models/language-code.model';
 
 /**
  * Function for formatting prices.

package/src/localization/formatting/format-price.function.ts

@@ -1,7 +1,9 @@
 import { FormatPriceFn } from './format-price-fn.model';
-import { inject, ZIBRI_DI_TOKENS } from '../../di';
-import { BigNumber } from '../../utilities';
-import { CurrencyCode, LanguageCode, LocalizeOptions } from '../models';
+import { ZIBRI_DI_TOKENS } from '../../di/default/zibri-di-tokens.default';
+import { inject } from '../../di/inject.function';
+import { CurrencyCode } from '../models/currency-code.model';
+import { LanguageCode } from '../models/language-code.model';
+import { LocalizeOptions } from '../models/localize-options.model';
 
 /**
  * Default implementation for formatting prices.

package/src/logging/log-cleanup.cron-job.ts

@@ -1,8 +1,9 @@
-
-import { CronJob, InitialCronConfig } from '../cron';
-import { inject, Injectable, repositoryTokenFor } from '../di';
 import { Log } from './log.model';
-import { Repository } from '../data-source';
+import { CronJob, InitialCronConfig } from '../cron/cron-job.model';
+import { Repository } from '../data-source/repository';
+import { repositoryTokenFor } from '../di/decorators/inject-repository.decorator';
+import { Injectable } from '../di/decorators/injectable.decorator';
+import { inject } from '../di/inject.function';
 
 /**
  * CronJob that cleans up the temp folder of the form data body parser.

package/src/logging/log-context.model.ts

@@ -1,6 +1,7 @@
-import { Property } from '../entity';
-import { HttpMethod, HttpStatus } from '../http';
-import { OmitStrict } from '../types';
+import { Property } from '../entity/decorators/property.decorator';
+import { HttpMethod } from '../http/http-method.enum';
+import { HttpStatus } from '../http/http-status.enum';
+import { OmitStrict } from '../types/omit-strict.type';
 
 /**
  * Context information about a request that triggered a log.

package/src/logging/log.model.ts

@@ -1,8 +1,9 @@
-import { Entity, Property } from '../entity';
 import { LogContext } from './log-context.model';
 import { LogLevel } from './log-level.enum';
 import { LoggedError } from './logged-error.model';
 import { BaseEntity } from '../entity/base-entity.model';
+import { Entity } from '../entity/decorators/entity.decorator';
+import { Property } from '../entity/decorators/property.decorator';
 
 /**
  * The data saved for a log entry.

package/src/logging/logged-error.model.ts

@@ -1,4 +1,4 @@
-import { Property } from '../entity';
+import { Property } from '../entity/decorators/property.decorator';
 
 /**
  * A logged error.

package/src/logging/logger.ts

@@ -1,4 +1,3 @@
-import { Inject, ZIBRI_DI_TOKENS } from '../di';
 import { errorToLoggedError } from './error-to-logged-error.function';
 import { LogCleanupCronJob } from './log-cleanup.cron-job';
 import { LogContextInput } from './log-context.model';
@@ -6,9 +5,11 @@ import { LogLevel } from './log-level.enum';
 import { Log } from './log.model';
 import { LoggerInterface } from './logger.interface';
 import { ZibriApplication } from '../application';
-import { GlobalRegistry } from '../global';
-import { UUIDUtilities } from '../utilities';
 import { BaseLoggerTransportConfig, LoggerTransport } from './transport/logger-transport.model';
+import { Inject } from '../di/decorators/inject.decorator';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { GlobalRegistry } from '../global/global-registry';
+import { UUIDUtilities } from '../utilities/uuid.utilities';
 
 /**
  * Default logger implementation of Zibri.

package/src/logging/transport/log-to-db.function.ts

@@ -1,5 +1,6 @@
-import { Repository } from '../../data-source';
-import { inject, repositoryTokenFor } from '../../di';
+import { Repository } from '../../data-source/repository';
+import { repositoryTokenFor } from '../../di/decorators/inject-repository.decorator';
+import { inject } from '../../di/inject.function';
 import { Log } from '../log.model';
 
 /**

package/src/logging/transport/log-to-email.function.ts

@@ -1,9 +1,12 @@
-import { inject, ZIBRI_DI_TOKENS } from '../../di';
-import { Email, EmailPriority, EmailServiceInterface } from '../../email';
-import { GlobalRegistry } from '../../global';
-import { renderEmailTemplate } from '../../handlebars';
-import { FormatDateFn } from '../../localization';
-import { OmitStrict } from '../../types';
+import { ZIBRI_DI_TOKENS } from '../../di/default/zibri-di-tokens.default';
+import { inject } from '../../di/inject.function';
+import { EmailServiceInterface } from '../../email/email-service.interface';
+import { EmailPriority } from '../../email/models/email-priority.enum';
+import { Email } from '../../email/models/email.model';
+import { GlobalRegistry } from '../../global/global-registry';
+import { renderEmailTemplate } from '../../handlebars/render-template.function';
+import { FormatDateFn } from '../../localization/formatting/format-date-fn.model';
+import { OmitStrict } from '../../types/omit-strict.type';
 import { LogLevel } from '../log-level.enum';
 import { Log } from '../log.model';
 import { BaseLoggerTransportConfig, LoggerTransportSend } from './logger-transport.model';

package/src/metrics/metric.model.ts

@@ -1,5 +1,5 @@
-import { Property } from '../entity';
 import { MetricType } from './metric-type.enum';
+import { Property } from '../entity/decorators/property.decorator';
 
 /**
  * A single recorded measurement.

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

@@ -1,9 +1,10 @@
 import { ZibriApplication } from '../application';
-import { HttpRequest, HttpResponse } from '../http';
 import { CounterInterface } from './counter.interface';
 import { GaugeInterface } from './gauge.interface';
 import { HistogramInterface } from './histogram.interface';
 import { Metric } from './metric.model';
+import { HttpRequest } from '../http/http-request.model';
+import { HttpResponse } from '../http/http-response.model';
 
 /**
  * Name of a counter metric.