clean

Author: michaelolof

src/interfaces.ts

@@ -13,6 +13,7 @@ export interface VuexModuleOptions {
   enableLocalWatchers ?:boolean | string;
   enableLocalSubscriptions ?:boolean | string;
   enableLocalActionSubscriptions ?:boolean | string;
+  enableAutomaticGettersAndSetters ?:boolean;
 }
 
 export interface VuexModuleAddons {

src/module.legacy.ts

@@ -46,7 +46,6 @@ export class LegacyVuexModule {
 
     const vxmodule = extractVuexModule( VuexClass );
     const path = getClassPath( VuexClass.prototype.__namespacedPath__ ) || toCamelCase( VuexClass.name );
-    console.log( "Module", vxmodule, "Path", path );
     return vxmodule[ path ];
   }
 

src/module.ts

@@ -64,7 +64,6 @@ export function extractVuexModule( cls :typeof VuexModule ) {
     modules: fromInstance.submodules,
   };
 
-  
   // Cache the vuex module on the class.
   const path = getNamespacedPath( VuexClass ) || toCamelCase( VuexClass.name );
 

src/proxy.ts

@@ -121,9 +121,9 @@ export function _createProxy<T>(cls: T, $store: any, namespacedPath = "") {
   const classPath = getClassPath( VuexClass.prototype.__namespacedPath__ ) || toCamelCase( VuexClass.name );
   const { state, mutations, actions, getters, modules } = extractVuexModule( VuexClass )[ classPath ];
 
-  createGettersAndMutationProxyFromState({ cls: VuexClass, proxy, state, $store, namespacedPath, maxDepth: 7 });
-  createExplicitMutationsProxy( VuexClass, proxy, $store, namespacedPath );
+  createGettersAndMutationProxyFromState({ cls: VuexClass, proxy, state, $store, namespacedPath, maxDepth: 1 });
   createGettersAndGetterMutationsProxy({ cls: VuexClass, mutations, getters, proxy, $store, namespacedPath });
+  createExplicitMutationsProxy( VuexClass, proxy, $store, namespacedPath );
   createActionProxy({ cls: VuexClass, actions, proxy, $store, namespacedPath });
   createSubModuleProxy( $store, VuexClass, proxy, modules );
 
@@ -298,7 +298,7 @@ function createGettersAndMutationProxyFromState({ cls, proxy, state, $store, nam
     if (currentField.length && !currentField.endsWith(".")) currentField += ".";
     const path = currentField + field;
 
-    if ( maxDepth === 0 || typeof value !== "object") {
+    if ( typeof value !== "object") {
       Object.defineProperty(proxy, field, {
         get: () => { 
           // When creating local proxies getters doesn't exist on that context, so we have to account
@@ -341,7 +341,9 @@ function createExplicitMutationsProxy( cls :VuexModuleConstructor, proxy :Map, $
 
   const mutations = cls.prototype.__mutations_cache__.__explicit_mutations__;
   const commit = cls.prototype.__store_cache__ ? cls.prototype.__store_cache__.commit : $store.commit;
-  namespacedPath = cls.prototype.__namespacedPath__.length ? cls.prototype.__namespacedPath__ + "/" : namespacedPath;
+  namespacedPath = refineNamespacedPath( 
+    cls.prototype.__namespacedPath__.length ? cls.prototype.__namespacedPath__ + "/" : namespacedPath
+  );
 
   for( let field in mutations ) {
     proxy[ field ] = ( payload :any ) => commit( namespacedPath + field, payload )
@@ -359,6 +361,8 @@ function createGettersAndGetterMutationsProxy({ cls, getters, mutations, proxy,
     $store.__internal_mutator__ = mutations.__internal_mutator__;
   }
 
+  namespacedPath = refineNamespacedPath( namespacedPath );
+
   for( let field in getters ) {
 
     if( $store === undefined ) continue;

src/utils.ts

@@ -9,7 +9,6 @@ export function getClassPath( path :string ) {
 
 export function refineNamespacedPath( path :string ) {
   const rtn = path.split( "/" ).filter( str => str.trim().length > 0 ).join( "/" ).trim();
-  console.log( "Return", rtn );
   if( rtn.length > 0 ) return rtn + "/"
   else return rtn;
 }

test-ts

@@ -1 +1 @@
-Subproject commit 5343f33db3f06798e3bbf6a817e74193422cfa8d
+Subproject commit 109a8706de1cbebca76b024a1c6a614c686cd22d