@@ -415,8 +415,6 @@ function extractNameFromPath (path: string) {
415
415
}
416
416
417
417
function formatStoreForInspectorState ( module , getters , path ) : CustomInspectorState {
418
- getters = ! module . namespaced || path === 'root' ? module . context . getters : getters [ path ]
419
- const gettersKeys = Object . keys ( getters )
420
418
const storeState : CustomInspectorState = {
421
419
state : Object . keys ( module . context . state ) . map ( ( key ) => ( {
422
420
key,
@@ -425,8 +423,26 @@ function formatStoreForInspectorState (module, getters, path): CustomInspectorSt
425
423
} ) ) ,
426
424
}
427
425
426
+ getters = ! module . namespaced || path === 'root' ? module . context . getters : getters [ path ]
427
+ let gettersKeys = Object . keys ( getters )
428
+ const shouldPickGetters = ! module . namespaced && path !== 'root'
429
+ if ( shouldPickGetters ) {
430
+ // Only pick the getters defined in the non-namespaced module
431
+ const definedGettersKeys = Object . keys ( module . _rawModule . getters ?? { } )
432
+ gettersKeys = gettersKeys . filter ( key => definedGettersKeys . includes ( key ) )
433
+ }
428
434
if ( gettersKeys . length ) {
429
- const tree = transformPathsToObjectTree ( getters )
435
+ let moduleGetters : Record < string , any >
436
+ if ( shouldPickGetters ) {
437
+ // Only pick the getters defined in the non-namespaced module
438
+ moduleGetters = { }
439
+ for ( const key of gettersKeys ) {
440
+ moduleGetters [ key ] = getters [ key ]
441
+ }
442
+ } else {
443
+ moduleGetters = getters
444
+ }
445
+ const tree = transformPathsToObjectTree ( moduleGetters )
430
446
storeState . getters = Object . keys ( tree ) . map ( ( key ) => ( {
431
447
key : key . endsWith ( '/' ) ? extractNameFromPath ( key ) : key ,
432
448
editable : false ,
0 commit comments