From e8ddecdfe24e29d6152b224243071061dd412941 Mon Sep 17 00:00:00 2001
From: markostanimirovic <markostanimirovic95@gmail.com>
Date: Tue, 30 Jan 2024 01:18:12 +0100
Subject: [PATCH] perf(signals): avoid unecessary observable conversions in
 rxMethod

---
 modules/signals/rxjs-interop/src/rx-method.ts | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/modules/signals/rxjs-interop/src/rx-method.ts b/modules/signals/rxjs-interop/src/rx-method.ts
index 54858e99f8..d97f9450bb 100644
--- a/modules/signals/rxjs-interop/src/rx-method.ts
+++ b/modules/signals/rxjs-interop/src/rx-method.ts
@@ -1,13 +1,13 @@
 import {
   assertInInjectionContext,
   DestroyRef,
+  effect,
   inject,
   Injector,
   isSignal,
   Signal,
 } from '@angular/core';
-import { toObservable } from '@angular/core/rxjs-interop';
-import { isObservable, Observable, of, Subject, Unsubscribable } from 'rxjs';
+import { isObservable, noop, Observable, Subject, Unsubscribable } from 'rxjs';
 
 type RxMethodInput<Input> = Input | Observable<Input> | Signal<Input>;
 
@@ -30,20 +30,23 @@ export function rxMethod<Input>(
   destroyRef.onDestroy(() => sourceSub.unsubscribe());
 
   const rxMethodFn = (input: RxMethodInput<Input>) => {
-    let input$: Observable<Input>;
-
     if (isSignal(input)) {
-      input$ = toObservable(input, { injector });
-    } else if (isObservable(input)) {
-      input$ = input;
-    } else {
-      input$ = of(input);
+      const watcher = effect(() => source$.next(input()), { injector });
+      const instanceSub = { unsubscribe: () => watcher.destroy() };
+      sourceSub.add(instanceSub);
+
+      return instanceSub;
     }
 
-    const instanceSub = input$.subscribe((value) => source$.next(value));
-    sourceSub.add(instanceSub);
+    if (isObservable(input)) {
+      const instanceSub = input.subscribe((value) => source$.next(value));
+      sourceSub.add(instanceSub);
+
+      return instanceSub;
+    }
 
-    return instanceSub;
+    source$.next(input);
+    return { unsubscribe: noop };
   };
   rxMethodFn.unsubscribe = sourceSub.unsubscribe.bind(sourceSub);