@ember-data/store 4.12.1 → 4.12.3

package/addon/-private.js

@@ -1 +1 @@
-export { f as AdapterPopulatedRecordArray, C as CacheHandler, j as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, h as SOURCE, S as Store, _ as _clearCaches, e as coerceId, k as fastPush, i as isStableIdentifier, n as normalizeModelName, g as notifyArray, p as peekCache, r as recordIdentifierFor, l as removeRecordDataFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./index-757cf686";
+export { f as AdapterPopulatedRecordArray, C as CacheHandler, j as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, h as SOURCE, S as Store, _ as _clearCaches, e as coerceId, k as fastPush, i as isStableIdentifier, n as normalizeModelName, g as notifyArray, p as peekCache, r as recordIdentifierFor, l as removeRecordDataFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./index-36c7ac56";

package/addon/{index-757cf686.js → index-36c7ac56.js}

@@ -5,7 +5,7 @@ import { getOwner, setOwner } from '@ember/application';
 import EmberObject, { get, set } from '@ember/object';
 import { _backburner } from '@ember/runloop';
 import { tracked } from '@glimmer/tracking';
-import { subscribe, addToTransaction, addTransactionCB } from '@ember-data/tracking/-private';
+import { addToTransaction, subscribe, addTransactionCB } from '@ember-data/tracking/-private';
 import { tagForProperty } from '@ember/-internals/metal';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { compare } from '@ember/utils';
@@ -200,6 +200,7 @@ function maybeUpdateUiObjects(store, request, options, document, isFromCache) {
         return document;
       }
       const data = recordArrayManager.createArray({
+        type: request.url,
         identifiers: document.data,
         doc: document,
         query: request
@@ -213,6 +214,7 @@ function maybeUpdateUiObjects(store, request, options, document, isFromCache) {
     let managed = recordArrayManager._keyedArrays.get(identifier.lid);
     if (!managed) {
       managed = recordArrayManager.createArray({
+        type: identifier.lid,
         identifiers: document.data,
         doc: document
       });
@@ -3856,7 +3858,7 @@ const MUTATE = Symbol('#update');
 const NOTIFY = Symbol('#notify');
 const IS_COLLECTION = Symbol.for('Collection');
 function notifyArray(arr) {
-  arr[IDENTIFIER_ARRAY_TAG].ref = null;
+  addToTransaction(arr[IDENTIFIER_ARRAY_TAG]);
   if (macroCondition(getOwnConfig().deprecations.DEPRECATE_COMPUTED_CHAINS)) {
     // eslint-disable-next-line
     dirtyTag(tagForProperty(arr, 'length'));
@@ -3877,6 +3879,11 @@ let Tag = (_class = class Tag {
 
   constructor() {
     _initializerDefineProperty(this, "ref", _descriptor, this);
+    if (macroCondition(getOwnConfig().env.DEBUG)) {
+      const [arr, prop] = arguments;
+      this._debug_base = arr.constructor.name + ':' + String(arr.modelName);
+      this._debug_prop = prop;
+    }
     this.shouldReset = false;
     this.t = false;
   }
@@ -3965,13 +3972,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
@@ -3996,7 +4003,6 @@ let IdentifierArray = (_class3 = class IdentifierArray {
     this.isDestroyed = false;
     this._updatingPromise = null;
     this[IS_COLLECTION] = true;
-    this[IDENTIFIER_ARRAY_TAG] = new Tag();
     this[SOURCE] = void 0;
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     let self = this;
@@ -4004,6 +4010,8 @@ let IdentifierArray = (_class3 = class IdentifierArray {
     this.store = options.store;
     this._manager = options.manager;
     this[SOURCE] = options.identifiers;
+    // @ts-expect-error
+    this[IDENTIFIER_ARRAY_TAG] = macroCondition(getOwnConfig().env.DEBUG) ? new Tag(this, 'length') : new Tag();
     const store = options.store;
     const boundFns = new Map();
     const _TAG = this[IDENTIFIER_ARRAY_TAG];
@@ -4316,8 +4324,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);
   }
@@ -4703,10 +4711,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);
@@ -4718,7 +4730,7 @@ class RecordArrayManager {
     if (!pending || this.isDestroying || this.isDestroyed) {
       return;
     }
-    sync(array, pending);
+    sync(array, pending, this._set.get(array));
     this._pending.delete(array);
   }
 
@@ -4751,6 +4763,7 @@ class RecordArrayManager {
         manager: this
       });
       this._live.set(type, array);
+      this._set.set(array, new Set(identifiers));
     }
     return array;
   }
@@ -4768,6 +4781,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);
     }
@@ -4839,6 +4853,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;
@@ -4876,21 +4891,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
@@ -4919,19 +4943,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);
       }
     }
@@ -4939,6 +4964,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 {
@@ -4946,6 +4972,7 @@ function sync(array, changes) {
         const index = state.indexOf(i);
         if (index !== -1) {
           state.splice(index, 1);
+          arraySet.delete(i);
         }
       });
     }
@@ -5329,17 +5356,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) {
@@ -6726,12 +6770,11 @@ class Store extends EmberObject {
         // during unload
         if (macroCondition(getOwnConfig().packages.HAS_GRAPH_PACKAGE)) {
           const peekGraph = importSync('@ember-data/graph/-private').peekGraph;
-          let graph = peekGraph(this);
+          const graph = peekGraph(this);
           if (graph) {
             graph.identifiers.clear();
           }
         }
-        this.notifications.destroy();
         this.recordArrayManager.clear();
         this._instanceCache.clear();
       } else {
@@ -7289,6 +7332,7 @@ class Store extends EmberObject {
         graph.destroy();
       }
     }
+    this.notifications.destroy();
     this.recordArrayManager.destroy();
     this.identifierCache.destroy();
     this.unloadAll();