Skip to content

Commit

Permalink
chore(src): use named exports everywhere
Browse files Browse the repository at this point in the history
refactors entire codebase to use named ES6 exports instead of default exports.

BREAKING CHANGE: commonjs users must import named exports when not importing from Rx.js or Rx.KitchenSink.js, eg:
```js
//before
var Observable = require('@reactivex/rxjs/dist/cjs/Observable');
//after
var Observable = require('@reactivex/rxjs/dist/cjs/Observable').Observable;
```
  • Loading branch information
robwormald committed Nov 9, 2015
1 parent 3d5d050 commit e196657
Show file tree
Hide file tree
Showing 173 changed files with 1,049 additions and 1,080 deletions.
13 changes: 0 additions & 13 deletions lib/copy_dts.js

This file was deleted.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"scripts": {
"build_all": "npm run build_es6 && npm run build_amd && npm run build_cjs && npm run build_global",
"build_amd": "rm -rf dist/amd && tsc typings/es6-shim/es6-shim.d.ts src/Rx.ts -m amd --outDir dist/amd --sourcemap --target ES5 --diagnostics",
"build_cjs": "rm -rf dist/cjs && babel dist/es6 --out-dir dist/cjs --modules common --source-maps --loose all && node lib/copy_dts.js",
"build_cjs": "rm -rf dist/cjs && tsc typings/es6-shim/es6-shim.d.ts src/Rx.ts src/Rx.KitchenSink.ts -m commonjs --outDir dist/cjs --sourcemap --target ES5 -d --diagnostics",
"build_es6": "rm -rf dist/es6 && tsc src/Rx.ts src/Rx.KitchenSink.ts --outDir dist/es6 --sourceMap --target ES6 -d --diagnostics",
"build_closure": "java -jar ./node_modules/google-closure-compiler/compiler.jar ./dist/global/Rx.js --create_source_map ./dist/global/Rx.min.js.map --js_output_file ./dist/global/Rx.min.js",
"build_global": "rm -rf dist/global && mkdir \"dist/global\" && browserify src/Rx.global.js --outfile dist/global/Rx.js && npm run build_closure",
Expand Down Expand Up @@ -76,8 +76,6 @@
},
"homepage": "https://github.com/ReactiveX/RxJS",
"devDependencies": {
"babel": "5.8.23",
"babelify": "6.1.2",
"benchmark": "1.0.0",
"benchpress": "2.0.0-alpha.37.2",
"browserify": "11.0.0",
Expand Down
6 changes: 3 additions & 3 deletions spec/observables/ScalarObservable-spec.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* globals describe, it, expect, rxTestScheduler*/
var Rx = require('../../dist/cjs/Rx');
var ScalarObservable = require('../../dist/cjs/observables/ScalarObservable');
var EmptyObservable = require('../../dist/cjs/observables/EmptyObservable');
var ErrorObservable = require('../../dist/cjs/observables/ErrorObservable');
var ScalarObservable = require('../../dist/cjs/observables/ScalarObservable').ScalarObservable;
var EmptyObservable = require('../../dist/cjs/observables/EmptyObservable').EmptyObservable;
var ErrorObservable = require('../../dist/cjs/observables/ErrorObservable').ErrorObservable;
var Observable = Rx.Observable;

describe('ScalarObservable', function () {
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/SubscribeOnObservable-spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* globals describe, it, expect, hot, expectObservable, expectSubscriptions, rxTestScheduler */
var Rx = require('../../dist/cjs/Rx');
var SubscribeOnObservable = require('../../dist/cjs/observables/SubscribeOnObservable');
var SubscribeOnObservable = require('../../dist/cjs/observables/SubscribeOnObservable').SubscribeOnObservable;
var Observable = Rx.Observable;

describe('SubscribeOnObservable', function () {
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/from-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var Rx = require('../../dist/cjs/Rx');
var Promise = require('promise');
var Observable = Rx.Observable;
var $$iterator = require('../../dist/cjs/util/Symbol_iterator');
var $$iterator = require('../../dist/cjs/util/Symbol_iterator').$$iterator;

describe('Observable.from', function () {
it('should enumerate an Array', function (done) {
Expand Down
6 changes: 3 additions & 3 deletions spec/observables/of-spec.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* globals describe, it, expect, expectObservable, rxTestScheduler */
var Rx = require('../../dist/cjs/Rx');
var ArrayObservable = require('../../dist/cjs/observables/ArrayObservable');
var ScalarObservable = require('../../dist/cjs/observables/ScalarObservable');
var EmptyObservable = require('../../dist/cjs/observables/EmptyObservable');
var ArrayObservable = require('../../dist/cjs/observables/ArrayObservable').ArrayObservable;
var ScalarObservable = require('../../dist/cjs/observables/ScalarObservable').ScalarObservable;
var EmptyObservable = require('../../dist/cjs/observables/EmptyObservable').EmptyObservable;
var Observable = Rx.Observable;

describe('Observable.of', function () {
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/range-spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Rx = require('../../dist/cjs/Rx');
var RangeObservable = require('../../dist/cjs/observables/RangeObservable');
var RangeObservable = require('../../dist/cjs/observables/RangeObservable').RangeObservable;
var Observable = Rx.Observable;
var nextTick = Rx.Scheduler.nextTick;

Expand Down
2 changes: 1 addition & 1 deletion spec/util/MapPolyfill-spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var MapPolyfill = require('../../dist/cjs/util/MapPolyfill');
var MapPolyfill = require('../../dist/cjs/util/MapPolyfill').MapPolyfill;

describe('MapPolyfill', function () {
it('should exist', function () {
Expand Down
2 changes: 1 addition & 1 deletion spec/utils/bindcallback-spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* globals describe, it, expect */
var Rx = require('../../dist/cjs/Rx');
var bindCallback = require('../../dist/cjs/util/bindCallback');
var bindCallback = require('../../dist/cjs/util/bindCallback').bindCallback;

describe('bindCallback', function () {
it('should bind function has no parameter', function () {
Expand Down
10 changes: 5 additions & 5 deletions src/CoreOperators.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Observable from './Observable';
import Scheduler from './Scheduler';
import ConnectableObservable from './observables/ConnectableObservable';
import Subject from './Subject';
import {Observable} from './Observable';
import {Scheduler} from './Scheduler';
import {ConnectableObservable} from './observables/ConnectableObservable';
import {Subject} from './Subject';
import {GroupedObservable} from './operators/groupBy-support';
import Notification from './Notification';
import {Notification} from './Notification';

export interface CoreOperators<T> {
buffer?: (closingNotifier: Observable<any>) => Observable<T[]>;
Expand Down
12 changes: 6 additions & 6 deletions src/InnerSubscriber.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Subscriber from './Subscriber';
import Observer from './Observer';
import OuterSubscriber from './OuterSubscriber';
import tryCatch from './util/tryCatch';
import { errorObject } from './util/errorObject';
import {Subscriber} from './Subscriber';
import {Observer} from './Observer';
import {OuterSubscriber} from './OuterSubscriber';
import {tryCatch} from './util/tryCatch';
import {errorObject} from './util/errorObject';

export default class InnerSubscriber<T, R> extends Subscriber<R> {
export class InnerSubscriber<T, R> extends Subscriber<R> {
index: number = 0;

constructor(private parent: OuterSubscriber<T, R>, private outerValue: T, private outerIndex: number) {
Expand Down
6 changes: 3 additions & 3 deletions src/Notification.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Observer from './Observer';
import Observable from './Observable';
import {Observer} from './Observer';
import {Observable} from './Observable';

export default class Notification<T> {
export class Notification<T> {
hasValue: boolean;

constructor(public kind: string, public value?: T, public exception?: any) {
Expand Down
26 changes: 13 additions & 13 deletions src/Observable.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import Observer from './Observer';
import Operator from './Operator';
import Scheduler from './Scheduler';
import Subscriber from './Subscriber';
import Subscription from './Subscription';
import { root } from './util/root';
import { CoreOperators } from './CoreOperators';
import $$observable from './util/Symbol_observable';
import { GroupedObservable } from './operators/groupBy-support';
import ConnectableObservable from './observables/ConnectableObservable';
import Subject from './Subject';
import Notification from './Notification';
import {Observer} from './Observer';
import {Operator} from './Operator';
import {Scheduler} from './Scheduler';
import {Subscriber} from './Subscriber';
import {Subscription} from './Subscription';
import {root} from './util/root';
import {CoreOperators } from './CoreOperators';
import {$$observable} from './util/Symbol_observable';
import {GroupedObservable} from './operators/groupBy-support';
import {ConnectableObservable} from './observables/ConnectableObservable';
import {Subject} from './Subject';
import {Notification} from './Notification';

/**
* A representation of any set of values over any amount of time. This the most basic building block
* of RxJS.
*
* @class Observable<T>
*/
export default class Observable<T> implements CoreOperators<T> {
export class Observable<T> implements CoreOperators<T> {
source: Observable<any>;
operator: Operator<any, T>;
_isScalar: boolean = false;
Expand Down
6 changes: 2 additions & 4 deletions src/Observer.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
interface Observer<T> {
export interface Observer<T> {
next(value: T): void;
error(err?: any): void;
complete(): void;
isUnsubscribed: boolean;
}

export default Observer;
}
8 changes: 3 additions & 5 deletions src/Operator.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import Observer from './Observer';
import Subscriber from './Subscriber';
import {Observer} from './Observer';
import {Subscriber} from './Subscriber';

interface Operator<T, R> {
export interface Operator<T, R> {
call<T, R>(subscriber: Subscriber<R>): Subscriber<T>;
}

export default Operator;

export function defaultCallFn<T, R>(observer: Observer<R>): Observer<T> {
return new Subscriber<T>(observer);
}
6 changes: 3 additions & 3 deletions src/OuterSubscriber.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import InnerSubscriber from './InnerSubscriber';
import Subscriber from './Subscriber';
import {InnerSubscriber} from './InnerSubscriber';
import {Subscriber} from './Subscriber';

export default class OuterSubscriber<T, R> extends Subscriber<T> {
export class OuterSubscriber<T, R> extends Subscriber<T> {
notifyComplete(inner?: InnerSubscriber<T, R>): void {
this.destination.complete();
}
Expand Down
Loading

0 comments on commit e196657

Please sign in to comment.