@ember-data/model 4.12.0 → 4.12.2

package/addon/-private.js

@@ -1,5 +1,5 @@
-import { M as Model } from "./has-many-465843f4";
-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-465843f4";
+import { M as Model } from "./has-many-26d79228";
+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-26d79228";
 import { getOwner } from '@ember/application';
 
 /*

package/addon/{has-many-465843f4.js → has-many-26d79228.js}

@@ -1383,7 +1383,9 @@ if (macroCondition(getOwnConfig().env.DEBUG)) {
     }
     if (parentDefinition.isPolymorphic) {
       let meta = store.getSchemaDefinitionService().relationshipsDefinitionFor(addedIdentifier)[parentDefinition.inverseKey];
-      if (meta?.options?.as) {
+      if (macroCondition(!getOwnConfig().deprecations.DEPRECATE_NON_EXPLICIT_POLYMORPHISM)) {
+        assert(`The schema for the relationship '${parentDefinition.inverseKey}' on '${addedIdentifier.type}' type does not implement '${parentDefinition.type}' and thus cannot be assigned to the '${parentDefinition.key}' relationship in '${parentIdentifier.type}'. The definition should specify 'as: "${parentDefinition.type}"' in options.`, meta.options.as === parentDefinition.type);
+      } else if (meta?.options?.as?.length > 0) {
         asserted = true;
         assert(`The schema for the relationship '${parentDefinition.inverseKey}' on '${addedIdentifier.type}' type does not implement '${parentDefinition.type}' and thus cannot be assigned to the '${parentDefinition.key}' relationship in '${parentIdentifier.type}'. The definition should specify 'as: "${parentDefinition.type}"' in options.`, meta.options.as === parentDefinition.type);
       }
@@ -2435,6 +2437,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) {
@@ -2781,12 +2784,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));
@@ -2820,10 +2824,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;
@@ -2846,7 +2850,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,
@@ -2854,9 +2858,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.
@@ -3051,6 +3055,11 @@ function isInvalidError(error) {
 let Tag = (_class$1 = class Tag {
   constructor() {
     _initializerDefineProperty(this, "ref", _descriptor$1, this);
+    if (macroCondition(getOwnConfig().env.DEBUG)) {
+      const [base, prop] = arguments;
+      this._debug_base = base;
+      this._debug_prop = prop;
+    }
     this.rev = 1;
     this.isDirty = true;
     this.value = undefined;
@@ -3083,7 +3092,8 @@ function getTag(record, key) {
     tags = Object.create(null);
     Tags.set(record, tags);
   }
-  return tags[key] = tags[key] || new Tag();
+  // @ts-expect-error
+  return tags[key] = tags[key] || (macroCondition(getOwnConfig().env.DEBUG) ? new Tag(record.constructor.modelName, key) : new Tag());
 }
 function peekTag(record, key) {
   let tags = Tags.get(record);
@@ -5015,6 +5025,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
         meta.name = name;
         meta.parentModelName = modelName;
         relationships[name] = macroCondition(getOwnConfig().deprecations.DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE) ? relationshipFromMeta(meta) : meta;
+        assert(`You should not specify both options.as and options.inverse as null on ${modelName}.${meta.name}, as if there is no inverse field there is no abstract type to conform to. You may have intended for this relationship to be polymorphic, or you may have mistakenly set inverse to null.`, !(meta.options.inverse === null && meta.options.as?.length > 0));
       }
     });
     return relationships;