@wolkabout/commons 0.0.39 → 0.0.41

package/fesm2022/wolkabout-commons.mjs

@@ -66,7 +66,7 @@ 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, 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, from, distinctUntilChanged, shareReplay, merge, Subject, takeUntil, combineLatest, take, first } from 'rxjs';
+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';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
@@ -513,46 +513,39 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.0", ngImpor
 
 class FeatureRegistry {
     injector = inject(Injector);
-    features = []; // Temporary holder, until all features are loaded.
+    loadedFeatures = [];
     _features$ = new BehaviorSubject([]);
-    expectedFeatures = null;
     /**
-     * Set the expected number of features.
-     * The features$ will output the value only after this many features were (successfully or unsuccessfully) loaded.
-     * If this isn't set, the registration of the feature will output values every time.
+     * Call when deploying a standalone app or when there are no external modules to load.
+     * Immediately emits the currently registered features.
      */
-    setExpectedFeatures(expectedFeatures) {
-        this.expectedFeatures = expectedFeatures;
+    noExternalModules() {
+        this._features$.next([...this.loadedFeatures]);
     }
+    /**
+     * Call when deploying a host application.
+     * Emits the registered features once all external modules loaded (successfully or unsuccessfully).
+     */
     loadExternalFeatures(features) {
-        features.forEach((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((feature) => {
+        if (!features || features.length === 0) {
+            this.noExternalModules();
+        }
+        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) => {
+            results.forEach((feature) => {
                 if (feature) {
                     this.registerFeature(feature);
                 }
-                else {
-                    this.features.push(null);
-                }
             });
+            this._features$.next([...this.loadedFeatures]);
         });
     }
     registerFeature(feature) {
-        this.features.push(feature);
+        this.loadedFeatures.push(feature);
         runInInjectionContext(this.injector, () => feature.init?.());
         console.info('Loaded feature: ', feature.name);
-        this.finalizeLoading();
-    }
-    finalizeLoading() {
-        const loadedFeatures = this.features.filter((feature) => !!feature);
-        if (!this.expectedFeatures) {
-            this._features$.next(loadedFeatures);
-        }
-        else if (this.features.length === this.expectedFeatures) {
-            this._features$.next(loadedFeatures);
-        }
     }
     get features$() {
         return this._features$.asObservable();