fixed shared state issues for modules

Author: michaelolof

dist/proxy.js

@@ -36,6 +36,7 @@ export function getRawActionContext<T extends VuexModule, R>( thisArg:ThisType<T
 
 function handleMutateActionMode(target:VuexModule, key:string, descriptor:ActionDescriptor) {
 
+  console.log( ">>", target )
 
   initializeActionsCache( target );
 

dist/proxy.js.map

@@ -16,26 +16,23 @@ export function createModule( options ?:VuexModuleOptions ) {
    * options variable as it is an internal variable.
    */
   (VuexModule as VuexModuleConstructor).prototype.__options__ = options;
-  (VuexModule as VuexModuleConstructor).prototype.__namespacedPath__ = "";
-  (VuexModule as VuexModuleConstructor).prototype.__vuex_module_cache__ = undefined;
-  (VuexModule as VuexModuleConstructor).prototype.__vuex_proxy_cache__ = undefined;
-  (VuexModule as VuexModuleConstructor).prototype.__vuex_local_proxy_cache__ = undefined;
-  (VuexModule as VuexModuleConstructor).prototype.__submodules_cache__ = {};
-  (VuexModule as VuexModuleConstructor).prototype.__context_store__ = {};
-  (VuexModule as VuexModuleConstructor).prototype.__mutations_cache__ = {
-    __explicit_mutations__: {},
-    __setter_mutations__: {}
-  };
-  (VuexModule as VuexModuleConstructor).prototype.__explicit_mutations_names__ = [];
-  (VuexModule as VuexModuleConstructor).prototype.__actions__ = [];
-  (VuexModule as VuexModuleConstructor).prototype.__watch__ = {};
-  (VuexModule as VuexModuleConstructor).prototype.__explicit_getter_names__ = [];
-  (VuexModule as VuexModuleConstructor).prototype.__decorator_getter_names__ = [];
 
   return VuexModule;
 
 }
 
+
+function initializeModuleInternals( cls: VuexModuleConstructor ) {
+  cls.prototype.__namespacedPath__ = "";
+  cls.prototype.__vuex_module_cache__ = undefined;
+  cls.prototype.__vuex_proxy_cache__ = undefined;
+  cls.prototype.__vuex_local_proxy_cache__ = undefined;
+  cls.prototype.__submodules_cache__ = {};
+  cls.prototype.__context_store__ = {};
+  cls.prototype.__watch__ = {};
+  cls.prototype.__explicit_getter_names__ = [];
+}
+
 export function extractVuexModule( cls :typeof VuexModule ) {
 
   const VuexClass = cls as VuexModuleConstructor;
@@ -46,13 +43,20 @@ export function extractVuexModule( cls :typeof VuexModule ) {
     return VuexClass.prototype.__vuex_module_cache__;
   }
 
+  initializeModuleInternals( VuexClass );
+
   // If not extract vuex module from class.
   const fromInstance = extractModulesFromInstance( VuexClass );
   const fromPrototype = extractModulesFromPrototype( VuexClass );
 
+  // console.log( "Class Name", VuexClass, VuexClass.name, VuexClass.prototype.__mutations_cache__ )
+  // console.log( "Mutation Names", VuexClass.name, VuexClass.prototype.__actions__ )
+
   // Cache explicit mutations and getter mutations.
-  VuexClass.prototype.__mutations_cache__.__explicit_mutations__ = fromPrototype.mutations.explicitMutations;
-  VuexClass.prototype.__mutations_cache__.__setter_mutations__ = fromPrototype.mutations.setterMutations;
+  VuexClass.prototype.__mutations_cache__ = { 
+    __explicit_mutations__: fromPrototype.mutations.explicitMutations,
+    __setter_mutations__: fromPrototype.mutations.setterMutations,
+  }
   const className = VuexClass.name.toLowerCase();
 
   const vuexModule :VuexObject = {
@@ -69,7 +73,7 @@ export function extractVuexModule( cls :typeof VuexModule ) {
 
   const rtn = { [ path ]: vuexModule }
   VuexClass.prototype.__vuex_module_cache__ = rtn;
-  
+
   return rtn;
 
 }
@@ -260,7 +264,7 @@ function extractModulesFromPrototype( cls :VuexModuleConstructor ) {
 
 }
 
-function extractDecoratorGetterNames( names :string[] ) {
+function extractDecoratorGetterNames( names :string[] = [] ) {
   const decorator :Map = {};
   for( let name of names ) {
     decorator[ name ] = new Function("state", `return state.${name}`);

js/proxy.js

@@ -6,7 +6,6 @@ import { Map, FieldPayload, MutationDescriptor, VuexModuleInternalsPrototype } f
 export function mutation( target:any, key:string, descriptor:MutationDescriptor ) {
   // Just store the name of the mutation.
   initializeExplicitMutationsCache( target );
-
   (target as VuexModuleInternalsPrototype).__explicit_mutations_names__.push( key );  
 }
 
@@ -56,7 +55,15 @@ export const internalMutator = ( state :Map, { field, payload } :FieldPayload )
 }
 
 function initializeExplicitMutationsCache(target :any) {  
-  if( ( target as VuexModuleInternalsPrototype).__explicit_mutations_names__ === undefined ) {
-    (target as VuexModuleInternalsPrototype).__explicit_mutations_names__ = [];
+  const cls = target as VuexModuleInternalsPrototype;
+  if ( cls.__explicit_mutations_names__ === undefined ) {
+    cls.__explicit_mutations_names__ = [];
+  }
+
+  if( cls.__mutations_cache__ === undefined ) {
+    cls.__mutations_cache__ = {
+      __explicit_mutations__: {},
+      __setter_mutations__: {},
+    }
   }
 }

js/proxy.js.map

@@ -451,7 +451,7 @@ function createGettersAndGetterMutationsProxy({ cls, getters, mutations, proxy,
 
   for( let field in getters ) {
 
-    if( $store === undefined ) continue;
+    if( $store === undefined || proxy[ field ] ) continue;
 
     const fieldHasGetterAndMutation = getterMutations.indexOf( field ) > -1;
     if( fieldHasGetterAndMutation ) {