From 4711673c8f1920fa2e906c61afc8420b0066bd5c Mon Sep 17 00:00:00 2001 From: Connor Schlesiger Date: Thu, 23 Feb 2017 01:03:10 +0000 Subject: [PATCH 1/4] Reduce import scope, ignore undefined state from reducers --- src/combineReducers.js | 4 ++-- src/createLoggerStream.js | 4 ++-- src/createMessageStreams.js | 4 ++-- src/createState.js | 11 +++++++---- src/messageStreamsMonitor.js | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/combineReducers.js b/src/combineReducers.js index a599db5..171b852 100644 --- a/src/combineReducers.js +++ b/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; diff --git a/src/createLoggerStream.js b/src/createLoggerStream.js index 5851506..97bd0d9 100644 --- a/src/createLoggerStream.js +++ b/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(); diff --git a/src/createMessageStreams.js b/src/createMessageStreams.js index 9e484db..ff9d6f6 100644 --- a/src/createMessageStreams.js +++ b/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]); } diff --git a/src/createState.js b/src/createState.js index 421e5c7..6c66cb1 100644 --- a/src/createState.js +++ b/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,14 @@ 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) => { + const obj = reducer(state); + return obj ? obj : state; + }) .publishReplay(1) .refCount(); }; diff --git a/src/messageStreamsMonitor.js b/src/messageStreamsMonitor.js index 7ccb504..8f7db0f 100644 --- a/src/messageStreamsMonitor.js +++ b/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$; From 46a39c21710fbedd36ca46ca6a2a806e709b5daf Mon Sep 17 00:00:00 2001 From: Connor Schlesiger Date: Thu, 23 Feb 2017 01:03:22 +0000 Subject: [PATCH 2/4] Reduce import scope, ignore undefined state from reducers --- package.json | 2 +- src/createState.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a343398..d1bedeb 100644 --- a/package.json +++ b/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", diff --git a/src/createState.js b/src/createState.js index 6c66cb1..788c538 100644 --- a/src/createState.js +++ b/src/createState.js @@ -31,7 +31,7 @@ const createState = (reducer$, initialState = Observable.of({})) => { .merge(reducer$) .scan((state, reducer) => { const obj = reducer(state); - return obj ? obj : state; + return obj === undefined ? state : obj; }) .publishReplay(1) .refCount(); From 8c3ed1662a7c014282ba4da3949e5c7fc3ac8671 Mon Sep 17 00:00:00 2001 From: Connor Schlesiger Date: Thu, 23 Feb 2017 02:45:58 +0000 Subject: [PATCH 3/4] Switch to an or, avoid storing new instance of state object --- src/createState.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/createState.js b/src/createState.js index 788c538..e371e78 100644 --- a/src/createState.js +++ b/src/createState.js @@ -30,8 +30,7 @@ const createState = (reducer$, initialState = Observable.of({})) => { return initialState$ .merge(reducer$) .scan((state, reducer) => { - const obj = reducer(state); - return obj === undefined ? state : obj; + return reducer(state) || state }) .publishReplay(1) .refCount(); From 0a78d4bfb25c0c3947bcdbdd409d6fb521df29a9 Mon Sep 17 00:00:00 2001 From: Connor Schlesiger Date: Thu, 23 Feb 2017 11:11:49 -0500 Subject: [PATCH 4/4] Update createState.js Remove handling of undefined returns from reducer --- src/createState.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/createState.js b/src/createState.js index e371e78..f4f1f08 100644 --- a/src/createState.js +++ b/src/createState.js @@ -29,9 +29,7 @@ const createState = (reducer$, initialState = Observable.of({})) => { return initialState$ .merge(reducer$) - .scan((state, reducer) => { - return reducer(state) || state - }) + .scan((state, reducer) => (reducer(state))) .publishReplay(1) .refCount(); };