@ember-data/model 5.5.0-alpha.0 → 5.5.0-alpha.10

package/addon/{model-b638e17c.js → model-b8502183.js}

@@ -1,6 +1,6 @@
-import { macroCondition, getOwnConfig, importSync } from '@embroider/macros';
 import { deprecate, assert, warn } from '@ember/debug';
 import { dasherize } from '@ember/string';
+import { macroCondition, getOwnConfig, importSync } from '@embroider/macros';
 import EmberObject, { computed, get } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { cached, tracked } from '@glimmer/tracking';
@@ -1051,19 +1051,6 @@ function tapPromise(proxy, promise) {
     throw error;
   });
 }
-
-/*
-  Assert that `addedRecord` has a valid type so it can be added to the
-  relationship of the `record`.
-
-  The assert basically checks if the `addedRecord` can be added to the
-  relationship (specified via `relationshipMeta`) of the `record`.
-
-  This utility should only be used internally, as both record parameters must
-  be stable record identifiers and the `relationshipMeta` needs to be the meta
-  information about the relationship, retrieved via
-  `record.relationshipFor(key)`.
-*/
 let assertPolymorphicType;
 if (macroCondition(getOwnConfig().env.DEBUG)) {
   assertPolymorphicType = function assertPolymorphicType(parentIdentifier, parentDefinition, addedIdentifier, store) {
@@ -1077,11 +1064,6 @@ if (macroCondition(getOwnConfig().env.DEBUG)) {
   };
 }
 var _class$3, _descriptor$3;
-
-/**
-  @module @ember-data/model
-*/
-
 function isResourceIdentiferWithRelatedLinks$1(value) {
   return Boolean(value && value.links && value.links.related);
 }
@@ -1555,11 +1537,6 @@ let BelongsToReference = (_class$3 = class BelongsToReference {
   }
 }), _applyDecoratedDescriptor(_class$3.prototype, "identifier", [cached, dependentKeyCompat], Object.getOwnPropertyDescriptor(_class$3.prototype, "identifier"), _class$3.prototype)), _class$3);
 var _class$2, _descriptor$2;
-
-/**
-  @module @ember-data/model
-*/
-
 function isResourceIdentiferWithRelatedLinks(value) {
   return Boolean(value && value.links && value.links.related);
 }
@@ -2854,11 +2831,9 @@ let RecordState = (_class3 = class RecordState {
 
     // we instantiate lazily
     // so we grab anything we don't have yet
-    if (macroCondition(!getOwnConfig().env.DEBUG)) {
-      const lastRequest = requests.getLastRequestForRecord(identity);
-      if (lastRequest) {
-        handleRequest(lastRequest);
-      }
+    const lastRequest = requests.getLastRequestForRecord(identity);
+    if (lastRequest) {
+      handleRequest(lastRequest);
     }
     this.handler = notifications.subscribe(identity, (identifier, type, key) => {
       switch (type) {
@@ -3103,7 +3078,7 @@ function findPossibleInverses(type, inverseType, name, relationshipsSoFar) {
  * an expensive getter on first-access and thereafter
  * never recompute it.
  */
-function computeOnce(target, key, desc) {
+function computeOnce(target, propertyName, desc) {
   const cache = new WeakMap();
   let getter = desc.get;
   desc.get = function () {
@@ -3175,8 +3150,8 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     this.___recordState = macroCondition(getOwnConfig().env.DEBUG) ? new RecordState(this) : null;
     this.setProperties(createProps);
     let notifications = store.notifications;
-    this.___private_notifications = notifications.subscribe(identity, (identifier, type, key) => {
-      notifyChanges(identifier, type, key, this, store);
+    this.___private_notifications = notifications.subscribe(identity, (identifier, type, field) => {
+      notifyChanges(identifier, type, field, this, store);
     });
   }
   destroy() {
@@ -3191,9 +3166,9 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     // notify individual changes once the delete has been signaled,
     // this decision is left to model instances.
 
-    this.eachRelationship((key, meta) => {
+    this.eachRelationship((name, meta) => {
       if (meta.kind === 'belongsTo') {
-        this.notifyPropertyChange(key);
+        this.notifyPropertyChange(name);
       }
     });
     LEGACY_SUPPORT.get(this)?.destroy();
@@ -3584,12 +3559,12 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     to trigger their flush. We wouldn't need to
     super in 4.0+ where sync observers are removed.
    */
-  notifyPropertyChange(key) {
-    let tag = peekTag(this, key);
+  notifyPropertyChange(prop) {
+    let tag = peekTag(this, prop);
     if (tag) {
       tag.notify();
     }
-    super.notifyPropertyChange(key);
+    super.notifyPropertyChange(prop);
   }
 
   /**
@@ -3699,10 +3674,10 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     // and protects with a try...finally block
     // previously used begin...endPropertyChanges but this is private API
     changeProperties(() => {
-      let key;
+      let prop;
       for (let i = 0, length = keys.length; i < length; i++) {
-        key = keys[i];
-        this.notifyPropertyChange(key);
+        prop = keys[i];
+        this.notifyPropertyChange(prop);
       }
     });
   }
@@ -4005,7 +3980,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     - `name` the name of the current property in the iteration
    - `descriptor` the meta object that describes this relationship
     The relationship descriptor argument is an object with the following properties.
-    - **key** <span class="type">String</span> the name of this relationship on the Model
+    - **name** <span class="type">String</span> the name of this relationship on the Model
    - **kind** <span class="type">String</span> "hasMany" or "belongsTo"
    - **options** <span class="type">Object</span> the original options hash passed when the relationship was declared
    - **parentType** <span class="type">Model</span> the type of the Model that owns this relationship
@@ -4039,8 +4014,8 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
   relationshipFor(name) {
     return this.constructor.relationshipsByName.get(name);
   }
-  inverseFor(key) {
-    return this.constructor.inverseFor(key, storeFor$1(this));
+  inverseFor(name) {
+    return this.constructor.inverseFor(name, storeFor$1(this));
   }
   eachAttribute(callback, binding) {
     this.constructor.eachAttribute(callback, binding);
@@ -4292,7 +4267,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
       belongsTo: []
     };
     this.eachComputedProperty((name, meta) => {
-      if (meta.isRelationship) {
+      if (meta.kind === 'hasMany' || meta.kind === 'belongsTo') {
         names[meta.kind].push(name);
       }
     });
@@ -4363,9 +4338,9 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
    import Blog from 'app/models/blog';
     let relationshipsByName = Blog.relationshipsByName;
    relationshipsByName.users;
-   //=> { key: 'users', kind: 'hasMany', type: 'user', options: Object, isRelationship: true }
+   //=> { name: 'users', kind: 'hasMany', type: 'user', options: Object }
    relationshipsByName.owner;
-   //=> { key: 'owner', kind: 'belongsTo', type: 'user', options: Object, isRelationship: true }
+   //=> { name: 'owner', kind: 'belongsTo', type: 'user', options: Object }
    ```
     @property relationshipsByName
     @public
@@ -4379,9 +4354,9 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     let rels = this.relationshipsObject;
     let relationships = Object.keys(rels);
     for (let i = 0; i < relationships.length; i++) {
-      let key = relationships[i];
-      let value = rels[key];
-      map.set(value.name || value.key, value);
+      let name = relationships[i];
+      let value = rels[name];
+      map.set(value.name, value);
     }
     return map;
   }
@@ -4390,7 +4365,8 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     let relationships = Object.create(null);
     let modelName = this.modelName;
     this.eachComputedProperty((name, meta) => {
-      if (meta.isRelationship) {
+      if (meta.kind === 'hasMany' || meta.kind === 'belongsTo') {
+        // TODO deprecate key being here
         meta.key = name;
         meta.name = name;
         meta.parentModelName = modelName;
@@ -4438,10 +4414,9 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     assert(`Accessing schema information on Models without looking up the model via the store is disallowed.`, this.modelName);
     let map = new Map();
     this.eachComputedProperty((name, meta) => {
-      // TODO end reliance on these booleans and stop leaking them in the spec
-      if (meta.isRelationship) {
+      if (meta.kind === 'hasMany' || meta.kind === 'belongsTo') {
         map.set(name, meta.kind);
-      } else if (meta.isAttribute) {
+      } else if (meta.kind === 'attribute') {
         map.set(name, 'attribute');
       }
     });
@@ -4486,7 +4461,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
   }
   static determineRelationshipType(knownSide, store) {
     assert(`Accessing schema information on Models without looking up the model via the store is disallowed.`, this.modelName);
-    let knownKey = knownSide.key;
+    let knownKey = knownSide.name;
     let knownKind = knownSide.kind;
     let inverse = this.inverseFor(knownKey, store);
     // let key;
@@ -4525,9 +4500,9 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
       // do thing
     });
     // prints:
-   // firstName {type: "string", isAttribute: true, options: Object, parentType: function, name: "firstName"}
-   // lastName {type: "string", isAttribute: true, options: Object, parentType: function, name: "lastName"}
-   // birthday {type: "date", isAttribute: true, options: Object, parentType: function, name: "birthday"}
+   // firstName {type: "string", kind: 'attribute', options: Object, parentType: function, name: "firstName"}
+   // lastName {type: "string", kind: 'attribute', options: Object, parentType: function, name: "lastName"}
+   // birthday {type: "date", kind: 'attribute', options: Object, parentType: function, name: "birthday"}
    ```
     @property attributes
     @public
@@ -4539,8 +4514,11 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     assert(`Accessing schema information on Models without looking up the model via the store is disallowed.`, this.modelName);
     let map = new Map();
     this.eachComputedProperty((name, meta) => {
-      if (meta.isAttribute) {
+      if (meta.kind === 'attribute') {
         assert("You may not set `id` as an attribute on your model. Please remove any lines that look like: `id: attr('<type>')` from " + this.toString(), name !== 'id');
+
+        // TODO deprecate key being here
+        meta.key = name;
         meta.name = name;
         map.set(name, meta);
       }
@@ -4582,9 +4560,9 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
   static get transformedAttributes() {
     assert(`Accessing schema information on Models without looking up the model via the store is disallowed.`, this.modelName);
     let map = new Map();
-    this.eachAttribute((key, meta) => {
+    this.eachAttribute((name, meta) => {
       if (meta.type) {
-        map.set(key, meta.type);
+        map.set(name, meta.type);
       }
     });
     return map;
@@ -4614,9 +4592,9 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
       // do thing
     });
     // prints:
-   // firstName {type: "string", isAttribute: true, options: Object, parentType: function, name: "firstName"}
-   // lastName {type: "string", isAttribute: true, options: Object, parentType: function, name: "lastName"}
-   // birthday {type: "date", isAttribute: true, options: Object, parentType: function, name: "birthday"}
+   // firstName {type: "string", kind: 'attribute', options: Object, parentType: function, name: "firstName"}
+   // lastName {type: "string", kind: 'attribute', options: Object, parentType: function, name: "lastName"}
+   // birthday {type: "date", kind: 'attribute', options: Object, parentType: function, name: "birthday"}
    ```
     @method eachAttribute
     @public