expose rootState in module getters and actions

yyx990803 · yyx990803 · commit 2e46bf98913e · 2016-07-11T16:26:30.000-04:00
diff --git a/src/index.js b/src/index.js
@@ -120,7 +120,8 @@ class Store {
         dispatch,
         commit,
         getters: store.getters,
-        state: getNestedState(store.state, path)
+        state: getNestedState(store.state, path),
+        rootState: store.state
       }, payload, cb)
       if (!isPromise(res)) {
         res = Promise.resolve(res)
@@ -276,7 +277,7 @@ function extractModuleGetters (getters = {}, modules = {}, path = []) {
           return
         }
         getters[getterKey] = function wrappedGetter (state) {
-          return rawGetter(getNestedState(state, modulePath))
+          return rawGetter(getNestedState(state, modulePath), state)
         }
       })
     }
diff --git a/test/unit/test.js b/test/unit/test.js
@@ -378,9 +378,10 @@ describe('Vuex', () => {
     let calls = 0
     const makeAction = n => {
       return {
-        [TEST] ({ state }) {
+        [TEST] ({ state, rootState }) {
           calls++
           expect(state.a).to.equal(n)
+          expect(rootState).to.equal(store.state)
         }
       }
     }
@@ -424,7 +425,12 @@ describe('Vuex', () => {
 
   it('module: getters', function () {
     const makeGetter = n => ({
-      [`getter${n}`]: state => state.a
+      [`getter${n}`]: (state, rootState) => {
+        if (rootState) {
+          expect(rootState).to.equal(store.state)
+        }
+        return state.a
+      }
     })
     const store = new Vuex.Store({
       state: {

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ class Store {`
`120`	`120`	`dispatch,`
`121`	`121`	`commit,`
`122`	`122`	`getters: store.getters,`
`123`		`- state: getNestedState(store.state, path)`
	`123`	`+ state: getNestedState(store.state, path),`
	`124`	`+ rootState: store.state`
`124`	`125`	`}, payload, cb)`
`125`	`126`	`if (!isPromise(res)) {`
`126`	`127`	`res = Promise.resolve(res)`
`@@ -276,7 +277,7 @@ function extractModuleGetters (getters = {}, modules = {}, path = []) {`
`276`	`277`	`return`
`277`	`278`	`}`
`278`	`279`	`getters[getterKey] = function wrappedGetter (state) {`
`279`		`- return rawGetter(getNestedState(state, modulePath))`
	`280`	`+ return rawGetter(getNestedState(state, modulePath), state)`
`280`	`281`	`}`
`281`	`282`	`})`
`282`	`283`	`}`