@acontplus/ng-infrastructure 1.0.7 → 1.1.0

package/fesm2022/acontplus-ng-infrastructure.mjs

@@ -1,15 +1,14 @@
-import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injectable, signal, computed } from '@angular/core';
 import { HttpContextToken, HttpResponse, HttpContext, HttpClient } from '@angular/common/http';
+import * as i0 from '@angular/core';
+import { inject, Injectable, signal, computed, InjectionToken } from '@angular/core';
 import { retry, map, catchError, finalize } from 'rxjs/operators';
 import { throwError, catchError as catchError$1, switchMap, lastValueFrom } from 'rxjs';
 import { NotificationService } from '@acontplus/ng-notifications';
+import { AUTH_TOKEN, ENVIRONMENT, DEFAULT_CONFIG as DEFAULT_CONFIG$1 } from '@acontplus/ng-config';
 import { Router } from '@angular/router';
 import { v4 } from 'uuid';
-import { ENVIRONMENT } from '@acontplus/ng-config';
 import { OverlayService } from '@acontplus/ng-components';
-
-const TOKEN_PROVIDER = new InjectionToken('TOKEN_PROVIDER');
+import { CORE_CONFIG } from '@acontplus/ng-config/src/lib/tokens/core-config-token';
 
 // A token to use with HttpContext for skipping notifications on specific requests.
 const SKIP_NOTIFICATION = new HttpContextToken(() => false);
@@ -17,7 +16,7 @@ const SKIP_NOTIFICATION = new HttpContextToken(() => false);
 const SHOW_NOTIFICATIONS = new HttpContextToken(() => undefined);
 const apiInterceptor = (req, next) => {
     const toastr = inject(NotificationService);
-    const tokenProvider = inject(TOKEN_PROVIDER, { optional: true });
+    const tokenProvider = inject(AUTH_TOKEN, { optional: true });
     // Add authorization header if token is available
     let modifiedReq = req;
     const token = tokenProvider?.getToken();
@@ -312,17 +311,17 @@ class LoggingService {
         // e.g., Sentry, LogRocket, etc.
         // This is a placeholder for production logging implementation
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: LoggingService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: LoggingService, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: LoggingService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
         }] });
 
-class TenantService {
+class TenantInfo {
     tenantId = null;
     logger = inject(LoggingService);
     getTenantId() {
@@ -361,17 +360,17 @@ class TenantService {
         localStorage.removeItem('tenantId');
         sessionStorage.removeItem('tenantId');
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: TenantService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: TenantService, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TenantInfo, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TenantInfo, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: TenantService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TenantInfo, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
         }] });
 
-class CorrelationService {
+class CorrelationInfo {
     correlationId = signal(null, ...(ngDevMode ? [{ debugName: "correlationId" }] : []));
     CORRELATION_KEY = 'correlation-id';
     // Signal-based getter for reactive updates
@@ -396,10 +395,10 @@ class CorrelationService {
     getId() {
         return this.getOrCreateCorrelationId();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: CorrelationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: CorrelationService, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: CorrelationInfo, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: CorrelationInfo, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: CorrelationService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: CorrelationInfo, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -421,7 +420,7 @@ function withCustomHeaders(headers) {
     return new HttpContext().set(CUSTOM_HEADERS, headers);
 }
 // Default configuration
-const DEFAULT_CONFIG$1 = {
+const DEFAULT_CONFIG = {
     enableCorrelationTracking: true,
     enableRequestLogging: false, // This will be overridden by environment.isProduction
     enableErrorLogging: true,
@@ -439,18 +438,18 @@ const DEFAULT_CONFIG$1 = {
 };
 // Injection token for configuration - FIXED
 const HTTP_CONTEXT_CONFIG = new InjectionToken('HTTP_CONTEXT_CONFIG', {
-    factory: () => DEFAULT_CONFIG$1, // Provide a default factory in case it's not provided
+    factory: () => DEFAULT_CONFIG, // Provide a default factory in case it's not provided
 });
 const httpContextInterceptor = (req, next) => {
-    const tokenProvider = inject(TOKEN_PROVIDER, { optional: true });
+    const tokenProvider = inject(AUTH_TOKEN, { optional: true });
     const router = inject(Router);
-    const tenantService = inject(TenantService);
-    const correlationService = inject(CorrelationService);
+    const tenantService = inject(TenantInfo);
+    const correlationService = inject(CorrelationInfo);
     const loggingService = inject(LoggingService);
     const environment = inject(ENVIRONMENT);
     // Get configuration (with fallback to default) - FIXED
     const config = {
-        ...DEFAULT_CONFIG$1,
+        ...DEFAULT_CONFIG,
         // The default enableRequestLogging needs to be set based on environment here,
         // as it's dynamic, and DEFAULT_CONFIG is static.
         enableRequestLogging: !environment.isProduction,
@@ -640,7 +639,7 @@ const httpContextInterceptor = (req, next) => {
 // Helper function to create configuration
 function createHttpContextConfig(overrides = {}) {
     return {
-        ...DEFAULT_CONFIG$1,
+        ...DEFAULT_CONFIG,
         ...overrides,
     };
 }
@@ -683,10 +682,10 @@ class ActiveRequestsTracker {
             requests.splice(index, 1);
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: ActiveRequestsTracker, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: ActiveRequestsTracker, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: ActiveRequestsTracker, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: ActiveRequestsTracker, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: ActiveRequestsTracker, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: ActiveRequestsTracker, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -741,10 +740,10 @@ class BaseHttpRepository {
     delete(path = '') {
         return this.http.delete(this.buildUrl(path));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: BaseHttpRepository, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: BaseHttpRepository });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: BaseHttpRepository, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: BaseHttpRepository });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: BaseHttpRepository, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: BaseHttpRepository, decorators: [{
             type: Injectable
         }] });
 
@@ -788,10 +787,10 @@ class GenericRepository extends BaseHttpRepository {
         }
         return params;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: GenericRepository, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: GenericRepository });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: GenericRepository, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: GenericRepository });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: GenericRepository, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: GenericRepository, decorators: [{
             type: Injectable
         }], ctorParameters: () => [] });
 class SearchableGenericRepository extends GenericRepository {
@@ -800,10 +799,10 @@ class SearchableGenericRepository extends GenericRepository {
         const params = this.buildParams(pagination, searchFilters);
         return this.get('search', params);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: SearchableGenericRepository, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: SearchableGenericRepository });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: SearchableGenericRepository, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: SearchableGenericRepository });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: SearchableGenericRepository, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: SearchableGenericRepository, decorators: [{
             type: Injectable
         }] });
 
@@ -846,10 +845,10 @@ class RepositoryFactory {
             remove: (id) => this.http.delete(buildUrl(idToString(id))),
         };
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: RepositoryFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: RepositoryFactory, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: RepositoryFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: RepositoryFactory, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: RepositoryFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: RepositoryFactory, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -899,35 +898,10 @@ class AngularHttpAdapter {
     }
 }
 
-// Default configuration
-const DEFAULT_CONFIG = {
-    apiBaseUrl: '',
-    apiTimeout: 30000,
-    retryAttempts: 2,
-    retryDelay: 1000,
-    enableCorrelationTracking: true,
-    enableRequestLogging: false,
-    enableErrorLogging: true,
-    enableToastNotifications: true,
-    includeAuthToken: true,
-    authTokenHeader: 'Authorization',
-    enableMultiTenancy: true,
-    tenantIdHeader: 'Tenant-Id',
-    logLevel: 'info',
-    enableConsoleLogging: true,
-    customHeaders: {},
-    excludeUrls: [],
-    excludeMethods: [],
-};
-// Injection token for configuration
-const CORE_CONFIG = new InjectionToken('CORE_CONFIG', {
-    factory: () => DEFAULT_CONFIG,
-});
 class CoreConfigService {
     config;
     environment = inject(ENVIRONMENT);
     constructor() {
-        // Initialize with default config and environment overrides
         this.config = this.initializeConfig();
     }
     /**
@@ -936,9 +910,9 @@ class CoreConfigService {
     initializeConfig() {
         const injectedConfig = inject(CORE_CONFIG, { optional: true });
         return {
-            ...DEFAULT_CONFIG,
+            ...DEFAULT_CONFIG$1,
             // Environment overrides
-            apiBaseUrl: this.environment.apiBaseUrl || DEFAULT_CONFIG.apiBaseUrl,
+            apiBaseUrl: this.environment.apiBaseUrl || DEFAULT_CONFIG$1.apiBaseUrl,
             enableRequestLogging: !this.environment.isProduction,
             // Injected config overrides
             ...injectedConfig,
@@ -1006,10 +980,10 @@ class CoreConfigService {
     resetConfig() {
         this.config = this.initializeConfig();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: CoreConfigService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: CoreConfigService, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: CoreConfigService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: CoreConfigService, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: CoreConfigService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: CoreConfigService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1027,7 +1001,7 @@ function provideCoreConfig(config = {}) {
 // Helper function to create configuration
 function createCoreConfig(overrides = {}) {
     return {
-        ...DEFAULT_CONFIG,
+        ...DEFAULT_CONFIG$1,
         ...overrides,
     };
 }
@@ -1076,5 +1050,5 @@ class Query extends BaseUseCase {
  * Generated bundle index. Do not edit.
  */
 
-export { ActiveRequestsTracker, AngularHttpAdapter, BaseHttpRepository, BaseUseCase, CORE_CONFIG, Command, CoreConfigService, CorrelationService, GenericRepository, HTTP_CONTEXT_CONFIG, LoggingService, Query, REPOSITORY_CONFIG, RepositoryFactory, SHOW_NOTIFICATIONS, SKIP_NOTIFICATION, SearchableGenericRepository, TOKEN_PROVIDER, apiInterceptor, createCoreConfig, createHttpContextConfig, customUrl, httpContextInterceptor, provideCoreConfig, provideHttpContext, skipContextHeaders, spinnerInterceptor, withCustomHeaders, withoutSpinner };
+export { ActiveRequestsTracker, AngularHttpAdapter, BaseHttpRepository, BaseUseCase, Command, CoreConfigService, CorrelationInfo, GenericRepository, HTTP_CONTEXT_CONFIG, LoggingService, Query, REPOSITORY_CONFIG, RepositoryFactory, SHOW_NOTIFICATIONS, SKIP_NOTIFICATION, SearchableGenericRepository, apiInterceptor, createCoreConfig, createHttpContextConfig, customUrl, httpContextInterceptor, provideCoreConfig, provideHttpContext, skipContextHeaders, spinnerInterceptor, withCustomHeaders, withoutSpinner };
 //# sourceMappingURL=acontplus-ng-infrastructure.mjs.map