@wolkabout/commons 0.0.44 → 0.0.46

package/fesm2022/wolkabout-commons.mjs

@@ -65,7 +65,7 @@ import { MatTabsModule } from '@angular/material/tabs';
 import * as i32 from '@angular/cdk/drag-drop';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import * as i0 from '@angular/core';
-import { NgModule, InjectionToken, inject, Injectable, EnvironmentInjector, runInInjectionContext, DOCUMENT, Inject, Input, Directive, forwardRef, HostListener, TemplateRef, PLATFORM_ID, Pipe, ViewChild, ContentChild, Optional, Self, Component, input, computed, untracked, signal, viewChild, afterNextRender, effect, output, afterRenderEffect, contentChild } from '@angular/core';
+import { NgModule, InjectionToken, inject, Injectable, Injector, runInInjectionContext, DOCUMENT, Inject, Input, Directive, forwardRef, HostListener, TemplateRef, PLATFORM_ID, Pipe, ViewChild, ContentChild, Optional, Self, Component, input, computed, untracked, signal, viewChild, afterNextRender, effect, output, afterRenderEffect, contentChild } from '@angular/core';
 import { BehaviorSubject, catchError, of, switchMap, EMPTY, tap, filter, map, combineLatestWith, forkJoin, from, distinctUntilChanged, shareReplay, merge, Subject, takeUntil, combineLatest, take, first } from 'rxjs';
 import { jwtDecode } from 'jwt-decode';
 import { loadRemoteModule } from '@angular-architects/native-federation';
@@ -512,7 +512,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.0", ngImpor
         }] });
 
 class FeatureRegistry {
-    injector = inject(EnvironmentInjector);
+    injector = inject(Injector);
     loadedFeatures = [];
     _features$ = new BehaviorSubject([]);
     /**
@@ -529,28 +529,24 @@ class FeatureRegistry {
     loadExternalFeatures(features) {
         if (!features || features.length === 0) {
             this.noExternalModules();
+            return;
         }
         forkJoin(features.map((feature) => from(loadRemoteModule(feature.remote, feature.feature)).pipe(map(module => module.default), catchError((error) => {
             console.warn("Unable to load: ", feature.remote + '/' + feature.feature, error);
             return of(null);
         })))).subscribe((results) => {
-            runInInjectionContext(this.injector, () => {
-                results.forEach((feature) => {
-                    if (feature) {
-                        this.initiateFeature(feature);
-                    }
-                });
+            results.forEach((feature) => {
+                if (feature) {
+                    this.registerFeature(feature);
+                }
             });
             this._features$.next([...this.loadedFeatures]);
         });
     }
     registerFeature(feature) {
-        runInInjectionContext(this.injector, () => this.initiateFeature(feature));
-    }
-    initiateFeature(feature) {
         this.loadedFeatures.push(feature);
         if (feature.init) {
-            feature.init();
+            runInInjectionContext(this.injector, feature.init);
         }
         console.info('Loaded feature: ', feature.name);
     }