@ember-data/model 5.1.0-alpha.7 → 5.1.0-alpha.9

package/addon/-private.js

@@ -1,5 +1,5 @@
-import { M as Model } from "./has-many-2eb0dc13";
-export { E as Errors, L as LEGACY_SUPPORT, R as ManyArray, P as PromiseBelongsTo, c as PromiseManyArray, a as attr, b as belongsTo, h as hasMany } from "./has-many-2eb0dc13";
+import { M as Model } from "./has-many-1937fb05";
+export { E as Errors, L as LEGACY_SUPPORT, R as ManyArray, P as PromiseBelongsTo, c as PromiseManyArray, a as attr, b as belongsTo, h as hasMany } from "./has-many-1937fb05";
 import { getOwner } from '@ember/application';
 
 /*

package/addon/{has-many-2eb0dc13.js → has-many-1937fb05.js}

@@ -2204,6 +2204,7 @@ class LegacySupport {
     this._manyArrayCache = Object.create(null);
     this._relationshipPromisesCache = Object.create(null);
     this._relationshipProxyCache = Object.create(null);
+    this._pending = Object.create(null);
     this.references = Object.create(null);
   }
   _syncArray(array) {
@@ -2550,12 +2551,13 @@ class LegacySupport {
     if (!resource) {
       return Promise.resolve(null);
     }
+    const key = relationship.definition.key;
 
     // interleaved promises mean that we MUST cache this here
     // in order to prevent infinite re-render if the request
     // fails.
-    if (this._pending) {
-      return this._pending;
+    if (this._pending[key]) {
+      return this._pending[key];
     }
     const identifier = resource.data ? resource.data : null;
     assert(`Expected a stable identifier`, !identifier || isStableIdentifier(identifier));
@@ -2589,10 +2591,10 @@ class LegacySupport {
           [Symbol.for('ember-data:skip-cache')]: true
         }
       });
-      this._pending = future.then(doc => doc.content).finally(() => {
-        this._pending = null;
+      this._pending[key] = future.then(doc => doc.content).finally(() => {
+        this._pending[key] = undefined;
       });
-      return this._pending;
+      return this._pending[key];
     }
     const preferLocalCache = hasReceivedData && allInverseRecordsAreLoaded && !isEmpty;
     const hasLocalPartialData = hasDematerializedInverse || isEmpty && resource.data;
@@ -2615,7 +2617,7 @@ class LegacySupport {
     if (identifier) {
       assert(`Cannot fetch belongs-to relationship with no information`, identifier);
       options.reload = options.reload || !attemptLocalCache || undefined;
-      this._pending = this.store.request({
+      this._pending[key] = this.store.request({
         op: 'findBelongsTo',
         records: [identifier],
         data: request,
@@ -2623,9 +2625,9 @@ class LegacySupport {
           [Symbol.for('ember-data:skip-cache')]: true
         }
       }).then(doc => doc.content).finally(() => {
-        this._pending = null;
+        this._pending[key] = undefined;
       });
-      return this._pending;
+      return this._pending[key];
     }
 
     // we were explicitly told we have no data and no links.