Merge remote-tracking branch 'origin/master' into moar-fp

Author: david-driscoll

CHANGELOG.md

@@ -1,3 +1,35 @@
+<a name="5.3.0"></a>
+# [5.3.0](https://github.com/ReactiveX/RxJS/compare/5.2.0...v5.3.0) (2017-04-03)
+
+
+### Bug Fixes
+
+* **catch:** return type is now the union of input types ([#2478](https://github.com/ReactiveX/RxJS/issues/2478)) ([840def0](https://github.com/ReactiveX/RxJS/commit/840def0))
+* **forEach:** fix a temporal dead zone issue in forEach. ([#2474](https://github.com/ReactiveX/RxJS/issues/2474)) ([e9e9801](https://github.com/ReactiveX/RxJS/commit/e9e9801))
+* **multicast:** Ensure ConnectableObservables returned by multicast are state-isolated. ([aaa9e6b](https://github.com/ReactiveX/RxJS/commit/aaa9e6b))
+* **reduce:** proper TypeScript signature overload ordering ([#2382](https://github.com/ReactiveX/RxJS/issues/2382)) ([f6a4951](https://github.com/ReactiveX/RxJS/commit/f6a4951)), closes [#2338](https://github.com/ReactiveX/RxJS/issues/2338)
+* **SafeSubscriber:** SafeSubscriber shouldn't mutate incoming Observers. ([a1778e0](https://github.com/ReactiveX/RxJS/commit/a1778e0))
+* **timeout:** Cancels scheduled timeout, if no longer needed ([3e9d529](https://github.com/ReactiveX/RxJS/commit/3e9d529)), closes [#2134](https://github.com/ReactiveX/RxJS/issues/2134) [#2244](https://github.com/ReactiveX/RxJS/issues/2244) [#2355](https://github.com/ReactiveX/RxJS/issues/2355) [#2347](https://github.com/ReactiveX/RxJS/issues/2347) [#2353](https://github.com/ReactiveX/RxJS/issues/2353) [#2254](https://github.com/ReactiveX/RxJS/issues/2254) [#2372](https://github.com/ReactiveX/RxJS/issues/2372) [#1301](https://github.com/ReactiveX/RxJS/issues/1301)
+* **zipAll:** complete when the source is empty ([712fece](https://github.com/ReactiveX/RxJS/commit/712fece))
+
+
+### Features
+
+* **delayWhen:** add index to the selector function ([5d6291e](https://github.com/ReactiveX/RxJS/commit/5d6291e))
+* **symbol exports:** symbols now also exported without `$$` prefix to work with Babel UMD exporting ([#2435](https://github.com/ReactiveX/RxJS/issues/2435)) ([747bef6](https://github.com/ReactiveX/RxJS/commit/747bef6)), closes [#2415](https://github.com/ReactiveX/RxJS/issues/2415)
+
+
+### Performance Improvements
+
+* **bufferCount:** optimize bufferCount operator ([#2359](https://github.com/ReactiveX/RxJS/issues/2359)) ([28d0883](https://github.com/ReactiveX/RxJS/commit/28d0883))
+
+
+### April Fools
+
+* **smooth:** `smooth()` was never really a thing. Sorry, folks. :D
+
+
+
 <a name="5.2.0"></a>
 # [5.2.0](https://github.com/ReactiveX/RxJS/compare/5.1.1...v5.2.0) (2017-02-21)
 

doc/index.md

@@ -15,6 +15,8 @@ RxJS is a library for reactive programming using Observables, to make it easier
 
 - - -
 
+### Find the right Operator
+
 <div class="decision-tree-widget"></div>
 
 **Hint: open your DevTools to experiment with RxJS.**

doc/installation.md

@@ -1,7 +1,7 @@
 ## ES6 via npm
 
 ```none
-npm install rxjs-es
+npm install rxjs
 ```
 
 To import the entire core set of functionality:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactivex/rxjs",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "Reactive Extensions for modern JavaScript",
   "main": "index.js",
   "config": {
@@ -75,10 +75,10 @@
     "copy_src_cjs": "mkdirp ./dist/cjs/src && shx cp -r ./src/* ./dist/cjs/src",
     "copy_src_es6": "mkdirp ./dist/es6/src && shx cp -r ./src/* ./dist/es6/src",
     "commit": "git-cz",
-    "compile_dist_cjs": "tsc ./dist/cjs/src/Rx.ts ./dist/cjs/src/fp.ts ./dist/cjs/src/add/observable/of.ts                         -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --sourceMap --outDir ./dist/cjs --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
-    "compile_module_es6": "tsc                                          ./dist/es6/src/Rx.ts ./dist/es6/src/fp.ts ./dist/es6/src/add/observable/of.ts                             -m es2015   --sourceMap --outDir ./dist/es6 --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom ",
-    "compile_dist_es6_for_docs": "tsc                                 ./dist/es6/src/Rx.ts ./dist/es6/src/fp.ts ./dist/es6/src/add/observable/of.ts ./dist/es6/src/MiscJSDoc.ts -m es2015   --sourceMap --outDir ./dist/es6 --target ES6 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
-    "cover": "shx rm -rf dist/cjs && tsc src/Rx.ts src/fp.ts src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --outDir dist/cjs --sourceMap --target ES5 -d && nyc --reporter=lcov --reporter=html --exclude=spec/support/**/* --exclude=spec-js/**/* --exclude=node_modules mocha --opts spec/support/default.opts spec-js",
+    "compile_dist_cjs": "tsc ./dist/cjs/src/Rx.ts ./dist/cjs/src/fp.ts ./dist/cjs/src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --sourceMap --outDir ./dist/cjs --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
+    "compile_module_es6": "tsc                                          ./dist/es6/src/Rx.ts ./dist/cjs/src/fp.ts ./dist/es6/src/add/observable/of.ts -m es2015   --sourceMap --outDir ./dist/es6 --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom ",
+    "compile_dist_es6_for_docs": "tsc                                 ./dist/es6/src/Rx.ts ./dist/cjs/src/fp.ts ./dist/es6/src/add/observable/of.ts ./dist/es6/src/MiscJSDoc.ts -m es2015   --sourceMap --outDir ./dist/es6 --target ES6 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
+    "cover": "shx rm -rf dist/cjs && tsc src/Rx.ts ./dist/cjs/src/fp.ts src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --outDir dist/cjs --sourceMap --target ES5 -d && nyc --reporter=lcov --reporter=html --exclude=spec/support/**/* --exclude=spec-js/**/* --exclude=node_modules mocha --opts spec/support/default.opts spec-js",
     "decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..",
     "doctoc": "doctoc CONTRIBUTING.md",
     "generate_packages": "node .make-packages.js",
@@ -92,7 +92,7 @@
     "prepublish": "shx rm -rf ./typings && typings install && npm run build_all",
     "publish_docs": "./publish_docs.sh",
     "test_mocha": "mocha --opts spec/support/default.opts spec-js",
-    "debug_mocha": "node-debug _mocha --opts spec/support/debug.opts spec-js",
+    "debug_mocha": "node --inspect --debug-brk ./node_modules/.bin/_mocha --opts spec/support/debug.opts spec-js",
     "test_browser": "npm-run-all build_spec_browser && opn spec/support/mocha-browser-runner.html",
     "test": "npm-run-all clean_spec build_spec test_mocha clean_spec",
     "tests2png": "npm run build_spec && mkdirp tmp/docs/img && mkdirp spec-js/support && shx cp spec/support/*.opts spec-js/support/ && mocha --opts spec/support/tests2png.opts spec-js",
@@ -159,24 +159,24 @@
     "escape-string-regexp": "^1.0.5 ",
     "esdoc": "^0.4.7",
     "eslint": "^3.8.0",
-    "fs-extra": "^0.30.0",
+    "fs-extra": "^2.1.2",
     "glob": "^7.0.3",
     "gm": "^1.22.0",
-    "google-closure-compiler-js": "^20160916.0.0",
+    "google-closure-compiler-js": "^20170218.0.0",
     "gzip-size": "^3.0.0",
     "http-server": "^0.9.0",
-    "husky": "^0.12.0",
+    "husky": "^0.13.3",
     "lint-staged": "^3.2.5",
     "lodash": "^4.15.0",
     "madge": "^1.4.3",
-    "markdown-doctest": "^0.8.1",
+    "markdown-doctest": "^0.9.1",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mocha": "^3.0.2",
     "mocha-in-sauce": "0.0.1",
-    "npm-run-all": "^3.1.0",
+    "npm-run-all": "^4.0.2",
     "npm-scripts-info": "^0.3.4",
-    "nyc": "^8.3.0",
+    "nyc": "^10.2.0",
     "opn-cli": "^3.1.0",
     "platform": "^1.3.1",
     "promise": "^7.1.1",
@@ -185,17 +185,16 @@
     "rollup-plugin-inject": "^2.0.0",
     "rollup-plugin-node-resolve": "^2.0.0",
     "rx": "latest",
-    "shx": "^0.1.4",
-    "sinon": "^2.0.0-pre",
-    "sinon-chai": "^2.8.0",
+    "shx": "^0.2.2",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.9.0",
     "source-map-support": "^0.4.0",
     "tslib": "^1.5.0",
     "tslint": "^4.4.2",
     "typescript": "~2.0.6",
     "typings": "^2.0.0",
     "validate-commit-msg": "^2.3.1",
     "watch": "^1.0.1",
-    "watchify": "3.7.0",
     "webpack": "^1.13.1",
     "xmlhttprequest": "1.8.0"
   },

perf/micro/current-thread-scheduler/operators/buffercount-skip.js

@@ -0,0 +1,18 @@
+var RxOld = require('rx');
+var RxNew = require('../../../../index');
+
+module.exports = function (suite) {
+  var oldBufferCountWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).bufferWithCount(5, 3);
+  var newBufferCountWithCurrentThreadScheduler = RxNew.Observable.range(0, 25, RxNew.Scheduler.queue).bufferCount(5, 3);
+
+  function _next(x) { }
+  function _error(e) { }
+  function _complete() { }
+  return suite
+    .add('old bufferCount with current thread scheduler', function () {
+      oldBufferCountWithCurrentThreadScheduler.subscribe(_next, _error, _complete);
+    })
+    .add('new bufferCount with current thread scheduler', function () {
+      newBufferCountWithCurrentThreadScheduler.subscribe(_next, _error, _complete);
+    });
+};

perf/micro/immediate-scheduler/operators/buffercount-skip.js

@@ -0,0 +1,18 @@
+var RxOld = require('rx');
+var RxNew = require('../../../../index');
+
+module.exports = function (suite) {
+  var oldBufferCountWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).bufferWithCount(5, 3);
+  var newBufferCountWithImmediateScheduler = RxNew.Observable.range(0, 25).bufferCount(5, 3);
+
+  function _next(x) { }
+  function _error(e) { }
+  function _complete() { }
+  return suite
+      .add('old bufferCount with immediate scheduler', function () {
+        oldBufferCountWithImmediateScheduler.subscribe(_next, _error, _complete);
+      })
+      .add('new bufferCount with immediate scheduler', function () {
+        newBufferCountWithImmediateScheduler.subscribe(_next, _error, _complete);
+      });
+};

spec/observables/forkJoin-spec.ts

@@ -194,6 +194,35 @@ describe('Observable.forkJoin', () => {
     expectObservable(e1).toBe(expected);
   });
 
+  it('should not complete when only source never completes', () => {
+    const e1 = Observable.forkJoin(
+      hot('--------------')
+    );
+    const expected = '-';
+
+    expectObservable(e1).toBe(expected);
+  });
+
+  it('should not complete when one of the sources never completes', () => {
+    const e1 = Observable.forkJoin(
+      hot('--------------'),
+      hot('-a---b--c--|')
+    );
+    const expected = '-';
+
+    expectObservable(e1).toBe(expected);
+  });
+
+  it('should complete when one of the sources never completes but other completes without values', () => {
+    const e1 = Observable.forkJoin(
+                 hot('--------------'),
+                 hot('------|')
+    );
+    const expected = '------|';
+
+    expectObservable(e1).toBe(expected);
+  });
+
   it('should complete if source is not provided', () => {
     const e1 = Observable.forkJoin();
     const expected = '|';
@@ -245,6 +274,15 @@ describe('Observable.forkJoin', () => {
     expectObservable(e1).toBe(expected);
   });
 
+  it('should raise error when any of source raises error with source that never completes', () => {
+    const e1 = Observable.forkJoin(
+                 hot('------#'),
+                 hot('----------'));
+    const expected = '------#';
+
+    expectObservable(e1).toBe(expected);
+  });
+
   it('should raise error when any of source raises error with selector with empty observable', () => {
     function selector(x, y) {
       return x + y;
@@ -297,6 +335,20 @@ describe('Observable.forkJoin', () => {
     expectSubscriptions(e2.subscriptions).toBe(e2subs);
   });
 
+  it('should unsubscribe other Observables, when one of them errors', () => {
+    const e1 =   hot('--a--^--b--c---d-| ');
+    const e1subs =        '^        !    ';
+    const e2 =   hot('---e-^---f--g-#');
+    const e2subs =        '^        !    ';
+    const expected =      '---------#    ';
+
+    const result = Observable.forkJoin(e1, e2);
+
+    expectObservable(result).toBe(expected);
+    expectSubscriptions(e1.subscriptions).toBe(e1subs);
+    expectSubscriptions(e2.subscriptions).toBe(e2subs);
+  });
+
   it('should support promises', () => {
     type(() => {
       /* tslint:disable:no-unused-variable */

spec/operators/reduce-spec.ts

@@ -301,24 +301,85 @@ describe('Observable.prototype.reduce', () => {
   });
 
   it('should accept T typed reducers', () => {
+    type(() => {
+      let a: Rx.Observable<{ a: number; b: string }>;
+      const reduced = a.reduce((acc, value) => {
+        value.a = acc.a;
+        value.b = acc.b;
+        return acc;
+      });
+
+      reduced.subscribe(r => {
+        r.a.toExponential();
+        r.b.toLowerCase();
+      });
+    });
+  });
+
+  it('should accept R typed reducers when R is assignable to T', () => {
     type(() => {
       let a: Rx.Observable<{ a?: number; b?: string }>;
-      a.reduce((acc, value) => {
+      const reduced = a.reduce((acc, value) => {
         value.a = acc.a;
         value.b = acc.b;
         return acc;
       }, {});
+
+      reduced.subscribe(r => {
+        r.a.toExponential();
+        r.b.toLowerCase();
+      });
+    });
+  });
+
+  it('should accept R typed reducers when R is not assignable to T', () => {
+    type(() => {
+      let a: Rx.Observable<{ a: number; b: string }>;
+      const seed = {
+        as: [1],
+        bs: ['a']
+      };
+      const reduced = a.reduce((acc, value) => {
+        acc.as.push(value.a);
+        acc.bs.push(value.b);
+        return acc;
+      }, seed);
+
+      reduced.subscribe(r => {
+        r.as[0].toExponential();
+        r.bs[0].toLowerCase();
+      });
     });
   });
 
-  it('should accept R typed reducers', () => {
+  it('should accept R typed reducers and reduce to type R', () => {
     type(() => {
       let a: Rx.Observable<{ a: number; b: string }>;
-      a.reduce<{ a?: number; b?: string }>((acc, value) => {
+      const reduced = a.reduce<{ a?: number; b?: string }>((acc, value) => {
         value.a = acc.a;
         value.b = acc.b;
         return acc;
       }, {});
+
+      reduced.subscribe(r => {
+        r.a.toExponential();
+        r.b.toLowerCase();
+      });
+    });
+  });
+
+  it('should accept array of R typed reducers and reduce to array of R', () => {
+    type(() => {
+      let a: Rx.Observable<number>;
+      const reduced = a.reduce((acc, cur) => {
+        console.log(acc);
+        acc.push(cur.toString());
+        return acc;
+      }, [] as string[]);
+
+      reduced.subscribe(rs => {
+        rs[0].toLowerCase();
+      });
     });
   });
-});
+});

spec/operators/timeout-spec.ts

@@ -1,14 +1,14 @@
-import * as Rx from '../../dist/cjs/Rx';
 import { expect } from 'chai';
+import * as Rx from '../../dist/cjs/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };
+declare const rxTestScheduler: Rx.TestScheduler;
 declare const hot: typeof marbleTestingSignature.hot;
 declare const cold: typeof marbleTestingSignature.cold;
 declare const expectObservable: typeof marbleTestingSignature.expectObservable;
 declare const expectSubscriptions: typeof marbleTestingSignature.expectSubscriptions;
 
-declare const rxTestScheduler: Rx.TestScheduler;
 const Observable = Rx.Observable;
 
 /** @test {timeout} */
@@ -121,4 +121,28 @@ describe('Observable.prototype.timeout', () => {
     expectObservable(result).toBe(expected, values, defaultTimeoutError);
     expectSubscriptions(e1.subscriptions).toBe(e1subs);
   });
+
+  it('should unsubscribe from the scheduled timeout action when timeout is unsubscribed early', () => {
+    const e1 =   hot('--a--b--c---d--e--|');
+    const e1subs =   '^         !        ';
+    const expected = '--a--b--c--        ';
+    const unsub =    '          !        ';
+
+    const result = e1
+      .lift({
+        call: (timeoutSubscriber, source) => {
+          const { action } = <any> timeoutSubscriber; // get a ref to the action here
+          timeoutSubscriber.add(() => {               // because it'll be null by the
+            if (!action.closed) {                     // time we get into this function.
+              throw new Error('TimeoutSubscriber scheduled action wasn\'t canceled');
+            }
+          });
+          return source.subscribe(timeoutSubscriber);
+        }
+      })
+      .timeout(50, rxTestScheduler);
+
+    expectObservable(result, unsub).toBe(expected);
+    expectSubscriptions(e1.subscriptions).toBe(e1subs);
+  });
 });