@ember-data/store 5.1.1 → 5.1.2

package/addon/-private.js

@@ -2664,13 +2664,13 @@ let IdentifierArray = (_class3 = class IdentifierArray {
     @type Store
     */
 
-  destroy() {
-    this.isDestroying = true;
+  destroy(clear) {
+    this.isDestroying = !clear;
     // changing the reference breaks the Proxy
     // this[SOURCE] = [];
     this[SOURCE].length = 0;
     this[NOTIFY]();
-    this.isDestroyed = true;
+    this.isDestroyed = !clear;
   }
 
   // length must be on self for proxied methods to work properly
@@ -2961,8 +2961,8 @@ class Collection extends IdentifierArray {
     });
     return promise;
   }
-  destroy() {
-    super.destroy();
+  destroy(clear) {
+    super.destroy(clear);
     this._manager._managed.delete(this);
     this._manager._pending.delete(this);
   }
@@ -3060,10 +3060,14 @@ class RecordArrayManager {
     this._staged = new Map();
     this._keyedArrays = new Map();
     this._identifiers = new Map();
+    this._set = new Map();
+    this._visibilitySet = new Map();
     this._subscription = this.store.notifications.subscribe('resource', (identifier, type) => {
       if (type === 'added') {
+        this._visibilitySet.set(identifier, true);
         this.identifierAdded(identifier);
       } else if (type === 'removed') {
+        this._visibilitySet.set(identifier, false);
         this.identifierRemoved(identifier);
       } else if (type === 'state') {
         this.identifierChanged(identifier);
@@ -3075,7 +3079,7 @@ class RecordArrayManager {
     if (!pending || this.isDestroying || this.isDestroyed) {
       return;
     }
-    sync(array, pending);
+    sync(array, pending, this._set.get(array));
     this._pending.delete(array);
   }
 
@@ -3108,6 +3112,7 @@ class RecordArrayManager {
         manager: this
       });
       this._live.set(type, array);
+      this._set.set(array, new Set(identifiers));
     }
     return array;
   }
@@ -3125,6 +3130,7 @@ class RecordArrayManager {
     };
     let array = new Collection(options);
     this._managed.add(array);
+    this._set.set(array, new Set(options.identifiers || []));
     if (config.identifiers) {
       associate(this._identifiers, array, config.identifiers);
     }
@@ -3196,6 +3202,7 @@ class RecordArrayManager {
     const old = source.slice();
     source.length = 0;
     fastPush(source, identifiers);
+    this._set.set(array, new Set(identifiers));
     notifyArray(array);
     array.meta = payload.meta || null;
     array.links = payload.links || null;
@@ -3233,21 +3240,30 @@ class RecordArrayManager {
   }
   identifierChanged(identifier) {
     let newState = this.store._instanceCache.recordIsLoaded(identifier, true);
+
+    // if the change matches the most recent direct added/removed
+    // state, then we can ignore it
+    if (this._visibilitySet.get(identifier) === newState) {
+      return;
+    }
     if (newState) {
       this.identifierAdded(identifier);
     } else {
       this.identifierRemoved(identifier);
     }
   }
-  clear() {
-    this._live.forEach(array => array.destroy());
-    this._managed.forEach(array => array.destroy());
+  clear(isClear = true) {
+    this._live.forEach(array => array.destroy(isClear));
+    this._managed.forEach(array => array.destroy(isClear));
     this._managed.clear();
     this._identifiers.clear();
+    this._pending.clear();
+    this._set.forEach(set => set.clear());
+    this._visibilitySet.clear();
   }
   destroy() {
     this.isDestroying = true;
-    this.clear();
+    this.clear(false);
     this._live.clear();
     this.isDestroyed = true;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -3276,19 +3292,20 @@ function disassociateIdentifier(ArraysCache, array, identifier) {
     cache.delete(array);
   }
 }
-function sync(array, changes) {
+function sync(array, changes, arraySet) {
   let state = array[SOURCE];
   const adds = [];
   const removes = [];
   changes.forEach((value, key) => {
     if (value === 'add') {
       // likely we want to keep a Set along-side
-      if (state.includes(key)) {
+      if (arraySet.has(key)) {
         return;
       }
       adds.push(key);
+      arraySet.add(key);
     } else {
-      if (state.includes(key)) {
+      if (arraySet.has(key)) {
         removes.push(key);
       }
     }
@@ -3296,6 +3313,7 @@ function sync(array, changes) {
   if (removes.length) {
     if (removes.length === state.length) {
       state.length = 0;
+      arraySet.clear();
       // changing the reference breaks the Proxy
       // state = array[SOURCE] = [];
     } else {
@@ -3303,6 +3321,7 @@ function sync(array, changes) {
         const index = state.indexOf(i);
         if (index !== -1) {
           state.splice(index, 1);
+          arraySet.delete(i);
         }
       });
     }
@@ -3722,17 +3741,34 @@ class Store extends EmberObject {
   _run(cb) {
     assert(`EmberData should never encounter a nested run`, !this._cbs);
     const _cbs = this._cbs = {};
-    cb();
-    if (_cbs.coalesce) {
-      _cbs.coalesce();
-    }
-    if (_cbs.sync) {
-      _cbs.sync();
-    }
-    if (_cbs.notify) {
-      _cbs.notify();
+    if (macroCondition(getOwnConfig().env.DEBUG)) {
+      try {
+        cb();
+        if (_cbs.coalesce) {
+          _cbs.coalesce();
+        }
+        if (_cbs.sync) {
+          _cbs.sync();
+        }
+        if (_cbs.notify) {
+          _cbs.notify();
+        }
+      } finally {
+        this._cbs = null;
+      }
+    } else {
+      cb();
+      if (_cbs.coalesce) {
+        _cbs.coalesce();
+      }
+      if (_cbs.sync) {
+        _cbs.sync();
+      }
+      if (_cbs.notify) {
+        _cbs.notify();
+      }
+      this._cbs = null;
     }
-    this._cbs = null;
   }
   _join(cb) {
     if (this._cbs) {