refactor deserialization in persistState

This commit is contained in:
David Lu 2015-09-10 23:46:33 -04:00
parent 3294864b7d
commit b4ea5c278e

View File

@ -4,9 +4,6 @@ export default function persistState(sessionId, stateDeserializer = null, action
} }
function deserializeState(fullState) { function deserializeState(fullState) {
if (!fullState || typeof stateDeserializer !== 'function') {
return fullState;
}
return { return {
...fullState, ...fullState,
committedState: stateDeserializer(fullState.committedState), committedState: stateDeserializer(fullState.committedState),
@ -20,9 +17,6 @@ export default function persistState(sessionId, stateDeserializer = null, action
} }
function deserializeActions(fullState) { function deserializeActions(fullState) {
if (!fullState || typeof actionDeserializer !== 'function') {
return fullState;
}
return { return {
...fullState, ...fullState,
stagedActions: fullState.stagedActions.map((action) => { stagedActions: fullState.stagedActions.map((action) => {
@ -31,12 +25,26 @@ export default function persistState(sessionId, stateDeserializer = null, action
}; };
} }
function deserialize(fullState) {
if (!fullState) {
return fullState;
}
let deserializedState = fullState;
if (typeof stateDeserializer === 'function') {
deserializedState = deserializeState(deserializedState);
}
if (typeof actionDeserializer === 'function') {
deserializedState = deserializeActions(deserializedState);
}
return deserializedState;
}
return next => (reducer, initialState) => { return next => (reducer, initialState) => {
const key = `redux-dev-session-${sessionId}`; const key = `redux-dev-session-${sessionId}`;
let finalInitialState; let finalInitialState;
try { try {
finalInitialState = deserializeActions(deserializeState(JSON.parse(localStorage.getItem(key)))) || initialState; finalInitialState = deserialize(JSON.parse(localStorage.getItem(key))) || initialState;
next(reducer, initialState); next(reducer, initialState);
} catch (e) { } catch (e) {
console.warn('Could not read debug session from localStorage:', e); console.warn('Could not read debug session from localStorage:', e);