Merge branch 'master' into shareReaplay-unsubscribe-fix

.gitignore

@@ -12,10 +12,12 @@ typings/
 
 # Generated
 dist/
+dist-compat/
 tmp/
 coverage/
 img/
 spec-js/
+spec-build/
 .nyc_output/
 .out/
 

.make-compat-package.js

@@ -0,0 +1,53 @@
+"use strict";
+
+let pkg = require('./compat/package.json');
+let fs = require('fs-extra');
+let mkdirp = require('mkdirp');
+let path = require('path');
+let klawSync = require('klaw-sync');
+let licenseTool = require('./tools/add-license-to-file');
+let addLicenseToFile = licenseTool.addLicenseToFile;
+let addLicenseTextToFile = licenseTool.addLicenseTextToFile;
+
+const ROOT = 'dist-compat/';
+const CJS_ROOT = ROOT + 'cjs/compat/';
+const ESM5_ROOT = ROOT + 'esm5/compat/';
+const ESM2015_ROOT = ROOT + 'esm2015/compat/';
+const TYPE_ROOT = ROOT + 'typings/compat/';
+const PKG_ROOT = ROOT + 'package/';
+const CJS_PKG = PKG_ROOT + '';
+const ESM5_PKG = PKG_ROOT + '_esm5/';
+const ESM2015_PKG = PKG_ROOT + '_esm2015/';
+const UMD_PKG = PKG_ROOT + 'bundles/';
+const TYPE_PKG = PKG_ROOT;
+
+// License info for minified files
+let licenseUrl = 'https://github.com/ReactiveX/RxJS/blob/master/LICENSE.txt';
+let license = 'Apache License 2.0 ' + licenseUrl;
+
+// Recreate the distribution folder
+fs.removeSync(PKG_ROOT);
+mkdirp.sync(PKG_ROOT);
+
+// Copy over the sources
+fs.copySync(TYPE_ROOT, TYPE_PKG);
+copySources(CJS_ROOT, CJS_PKG);
+copySources(ESM5_ROOT, ESM5_PKG, true);
+copySources(ESM2015_ROOT, ESM2015_PKG, true);
+
+fs.copySync('compat/package.json', PKG_ROOT + '/package.json');
+
+function copySources(rootDir, packageDir, ignoreMissing) {
+  // If we are ignoring missing directories, early return when source doesn't exist
+  if (!fs.existsSync(rootDir)) {
+    if (ignoreMissing) {
+      return;
+    } else {
+      throw "Source root dir does not exist!";
+    }
+  }
+  // Copy over the CommonJS files
+  fs.copySync(rootDir, packageDir);
+  fs.copySync('./LICENSE.txt', packageDir + 'LICENSE.txt');
+  fs.copySync('./compat/README.md', packageDir + 'README.md');
+}

.make-packages.js

@@ -22,6 +22,7 @@ const CJS_ROOT = ROOT + 'cjs/';
 const ESM5_ROOT = ROOT + 'esm5/';
 const ESM2015_ROOT = ROOT + 'esm2015/';
 const UMD_ROOT = ROOT + 'global/';
+const LEGACY_REEXPORT_ROOT = ROOT + "legacy-reexport/"
 const TYPE_ROOT = ROOT + 'typings/';
 const PKG_ROOT = ROOT + 'package/';
 const CJS_PKG = PKG_ROOT + '';
@@ -52,14 +53,14 @@ let rootPackageJson = Object.assign({}, pkg, {
 // functionality requires that the most broad mapping (rxjs/operators) be at
 // the end of the alias mapping object. Created Webpack issue:
 // https://github.com/webpack/webpack/issues/5870
-const fileNames = klawSync(CJS_ROOT, {
+const fileNames = klawSync(LEGACY_REEXPORT_ROOT, {
   nodir: true,
   filter: function(item) {
     return item.path.endsWith('.js');
   }
 })
 .map(item => item.path)
-.map(path => path.slice((`${__dirname}/${CJS_ROOT}`).length))
+.map(path => path.slice((`${__dirname}/${LEGACY_REEXPORT_ROOT}`).length))
 .sort().reverse();
 
 // Execute build optimizer transforms on ESM5 files
@@ -96,19 +97,21 @@ mkdirp.sync(PKG_ROOT);
 copySources('src/', PKG_ROOT + 'src/');
 copySources(CJS_ROOT, CJS_PKG);
 fs.copySync(TYPE_ROOT, TYPE_PKG);
+fs.copySync(LEGACY_REEXPORT_ROOT, CJS_PKG, {overwrite: false, errorOnExist: true});
 
 copySources(ESM5_ROOT, ESM5_PKG, true);
 copySources(ESM2015_ROOT, ESM2015_PKG, true);
 
 // Copy over tsconfig.json for bazel build support
-fs.copySync('./tsconfig.json', PKG_ROOT + 'src/tsconfig.json');
+fs.copySync('./tsconfig.base.json', PKG_ROOT + 'src/tsconfig.json');
 
-fs.writeJsonSync(PKG_ROOT + 'package.json', rootPackageJson);
+fs.writeJsonSync(PKG_ROOT + 'package.json', rootPackageJson, {spaces: 2});
 fs.copySync('src/operators/package.json', PKG_ROOT + '/operators/package.json');
 fs.copySync('src/ajax/package.json', PKG_ROOT + '/ajax/package.json');
 fs.copySync('src/websocket/package.json', PKG_ROOT + '/websocket/package.json');
 fs.copySync('src/testing/package.json', PKG_ROOT + '/testing/package.json');
 
+
 if (fs.existsSync(UMD_ROOT)) {
   fs.copySync(UMD_ROOT, UMD_PKG);
   // Add licenses to tops of bundles
@@ -118,6 +121,15 @@ if (fs.existsSync(UMD_ROOT)) {
   addLicenseTextToFile(license, UMD_PKG + 'rxjs.umd.min.js');
 }
 
+// remove umd.js/umd.d.ts files that are only needed for creation of the umd bundle
+fs.removeSync(CJS_PKG + '/internal/umd.js');
+fs.removeSync(CJS_PKG + '/internal/umd.js.map');
+fs.removeSync(ESM5_PKG + '/internal/umd.js');
+fs.removeSync(ESM5_PKG + '/internal/umd.js.map');
+fs.removeSync(ESM2015_PKG + '/internal/umd.js');
+fs.removeSync(ESM2015_PKG + '/internal/umd.js.map');
+fs.removeSync(TYPE_PKG + '/internal/umd.d.ts');
+
 function copySources(rootDir, packageDir, ignoreMissing) {
   // If we are ignoring missing directories, early return when source doesn't exist
   if (!fs.existsSync(rootDir)) {
@@ -137,7 +149,7 @@ function copySources(rootDir, packageDir, ignoreMissing) {
 function createImportTargets(importTargets, targetName, targetDirectory) {
   const importMap = {};
   for (const x in importTargets) {
-    importMap['rxjs/' + x] = 'rxjs/' + targetName + importTargets[x];
+    importMap['rxjs/' + x] = ('rxjs-compat/' + targetName + importTargets[x]).replace(/\.js$/, '');
   }
 
   const outputData =
@@ -148,7 +160,7 @@ var path = require('path');
 var dir = path.resolve(__dirname);
 
 module.exports = function() {
-  return ${JSON.stringify(importMap, null, 4).replace(/(: )"rxjs\/_esm(5|2015)\/(.+")(,?)/g, "$1path.join(dir, \"$3)$4")};
+  return ${JSON.stringify(importMap, null, 4)};
 }
 `
 

CHANGELOG.md

@@ -1,3 +1,71 @@
+<a name="6.0.0-alpha.4"></a>
+# [6.0.0-alpha.4](https://github.com/ReactiveX/RxJS/compare/6.0.0-alpha.3...v6.0.0-alpha.4) (2018-03-13)
+
+
+### Bug Fixes
+
+* **ESM:** Add [operators|ajax|websocket|testing]/package.json for ESM support, fixes [#3227](https://github.com/ReactiveX/RxJS/issues/3227) ([#3356](https://github.com/ReactiveX/RxJS/issues/3356)) ([725dcb4](https://github.com/ReactiveX/RxJS/commit/725dcb4))
+* **fromEvent:** Defines toString to fix Closure compilations ([#3417](https://github.com/ReactiveX/RxJS/issues/3417)) ([1558b43](https://github.com/ReactiveX/RxJS/commit/1558b43))
+* **fromEvent:** pass options in unsubscribe ([f1872b0](https://github.com/ReactiveX/RxJS/commit/f1872b0)), closes [#3349](https://github.com/ReactiveX/RxJS/issues/3349)
+* **rxjs:** add exports for symbols/interfaces that were missing ([#3380](https://github.com/ReactiveX/RxJS/issues/3380)) ([1622ee0](https://github.com/ReactiveX/RxJS/commit/1622ee0))
+* **rxjs:** make sure esm imports from index.js by default, not Rx.js ([#3316](https://github.com/ReactiveX/RxJS/issues/3316)) ([c2b00f4](https://github.com/ReactiveX/RxJS/commit/c2b00f4)), closes [#3315](https://github.com/ReactiveX/RxJS/issues/3315)
+* **rxjs:** once again exports custom error types ([#3371](https://github.com/ReactiveX/RxJS/issues/3371)) ([4465a9f](https://github.com/ReactiveX/RxJS/commit/4465a9f))
+* **rxjs:** remove types.ts importing from itself. ([#3383](https://github.com/ReactiveX/RxJS/issues/3383)) ([8fd50ad](https://github.com/ReactiveX/RxJS/commit/8fd50ad))
+* correct internal module paths to be systemjs compatible ([#3412](https://github.com/ReactiveX/RxJS/issues/3412)) ([35abc9d](https://github.com/ReactiveX/RxJS/commit/35abc9d))
+* **Symbol.iterator:** correctly handle case where Symbol constructor itself is not defined ([#3394](https://github.com/ReactiveX/RxJS/issues/3394)) ([6725be1](https://github.com/ReactiveX/RxJS/commit/6725be1))
+* **typings:** fixed some cases where multicast and publish would not return a ConnectableObservable ([#3320](https://github.com/ReactiveX/RxJS/issues/3320)) ([ddffecc](https://github.com/ReactiveX/RxJS/commit/ddffecc))
+* reexport Symbol.observable typings patch ([4c4d7b0](https://github.com/ReactiveX/RxJS/commit/4c4d7b0))
+* remove the root operators.ts because it overshadows operators/package.json ([184b6d4](https://github.com/ReactiveX/RxJS/commit/184b6d4))
+
+
+### Code Refactoring
+
+* **Observable.if:** remove ts hacks from Observable ([f46f261](https://github.com/ReactiveX/RxJS/commit/f46f261))
+* **Rx.ts:** move Rx.ts to internal ([#3400](https://github.com/ReactiveX/RxJS/issues/3400)) ([7ad2119](https://github.com/ReactiveX/RxJS/commit/7ad2119))
+
+
+### Features
+
+* **bindCallback:** remove result selector ([2535641](https://github.com/ReactiveX/RxJS/commit/2535641))
+* **bindNodeCallback:** remove resultSelector ([26e6e5c](https://github.com/ReactiveX/RxJS/commit/26e6e5c))
+* **exhaustMap:** simplify interface ([42589d0](https://github.com/ReactiveX/RxJS/commit/42589d0))
+* **first:** simplify interface ([a011338](https://github.com/ReactiveX/RxJS/commit/a011338))
+* **forkJoin:** simplify interface ([4d2338b](https://github.com/ReactiveX/RxJS/commit/4d2338b))
+* **fromEvent:** remove resultSelector ([197f449](https://github.com/ReactiveX/RxJS/commit/197f449))
+* **fromEvent:** will now emit an array when event emits multiple arguments ([51b37fd](https://github.com/ReactiveX/RxJS/commit/51b37fd))
+* **fromEventPattern:** removed resultSelector ([6b34f9f](https://github.com/ReactiveX/RxJS/commit/6b34f9f))
+* **last:** simplify interface ([3240419](https://github.com/ReactiveX/RxJS/commit/3240419))
+* **mergeMap|concatMap|concatMapTo:** simplified the signatures ([d293245](https://github.com/ReactiveX/RxJS/commit/d293245))
+* **mergeMapTo:** simplify interface ([582c7be](https://github.com/ReactiveX/RxJS/commit/582c7be))
+* **never:** no longer export `never` function ([#3386](https://github.com/ReactiveX/RxJS/issues/3386)) ([53debc8](https://github.com/ReactiveX/RxJS/commit/53debc8))
+* **switchMap|switchMapTo:** simplify interface ([959fb6a](https://github.com/ReactiveX/RxJS/commit/959fb6a))
+* **Symbol.iterator:** no longer polyfilled ([#3389](https://github.com/ReactiveX/RxJS/issues/3389)) ([6319f3c](https://github.com/ReactiveX/RxJS/commit/6319f3c))
+* **Symbol.observable:** is no longer polyfilled ([#3387](https://github.com/ReactiveX/RxJS/issues/3387)) ([4a5aaaf](https://github.com/ReactiveX/RxJS/commit/4a5aaaf))
+* **throwIfEmpty:** adds throwIfEmpty operator ([#3368](https://github.com/ReactiveX/RxJS/issues/3368)) ([9b21458](https://github.com/ReactiveX/RxJS/commit/9b21458))
+* **typings:** updated typings for combineAll, mergeAll, concatAll, switch, exhaust, zipAll ([#3321](https://github.com/ReactiveX/RxJS/issues/3321)) ([f7e4c02](https://github.com/ReactiveX/RxJS/commit/f7e4c02))
+* **umd:** UMD now mirrors export schema for ESM and CJS ([#3426](https://github.com/ReactiveX/RxJS/issues/3426)) ([556c904](https://github.com/ReactiveX/RxJS/commit/556c904))
+
+
+### BREAKING CHANGES
+
+* **Symbol.observable:** RxJS will no longer be polyfilling Symbol.observable. That should be done by an actual polyfill library. This is to prevent duplication of code, and also to prevent having modules with side-effects in rxjs.
+* **mergeMap|concatMap|concatMapTo:** mergeMap, concatMap and concatMapTo no longer support a result selector, if you need to use a result selector, use the following pattern: `source.mergeMap(x => of(x + x).pipe(map(y => y + x))` (the pattern would be the same for `concatMap`).
+* **bindCallback:** removes result selector, use `map` instead: `bindCallback(fn1, fn2)()` becomes `bindCallback(fn1)().pipe(map(fn2))`
+* **Rx.ts:** importing from `rxjs/Rx` is no longer available. Upcoming backwards compat solution will allow that
+* **Symbol.iterator:** We are no longer polyfilling `Symbol.iterator`. That would be done by a proper polyfilling library
+* **Observable.if:** TypeScript users using `Observable.if` will have to cast `Observable` as any to get to `if`. It is a better idae to just use `iif` directly via `import { iif } from 'rxjs';`
+* **bindNodeCallback:** resultSelector removed, use `map` instead: `bindNodeCallback(fn1, fn2)()` becomes `bindNodeCallback(fn1)().pipe(map(fn2))`
+* **never:** no longer exported. Use the `NEVER` constant instead.
+* **fromEvent:** result selector removed, use `map` instead: `fromEvent(target, 'click', fn)` becomes `fromEvent(target, 'click').pipe(map(fn))`
+* **last:** no longer accepts `resultSelector` argument. To get this same functionality, use `map`.
+* **first:** no longer supports `resultSelector` argument. The same functionality can be achieved by simply mapping either before or after `first` depending on your use case.
+* **exhaustMap:** `resultSelector` no longer supported, to get this functionality use: `source.pipe(exhaustMap(x => of(x + x).pipe(map(y => x + y))))`
+* **switchMap|switchMapTo:** `switchMap` and `switchMapTo` no longer take `resultSelector` arguments, to get the same functionality use `switchMap` and `map` in combination: `source.pipe(switchMap(x => of(x + x).pipe(y => x + y)))`.
+* **mergeMapTo:** `mergeMapTo` no longer accepts a resultSelector, to get this functionality, you'll want to use `mergeMap` and `map` together: `source.pipe(mergeMap(() => inner).pipe(map(y => x + y)))`
+* **fromEventPattern:** no longer supports a result selector, use `map` instead: `fromEventPattern(fn1, fn2, fn3)` becomes `fromEventPattern(fn1, fn2).pipe(map(fn3))`
+
+
+
 <a name="6.0.0-alpha.3"></a>
 # [6.0.0-alpha.3](https://github.com/ReactiveX/RxJS/compare/6.0.0-alpha.2...v6.0.0-alpha.3) (2018-02-06)
 

README.md

@@ -21,10 +21,8 @@ Reactive Extensions Library for JavaScript. This is a rewrite of [Reactive-Exten
 
 ## Versions In This Repository
 
-- [master](https://github.com/ReactiveX/rxjs/commits/master) - commits that will be included in the next _major_ release (breaking changes)
-- [next](https://github.com/ReactiveX/rxjs/commits/stable) - commits that will be included in the next _minor_ or _patch_ release
-
-Most PRs should be made to **master**, unless you know it is a breaking change.
+- [master](https://github.com/ReactiveX/rxjs/commits/master) - This all of the current, unreleased work, which is against v6 of RxJS right now
+- [stable](https://github.com/ReactiveX/rxjs/commits/stable) - This is the branch for the latest version you'd get if you do `npm install rxjs`, (currently this is 5.5)
 
 ## Important
 
@@ -38,19 +36,10 @@ By contributing or commenting on issues in this repository, whether you've read
 npm install rxjs@alpha
 ```
 
-To import the entire core set of functionality:
-
-```js
-import Rx from 'rxjs/Rx';
-
-Rx.Observable.of(1,2,3)
-```
-
 To import only what you need by patching (this is useful for size-sensitive bundling):
 
 ```js
-import { Observable, Subject, ReplaySubject } from 'rxjs';
-import { from, of, range } from 'rxjs/create';
+import { Observable, Subject, ReplaySubject, from, of, range } from 'rxjs';
 import { map, filter, switchMap } from 'rxjs/operators';
 
 range(1, 200)
@@ -69,8 +58,7 @@ npm install rxjs@alpha
 (Note: destructuring available in Node 8+)
 
 ```js
-const { Observable, Subject, ReplaySubject } = require('rxjs');
-const { from, of, range } = require('rxjs/create');
+const { Observable, Subject, ReplaySubject, from, of, range } = require('rxjs');
 const { map, filter, switchMap } = require('rxjs/operators');
 
 range(1, 200)
@@ -82,15 +70,17 @@ range(1, 200)
 
 For CDN, you can use [unpkg](https://unpkg.com/):
 
-https://unpkg.com/rxjs/bundles/Rx.min.js
+https://unpkg.com/rxjs/bundles/rxjs.umd.min.js
 
-#### Node.js Usage:
+The global namespace for rxjs is `rxjs`:
 
 ```js
-var Rx = require('@reactivex/rxjs');
+const { Observable, Subject, ReplaySubject, from, of, range } = rxjs;
+const { map, filter, switchMap } = rxjs.operators;
 
-Rx.Observable.of('hello world')
-  .subscribe(function(x) { console.log(x); });
+range(1, 200)
+  .pipe(filter(x => x % 2 === 1), map(x => x + x))
+  .subscribe(x => console.log(x));
 ```
 
 ## Goals

compat/AsyncSubject.ts

@@ -0,0 +1 @@
+export {AsyncSubject} from 'rxjs';

compat/BehaviorSubject.ts

@@ -0,0 +1 @@
+export {BehaviorSubject} from 'rxjs';

compat/InnerSubscriber.ts

@@ -0,0 +1 @@
+export {InnerSubscriber} from 'rxjs/internal-compatibility';

compat/Notification.ts

@@ -0,0 +1 @@
+export {Notification} from 'rxjs';

compat/Observable.ts

@@ -0,0 +1 @@
+export {Observable, Subscribable, SubscribableOrPromise, ObservableInput} from 'rxjs';

compat/Observer.ts

@@ -0,0 +1 @@
+export {Observer, NextObserver, ErrorObserver, CompletionObserver, PartialObserver} from 'rxjs';

compat/Operator.ts

@@ -0,0 +1 @@
+export {Operator} from 'rxjs';

compat/OuterSubscriber.ts

@@ -0,0 +1 @@
+export {OuterSubscriber} from 'rxjs/internal-compatibility';

compat/README.md

@@ -0,0 +1,15 @@
+# RxJS Compatibility Package
+
+This package is required to get backwards compatibility with RxJS pervious to version 6. It contains the imports to add operators to `Observable.prototype` and creation methods to `Observable`. This is what allows, for instance, dot-chaining:
+
+```
+Observable.interval(1)
+  .map(i => i * i)
+```
+
+vs
+
+```
+Observable.interval(1)
+  .pipe(map(i => i * i))
+```

compat/ReplaySubject.ts

@@ -0,0 +1 @@
+export {ReplaySubject} from 'rxjs';