chore: migrate all 'rxjs/operators' imports to 'rxjs'

Author: demensky

docs_app/src/app/app.component.spec.ts

@@ -7,8 +7,7 @@ import { MatProgressBar } from '@angular/material/progress-bar';
 import { MatSidenav } from '@angular/material/sidenav';
 import { By } from '@angular/platform-browser';
 
-import { of, timer } from 'rxjs';
-import { first, mapTo } from 'rxjs/operators';
+import { of, timer, first, mapTo } from 'rxjs';
 
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';

docs_app/src/app/app.component.ts

@@ -12,8 +12,7 @@ import { SearchResults } from 'app/search/interfaces';
 import { SearchService } from 'app/search/search.service';
 import { TocService } from 'app/shared/toc.service';
 
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, Observable, first, map } from 'rxjs';
 import { Inject } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 

docs_app/src/app/custom-elements/announcement-bar/announcement-bar.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs';
 import { Logger } from 'app/shared/logger.service';
 import { CONTENT_URL_PREFIX } from 'app/documents/document.service';
 const announcementsPath = CONTENT_URL_PREFIX + 'announcements.json';

docs_app/src/app/custom-elements/api/api-list.component.ts

@@ -8,13 +8,13 @@
 
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 
-import { combineLatest, Observable, ReplaySubject } from 'rxjs';
+import { combineLatest, Observable, ReplaySubject, map } from 'rxjs';
 
 import { LocationService } from 'app/shared/location.service';
 import { ApiSection, ApiService } from './api.service';
 
 import { Option } from 'app/shared/select/select.component';
-import { map } from 'rxjs/operators';
+
 
 class SearchCriteria {
   query? = '';

docs_app/src/app/custom-elements/api/api.service.ts

@@ -1,8 +1,7 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 
-import { ReplaySubject, Subject } from 'rxjs';
-import { takeUntil, tap } from 'rxjs/operators';
+import { ReplaySubject, Subject, takeUntil, tap } from 'rxjs';
 
 import { Logger } from 'app/shared/logger.service';
 import { DOC_CONTENT_URL_PREFIX } from 'app/documents/document.service';

docs_app/src/app/custom-elements/code/code.component.ts

@@ -3,7 +3,7 @@ import { Logger } from 'app/shared/logger.service';
 import { PrettyPrinter } from './pretty-printer.service';
 import { CopierService } from 'app/shared/copier.service';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import { StackblitzService } from 'app/shared/stackblitz.service';
 import version from '../../../../tools/stackblitz/rxjs.version';
 

docs_app/src/app/custom-elements/code/pretty-printer.service.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { from as fromPromise, Observable } from 'rxjs';
-import { first, map, share } from 'rxjs/operators';
+import { from as fromPromise, Observable, first, map, share } from 'rxjs';
 
 import { Logger } from 'app/shared/logger.service';
 

docs_app/src/app/custom-elements/contributor/contributor.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
-import { ConnectableObservable, Observable } from 'rxjs';
-import { map, publishLast } from 'rxjs/operators';
+import { ConnectableObservable, Observable, map, publishLast } from 'rxjs';
 
 import { Contributor, ContributorGroup } from './contributors.model';
 

docs_app/src/app/custom-elements/operator-decision-tree/operator-decision-tree.service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
-import { filter, map, mapTo, shareReplay, catchError } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, Observable, of, filter, map, mapTo, shareReplay, catchError } from 'rxjs';
 import { OperatorDecisionTree, OperatorTreeNode, State } from './interfaces';
 import { OperatorDecisionTreeDataService } from './operator-decision-tree-data.service';
 import { isInitialDecision, nodeHasOptions, treeIsErrorFree } from './utils';

docs_app/src/app/custom-elements/resource/resource.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
-import { ConnectableObservable, Observable } from 'rxjs';
-import { map, publishLast } from 'rxjs/operators';
+import { ConnectableObservable, Observable, map, publishLast } from 'rxjs';
 
 import { Category, Resource, SubCategory } from './resource.model';
 import { CONTENT_URL_PREFIX } from 'app/documents/document.service';

docs_app/src/app/custom-elements/search/file-not-found-search.component.ts

@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { Observable, switchMap } from 'rxjs';
 import { LocationService } from 'app/shared/location.service';
 import { SearchResults } from 'app/search/interfaces';
 import { SearchService } from 'app/search/search.service';

docs_app/src/app/custom-elements/toc/toc.component.ts

@@ -1,6 +1,5 @@
 import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
-import { asapScheduler as asap, combineLatest, Subject } from 'rxjs';
-import { startWith, subscribeOn, takeUntil } from 'rxjs/operators';
+import { asapScheduler as asap, combineLatest, Subject, startWith, subscribeOn, takeUntil } from 'rxjs';
 
 import { ScrollService } from 'app/shared/scroll.service';
 import { TocItem, TocService } from 'app/shared/toc.service';

docs_app/src/app/documents/document.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 
-import { AsyncSubject, Observable, of } from 'rxjs';
-import { catchError, switchMap, tap } from 'rxjs/operators';
+import { AsyncSubject, Observable, of, catchError, switchMap, tap } from 'rxjs';
 
 import { DocumentContents } from './document-contents';
 export { DocumentContents } from './document-contents';

docs_app/src/app/layout/doc-viewer/doc-viewer.component.ts

@@ -1,8 +1,7 @@
 import { Component, ElementRef, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
 import { Title, Meta } from '@angular/platform-browser';
 
-import { asapScheduler, Observable, of, timer } from 'rxjs';
-import { catchError, observeOn, switchMap, takeUntil, tap } from 'rxjs/operators';
+import { asapScheduler, Observable, of, timer, catchError, observeOn, switchMap, takeUntil, tap } from 'rxjs';
 
 import { DocumentContents, FILE_NOT_FOUND_ID, FETCHING_ERROR_ID } from 'app/documents/document.service';
 import { Logger } from 'app/shared/logger.service';

docs_app/src/app/navigation/navigation.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
-import { combineLatest, ConnectableObservable, Observable } from 'rxjs';
-import { map, publishLast, publishReplay } from 'rxjs/operators';
+import { combineLatest, ConnectableObservable, Observable, map, publishLast, publishReplay } from 'rxjs';
 
 import { LocationService } from 'app/shared/location.service';
 import { CONTENT_URL_PREFIX } from 'app/documents/document.service';

docs_app/src/app/search/search-box/search-box.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, ViewChild, ElementRef, EventEmitter, Output } from '@angular/core';
 import { LocationService } from 'app/shared/location.service';
-import { Subject } from 'rxjs';
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { Subject, debounceTime, distinctUntilChanged } from 'rxjs';
 
 /**
  * This component provides a text box to type a search query that will be sent to the SearchService.

docs_app/src/app/search/search.service.ts

@@ -5,8 +5,7 @@ can be found in the LICENSE file at http://angular.io/license
 */
 
 import { NgZone, Injectable } from '@angular/core';
-import { ConnectableObservable, Observable, race, ReplaySubject, timer } from 'rxjs';
-import { concatMap, first, publishReplay } from 'rxjs/operators';
+import { ConnectableObservable, Observable, race, ReplaySubject, timer, concatMap, first, publishReplay } from 'rxjs';
 import { WebWorkerClient } from 'app/shared/web-worker';
 import { SearchResults } from 'app/search/interfaces';
 

docs_app/src/app/shared/location.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Location, PlatformLocation } from '@angular/common';
 
-import { ReplaySubject } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { ReplaySubject, map, tap } from 'rxjs';
 
 import { GaService } from 'app/shared/ga.service';
 import { SwUpdatesService } from 'app/sw-updates/sw-updates.service';

docs_app/src/app/shared/scroll-spy.service.ts

@@ -1,7 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
-import { fromEvent, Observable, ReplaySubject, Subject } from 'rxjs';
-import { auditTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
+import { fromEvent, Observable, ReplaySubject, Subject, auditTime, distinctUntilChanged, takeUntil } from 'rxjs';
 
 import { ScrollService } from 'app/shared/scroll.service';
 

docs_app/src/app/shared/scroll.service.ts

@@ -1,7 +1,6 @@
 import { DOCUMENT, Location, PlatformLocation, PopStateEvent, ViewportScroller } from '@angular/common';
 import { Injectable, Inject } from '@angular/core';
-import { fromEvent } from 'rxjs';
-import { debounceTime } from 'rxjs/operators';
+import { fromEvent, debounceTime } from 'rxjs';
 
 type ScrollPosition = [number, number];
 interface ScrollPositionPopStateEvent extends PopStateEvent {

docs_app/src/app/sw-updates/sw-updates.service.ts

@@ -1,7 +1,6 @@
 import { ApplicationRef, Injectable, OnDestroy } from '@angular/core';
 import { SwUpdate } from '@angular/service-worker';
-import { concat, interval, NEVER, Observable, Subject } from 'rxjs';
-import { first, map, takeUntil, tap } from 'rxjs/operators';
+import { concat, interval, NEVER, Observable, Subject, first, map, takeUntil, tap } from 'rxjs';
 
 import { Logger } from 'app/shared/logger.service';
 

docs_app/src/testing/location.service.ts

@@ -1,5 +1,4 @@
-import { BehaviorSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { BehaviorSubject, map } from 'rxjs';
 
 export class MockLocationService {
   urlSubject = new BehaviorSubject<string>(this.initialUrl);

spec-dtslint/Observable-spec.ts

@@ -1,5 +1,4 @@
-import { Observable, of, OperatorFunction } from 'rxjs';
-import { mapTo } from 'rxjs/operators';
+import { Observable, of, OperatorFunction, mapTo } from 'rxjs';
 
 function a<I extends string, O extends string>(input: I, output: O): OperatorFunction<I, O>;
 function a<I, O extends string>(output: O): OperatorFunction<I, O>;
@@ -126,4 +125,4 @@ describe('pipe', () => {
     const customOperator = () => <T>(a: Observable<T>) => a;
     const o = of('foo').pipe(customOperator()); // $ExpectType Observable<string>
   });
-});
+});

spec-dtslint/operators/audit-spec.ts

@@ -1,5 +1,4 @@
-import { of, NEVER } from 'rxjs';
-import { audit } from 'rxjs/operators';
+import { of, NEVER, audit } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(audit(() => of('foo'))); // $ExpectType Observable<number>

spec-dtslint/operators/auditTime-spec.ts

@@ -1,5 +1,4 @@
-import { of, asyncScheduler } from 'rxjs';
-import { auditTime } from 'rxjs/operators';
+import { of, asyncScheduler, auditTime } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of('a', 'b', 'c').pipe(auditTime(47)); // $ExpectType Observable<string>

spec-dtslint/operators/buffer-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { buffer } from 'rxjs/operators';
+import { of, buffer } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(buffer(of('foo'))); // $ExpectType Observable<number[]>

spec-dtslint/operators/bufferCount-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { bufferCount } from 'rxjs/operators';
+import { of, bufferCount } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(bufferCount(1)); // $ExpectType Observable<number[]>

spec-dtslint/operators/bufferTime-spec.ts

@@ -1,5 +1,4 @@
-import { of, asyncScheduler } from 'rxjs';
-import { bufferTime } from 'rxjs/operators';
+import { of, asyncScheduler, bufferTime } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(bufferTime(1)); // $ExpectType Observable<number[]>

spec-dtslint/operators/bufferToggle-spec.ts

@@ -1,5 +1,4 @@
-import { of, NEVER } from 'rxjs';
-import { bufferToggle } from 'rxjs/operators';
+import { of, NEVER, bufferToggle } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(bufferToggle(of('a', 'b', 'c'), value => of(new Date()))); // $ExpectType Observable<number[]>

spec-dtslint/operators/bufferWhen-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { bufferWhen } from 'rxjs/operators';
+import { of, bufferWhen } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(bufferWhen(() => of('a', 'b', 'c'))); // $ExpectType Observable<number[]>

spec-dtslint/operators/catchError-spec.ts

@@ -1,5 +1,4 @@
-import { of, Observable, EMPTY } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { of, Observable, EMPTY, catchError } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(catchError((() => of(4, 5, 6)))); // $ExpectType Observable<number>

spec-dtslint/operators/combineLatestAll-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { combineLatestAll } from 'rxjs/operators';
+import { of, combineLatestAll } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of([1, 2, 3]).pipe(combineLatestAll()); // $ExpectType Observable<number[]>

spec-dtslint/operators/combineLatestWith-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { combineLatestWith } from 'rxjs/operators';
+import { of, combineLatestWith } from 'rxjs';
 
 describe('combineLatestWith', () => {
   describe('without project parameter', () => {

spec-dtslint/operators/concatAll-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { concatAll } from 'rxjs/operators';
+import { of, concatAll } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(of(1, 2, 3)).pipe(concatAll()); // $ExpectType Observable<number>

spec-dtslint/operators/concatMap-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
+import { of, concatMap } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(concatMap(p => of(Boolean(p)))); // $ExpectType Observable<boolean>

spec-dtslint/operators/concatMapTo-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { concatMapTo } from 'rxjs/operators';
+import { of, concatMapTo } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(concatMapTo(of('foo'))); // $ExpectType Observable<string>

spec-dtslint/operators/concatWith-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { concatWith } from 'rxjs/operators';
+import { of, concatWith } from 'rxjs';
 import { a$, b$, c$, d$, e$ } from 'helpers';
 
 it('should support rest params', () => {

spec-dtslint/operators/connect-spec.ts

@@ -1,7 +1,6 @@
-import { of } from 'rxjs';
-import { connect } from 'rxjs/operators';
+import { of, connect } from 'rxjs';
 import { a$, b$ } from '../helpers';
 
 it('should infer from a union', () => {
     const o = of(null).pipe(connect(() => Math.random() > 0.5 ? a$ : b$)); // $ExpectType Observable<A | B>
-});
+});

spec-dtslint/operators/count-spec.ts

@@ -1,5 +1,4 @@
-import { of, Observable } from 'rxjs';
-import { count } from 'rxjs/operators';
+import { of, Observable, count } from 'rxjs';
 
 it('should always infer number', () => {
   const o = of(1, 2, 3).pipe(count(x => x > 1)); // $ExpectType Observable<number>

spec-dtslint/operators/debounce-spec.ts

@@ -1,5 +1,4 @@
-import { of, timer } from 'rxjs';
-import { debounce } from 'rxjs/operators';
+import { of, timer, debounce } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(debounce(() => timer(47))); // $ExpectType Observable<number>

spec-dtslint/operators/debounceTime-spec.ts

@@ -1,5 +1,4 @@
-import { of, asyncScheduler } from 'rxjs';
-import { debounceTime } from 'rxjs/operators';
+import { of, asyncScheduler, debounceTime } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(debounceTime(47)); // $ExpectType Observable<number>

spec-dtslint/operators/defaultIfEmpty-spec.ts

@@ -1,5 +1,4 @@
-import { EMPTY, of } from 'rxjs';
-import { defaultIfEmpty, map } from 'rxjs/operators';
+import { EMPTY, of, defaultIfEmpty, map } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(defaultIfEmpty()); // $ExpectError

spec-dtslint/operators/delay-spec.ts

@@ -1,5 +1,4 @@
-import { of, asyncScheduler } from 'rxjs';
-import { delay } from 'rxjs/operators';
+import { of, asyncScheduler, delay } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(delay(100)); // $ExpectType Observable<number>

spec-dtslint/operators/delayWhen-spec.ts

@@ -1,5 +1,4 @@
-import { of, NEVER } from 'rxjs';
-import { delayWhen } from 'rxjs/operators';
+import { of, NEVER, delayWhen } from 'rxjs';
 
 it('should infer correctly', () => {
   const o = of(1, 2, 3).pipe(delayWhen(() => of('a', 'b', 'c'))); // $ExpectType Observable<number>

spec-dtslint/operators/dematerialize-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { dematerialize } from 'rxjs/operators';
+import { of, dematerialize } from 'rxjs';
 
 
 it('should infer correctly', () => {

spec-dtslint/operators/distinct-spec.ts

@@ -1,6 +1,5 @@
-import { of } from 'rxjs';
+import { of, distinct } from 'rxjs';
 import { asInteropObservable } from '../../spec/helpers/interop-helper';
-import { distinct } from 'rxjs/operators';
 import { ReadableStreamLike } from '../../src/internal/types';
 
 it('should infer correctly', () => {

spec-dtslint/operators/distinctUntilChanged-spec.ts

@@ -1,5 +1,4 @@
-import { of } from 'rxjs';
-import { distinctUntilChanged } from 'rxjs/operators';
+import { of, distinctUntilChanged } from 'rxjs';
 
 interface Person { name: string; }
 const sample: Person = { name: 'Tim' };