From f031611cb868a451752d7e64b7ec971db5fd8158 Mon Sep 17 00:00:00 2001 From: demensky Date: Thu, 30 Jun 2022 01:36:48 +0300 Subject: [PATCH] feat(throwError): removed deprecated throwError(errorFactory, scheduler) call pattern BREAKING CHANGE: `throwError(errorFactory, scheduler)` call pattern is no longer available. [Read more](https://rxjs.dev/deprecations/scheduler-argument). --- spec-dtslint/observables/throwError-spec.ts | 6 +----- spec/observables/throwError-spec.ts | 8 -------- src/internal/observable/throwError.ts | 22 ++++----------------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/spec-dtslint/observables/throwError-spec.ts b/spec-dtslint/observables/throwError-spec.ts index c7a1f375e2..45432da32a 100644 --- a/spec-dtslint/observables/throwError-spec.ts +++ b/spec-dtslint/observables/throwError-spec.ts @@ -1,4 +1,4 @@ -import { throwError, animationFrameScheduler } from 'rxjs'; +import { throwError } from 'rxjs'; it('should error for incorrect errorFactory', () => { const a = throwError(1); // $ExpectError @@ -12,7 +12,3 @@ it('should accept any type and return never observable with support of factory', const c = throwError(() => ({ a: 1 })); // $ExpectType Observable const d = throwError(() => ({ a: 2 })); // $ExpectType Observable }); - -it('should support a factory and a scheduler', () => { - const a = throwError(() => 1, animationFrameScheduler); // $ExpectType Observable -}); diff --git a/spec/observables/throwError-spec.ts b/spec/observables/throwError-spec.ts index 940cf679fa..0bcbc899d6 100644 --- a/spec/observables/throwError-spec.ts +++ b/spec/observables/throwError-spec.ts @@ -34,14 +34,6 @@ describe('throwError', () => { }); }); - it('should accept scheduler', () => { - rxTest.run(({ expectObservable }) => { - const e = throwError(() => 'error', rxTest); - - expectObservable(e).toBe('#'); - }); - }); - it('should accept a factory function', () => { let calls = 0; let errors: any[] = []; diff --git a/src/internal/observable/throwError.ts b/src/internal/observable/throwError.ts index 5db4e8aa2e..7753575628 100644 --- a/src/internal/observable/throwError.ts +++ b/src/internal/observable/throwError.ts @@ -1,6 +1,4 @@ import { Observable } from '../Observable'; -import { Subscriber } from '../Subscriber'; -import { SchedulerLike } from '../types'; /** * Creates an observable that will create an error instance and push it to the consumer as an error @@ -94,20 +92,8 @@ import { SchedulerLike } from '../types'; * * @param errorFactory A factory function that will create the error instance that is pushed. */ -export function throwError(errorFactory: () => any): Observable; - -/** - * Notifies the consumer of an error using a given scheduler by scheduling it at delay `0` upon subscription. - * - * @param errorFactory An error instance or error factory - * @param scheduler A scheduler to use to schedule the error notification - * @deprecated The `scheduler` parameter will be removed in v8. - * Use `throwError` in combination with {@link observeOn}: `throwError(() => new Error('test')).pipe(observeOn(scheduler));`. - * Details: https://rxjs.dev/deprecations/scheduler-argument - */ -export function throwError(errorFactory: () => any, scheduler: SchedulerLike): Observable; - -export function throwError(errorFactory: () => any, scheduler?: SchedulerLike): Observable { - const init = (subscriber: Subscriber) => subscriber.error(errorFactory()); - return new Observable(scheduler ? (subscriber) => scheduler.schedule(init as any, 0, subscriber) : init); +export function throwError(errorFactory: () => any): Observable { + return new Observable((subscriber) => { + subscriber.error(errorFactory()); + }); }