Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for the Saga pattern by enabling multiple actions in a transaction #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const applyCommit = (state, commitId, reducer) => {
// If the action to commit is the first in the queue (most common scenario)
if (history.first().meta.optimistic.id === commitId) {
const historyWithoutCommit = history.shift();
const nextOptimisticIndex = historyWithoutCommit.findIndex(action => action.meta && action.meta.optimistic && action.meta.optimistic.id);
const nextOptimisticIndex = historyWithoutCommit.findIndex(action => action.meta && action.meta.optimistic && action.meta.optimistic.type === BEGIN);
// If this is the only optimistic item in the queue, we're done!
if (nextOptimisticIndex === -1) {
return state.withMutations(mutState => {
Expand Down Expand Up @@ -60,13 +60,16 @@ const applyRevert = (state, revertId, reducer) => {
// If the action to revert is the first in the queue (most common scenario)
if (history.first().meta.optimistic.id === revertId) {
const historyWithoutRevert = history.shift();
const nextOptimisticIndex = historyWithoutRevert.findIndex(action => action.meta && action.meta.optimistic && action.meta.optimistic.id);
const nextOptimisticIndex = historyWithoutRevert.findIndex(action => action.meta && action.meta.optimistic && action.meta.optimistic.type === BEGIN);
// If this is the only optimistic action in the queue, we're done!
if (nextOptimisticIndex === -1) {
return state.withMutations(mutState => {
mutState
.set('history', List())
.set('current', historyWithoutRevert.reduce((mutState, action) => reducer(mutState, action), beforeState))
.set('current', historyWithoutRevert
.filter(action => (action.meta && action.meta.optimistic && action.meta.optimistic.id != revertId) ||
(!action.meta || !action.meta.optimistic || !action.meta.optimistic.id))
.reduce((mutState, action) => reducer(mutState, action), beforeState))
.set('beforeState', undefined)
});
}
Expand All @@ -76,16 +79,22 @@ const applyRevert = (state, revertId, reducer) => {
if (indexToRevert === -1) {
console.error(`@@optimist: Failed revert. Transaction #${revertId} does not exist!`);
}
newHistory = history.delete(indexToRevert);
newHistory = history.filter(action => (action.meta && action.meta.optimistic && action.meta.optimistic.id != revertId) ||
(!action.meta || !action.meta.optimistic || !action.meta.optimistic.id))
}
const newCurrent = newHistory.reduce((mutState, action) => {
return reducer(mutState, action)
}, beforeState);
const firstBegin = newHistory.findIndex(action => action.meta && action.meta.optimistic && action.meta.optimistic.type === BEGIN)
const newBeforeState = newHistory.slice(0, firstBegin).reduce((mutState, action) => {
return reducer(mutState, action)
}, beforeState)
newHistory = newHistory.slice(firstBegin)
return state.withMutations(mutState => {
mutState
.set('history', newHistory)
.set('current', newCurrent)
.set('beforeState', beforeState)
.set('beforeState', newBeforeState)
});
};

Expand Down