refactor: Update rxjs operators to be lettable

Author: Brocco

bin/devkit-admin

@@ -34,10 +34,10 @@ process.chdir(path.join(__dirname, '..'));
 let logger = null;
 try {
   logger = new (require('@angular-devkit/core').logging.IndentLogger)('root');
-  require('rxjs/add/operator/filter');
+  const filter = require('rxjs/operators').filter;
 
   logger
-    .filter(entry => (entry.level !== 'debug' || args.verbose))
+    .pipe(filter(entry => (entry.level !== 'debug' || args.verbose)))
     .subscribe(entry => {
       let color = gray;
       let output = process.stdout;
@@ -52,7 +52,7 @@ try {
     });
 
   logger
-    .filter(entry => entry.level === 'fatal')
+    .pipe(filter(entry => entry.level === 'fatal'))
     .subscribe(() => {
       process.stderr.write('A fatal error happened. See details above.\n');
       process.exit(100);

package-lock.json

@@ -66,7 +66,7 @@
     "npm": "^5.2.0",
     "npm-run": "^4.1.2",
     "npm-run-all": "^4.0.0",
-    "rxjs": "^5.5.2",
+    "rxjs": "5.5.4",
     "semver": "^5.3.0",
     "semver-intersect": "^1.1.2",
     "source-map": "^0.5.6",

package.json

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging, terminal } from '@angular-devkit/core';
-import 'rxjs/add/operator/filter';
+import { filter } from 'rxjs/operators';
 
 
 /**
@@ -16,7 +16,7 @@ export function createConsoleLogger(verbose = false): logging.Logger {
   const logger = new logging.IndentLogger('cling');
 
   logger
-    .filter(entry => (entry.level != 'debug' || verbose))
+    .pipe(filter(entry => (entry.level != 'debug' || verbose)))
     .subscribe(entry => {
       let color: (s: string) => string = x => terminal.dim(terminal.white(x));
       let output = process.stdout;

packages/angular_devkit/core/node/cli-logger.ts

@@ -19,7 +19,8 @@ import {
 import * as fs from 'fs';
 import { Observable } from 'rxjs/Observable';
 import { ArrayObservable } from 'rxjs/observable/ArrayObservable';
-import { FromObservable } from 'rxjs/observable/FromObservable';
+import { empty } from 'rxjs/observable/empty';
+import { from as observableFrom } from 'rxjs/observable/from';
 import { concat } from 'rxjs/operators/concat';
 import { concatMap } from 'rxjs/operators/concatMap';
 import { ignoreElements } from 'rxjs/operators/ignoreElements';
@@ -131,11 +132,11 @@ export class NodeJsAsyncHost implements virtualFs.Host<fs.Stats> {
           };
           _recurseList(path);
 
-          return FromObservable.create(allFiles)
+          return observableFrom(allFiles)
             .pipe(
               mergeMap(p => _callFs(fs.unlink, this._getSystemPath(p))),
               ignoreElements(),
-              concat(FromObservable.create(allDirs).pipe(
+              concat(observableFrom(allDirs).pipe(
                 concatMap(p => _callFs(fs.rmdir, this._getSystemPath(p))),
               )),
               map(() => {}),
@@ -251,7 +252,7 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
     _createDir(dirname(path));
     fs.writeFileSync(this._getSystemPath(path), new Uint8Array(content));
 
-    return Observable.empty<void>();
+    return empty<void>();
   }
 
   read(path: Path): Observable<virtualFs.FileBuffer> {
@@ -271,13 +272,13 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
       fs.unlinkSync(this._getSystemPath(path));
     }
 
-    return Observable.empty();
+    return empty();
   }
 
   rename(from: Path, to: Path): Observable<void> {
     fs.renameSync(this._getSystemPath(from), this._getSystemPath(to));
 
-    return Observable.empty();
+    return empty();
   }
 
   list(path: Path): Observable<PathFragment[]> {
@@ -292,11 +293,11 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
 
   isDirectory(path: Path): Observable<boolean> {
     // tslint:disable-next-line:non-null-operator
-    return this.stats(path) !.map(stat => stat.isDirectory());
+    return this.stats(path) !.pipe(map(stat => stat.isDirectory()));
   }
   isFile(path: Path): Observable<boolean> {
     // tslint:disable-next-line:non-null-operator
-    return this.stats(path) !.map(stat => stat.isFile());
+    return this.stats(path) !.pipe(map(stat => stat.isFile()));
   }
 
   // Some hosts may not support stats.

packages/angular_devkit/core/node/host.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import 'rxjs/add/operator/map';
+import { map } from 'rxjs/operators';
 import { Logger } from './logger';
 
 
@@ -24,21 +24,21 @@ export class IndentLogger extends Logger {
     super(name, parent);
 
     indentationMap[indentation] = indentationMap[indentation] || [''];
-    const map = indentationMap[indentation];
+    const indentMap = indentationMap[indentation];
 
-    this._observable = this._observable.map(entry => {
+    this._observable = this._observable.pipe(map(entry => {
       const l = entry.path.length;
-      if (l >= map.length) {
-        let current = map[map.length - 1];
-        while (l >= map.length) {
+      if (l >= indentMap.length) {
+        let current = indentMap[indentMap.length - 1];
+        while (l >= indentMap.length) {
           current += indentation;
-          map.push(current);
+          indentMap.push(current);
         }
       }
 
-      entry.message = map[l] + entry.message.split(/\n/).join('\n' + map[l]);
+      entry.message = indentMap[l] + entry.message.split(/\n/).join('\n' + indentMap[l]);
 
       return entry;
-    });
+    }));
   }
 }

packages/angular_devkit/core/src/logger/indent.ts

@@ -6,15 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-any
+import { toArray } from 'rxjs/operators';
 import { IndentLogger } from './indent';
 import { LogEntry, Logger } from './logger';
 
 
 describe('IndentSpec', () => {
   it('works', (done: DoneFn) => {
     const logger = new IndentLogger('test');
-    logger
-      .toArray()
+    logger.pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([

packages/angular_devkit/core/src/logger/indent_spec.ts

@@ -6,17 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-any
-import 'rxjs/add/operator/toArray';
-import 'rxjs/add/operator/toPromise';
+import { toArray } from 'rxjs/operators';
 import { JsonValue } from '../json/interface';
 import { Logger } from './logger';
 
 
 describe('Logger', () => {
   it('works', (done: DoneFn) => {
     const logger = new Logger('test');
-    logger
-      .toArray()
+    logger.pipe(toArray())
       .toPromise()
       .then((observed: JsonValue[]) => {
         expect(observed).toEqual([
@@ -34,8 +32,7 @@ describe('Logger', () => {
   it('works with children', (done: DoneFn) => {
     const logger = new Logger('test');
     let hasCompleted = false;
-    logger
-      .toArray()
+    logger.pipe(toArray())
       .toPromise()
       .then((observed: JsonValue[]) => {
         expect(observed).toEqual([
@@ -57,8 +54,7 @@ describe('Logger', () => {
     const logger = new Logger('test');
     logger.debug('woah');
 
-    logger
-      .toArray()
+    logger.pipe(toArray())
       .toPromise()
       .then((observed: JsonValue[]) => {
         expect(observed).toEqual([

packages/angular_devkit/core/src/logger/logger_spec.ts

@@ -5,15 +5,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/empty';
+import { empty } from 'rxjs/observable/empty';
 import { Logger, LoggerApi } from './logger';
 
 
 export class NullLogger extends Logger {
   constructor(parent: Logger | null = null) {
     super('', parent);
-    this._observable = Observable.empty();
+    this._observable = empty();
   }
 
   asApi(): LoggerApi {

packages/angular_devkit/core/src/logger/null-logger.ts

@@ -5,15 +5,15 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { toArray } from 'rxjs/operators';
 import { LogEntry, Logger } from './logger';
 import { NullLogger } from './null-logger';
 
 
 describe('NullLogger', () => {
   it('works', (done: DoneFn) => {
     const logger = new NullLogger();
-    logger
-      .toArray()
+    logger.pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([]);
@@ -27,8 +27,7 @@ describe('NullLogger', () => {
 
   it('nullifies children', (done: DoneFn) => {
     const logger = new Logger('test');
-    logger
-      .toArray()
+    logger.pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([]);

packages/angular_devkit/core/src/logger/null-logger_spec.ts

@@ -6,21 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-any
-import 'rxjs/add/operator/filter';
-import 'rxjs/add/operator/map';
+import { filter, map, toArray } from 'rxjs/operators';
 import { LogEntry } from './logger';
 import { TransformLogger } from './transform-logger';
 
 
 describe('TransformLogger', () => {
   it('works', (done: DoneFn) => {
     const logger = new TransformLogger('test', stream => {
-      return stream
-        .filter(entry => entry.message != 'hello')
-        .map(entry => (entry.message += '1', entry));
+      return stream.pipe(
+        filter(entry => entry.message != 'hello'),
+        map(entry => (entry.message += '1', entry)));
     });
-    logger
-      .toArray()
+    logger.pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([

packages/angular_devkit/core/src/logger/transform-logger_spec.ts

@@ -8,6 +8,7 @@
 import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
 import { ArrayObservable } from 'rxjs/observable/ArrayObservable';
+import { empty } from 'rxjs/observable/empty';
 import { _throw } from 'rxjs/observable/throw';
 import {
   FileAlreadyExistException,
@@ -106,7 +107,7 @@ export class SimpleMemoryHost implements Host<{}> {
     this._cache.set(path, content);
     this._updateWatchers(path, existed ? HostWatchEventType.Changed : HostWatchEventType.Created);
 
-    return Observable.empty<void>();
+    return empty<void>();
   }
   read(path: Path): Observable<FileBuffer> {
     if (this._isDir(path)) {
@@ -131,7 +132,7 @@ export class SimpleMemoryHost implements Host<{}> {
     }
     this._updateWatchers(path, HostWatchEventType.Deleted);
 
-    return Observable.empty();
+    return empty();
   }
   rename(from: Path, to: Path): Observable<void> {
     if (!this._cache.has(from)) {
@@ -158,7 +159,7 @@ export class SimpleMemoryHost implements Host<{}> {
 
     this._updateWatchers(from, HostWatchEventType.Renamed);
 
-    return Observable.empty();
+    return empty();
   }
 
   list(path: Path): Observable<PathFragment[]> {

packages/angular_devkit/core/src/virtual-fs/host/memory.ts

@@ -22,9 +22,13 @@ import {
   NodeModulesEngineHost,
 } from '@angular-devkit/schematics/tools';
 import * as minimist from 'minimist';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/operator/ignoreElements';
-
+import { of as observableOf } from 'rxjs/observable/of';
+import {
+  concat,
+  concatMap,
+  ignoreElements,
+  map,
+} from 'rxjs/operators';
 
 /**
  * Show usage of the CLI tool, and exit the process.
@@ -169,7 +173,7 @@ const dryRun: boolean = argv['dry-run'] === null ? debug : argv['dry-run'];
 const force = argv['force'];
 
 /** This host is the original Tree created from the current directory. */
-const host = Observable.of(new FileSystemTree(new FileSystemHost(process.cwd())));
+const host = observableOf(new FileSystemTree(new FileSystemHost(process.cwd())));
 
 // We need two sinks if we want to output what will happen, and actually do the work.
 // Note that fsSink is technically not used if `--dry-run` is passed, but creating the Sink
@@ -250,26 +254,31 @@ delete args._;
  * (if --dry-run was not passed or an error was detected by dryRun).
  */
 schematic.call(args, host, { debug, logger: logger.asApi() })
-  .map((tree: Tree) => Tree.optimize(tree))
-  .concatMap((tree: Tree) => {
-    return dryRunSink.commit(tree).ignoreElements().concat(Observable.of(tree));
-  })
-  .concatMap((tree: Tree) => {
-    if (!error) {
-      // Output the logging queue.
-      loggingQueue.forEach(log => logger.info(log));
-    }
+  .pipe(
+    map((tree: Tree) => Tree.optimize(tree)),
+    concatMap((tree: Tree) => {
+      return dryRunSink.commit(tree).pipe(
+        ignoreElements(),
+        concat(observableOf(tree)));
+    }),
+    concatMap((tree: Tree) => {
+      if (!error) {
+        // Output the logging queue.
+        loggingQueue.forEach(log => logger.info(log));
+      }
 
-    if (nothingDone) {
-      logger.info('Nothing to be done.');
-    }
+      if (nothingDone) {
+        logger.info('Nothing to be done.');
+      }
 
-    if (dryRun || error) {
-      return Observable.of(tree);
-    }
+      if (dryRun || error) {
+        return observableOf(tree);
+      }
 
-    return fsSink.commit(tree).ignoreElements().concat(Observable.of(tree));
-  })
+      return fsSink.commit(tree).pipe(
+        ignoreElements(),
+        concat(observableOf(tree)));
+    }))
   .subscribe({
     error(err: Error) {
       // Add extra processing to output better error messages.

packages/angular_devkit/schematics/bin/schematics.ts

@@ -23,6 +23,6 @@
     "@ngtools/json-schema": "^1.1.0",
     "@schematics/schematics": "0.0.0",
     "minimist": "^1.2.0",
-    "rxjs": "^5.5.2"
+    "rxjs": "5.5.4"
   }
 }