refactor(cdk): render-strategies: convert renderbehavior params to object

hoebbelsB · hoebbelsB · commit 2a2a43bc98ce · 2022-03-06T01:22:33.000+01:00
diff --git a/libs/cdk/render-strategies/src/lib/concurrent-strategies.ts b/libs/cdk/render-strategies/src/lib/concurrent-strategies.ts
@@ -20,11 +20,12 @@ forceFrameRate(60);
 const immediateStrategy: RxStrategyCredentials = {
   name: 'immediate',
   work: (cdRef) => cdRef.detectChanges(),
-  behavior: (work: any, scope: any, ngZone: NgZone) => {
+  behavior: ({ work, scope, ngZone }) => {
     return (o$) =>
       o$.pipe(
         scheduleOnQueue(work, {
-          ngZone, priority: PriorityLevel.ImmediatePriority,
+          ngZone,
+          priority: PriorityLevel.ImmediatePriority,
           scope,
         })
       );
@@ -34,11 +35,12 @@ const immediateStrategy: RxStrategyCredentials = {
 const userBlockingStrategy: RxStrategyCredentials = {
   name: 'userBlocking',
   work: (cdRef) => cdRef.detectChanges(),
-  behavior: (work: any, scope: any, ngZone: NgZone) => {
+  behavior: ({ work, scope, ngZone }) => {
     return (o$) =>
       o$.pipe(
         scheduleOnQueue(work, {
-          ngZone, priority: PriorityLevel.UserBlockingPriority,
+          ngZone,
+          priority: PriorityLevel.UserBlockingPriority,
           scope,
         })
       );
@@ -48,32 +50,44 @@ const userBlockingStrategy: RxStrategyCredentials = {
 const normalStrategy: RxStrategyCredentials = {
   name: 'normal',
   work: (cdRef) => cdRef.detectChanges(),
-  behavior: (work: any, scope: any, ngZone: NgZone) => {
+  behavior: ({ work, scope, ngZone }) => {
     return (o$) =>
       o$.pipe(
-        scheduleOnQueue(work, { ngZone, priority: PriorityLevel.NormalPriority, scope })
+        scheduleOnQueue(work, {
+          ngZone,
+          priority: PriorityLevel.NormalPriority,
+          scope,
+        })
       );
   },
 };
 
 const lowStrategy: RxStrategyCredentials = {
   name: 'low',
   work: (cdRef) => cdRef.detectChanges(),
-  behavior: (work: any, scope: any, ngZone: NgZone) => {
+  behavior: ({ work, scope, ngZone }) => {
     return (o$) =>
       o$.pipe(
-        scheduleOnQueue(work, { ngZone, priority: PriorityLevel.LowPriority, scope })
+        scheduleOnQueue(work, {
+          ngZone,
+          priority: PriorityLevel.LowPriority,
+          scope,
+        })
       );
   },
 };
 
 const idleStrategy: RxStrategyCredentials = {
   name: 'idle',
   work: (cdRef) => cdRef.detectChanges(),
-  behavior: (work: any, scope: any, ngZone: NgZone) => {
+  behavior: ({ work, scope, ngZone }) => {
     return (o$) =>
       o$.pipe(
-        scheduleOnQueue(work, { ngZone, priority: PriorityLevel.IdlePriority, scope })
+        scheduleOnQueue(work, {
+          ngZone,
+          priority: PriorityLevel.IdlePriority,
+          scope,
+        })
       );
   },
 };
@@ -84,7 +98,7 @@ function scheduleOnQueue<T>(
     priority: PriorityLevel;
     scope: Record<string, unknown>;
     delay?: number;
-    ngZone: NgZone
+    ngZone: NgZone;
   }
 ): MonoTypeOperatorFunction<T> {
   return (o$: Observable<T>): Observable<T> =>
diff --git a/libs/cdk/render-strategies/src/lib/model.ts b/libs/cdk/render-strategies/src/lib/model.ts
@@ -1,5 +1,4 @@
 import { ChangeDetectorRef, NgZone } from '@angular/core';
-import { coalescingObj } from '@rx-angular/cdk/coalescing';
 import { RxNotification } from '@rx-angular/cdk/notifications';
 import { Observable } from 'rxjs';
 
@@ -11,23 +10,25 @@ export interface ScheduleOnStrategyOptions {
 
 export type RxRenderWork = <T = unknown>(
   cdRef: ChangeDetectorRef,
-  scope?: coalescingObj,
+  scope?: Record<string, unknown>,
   notification?: RxNotification<T>
 ) => void;
-export type RxRenderBehavior = <T = unknown>(
-  work: any,
-  scope?: coalescingObj,
-  ngZone?: NgZone
-) => (o: Observable<T>) => Observable<T>;
+export type RxRenderBehavior = <T = unknown>(params: {
+  work: () => any;
+  scope?: Record<string, unknown>;
+  ngZone?: NgZone;
+}) => (o: Observable<T>) => Observable<T>;
 
 export interface RxStrategyCredentials<S = string> {
   name: S;
   work: RxRenderWork;
   behavior: RxRenderBehavior;
 }
 
-export type RxCustomStrategyCredentials<T extends string> = Record<T,
-  RxStrategyCredentials>;
+export type RxCustomStrategyCredentials<T extends string> = Record<
+  T,
+  RxStrategyCredentials
+>;
 export type RxNativeStrategyNames = 'native' | 'local' | 'global' | 'noop';
 export type RxConcurrentStrategyNames =
   | 'immediate'
@@ -39,4 +40,6 @@ export type RxDefaultStrategyNames =
   | RxNativeStrategyNames
   | RxConcurrentStrategyNames;
 export type RxStrategyNames<T> = RxDefaultStrategyNames | T;
-export type RxStrategies<T extends string> = RxCustomStrategyCredentials<RxStrategyNames<T>>;
+export type RxStrategies<T extends string> = RxCustomStrategyCredentials<
+  RxStrategyNames<T>
+>;
