Reduce Import Scope & Ignore Undefined Returns from Reducers

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxr",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Maintains state for React app with RxJS the Redux way",
   "main": "lib/index.js",
   "jsnext:main": "es/index.js",

src/combineReducers.js

@@ -1,4 +1,4 @@
-import Rx from 'rxjs';
+import {Observable} from 'rxjs';
 import isObservable from 'is-observable';
 
 const flatten = list => list.reduce(
@@ -27,7 +27,7 @@ const combineReducers = (reducers, options = {}) => {
   const flatened = flatten(reducerAsArr);
   const reducersArr = [].concat(flatened).filter(item => isObservable(item));
   // console.log('RA: ', reducersArr);
-  return Rx.Observable.merge(...reducersArr);
+  return Observable.merge(...reducersArr);
 };
 
 export default combineReducers;

src/createLoggerStream.js

@@ -1,4 +1,4 @@
-import Rx from 'rxjs';
+import {Observable} from 'rxjs';
 import deepEqual from 'deep-equal';
 import isObservable from 'is-observable';
 
@@ -25,7 +25,7 @@ const createLoggerStream = (state$, ...other) => {
   const stateToLog$ = state$.map(state => ({ streamName: 'state', payload: state }));
   const toLog = [ stateToLog$, ...otherToLog ];
 
-  return Rx.Observable.merge(...toLog)
+  return Observable.merge(...toLog)
     .distinctUntilChanged((a, b) => deepEqual(a, b))
     .publishReplay(1)
     .refCount();

src/createMessageStreams.js

@@ -1,4 +1,4 @@
-import Rx from 'rxjs';
+import {Subject} from 'rxjs';
 import createPushMessageFunctions from './createPushMessageFunctions';
 // import isObservable from 'is-observable';
 
@@ -32,7 +32,7 @@ const createMessageStreams = (
   return namesArr.reduce((acc, itemName) => {
     if (typeof itemName === 'string') {
       const streamName = `${itemName}$`;
-      acc[streamName] = new Rx.Subject;
+      acc[streamName] = new Subject;
       if (opts.makePushMessageFunctions) {
         acc[itemName] = createPushMessageFunctions(acc[streamName]);
       }

src/createState.js

@@ -1,4 +1,4 @@
-import Rx from 'rxjs';
+import {Observable} from 'rxjs';
 import isObservable from 'is-observable';
 
 /**
@@ -11,7 +11,7 @@ import isObservable from 'is-observable';
  *          or object (will be converted to Observable)
  * @returns {Observable} Observable stream of current state
  */
-const createState = (reducer$, initialState = Rx.Observable.of({})) => {
+const createState = (reducer$, initialState = Observable.of({})) => {
   if (!isObservable(reducer$)) {
     throw new Error(`createState expects first argument - reducer - to be Observable
     but it is ${reducer$ === null ? 'null' : typeof reducer$}`
@@ -25,11 +25,11 @@ const createState = (reducer$, initialState = Rx.Observable.of({})) => {
     );
   }
 
-  const initialState$ = isObservable(initialState) ? initialState : Rx.Observable.of(initialState);
+  const initialState$ = isObservable(initialState) ? initialState : Observable.of(initialState);
 
   return initialState$
     .merge(reducer$)
-    .scan((state, reducer) => reducer(state))
+    .scan((state, reducer) => (reducer(state)))
     .publishReplay(1)
     .refCount();
 };

src/messageStreamsMonitor.js

@@ -1,4 +1,4 @@
-import Rx from 'rxjs';
+import {Subject} from 'rxjs';
 
-const messageStreamsMonitor$ = new Rx.Subject;
+const messageStreamsMonitor$ = new Subject;
 export default messageStreamsMonitor$;