Revert "refactor(core): use stream in rxResource instead of loader (#59910)" (#60803)

JeanMeche · atscott · commit 880ebf4a7111 · 2025-04-09T09:33:27.000-07:00
This reverts commit 98a584c. PR Close #60803
diff --git a/goldens/public-api/core/rxjs-interop/index.api.md b/goldens/public-api/core/rxjs-interop/index.api.md
@@ -35,7 +35,10 @@ export function rxResource<T, R>(opts: RxResourceOptions<T, R> & {
 export function rxResource<T, R>(opts: RxResourceOptions<T, R>): ResourceRef<T | undefined>;
 
 // @public
-export type RxResourceOptions<T, R> = RxResourceStreamOptions<T, R> | RxResourceLoaderOptions<T, R>;
+export interface RxResourceOptions<T, R> extends BaseResourceOptions<T, R> {
+    // (undocumented)
+    loader: (params: ResourceLoaderParams<R>) => Observable<T>;
+}
 
 // @public
 export function takeUntilDestroyed<T>(destroyRef?: DestroyRef): MonoTypeOperatorFunction<T>;
diff --git a/packages/core/rxjs-interop/src/rx_resource.ts b/packages/core/rxjs-interop/src/rx_resource.ts
@@ -17,35 +17,17 @@ import {
 } from '@angular/core';
 import {Observable, Subscription} from 'rxjs';
 
-/**
- * Like `ResourceOptions` but uses an RxJS-based `stream`.
- *
- * @experimental
- */
-interface RxResourceStreamOptions<T, R> extends BaseResourceOptions<T, R> {
-  stream: (params: ResourceLoaderParams<R>) => Observable<T>;
-}
-
 /**
  * Like `ResourceOptions` but uses an RxJS-based `loader`.
  *
  * @experimental
- * @deprecated Use `stream` instead of `loader`.
  */
-interface RxResourceLoaderOptions<T, R> extends BaseResourceOptions<T, R> {
-  /** @deprecated Use `stream` instead of `loader`. */
+export interface RxResourceOptions<T, R> extends BaseResourceOptions<T, R> {
   loader: (params: ResourceLoaderParams<R>) => Observable<T>;
 }
 
 /**
- * Like `ResourceOptions` but uses an RxJS-based `stream`.
- *
- * @experimental
- */
-export type RxResourceOptions<T, R> = RxResourceStreamOptions<T, R> | RxResourceLoaderOptions<T, R>;
-
-/**
- * Like `resource` but uses an RxJS based `stream` which maps the request to an `Observable` of the
+ * Like `resource` but uses an RxJS based `loader` which maps the request to an `Observable` of the
  * resource's value.
  *
  * @experimental
@@ -55,7 +37,7 @@ export function rxResource<T, R>(
 ): ResourceRef<T>;
 
 /**
- * Like `resource` but uses an RxJS based `stream` which maps the request to an `Observable` of the
+ * Like `resource` but uses an RxJS based `loader` which maps the request to an `Observable` of the
  * resource's value.
  *
  * @experimental
@@ -85,11 +67,7 @@ export function rxResource<T, R>(opts: RxResourceOptions<T, R>): ResourceRef<T |
         resolve = undefined;
       }
 
-      // loader is kept for backwards compatibility
-      const streamOrLoader =
-        (opts as RxResourceStreamOptions<T, R>).stream ??
-        (opts as RxResourceLoaderOptions<T, R>).loader;
-      sub = streamOrLoader(params).subscribe({
+      sub = opts.loader(params).subscribe({
         next: (value) => send({value}),
         error: (error) => send({error}),
         complete: () => {
diff --git a/packages/core/rxjs-interop/test/rx_resource_spec.ts b/packages/core/rxjs-interop/test/rx_resource_spec.ts
@@ -16,7 +16,7 @@ describe('rxResource()', () => {
     const injector = TestBed.inject(Injector);
     const appRef = TestBed.inject(ApplicationRef);
     const res = rxResource({
-      stream: () => of(1),
+      loader: () => of(1),
       injector,
     });
     await appRef.whenStable();
@@ -31,7 +31,7 @@ describe('rxResource()', () => {
     let lastSeenRequest: number = 0;
     rxResource({
       request,
-      stream: ({request}) => {
+      loader: ({request}) => {
         lastSeenRequest = request;
         return new Observable((sub) => {
           if (request === 2) {
@@ -61,7 +61,7 @@ describe('rxResource()', () => {
     const appRef = TestBed.inject(ApplicationRef);
     const response = new BehaviorSubject(1);
     const res = rxResource({
-      stream: () => response,
+      loader: () => response,
       injector,
     });
     await appRef.whenStable();
