fix(template): fix properties not initialized

edbzn · edbzn · commit 02b62fb5da76 · 2023-06-22T10:26:41.000+02:00
Resolves "@rx-angular/template": "^16.0.0" -> Cannot read properties of undefined (reading 'config') #1580
diff --git a/libs/template/for/src/lib/for.directive.ts b/libs/template/for/src/lib/for.directive.ts
@@ -2,9 +2,9 @@ import {
   ChangeDetectorRef,
   Directive,
   DoCheck,
-  ElementRef,
   EmbeddedViewRef,
   ErrorHandler,
+  inject,
   Input,
   IterableDiffers,
   NgIterable,
@@ -82,6 +82,22 @@ declare const ngDevMode: boolean;
 export class RxFor<T, U extends NgIterable<T> = NgIterable<T>>
   implements OnInit, DoCheck, OnDestroy
 {
+  /** @internal */
+  private iterableDiffers = inject(IterableDiffers);
+  /** @internal */
+  private cdRef = inject(ChangeDetectorRef);
+  /** @internal */
+  private ngZone = inject(NgZone);
+  /** @internal */
+  private templateRef =
+    inject<TemplateRef<RxForViewContext<T, U>>>(TemplateRef);
+  /** @internal */
+  private viewContainerRef = inject(ViewContainerRef);
+  /** @internal */
+  private strategyProvider = inject(RxStrategyProvider);
+  /** @internal */
+  private errorHandler = inject(ErrorHandler);
+
   /** @internal */
   private staticValue?: U;
   /** @internal */
@@ -383,18 +399,6 @@ export class RxFor<T, U extends NgIterable<T> = NgIterable<T>>
     return this._template || this.templateRef;
   }
 
-  /** @internal */
-  constructor(
-    private iterableDiffers: IterableDiffers,
-    private cdRef: ChangeDetectorRef,
-    private ngZone: NgZone,
-    private eRef: ElementRef,
-    private templateRef: TemplateRef<RxForViewContext<T, U>>,
-    private readonly viewContainerRef: ViewContainerRef,
-    private strategyProvider: RxStrategyProvider,
-    private errorHandler: ErrorHandler
-  ) {}
-
   /** @internal */
   private strategyInput$ = new ReplaySubject<
     RxStrategyNames | Observable<RxStrategyNames>
diff --git a/libs/template/if/src/lib/if.directive.ts b/libs/template/if/src/lib/if.directive.ts
@@ -9,35 +9,36 @@ import {
   SimpleChanges,
   TemplateRef,
   ViewContainerRef,
+  inject,
 } from '@angular/core';
 import { coerceAllFactory } from '@rx-angular/cdk/coercing';
 import {
-  createTemplateNotifier,
   RxNotificationKind,
+  createTemplateNotifier,
 } from '@rx-angular/cdk/notifications';
 import {
   RxStrategyNames,
   RxStrategyProvider,
 } from '@rx-angular/cdk/render-strategies';
 import {
-  createTemplateManager,
   RxTemplateManager,
+  createTemplateManager,
 } from '@rx-angular/cdk/template';
 import {
-  merge,
   NEVER,
   NextObserver,
   Observable,
   ObservableInput,
   ReplaySubject,
   Subject,
   Subscription,
+  merge,
 } from 'rxjs';
-import { mergeAll, filter, map } from 'rxjs/operators';
+import { filter, map, mergeAll } from 'rxjs/operators';
 import {
   RxIfTemplateNames,
-  rxIfTemplateNames,
   RxIfViewContext,
+  rxIfTemplateNames,
 } from './model/index';
 
 /**
@@ -69,6 +70,17 @@ import {
 export class RxIf<T = unknown>
   implements OnInit, OnChanges, OnDestroy, OnChanges
 {
+  /** @internal */
+  private strategyProvider = inject(RxStrategyProvider);
+  /** @internal */
+  private cdRef = inject(ChangeDetectorRef);
+  /** @internal */
+  private ngZone = inject(NgZone);
+  /** @internal */
+  private templateRef = inject<TemplateRef<RxIfViewContext<T>>>(TemplateRef);
+  /** @internal */
+  private viewContainerRef = inject(ViewContainerRef);
+
   /** @internal */
   private subscription = new Subscription();
   /** @internal */
@@ -477,14 +489,6 @@ export class RxIf<T = unknown>
     return this.then ? this.then : this.templateRef;
   }
 
-  constructor(
-    private strategyProvider: RxStrategyProvider,
-    private cdRef: ChangeDetectorRef,
-    private ngZone: NgZone,
-    private readonly templateRef: TemplateRef<RxIfViewContext<T>>,
-    private readonly viewContainerRef: ViewContainerRef
-  ) {}
-
   /** @internal */
   ngOnInit() {
     this.subscription.add(
diff --git a/libs/template/let/src/lib/let.directive.ts b/libs/template/let/src/lib/let.directive.ts
@@ -2,6 +2,7 @@ import {
   ChangeDetectorRef,
   Directive,
   ErrorHandler,
+  inject,
   Input,
   NgZone,
   OnChanges,
@@ -40,7 +41,7 @@ import {
   Subject,
   Subscription,
 } from 'rxjs';
-import { map, filter } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 
 /** @internal */
 type RxLetTemplateNames = 'nextTpl' | RxBaseTemplateNames;
@@ -95,6 +96,20 @@ export interface RxLetViewContext<T> extends RxViewContext<T> {
 @Directive({ selector: '[rxLet]', standalone: true })
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
 export class RxLet<U> implements OnInit, OnDestroy, OnChanges {
+  /** @internal */
+  private strategyProvider = inject(RxStrategyProvider);
+  /** @internal */
+  private cdRef = inject(ChangeDetectorRef);
+  /** @internal */
+  private ngZone = inject(NgZone);
+  /** @internal */
+  private nextTemplateRef =
+    inject<TemplateRef<RxLetViewContext<U>>>(TemplateRef);
+  /** @internal */
+  private viewContainerRef = inject(ViewContainerRef);
+  /** @internal */
+  private errorHandler = inject(ErrorHandler);
+
   static ngTemplateGuard_rxLet: 'binding';
 
   /**
@@ -469,15 +484,6 @@ export class RxLet<U> implements OnInit, OnDestroy, OnChanges {
    */
   @Input('rxLetPatchZone') patchZone = this.strategyProvider.config.patchZone;
 
-  constructor(
-    private strategyProvider: RxStrategyProvider,
-    public cdRef: ChangeDetectorRef,
-    private ngZone: NgZone,
-    private readonly nextTemplateRef: TemplateRef<RxLetViewContext<U>>,
-    private readonly viewContainerRef: ViewContainerRef,
-    private errorHandler: ErrorHandler
-  ) {}
-
   /** @internal */
   private observablesHandler = createTemplateNotifier<U>();
   /** @internal */
diff --git a/libs/template/push/src/lib/push.pipe.ts b/libs/template/push/src/lib/push.pipe.ts
@@ -4,18 +4,19 @@ import {
   OnDestroy,
   Pipe,
   PipeTransform,
+  inject,
   untracked,
 } from '@angular/core';
+import {
+  RxNotification,
+  RxNotificationKind,
+  createTemplateNotifier,
+} from '@rx-angular/cdk/notifications';
 import {
   RxStrategyNames,
   RxStrategyProvider,
   strategyHandling,
 } from '@rx-angular/cdk/render-strategies';
-import {
-  createTemplateNotifier,
-  RxNotification,
-  RxNotificationKind,
-} from '@rx-angular/cdk/notifications';
 import {
   MonoTypeOperatorFunction,
   NextObserver,
@@ -26,9 +27,9 @@ import {
   Unsubscribable,
 } from 'rxjs';
 import {
+  filter,
   shareReplay,
   skip,
-  filter,
   switchMap,
   tap,
   withLatestFrom,
@@ -87,6 +88,12 @@ import {
  */
 @Pipe({ name: 'push', pure: false, standalone: true })
 export class RxPush implements PipeTransform, OnDestroy {
+  /** @internal */
+  private strategyProvider = inject(RxStrategyProvider);
+  /** @internal */
+  private cdRef = inject(ChangeDetectorRef);
+  /** @internal */
+  private ngZone = inject(NgZone);
   /**
    * @internal
    * This is typed as `any` because the type cannot be inferred
@@ -112,12 +119,6 @@ export class RxPush implements PipeTransform, OnDestroy {
   /** @internal */
   private _renderCallback: NextObserver<any>;
 
-  constructor(
-    private strategyProvider: RxStrategyProvider,
-    private cdRef: ChangeDetectorRef,
-    private ngZone: NgZone
-  ) {}
-
   transform<U>(
     potentialObservable: null,
     config?: RxStrategyNames | Observable<RxStrategyNames>,
