fix(proxy-state-tree): always remove proxies if needed, even if not tracking path in production

Author: christianalfoni

packages/node_modules/proxy-state-tree/src/Proxyfier.ts

@@ -179,23 +179,24 @@ export class Proxifier {
 
             trackingTree && trackingTree.proxifier.trackPath(nestedPath)
 
+            const method = String(prop)
+
+            // On POP we can optimally remove cached proxy by removing the specific one
+            // that was removed. If it is a PUSH, we do not have to remove anything, as
+            // existing proxies stays the same
+            if (method === 'pop') {
+              proxifier.tree.master.removeProxy(nestedPath)
+            } else if (method !== 'push') {
+              proxifier.tree.master.removeProxy(path)
+            }
+
             if (
               arrayMutations.has(String(prop)) &&
               proxifier.shouldTrackMutations(nestedPath)
             ) {
               proxifier.ensureMutationTrackingIsEnabled(nestedPath)
               return (...args) => {
                 const mutationTree = proxifier.getMutationTree()
-                const method = String(prop)
-
-                // On POP we can optimally remove cached proxy by removing the specific one
-                // that was removed. If it is a PUSH, we do not have to remove anything, as
-                // existing proxies stays the same
-                if (method === 'pop') {
-                  proxifier.tree.master.removeProxy(nestedPath)
-                } else if (method !== 'push') {
-                  proxifier.tree.master.removeProxy(path)
-                }
 
                 mutationTree.addMutation({
                   method,
@@ -297,6 +298,10 @@ export class Proxifier {
             proxifier.ensureMutationTrackingIsEnabled(nestedPath)
             proxifier.ensureValueDosntExistInStateTreeElsewhere(value)
 
+            if (isPlainObject(target[prop]) || Array.isArray(target[prop])) {
+              proxifier.tree.master.removeProxy(nestedPath)
+            }
+
             if (proxifier.shouldTrackMutations(nestedPath)) {
               let objectChangePath
 
@@ -306,10 +311,6 @@ export class Proxifier {
 
               const mutationTree = proxifier.getMutationTree()
 
-              if (isPlainObject(target[prop]) || Array.isArray(target[prop])) {
-                proxifier.tree.master.removeProxy(nestedPath)
-              }
-
               mutationTree.addMutation(
                 {
                   method: 'set',
@@ -331,6 +332,10 @@ export class Proxifier {
 
             proxifier.ensureMutationTrackingIsEnabled(nestedPath)
 
+            if (isPlainObject(target[prop]) || Array.isArray(target[prop])) {
+              proxifier.tree.master.removeProxy(nestedPath)
+            }
+
             if (proxifier.shouldTrackMutations(nestedPath)) {
               let objectChangePath
               if (prop in target) {
@@ -339,10 +344,6 @@ export class Proxifier {
 
               const mutationTree = proxifier.getMutationTree()
 
-              if (isPlainObject(target[prop]) || Array.isArray(target[prop])) {
-                proxifier.tree.master.removeProxy(nestedPath)
-              }
-
               mutationTree.addMutation(
                 {
                   method: 'unset',