refactor: use init and selector intersection

ReactiveX · Apr 3, 2020 · 32f8fee · 32f8fee
1 parent aca064b
commit 32f8fee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 49 deletions.
diff --git a/spec/observables/dom/fetch-spec.ts b/spec/observables/dom/fetch-spec.ts
@@ -270,36 +270,9 @@ describe('fromFetch', () => {
  ...OK_RESPONSE,
  text: () => Promise.resolve('bar')
  };
- const fetch$ = fromFetch('/foo', undefined, response => response.text());
- expect(mockFetch.calls.length).to.equal(0);
- expect(MockAbortController.created).to.equal(0);
-
- fetch$.subscribe({
- next: text => {
- expect(text).to.equal('bar');
- },
- error: done,
- complete: () => {
- // Wait until the complete and the subsequent unsubscribe are finished
- // before testing these expectations:
- setTimeout(() => {
- expect(MockAbortController.created).to.equal(1);
- expect(mockFetch.calls.length).to.equal(1);
- expect(mockFetch.calls[0].input).to.equal('/foo');
- expect(mockFetch.calls[0].init!.signal).not.to.be.undefined;
- expect(mockFetch.calls[0].init!.signal!.aborted).to.be.false;
- done();
- }, 0);
- }
+ const fetch$ = fromFetch('/foo', {
+ selector: response => response.text()
  });
- });
-
- it('should support a selector without an init argument', done => {
- mockFetch.respondWith = {
- ...OK_RESPONSE,
- text: () => Promise.resolve('bar')
- };
- const fetch$ = fromFetch('/foo', response => response.text());
  expect(mockFetch.calls.length).to.equal(0);
  expect(MockAbortController.created).to.equal(0);
 
@@ -328,7 +301,9 @@ describe('fromFetch', () => {
  ...OK_RESPONSE,
  text: () => Promise.resolve('bar')
  };
- const fetch$ = fromFetch('/foo', undefined, response => response.text());
+ const fetch$ = fromFetch('/foo', {
+ selector: response => response.text()
+ });
  expect(mockFetch.calls.length).to.equal(0);
  expect(MockAbortController.created).to.equal(0);
  const subscription = fetch$.subscribe();

diff --git a/src/internal/observable/dom/fetch.ts b/src/internal/observable/dom/fetch.ts
@@ -3,21 +3,17 @@ import { Subscription } from '../../Subscription';
 import { from } from '../../observable/from';
 import { ObservableInput } from '../../types';
 
-export function fromFetch(
- input: string | Request,
- init?: RequestInit
-): Observable<Response>;
-
 export function fromFetch<T>(
  input: string | Request,
- selector: (response: Response) => ObservableInput<T>
+ init: RequestInit & {
+ selector: (response: Response) => ObservableInput<T>
+ }
 ): Observable<T>;
 
-export function fromFetch<T>(
+export function fromFetch(
  input: string | Request,
- init: RequestInit | undefined,
- selector: (response: Response) => ObservableInput<T>
-): Observable<T>;
+ init?: RequestInit
+): Observable<Response>;
 
 /**
  * Uses [the Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) to
@@ -71,16 +67,11 @@ export function fromFetch<T>(
  */
 export function fromFetch<T>(
  input: string | Request,
- initOrSelector?: RequestInit | ((response: Response) => ObservableInput<T>),
- selector?: (response: Response) => ObservableInput<T>
+ initWithSelector: RequestInit & {
+ selector?: (response: Response) => ObservableInput<T>
+ } = {}
 ): Observable<Response | T> {
- let init: RequestInit | undefined;
- if (typeof initOrSelector === 'function') {
- init = undefined;
- selector = initOrSelector;
- } else {
- init = initOrSelector;
- }
+ const { selector, ...init } = initWithSelector;
  return new Observable<Response | T>(subscriber => {
  const controller = new AbortController();
  const signal = controller.signal;