@dereekb/dbx-firebase 12.6.21 → 12.7.0

package/fesm2022/dereekb-dbx-firebase.mjs

@@ -1,10 +1,10 @@
 import * as i0 from '@angular/core';
 import { inject, Injectable, APP_INITIALIZER, makeEnvironmentProviders, InjectionToken, Component, Optional, Inject, model, computed, ChangeDetectionStrategy, signal, Directive, input, EventEmitter, output, NgModule, Injector, viewChild, HostListener, ElementRef, forwardRef, effect, DestroyRef, Pipe } from '@angular/core';
 import { DbxAnalyticsService } from '@dereekb/dbx-analytics';
-import { asObservable, timeoutStartWith, filterMaybe, isNot, SubscriptionObject, lazyFrom, switchMapWhileTrue, loadingStateFromObs, distinctUntilKeysChange, cleanupDestroyable, iterationHasNextAndCanLoadMore, pageItemAccumulatorCurrentPage, accumulatorFlattenPageListLoadingState, useFirst, itemAccumulatorNextPageUntilResultsCount, iteratorNextPageUntilPage, iteratorNextPageUntilMaxPageLoadLimit, pageLoadingStateFromObs, useAsObservable, filterMaybeArray, mapEachAsync, invertObservableDecision, filterItemsWithObservableDecision, loadingStateContext, switchMapMaybe, beginLoading, mapLoadingStateValueWithOperator, valueFromFinishedLoadingState, skipInitialMaybe, distinctUntilModelKeyChange, successResult, tapLog, errorResult, isLoadingStateLoading, cleanup, mapLoadingState, throwErrorFromLoadingStateError, maybeValueFromObservableOrValue, distinctUntilHasDifferentValues, MultiSubscriptionObject, startWithBeginLoading, skipAllInitialMaybe } from '@dereekb/rxjs';
+import { asObservable, timeoutStartWith, filterMaybe, isNot, SubscriptionObject, lazyFrom, switchMapWhileTrue, loadingStateFromObs, distinctUntilKeysChange, cleanupDestroyable, iterationHasNextAndCanLoadMore, pageItemAccumulatorCurrentPage, accumulatorFlattenPageListLoadingState, useFirst, itemAccumulatorNextPageUntilResultsCount, iteratorNextPageUntilPage, iteratorNextPageUntilMaxPageLoadLimit, pageLoadingStateFromObs, useAsObservable, filterMaybeArray, mapEachAsync, invertObservableDecision, filterItemsWithObservableDecision, switchMapMaybe, beginLoading, mapLoadingStateValueWithOperator, valueFromFinishedLoadingState, skipInitialMaybe, distinctUntilModelKeyChange, successResult, tapLog, errorResult, isLoadingStateLoading, cleanup, mapLoadingState, throwErrorFromLoadingStateError, maybeValueFromObservableOrValue, distinctUntilHasDifferentValues, MultiSubscriptionObject, startWithBeginLoading, skipAllInitialMaybe } from '@dereekb/rxjs';
 import { switchMap, of, shareReplay, map, distinctUntilChanged, EMPTY, catchError, firstValueFrom, BehaviorSubject, combineLatest, first, from, tap, interval, exhaustMap, filter, take, startWith, Subject, throttleTime, NEVER, defaultIfEmpty, combineLatestWith, mergeMap, Observable } from 'rxjs';
 import * as i2 from '@dereekb/dbx-core';
-import { loggedInObsFromIsLoggedIn, loggedOutObsFromIsLoggedIn, authUserIdentifier, DbxInjectionContext, DbxInjectionComponent, AbstractForwardDbxInjectionContextDirective, DbxInjectionContextDirective, DBX_INJECTION_COMPONENT_DATA, DbxAuthService, DbxActionButtonDirective, DbxActionDirective, DbxActionEnforceModifiedDirective, DbxActionHandlerDirective, DbxActionAutoTriggerDirective, provideDbxRouteModelIdDirectiveDelegate, provideDbxRouteModelKeyDirectiveDelegate, AbstractSubscriptionDirective, AbstractIfDirective, LockSetComponentStore, newWithInjector, CutTextPipe, DbxActionContextStoreSourceInstance, DbxActionHandlerInstance, SimpleStorageAccessorFactory, dbxRouteParamReaderInstance, DbxRouteParamDefaultRedirectInstance } from '@dereekb/dbx-core';
+import { loggedInObsFromIsLoggedIn, loggedOutObsFromIsLoggedIn, authUserIdentifier, DbxInjectionContext, DbxInjectionComponent, AbstractForwardDbxInjectionContextDirective, DbxInjectionContextDirective, DBX_INJECTION_COMPONENT_DATA, DbxAuthService, DbxActionButtonDirective, completeOnDestroy, cleanSubscription, DbxActionDirective, DbxActionEnforceModifiedDirective, DbxActionHandlerDirective, DbxActionAutoTriggerDirective, clean, cleanLoadingContext, provideDbxRouteModelIdDirectiveDelegate, provideDbxRouteModelKeyDirectiveDelegate, AbstractIfDirective, LockSetComponentStore, newWithInjector, CutTextPipe, DbxActionContextStoreSourceInstance, DbxActionHandlerInstance, SimpleStorageAccessorFactory, dbxRouteParamReaderInstance, DbxRouteParamDefaultRedirectInstance } from '@dereekb/dbx-core';
 import { Auth, authState, idToken, GoogleAuthProvider, FacebookAuthProvider, TwitterAuthProvider, GithubAuthProvider, signInWithPopup, createUserWithEmailAndPassword, signInWithEmailAndPassword, signInAnonymously, reauthenticateWithPopup, provideAuth, getAuth, connectAuthEmulator } from '@angular/fire/auth';
 import { AUTH_ADMIN_ROLE, cachedGetter, urlWithoutParameters, addToSet, removeFromSet, filterMaybeArrayValues, mapIterable, asArray, excludeValuesFromArray, containsStringAnyCase, addToSetCopy, iterableToArray, runAsyncTasksForValues, pushArrayItemsIntoArray, forEachKeyValue, countAllInNestedArray, invertDecision, filterUniqueValues, reverseCompareFn, sortByNumberFunction, separateValues, readableError, isMaybeSo, firstValue, splitJoinRemainder, MS_IN_HOUR, SECONDS_IN_MINUTE, MS_IN_DAY, unixDateTimeSecondsNumberForNow, MS_IN_MINUTE, addMilliseconds, unixDateTimeSecondsNumberFromDate, dateFromDateOrTimeSecondsNumber, MS_IN_SECOND, isPast } from '@dereekb/util';
 import { safeFormatToISO8601DateString, msToSeconds, isSameDate } from '@dereekb/date';
@@ -1903,11 +1903,10 @@ class DbxFirebaseDevelopmentPopupContentComponent {
     dbxFirebaseDevelopmentWidgetService = inject(DbxFirebaseDevelopmentWidgetService);
     dbxFirebaseDevelopmentSchedulerService = inject(DbxFirebaseDevelopmentSchedulerService);
     dbxFirebaseEmulatorService = inject(DbxFirebaseEmulatorService);
-    _backSub = new SubscriptionObject();
     showEmulatorButton = this.dbxFirebaseEmulatorService.useEmulators === true;
     emulatorUIAnchor = this.dbxFirebaseEmulatorService.emulatorUIAnchor ?? {};
     entries = this.dbxFirebaseDevelopmentWidgetService.getEntries();
-    _activeEntrySelector = new BehaviorSubject(DEVELOPMENT_FIREBASE_SERVER_SCHEDULER_WIDGET_KEY);
+    _activeEntrySelector = completeOnDestroy(new BehaviorSubject(DEVELOPMENT_FIREBASE_SERVER_SCHEDULER_WIDGET_KEY));
     isLoggedIn$ = this.dbxAuthService.isLoggedIn$;
     entries$ = this.isLoggedIn$.pipe(distinctUntilChanged(), map((isLoggedIn) => this.entries), shareReplay(1));
     formConfig$ = this.entries$.pipe(map((entries) => ({ entries })));
@@ -1932,15 +1931,11 @@ class DbxFirebaseDevelopmentPopupContentComponent {
         }
         return widgetConfig;
     });
-    ngOnInit() {
+    constructor() {
         this.twoColumnsContextStore.setShowRight(this.showRight$);
-        this._backSub.subscription = this.twoColumnsContextStore.back$.subscribe(() => {
+        cleanSubscription(this.twoColumnsContextStore.back$.subscribe(() => {
             this.clearSelection();
-        });
-    }
-    ngOnDestroy() {
-        this._backSub.destroy();
-        this._activeEntrySelector.complete();
+        }));
     }
     handleFormUpdate = (value, context) => {
         this._activeEntrySelector.next(value.specifier);
@@ -1958,7 +1953,7 @@ class DbxFirebaseDevelopmentPopupContentComponent {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseDevelopmentPopupContentComponent, decorators: [{
             type: Component,
             args: [{ selector: 'dbx-firebase-development-popup-content', imports: [DbxAnchorComponent, DbxTwoColumnFullLeftDirective, DbxWidgetViewComponent, DbxTwoColumnComponent, DbxTwoBlockComponent, DbxTwoColumnRightComponent, DbxWidgetViewComponent, DbxFirebaseDevelopmentPopupContentFormComponent, DbxActionDirective, DbxActionEnforceModifiedDirective, DbxActionHandlerDirective, DbxActionFormDirective, DbxFormSourceDirective, DbxActionAutoTriggerDirective, MatButtonModule], providers: [TwoColumnsContextStore], standalone: true, template: "<dbx-two-column class=\"dbx-firebase-development-popup-content\" [dbxTwoColumnFullLeft]=\"true\">\n  <dbx-two-block left>\n    <div>\n      <h4>Info</h4>\n      <p>Scheduler (Running): {{ schedulerRunningSignal() }} : {{ schedulerIntervalSignal() }}s : {{ schedulerErrorSignal() }}</p>\n      <div>\n        @if (showEmulatorButton) {\n          <dbx-anchor [anchor]=\"emulatorUIAnchor\">\n            <button mat-flat-button color=\"accent\">Emulator Enabled</button>\n          </dbx-anchor>\n        }\n      </div>\n    </div>\n    <div>\n      <h4>Tools</h4>\n      <div dbxAction dbxActionEnforceModified dbxActionAutoTrigger useInstantTriggerPreset [dbxActionHandler]=\"handleFormUpdate\">\n        <dbx-firebase-development-popup-content-form [config]=\"formConfig$\" dbxActionForm [dbxActionFormIsModified]=\"isFormModified\" [dbxFormSource]=\"formData$\" dbxFormSourceMode=\"always\"></dbx-firebase-development-popup-content-form>\n      </div>\n    </div>\n  </dbx-two-block>\n  <dbx-two-column-right right [header]=\"rightTitleSignal()\">\n    <dbx-widget-view [config]=\"widgetConfigSignal()\"></dbx-widget-view>\n  </dbx-two-column-right>\n</dbx-two-column>\n", styles: [".dbx-firebase-development-popup-content{height:400px;overflow:hidden}\n"] }]
-        }] });
+        }], ctorParameters: () => [] });
 
 const DEFAULT_FIREBASE_DEVELOPMENT_POPUP_KEY = 'devpopup';
 class DbxFirebaseDevelopmentPopupComponent extends AbstractPopupDirective {
@@ -2029,6 +2024,9 @@ class DbxFirebaseDevelopmentDirective {
     get enabled() {
         return this.dbxFirebaseDevelopmentService.enabled;
     }
+    constructor() {
+        clean(() => this.closePopup());
+    }
     handleKeyboardEvent(event) {
         if (this.enabled && event.shiftKey && event.altKey && event.code === 'KeyD') {
             this.togglePopup();
@@ -2073,9 +2071,6 @@ class DbxFirebaseDevelopmentDirective {
             });
         }
     }
-    ngOnDestroy() {
-        this.closePopup();
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseDevelopmentDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: DbxFirebaseDevelopmentDirective, isStandalone: true, selector: "[dbxFirebaseDevelopment]", host: { listeners: { "window:keydown": "handleKeyboardEvent($event)" } }, ngImport: i0 });
 }
@@ -2085,7 +2080,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                     selector: '[dbxFirebaseDevelopment]',
                     standalone: true
                 }]
-        }], propDecorators: { handleKeyboardEvent: [{
+        }], ctorParameters: () => [], propDecorators: { handleKeyboardEvent: [{
                 type: HostListener,
                 args: ['window:keydown', ['$event']]
             }] } });
@@ -3685,10 +3680,7 @@ class DbxFirebaseModelEntitiesEntityComponent {
     entityWidgetConfigSignal = computed(() => this.widgetInjectionConfigSignal()?.entityComponentConfig);
     commonWidgetConfigSignal = computed(() => this.widgetInjectionConfigSignal()?.commonComponentConfig);
     debugWidgetConfigSignal = computed(() => this.widgetInjectionConfigSignal()?.debugComponentConfig);
-    loadingContext = loadingStateContext({ obs: this.loadingState$ });
-    ngOnDestroy() {
-        this.loadingContext.destroy();
-    }
+    loadingContext = cleanLoadingContext({ obs: this.loadingState$ });
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseModelEntitiesEntityComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.13", type: DbxFirebaseModelEntitiesEntityComponent, isStandalone: true, selector: "dbx-firebase-model-entities-entity", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null } }, ngImport: i0, template: "<mat-expansion-panel>\n  <mat-expansion-panel-header>\n    <mat-panel-title>\n      @if (displayInfoSignal(); as displayInfo) {\n        <div class=\"dbx-list-two-line-item\">\n          <div class=\"item-left\">\n            <span class=\"dbx-pb2 dbx-flex-bar\">\n              @if (displayInfo.icon) {\n                <mat-icon class=\"dbx-button-spacer\">{{ displayInfo.icon }}</mat-icon>\n              }\n              <span>{{ displayInfo.title }}</span>\n            </span>\n            <span>\n              <span class=\"dbx-hint dbx-small\">{{ modelTypeSignal() }}</span>\n              @if (displayNameSignal(); as displayName) {\n                <span class=\"dbx-small dbx-u dbx-pl2\">{{ displayName }}</span>\n              }\n            </span>\n          </div>\n        </div>\n      }\n    </mat-panel-title>\n  </mat-expansion-panel-header>\n  <ng-template matExpansionPanelContent>\n    <div class=\"dbx-firebase-model-entities-entity-panel-content\">\n      <dbx-loading [context]=\"loadingContext\">\n        @if (entityWidgetConfigSignal(); as config) {\n          <div class=\"dbx-pb3 dbx-firebase-model-entities-entity-content\">\n            <dbx-injection [config]=\"config\"></dbx-injection>\n          </div>\n        }\n        @if (commonWidgetConfigSignal(); as config) {\n          <div class=\"dbx-pb3 dbx-firebase-model-entities-common-content\">\n            <dbx-injection [config]=\"config\"></dbx-injection>\n          </div>\n        }\n        @if (debugWidgetConfigSignal(); as config) {\n          <div class=\"dbx-pb3 dbx-firebase-model-entities-debug-content\">\n            <dbx-injection [config]=\"config\"></dbx-injection>\n          </div>\n        }\n      </dbx-loading>\n    </div>\n  </ng-template>\n</mat-expansion-panel>\n", dependencies: [{ kind: "component", type: DbxInjectionComponent, selector: "dbx-injection, [dbxInjection], [dbx-injection]", inputs: ["config", "template"] }, { kind: "component", type: DbxLoadingComponent, selector: "dbx-loading", inputs: ["padding", "show", "text", "mode", "color", "diameter", "linear", "loading", "error", "context"] }, { kind: "component", type: MatExpansionPanel, selector: "mat-expansion-panel", inputs: ["hideToggle", "togglePosition"], outputs: ["afterExpand", "afterCollapse"], exportAs: ["matExpansionPanel"] }, { kind: "component", type: MatExpansionPanelHeader, selector: "mat-expansion-panel-header", inputs: ["expandedHeight", "collapsedHeight", "tabIndex"] }, { kind: "directive", type: MatExpansionPanelTitle, selector: "mat-panel-title" }, { kind: "directive", type: MatExpansionPanelContent, selector: "ng-template[matExpansionPanelContent]" }, { kind: "component", type: MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
@@ -3752,10 +3744,7 @@ class DbxFirebaseModelEntitiesComponent {
         return onlyShowRegisteredTypes && Boolean(unregisteredEntities?.length);
     });
     hasNoEntitiesSignal = computed(() => !this.entitiesWithKeysSignal()?.length);
-    context = loadingStateContext({ obs: this.allEntitiesState$ });
-    ngOnDestroy() {
-        this.context.destroy();
-    }
+    context = cleanLoadingContext({ obs: this.allEntitiesState$ });
     clickShowUnregisteredEntities() {
         this.showUnregisteredTypesSignal.set(true);
     }
@@ -4099,10 +4088,7 @@ class DbxFirebaseModelEntitiesDebugWidgetComponent extends AbstractDbxFirebaseMo
         }
         return content;
     });
-    context = loadingStateContext(this.store.dataLoadingState$);
-    ngOnDestroy() {
-        this.context.destroy();
-    }
+    context = cleanLoadingContext(this.store.dataLoadingState$);
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseModelEntitiesDebugWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.13", type: DbxFirebaseModelEntitiesDebugWidgetComponent, isStandalone: true, selector: "dbx-firebase-model-entities-debug-widget", usesInheritance: true, ngImport: i0, template: "<div class=\"dbx-firebase-model-entities-debug-widget\">\n  <!-- Model Key Section -->\n  <div class=\"dbx-debug-section\">\n    <h4>Model Key Information</h4>\n    @if (currentKey(); as key) {\n      <dbx-firebase-model-key [modelKey]=\"key\"></dbx-firebase-model-key>\n    }\n  </div>\n\n  <!-- Document Data Section -->\n  <div class=\"dbx-debug-section\">\n    <h4>Document Data</h4>\n    <dbx-loading [context]=\"context\">\n      @if (currentData(); as data) {\n        <dbx-download-text-view [showTitle]=\"false\" [content]=\"contentSignal()\"></dbx-download-text-view>\n      } @else {\n        <p class=\"dbx-empty\">No data available</p>\n      }\n    </dbx-loading>\n  </div>\n</div>\n", dependencies: [{ kind: "component", type: DbxFirebaseModelKeyComponent, selector: "dbx-firebase-model-key", inputs: ["modelKey"] }, { kind: "component", type: DbxDownloadTextViewComponent, selector: "dbx-download-text-view", inputs: ["showDownloadButton", "loadingText", "linear", "showTitle", "showPreview", "showExpandPreviewButton", "expandPreview", "content", "contentState"], outputs: ["expandPreviewChange"] }, { kind: "component", type: DbxLoadingComponent, selector: "dbx-loading", inputs: ["padding", "show", "text", "mode", "color", "diameter", "linear", "loading", "error", "context"] }] });
 }
@@ -4127,8 +4113,7 @@ class DbxFirebaseDocumentStoreDirective {
     _flatKey$ = toObservable(this.flatKey).pipe(skipInitialMaybe());
     _ref$ = toObservable(this.ref).pipe(skipInitialMaybe());
     _streamMode$ = toObservable(this.streamMode).pipe(skipInitialMaybe());
-    _store = new BehaviorSubject(undefined);
-    _storeSub = new SubscriptionObject();
+    _store = completeOnDestroy(new BehaviorSubject(undefined));
     store$ = this._store.pipe(filterMaybe(), shareReplay(1));
     exists$ = this.store$.pipe(switchMap((x) => x.exists$));
     document$ = this.store$.pipe(switchMap((x) => x.document$));
@@ -4145,7 +4130,7 @@ class DbxFirebaseDocumentStoreDirective {
     constructor(store) {
         this.replaceStore(store);
         // sync inputs to store any time the store changes
-        this._storeSub.subscription = this._store.subscribe((x) => {
+        cleanSubscription(this._store.subscribe((x) => {
             if (x) {
                 x.setStoreName(this._storeName$);
                 x.setId(this._documentId$);
@@ -4154,11 +4139,7 @@ class DbxFirebaseDocumentStoreDirective {
                 x.setRef(this._ref$);
                 x.setStreamMode(this._streamMode$);
             }
-        });
-    }
-    ngOnDestroy() {
-        this._store.complete();
-        this._storeSub.destroy();
+        }));
     }
     get store() {
         return this._store.value;
@@ -4221,13 +4202,13 @@ function provideDbxFirebaseDocumentStoreDirective(sourceType, storeType) {
 /**
  * Used with a DbxFirebaseDocumentStoreDirective to emit model viewed events.
  */
-class DbxFirebaseModelViewedEventDirective extends AbstractSubscriptionDirective {
+class DbxFirebaseModelViewedEventDirective {
     dbxFirebaseDocumentStoreDirective = inject(DbxFirebaseDocumentStoreDirective);
     dbxModelObjectStateService = inject(DbxModelObjectStateService);
     dbxFirebaseModelTypesService = inject(DbxFirebaseModelTypesService);
     modelViewContext = input(undefined, { alias: 'dbxFirebaseModelViewedEvent' });
-    ngOnInit() {
-        this.sub = this.dbxFirebaseDocumentStoreDirective.data$
+    constructor() {
+        cleanSubscription(this.dbxFirebaseDocumentStoreDirective.data$
             .pipe(
         //
         distinctUntilModelKeyChange(), combineLatestWith(this.dbxFirebaseDocumentStoreDirective.modelIdentity$.pipe(switchMap((x) => this.dbxFirebaseModelTypesService.infoForType(x.modelType)), first()), this.dbxFirebaseDocumentStoreDirective.key$), map(([data, typeInfo, key]) => {
@@ -4242,10 +4223,10 @@ class DbxFirebaseModelViewedEventDirective extends AbstractSubscriptionDirective
             .subscribe((modelKeyTypeNamePair) => {
             const context = this.modelViewContext();
             this.dbxModelObjectStateService.emitModelViewEvent({ modelKeyTypeNamePair, context });
-        });
+        }));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseModelViewedEventDirective, deps: null, target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "18.2.13", type: DbxFirebaseModelViewedEventDirective, isStandalone: true, selector: "[dbxFirebaseModelViewedEvent]", inputs: { modelViewContext: { classPropertyName: "modelViewContext", publicName: "dbxFirebaseModelViewedEvent", isSignal: true, isRequired: false, transformFunction: null } }, usesInheritance: true, ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseModelViewedEventDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "18.2.13", type: DbxFirebaseModelViewedEventDirective, isStandalone: true, selector: "[dbxFirebaseModelViewedEvent]", inputs: { modelViewContext: { classPropertyName: "modelViewContext", publicName: "dbxFirebaseModelViewedEvent", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseModelViewedEventDirective, decorators: [{
             type: Directive,
@@ -4253,7 +4234,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                     selector: '[dbxFirebaseModelViewedEvent]',
                     standalone: true
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 
 const importsAndExports$4 = [DbxFirebaseModelViewedEventDirective, DbxFirebaseModelTypeInstanceListComponent, DbxFirebaseModelTypeInstanceListViewComponent, DbxFirebaseModelTypeInstanceListViewItemComponent];
 /**
@@ -4295,14 +4276,13 @@ class DbxFirebaseCollectionStoreDirective {
     _itemsPerPage = toObservable(this.itemsPerPage).pipe(skipInitialMaybe());
     _constraints = toObservable(this.constraints).pipe(skipInitialMaybe());
     _waitForNonNullConstraints = toObservable(this.waitForNonNullConstraints).pipe(skipInitialMaybe());
-    _store = new BehaviorSubject(undefined);
-    _storeSub = new SubscriptionObject();
+    _store = completeOnDestroy(new BehaviorSubject(undefined));
     store$ = this._store.pipe(filterMaybe(), shareReplay(1));
     pageLoadingState$ = this.store$.pipe(switchMap((x) => x.pageLoadingState$));
     constructor(store) {
         this.replaceStore(store);
         // sync inputs to store any time the store changes
-        this._storeSub.subscription = this.store$.subscribe((x) => {
+        cleanSubscription(this.store$.subscribe((x) => {
             x.setCollectionMode(this._collectionMode);
             x.setCollectionKeys(this._collectionKeys);
             x.setCollectionRefs(this._collectionRefs);
@@ -4310,15 +4290,11 @@ class DbxFirebaseCollectionStoreDirective {
             x.setMaxPages(this._maxPages);
             x.setItemsPerPage(this._itemsPerPage);
             x.setWaitForNonNullConstraints(this._waitForNonNullConstraints);
-        });
+        }));
     }
     get store() {
         return this._store.value;
     }
-    ngOnDestroy() {
-        this._store.complete();
-        this._storeSub.destroy();
-    }
     /**
      * Replaces the internal store.
      */
@@ -4377,8 +4353,8 @@ function provideDbxFirebaseCollectionStoreDirective(sourceType, storeType) {
 class DbxFirebaseCollectionChangeDirective {
     dbxFirebaseCollectionStoreDirective = inject((DbxFirebaseCollectionStoreDirective));
     mode = input('off', { alias: 'dbxFirebaseCollectionChange', transform: (x) => x || 'off' });
-    _watcher = dbxFirebaseCollectionChangeWatcher(this.dbxFirebaseCollectionStoreDirective.store);
-    _trigger = dbxFirebaseCollectionChangeTriggerForWatcher(this._watcher, () => this.restart());
+    _watcher = clean(dbxFirebaseCollectionChangeWatcher(this.dbxFirebaseCollectionStoreDirective.store));
+    _trigger = clean(dbxFirebaseCollectionChangeTriggerForWatcher(this._watcher, () => this.restart()));
     mode$ = this._watcher.mode$;
     event$ = this._watcher.event$;
     hasChangeAvailable$ = this._watcher.hasChangeAvailable$;
@@ -4390,13 +4366,9 @@ class DbxFirebaseCollectionChangeDirective {
     get store() {
         return this._watcher.store;
     }
-    ngOnInit() {
+    constructor() {
         this._trigger.init();
     }
-    ngOnDestroy() {
-        this._watcher.destroy();
-        this._trigger.destroy();
-    }
     restart() {
         this.dbxFirebaseCollectionStoreDirective.store.restart();
     }
@@ -4409,7 +4381,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                     selector: '[dbxFirebaseCollectionChange]',
                     standalone: true
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 
 /**
  * Structural directive that displays the content when the target change is detected.
@@ -4450,20 +4422,19 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
 /**
  * Directive that connects a host DbxListView to a DbxFirebaseCollectionStoreDirective to pass data for rendering items from a collection and query parameters.
  */
-class DbxFirebaseCollectionListDirective extends AbstractSubscriptionDirective {
+class DbxFirebaseCollectionListDirective {
     dbxFirebaseCollectionStoreDirective = inject((DbxFirebaseCollectionStoreDirective));
     dbxListViewWrapper = inject((DbxListViewWrapper), { host: true });
     constructor() {
-        super();
         this.dbxListViewWrapper.setState(this.dbxFirebaseCollectionStoreDirective.pageLoadingState$);
-    }
-    ngOnInit() {
-        this.sub = this.dbxListViewWrapper.loadMore?.subscribe(() => {
-            this.dbxFirebaseCollectionStoreDirective.next();
-        });
+        if (this.dbxListViewWrapper.loadMore) {
+            cleanSubscription(this.dbxListViewWrapper.loadMore.subscribe(() => {
+                this.dbxFirebaseCollectionStoreDirective.next();
+            }));
+        }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseCollectionListDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: DbxFirebaseCollectionListDirective, isStandalone: true, selector: "[dbxFirebaseCollectionList]", usesInheritance: true, ngImport: i0 });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: DbxFirebaseCollectionListDirective, isStandalone: true, selector: "[dbxFirebaseCollectionList]", ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseCollectionListDirective, decorators: [{
             type: Directive,
@@ -4509,15 +4480,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
 /**
  * Used for providing an id from the twoWayFlatKey$ from a DbxFirebaseDocumentStoreTwoWayKeyProvider.
  */
-class DbxFirebaseDocumentStoreIdFromTwoWayModelKeyDirective extends AbstractSubscriptionDirective {
+class DbxFirebaseDocumentStoreIdFromTwoWayModelKeyDirective {
     dbxFirebaseDocumentStoreDirective = inject(DbxFirebaseDocumentStoreDirective, { host: true });
     dbxFirebaseDocumentStoreTwoWayKeyProvider = inject(DbxFirebaseDocumentStoreTwoWayKeyProvider, { skipSelf: true, host: false });
     constructor() {
-        super();
-        this.sub = this.dbxFirebaseDocumentStoreDirective.store.setId(this.dbxFirebaseDocumentStoreTwoWayKeyProvider.twoWayFlatKey$);
+        cleanSubscription(this.dbxFirebaseDocumentStoreDirective.store.setId(this.dbxFirebaseDocumentStoreTwoWayKeyProvider.twoWayFlatKey$));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseDocumentStoreIdFromTwoWayModelKeyDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: DbxFirebaseDocumentStoreIdFromTwoWayModelKeyDirective, isStandalone: true, selector: "[dbxFirebaseDocumentStoreIdFromTwoWayModelKey]", usesInheritance: true, ngImport: i0 });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: DbxFirebaseDocumentStoreIdFromTwoWayModelKeyDirective, isStandalone: true, selector: "[dbxFirebaseDocumentStoreIdFromTwoWayModelKey]", ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseDocumentStoreIdFromTwoWayModelKeyDirective, decorators: [{
             type: Directive,
@@ -5139,17 +5109,12 @@ class AbstractSingleItemDbxFirebaseDocument extends AbstractDbxFirebaseDocumentW
 class DbxFirebaseCollectionWithParentStoreDirective extends DbxFirebaseCollectionStoreDirective {
     sourceMode = model(undefined);
     _sourceMode$ = toObservable(this.sourceMode).pipe(skipInitialMaybe());
-    _parentSourceModeSub = new SubscriptionObject();
     constructor(store) {
         super(store);
         // sync inputs to store any time the store changes
-        this._parentSourceModeSub.subscription = this.store$.subscribe((x) => {
+        cleanSubscription(this.store$.subscribe((x) => {
             x.setSourceMode(this._sourceMode$);
-        });
-    }
-    ngOnDestroy() {
-        super.ngOnDestroy();
-        this._parentSourceModeSub.destroy();
+        }));
     }
     // MARK: Inputs
     setSourceMode(sourceMode) {
@@ -5239,9 +5204,6 @@ class AbstractSystemStateDocumentStoreAccessor {
     constructor(type) {
         this.systemStateDocumentStore.setId(type);
     }
-    ngOnDestroy() {
-        this.systemStateDocumentStore.ngOnDestroy();
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: AbstractSystemStateDocumentStoreAccessor, deps: [{ token: null, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: AbstractSystemStateDocumentStoreAccessor });
 }
@@ -6849,13 +6811,9 @@ class StorageFileUploadFilesError extends BaseError {
  * Connects a DbxFirebaseStorageFileUploadStore to a DbxActionContext, and handles the upload action.
  */
 class DbxFirebaseStorageFileUploadActionHandlerDirective {
-    _triggerSub = new SubscriptionObject();
-    _readySub = new SubscriptionObject();
-    _isWorkingSub = new SubscriptionObject();
-    _progressSub = new SubscriptionObject();
     source = inject((DbxActionContextStoreSourceInstance));
     uploadStore = inject(DbxFirebaseStorageFileUploadStore);
-    _dbxActionHandlerInstance = new DbxActionHandlerInstance(this.source);
+    _dbxActionHandlerInstance = clean(new DbxActionHandlerInstance(this.source));
     /**
      * If true, the action will be triggered when files are set.
      *
@@ -6914,10 +6872,10 @@ class DbxFirebaseStorageFileUploadActionHandlerDirective {
     });
     files$ = this.uploadStore.files$;
     uploadHandler$ = toObservable(this.uploadHandler);
-    ngOnInit() {
+    constructor() {
         this._dbxActionHandlerInstance.init();
         // trigger the action if files are available
-        this._triggerSub.subscription = this.triggerOnFiles$
+        cleanSubscription(this.triggerOnFiles$
             .pipe(switchMap((triggerOnFiles) => {
             if (triggerOnFiles) {
                 return this.files$.pipe(map((x) => x?.length));
@@ -6930,18 +6888,15 @@ class DbxFirebaseStorageFileUploadActionHandlerDirective {
             if (canTrigger) {
                 this.source.trigger();
             }
-        });
+        }));
         // ready the source with files after trigger is called and files are available
-        this._readySub.subscription = this.files$.pipe(switchMap((files) => this.source.triggered$.pipe(map(() => files)))).subscribe((files) => {
+        cleanSubscription(this.files$.pipe(switchMap((files) => this.source.triggered$.pipe(map(() => files)))).subscribe((files) => {
             this.source.readyValue(files);
-        });
+        }));
         // sync isWorking
-        this._isWorkingSub.subscription = this.uploadStore.setIsUploadHandlerWorking(this.source.isWorking$);
+        cleanSubscription(this.uploadStore.setIsUploadHandlerWorking(this.source.isWorking$));
         // sync progress amount
-        this._progressSub.subscription = this.source.setWorkProgress(this.uploadStore.latestProgressEvent$.pipe(throttleTime(100, undefined, { leading: true, trailing: true }), map((x) => x?.overallProgress), distinctUntilChanged()));
-    }
-    ngOnDestroy() {
-        this._dbxActionHandlerInstance.destroy();
+        this.source.setWorkProgress(this.uploadStore.latestProgressEvent$.pipe(throttleTime(100, undefined, { leading: true, trailing: true }), map((x) => x?.overallProgress), distinctUntilChanged()));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseStorageFileUploadActionHandlerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "18.2.13", type: DbxFirebaseStorageFileUploadActionHandlerDirective, isStandalone: true, selector: "[dbxFirebaseStorageFileUploadActionHandler]", inputs: { triggerOnFiles: { classPropertyName: "triggerOnFiles", publicName: "triggerOnFiles", isSignal: true, isRequired: false, transformFunction: null }, cancelUploadsOnUploadError: { classPropertyName: "cancelUploadsOnUploadError", publicName: "cancelUploadsOnUploadError", isSignal: true, isRequired: false, transformFunction: null }, actionFailureOnUploadError: { classPropertyName: "actionFailureOnUploadError", publicName: "actionFailureOnUploadError", isSignal: true, isRequired: false, transformFunction: null }, uploadHandler: { classPropertyName: "uploadHandler", publicName: "dbxFirebaseStorageFileUploadActionHandler", isSignal: true, isRequired: true, transformFunction: null } }, ngImport: i0 });
@@ -6952,7 +6907,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                     selector: '[dbxFirebaseStorageFileUploadActionHandler]',
                     standalone: true
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 
 class StorageFileCollectionStore extends AbstractDbxFirebaseCollectionStore {
     storageFileFunctions = inject(StorageFileFunctions);
@@ -7054,22 +7009,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
  *
  * Use with a DbxAction instance.
  */
-class DbxFirebaseStorageFileUploadInitializeDocumentDirective extends AbstractSubscriptionDirective {
+class DbxFirebaseStorageFileUploadInitializeDocumentDirective {
     uploadStore = inject(DbxFirebaseStorageFileUploadStore);
     storageFileDocumentStore = inject(StorageFileDocumentStore);
     initializeWithExpediteProcessing = input();
     source = inject((DbxActionContextStoreSourceInstance), { host: true });
-    _dbxActionHandlerInstance = new DbxActionHandlerInstance(this.source);
+    _dbxActionHandlerInstance = clean(new DbxActionHandlerInstance(this.source));
     constructor() {
-        super();
         // set the trigger
-        this.sub = this.uploadStore.uploadResult$.subscribe(async (result) => {
+        cleanSubscription(this.uploadStore.uploadResult$.subscribe(async (result) => {
             const successFileResult = result.successFileResults.find((x) => x.fileRef != null);
             const fileRef = successFileResult?.fileRef;
             if (fileRef) {
                 this.source.triggerWithValue(fileRef);
             }
-        });
+        }));
         // set the handler function
         this._dbxActionHandlerInstance.setHandlerFunction((fileRef, context) => {
             context.startWorkingWithLoadingStateObservable(this.storageFileDocumentStore.initializeStorageFileFromUpload({
@@ -7080,12 +7034,8 @@ class DbxFirebaseStorageFileUploadInitializeDocumentDirective extends AbstractSu
         });
         this._dbxActionHandlerInstance.init();
     }
-    ngOnDestroy() {
-        super.ngOnDestroy();
-        this._dbxActionHandlerInstance.destroy();
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseStorageFileUploadInitializeDocumentDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "18.2.13", type: DbxFirebaseStorageFileUploadInitializeDocumentDirective, isStandalone: true, selector: "[dbxFirebaseStorageFileUploadInitializeDocument]", inputs: { initializeWithExpediteProcessing: { classPropertyName: "initializeWithExpediteProcessing", publicName: "initializeWithExpediteProcessing", isSignal: true, isRequired: false, transformFunction: null } }, exportAs: ["dbxFirebaseStorageFileUploadInitializeDocument"], usesInheritance: true, ngImport: i0 });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "18.2.13", type: DbxFirebaseStorageFileUploadInitializeDocumentDirective, isStandalone: true, selector: "[dbxFirebaseStorageFileUploadInitializeDocument]", inputs: { initializeWithExpediteProcessing: { classPropertyName: "initializeWithExpediteProcessing", publicName: "initializeWithExpediteProcessing", isSignal: true, isRequired: false, transformFunction: null } }, exportAs: ["dbxFirebaseStorageFileUploadInitializeDocument"], ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseStorageFileUploadInitializeDocumentDirective, decorators: [{
             type: Directive,
@@ -7100,20 +7050,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
  * Directive that provides a DbxFirebaseStorageFileUploadStore, and sync's the inputs to the store.
  */
 class DbxFirebaseStorageFileUploadStoreDirective {
-    _allowedSub = new SubscriptionObject();
-    _multiSub = new SubscriptionObject();
     uploadStore = inject(DbxFirebaseStorageFileUploadStore);
     multipleUpload = input();
     fileTypesAccepted = input();
     fileTypesAccepted$ = toObservable(this.fileTypesAccepted).pipe(skipAllInitialMaybe(), shareReplay(1));
     isMultiUploadAllowed$ = toObservable(this.multipleUpload).pipe(skipAllInitialMaybe(), shareReplay(1));
     constructor() {
-        this._allowedSub.subscription = this.fileTypesAccepted$.subscribe((x) => this.uploadStore.setFileTypesAccepted(x));
-        this._multiSub.subscription = this.isMultiUploadAllowed$.subscribe((x) => this.uploadStore.setIsMultiUploadAllowed(x));
-    }
-    ngOnDestroy() {
-        this._allowedSub.destroy();
-        this._multiSub.destroy();
+        cleanSubscription(this.fileTypesAccepted$.subscribe((x) => this.uploadStore.setFileTypesAccepted(x)));
+        cleanSubscription(this.isMultiUploadAllowed$.subscribe((x) => this.uploadStore.setIsMultiUploadAllowed(x)));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseStorageFileUploadStoreDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "18.2.13", type: DbxFirebaseStorageFileUploadStoreDirective, isStandalone: true, selector: "[dbxFirebaseStorageFileUploadStore]", inputs: { multipleUpload: { classPropertyName: "multipleUpload", publicName: "multipleUpload", isSignal: true, isRequired: false, transformFunction: null }, fileTypesAccepted: { classPropertyName: "fileTypesAccepted", publicName: "fileTypesAccepted", isSignal: true, isRequired: false, transformFunction: null } }, providers: [DbxFirebaseStorageFileUploadStore], exportAs: ["dbxFirebaseStorageFileUploadStore"], ngImport: i0 });
@@ -7132,20 +7076,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
  * Directive that syncs a DbxFirebaseStorageFileUploadStore's configuration to a DbxFileUploadComponent.
  */
 class DbxFirebaseStorageFileUploadSyncDirective {
-    _allowedSub = new SubscriptionObject();
-    _multiSub = new SubscriptionObject();
-    _filesSub = new SubscriptionObject();
     uploadStore = inject(DbxFirebaseStorageFileUploadStore);
     uploadComponent = inject(DbxFileUploadComponent);
     constructor() {
-        this._allowedSub.subscription = this.uploadStore.fileTypesAllowed$.subscribe((x) => this.uploadComponent.setAccept(x));
-        this._multiSub.subscription = this.uploadStore.isMultiUploadAllowed$.subscribe((x) => this.uploadComponent.setMultiple(x));
-        this._filesSub.subscription = this.uploadComponent.filesChanged.subscribe((files) => this.uploadStore.setFiles(files.matchResult.accepted));
-    }
-    ngOnDestroy() {
-        this._allowedSub.destroy();
-        this._multiSub.destroy();
-        this._filesSub.destroy();
+        cleanSubscription(this.uploadStore.fileTypesAllowed$.subscribe((x) => this.uploadComponent.setAccept(x)));
+        cleanSubscription(this.uploadStore.isMultiUploadAllowed$.subscribe((x) => this.uploadComponent.setMultiple(x)));
+        cleanSubscription(this.uploadComponent.filesChanged.subscribe((files) => this.uploadStore.setFiles(files.matchResult.accepted)));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxFirebaseStorageFileUploadSyncDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: DbxFirebaseStorageFileUploadSyncDirective, isStandalone: true, selector: "[dbxFirebaseStorageFileUploadSync]", exportAs: ["dbxFirebaseStorageFileUploadSync"], ngImport: i0 });