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

package/addon/-private.js

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

package/addon/{has-many-d114a056.js → has-many-2cd7707a.js}

@@ -1,8 +1,8 @@
 import { macroCondition, isDevelopingApp, getOwnConfig, importSync, dependencySatisfies } from '@embroider/macros';
 import { assert, deprecate, warn, inspect } from '@ember/debug';
 import EmberObject, { computed, get } from '@ember/object';
-import { recordIdentifierFor, storeFor } from '@ember-data/store';
-import { recordDataFor, RecordArray, MUTATE, SOURCE, recordIdentifierFor as recordIdentifierFor$1, IDENTIFIER_ARRAY_TAG, notifyArray, isStableIdentifier, storeFor as storeFor$1, fastPush, coerceId } from '@ember-data/store/-private';
+import { recordIdentifierFor, storeFor as storeFor$1 } from '@ember-data/store';
+import { peekCache, RecordArray, MUTATE, SOURCE, recordIdentifierFor as recordIdentifierFor$1, IDENTIFIER_ARRAY_TAG, notifyArray, isStableIdentifier, storeFor, fastPush, coerceId } from '@ember-data/store/-private';
 import { dasherize } from '@ember/string';
 import ArrayMixin, { A, NativeArray } from '@ember/array';
 import { singularize } from 'ember-inflector';
@@ -150,7 +150,7 @@ function attr(type, options) {
       if (this.isDestroyed || this.isDestroying) {
         return;
       }
-      return recordDataFor(this).getAttr(recordIdentifierFor(this), key);
+      return peekCache(this).getAttr(recordIdentifierFor(this), key);
     },
     set(key, value) {
       if (macroCondition(isDevelopingApp())) {
@@ -160,10 +160,10 @@ function attr(type, options) {
       }
       assert(`Attempted to set '${key}' on the deleted record ${recordIdentifierFor(this)}`, !this.currentState.isDeleted);
       const identifier = recordIdentifierFor(this);
-      const recordData = storeFor(this)._instanceCache.getRecordData(identifier);
-      let currentValue = recordData.getAttr(identifier, key);
+      const cache = peekCache(this);
+      let currentValue = cache.getAttr(identifier, key);
       if (currentValue !== value) {
-        recordData.setAttr(identifier, key, value);
+        cache.setAttr(identifier, key, value);
         if (!this.isValid) {
           const {
             errors
@@ -1118,7 +1118,7 @@ class RelatedCollection extends RecordArray {
     switch (prop) {
       case 'length 0':
         {
-          this._manager.updateCache({
+          this._manager.mutate({
             op: 'replaceRelatedRecords',
             record: this.identifier,
             field: this.key,
@@ -1129,7 +1129,7 @@ class RelatedCollection extends RecordArray {
       case 'replace cell':
         {
           const [index, prior, value] = args;
-          this._manager.updateCache({
+          this._manager.mutate({
             op: 'replaceRelatedRecord',
             record: this.identifier,
             field: this.key,
@@ -1140,7 +1140,7 @@ class RelatedCollection extends RecordArray {
           break;
         }
       case 'push':
-        this._manager.updateCache({
+        this._manager.mutate({
           op: 'addToRelatedRecords',
           record: this.identifier,
           field: this.key,
@@ -1149,7 +1149,7 @@ class RelatedCollection extends RecordArray {
         break;
       case 'pop':
         if (result) {
-          this._manager.updateCache({
+          this._manager.mutate({
             op: 'removeFromRelatedRecords',
             record: this.identifier,
             field: this.key,
@@ -1158,7 +1158,7 @@ class RelatedCollection extends RecordArray {
         }
         break;
       case 'unshift':
-        this._manager.updateCache({
+        this._manager.mutate({
           op: 'addToRelatedRecords',
           record: this.identifier,
           field: this.key,
@@ -1168,7 +1168,7 @@ class RelatedCollection extends RecordArray {
         break;
       case 'shift':
         if (result) {
-          this._manager.updateCache({
+          this._manager.mutate({
             op: 'removeFromRelatedRecords',
             record: this.identifier,
             field: this.key,
@@ -1178,7 +1178,7 @@ class RelatedCollection extends RecordArray {
         }
         break;
       case 'sort':
-        this._manager.updateCache({
+        this._manager.mutate({
           op: 'sortRelatedRecords',
           record: this.identifier,
           field: this.key,
@@ -1190,7 +1190,7 @@ class RelatedCollection extends RecordArray {
           const [start, removeCount, ...adds] = args;
           // detect a full replace
           if (removeCount > 0 && adds.length === this[SOURCE].length) {
-            this._manager.updateCache({
+            this._manager.mutate({
               op: 'replaceRelatedRecords',
               record: this.identifier,
               field: this.key,
@@ -1199,7 +1199,7 @@ class RelatedCollection extends RecordArray {
             return;
           }
           if (removeCount > 0) {
-            this._manager.updateCache({
+            this._manager.mutate({
               op: 'removeFromRelatedRecords',
               record: this.identifier,
               field: this.key,
@@ -1208,7 +1208,7 @@ class RelatedCollection extends RecordArray {
             });
           }
           if (adds?.length) {
-            this._manager.updateCache({
+            this._manager.mutate({
               op: 'addToRelatedRecords',
               record: this.identifier,
               field: this.key,
@@ -1278,6 +1278,7 @@ class RelatedCollection extends RecordArray {
     const {
       store
     } = this;
+    assert(`Expected modelName to be set`, this.modelName);
     const record = store.createRecord(this.modelName, hash);
     this.push(record);
     return record;
@@ -1286,7 +1287,7 @@ class RelatedCollection extends RecordArray {
 RelatedCollection.prototype.isAsync = false;
 RelatedCollection.prototype.isPolymorphic = false;
 RelatedCollection.prototype.identifier = null;
-RelatedCollection.prototype.recordData = null;
+RelatedCollection.prototype.cache = null;
 RelatedCollection.prototype._inverseIsAsync = false;
 RelatedCollection.prototype.key = '';
 RelatedCollection.prototype.DEPRECATED_CLASS_NAME = 'ManyArray';
@@ -1967,7 +1968,8 @@ let BelongsToReference = (_class$3 = class BelongsToReference {
   }
   _resource() {
     this._ref; // subscribe
-    return this.store._instanceCache.getRecordData(this.___identifier).getRelationship(this.___identifier, this.key);
+    const cache = macroCondition(getOwnConfig().deprecations.DEPRECATE_V1_RECORD_DATA) ? this.store._instanceCache.getResourceCache(this.___identifier) : this.store.cache;
+    return cache.getRelationship(this.___identifier, this.key);
   }
 
   /**
@@ -2332,7 +2334,8 @@ let HasManyReference = (_class$2 = class HasManyReference {
     return [];
   }
   _resource() {
-    return this.store._instanceCache.getRecordData(this.___identifier).getRelationship(this.___identifier, this.key);
+    const cache = macroCondition(getOwnConfig().deprecations.DEPRECATE_V1_RECORD_DATA) ? this.store._instanceCache.getResourceCache(this.___identifier) : this.store.cache;
+    return cache.getRelationship(this.___identifier, this.key);
   }
 
   /**
@@ -2775,9 +2778,9 @@ let HasManyReference = (_class$2 = class HasManyReference {
 class LegacySupport {
   constructor(record) {
     this.record = record;
-    this.store = storeFor$1(record);
+    this.store = storeFor(record);
     this.identifier = recordIdentifierFor$1(record);
-    this.recordData = this.store._instanceCache.getRecordData(this.identifier);
+    this.cache = peekCache(record);
     this._manyArrayCache = Object.create(null);
     this._relationshipPromisesCache = Object.create(null);
     this._relationshipProxyCache = Object.create(null);
@@ -2800,8 +2803,8 @@ class LegacySupport {
     currentState.length = 0;
     fastPush(currentState, identifiers);
   }
-  updateCache(operation) {
-    this.recordData.update(operation);
+  mutate(mutation) {
+    this.cache.mutate(mutation);
   }
   _findBelongsTo(key, resource, relationship, options) {
     // TODO @runspired follow up if parent isNew then we should not be attempting load here
@@ -2816,7 +2819,7 @@ class LegacySupport {
     const graphFor = importSync('@ember-data/graph/-private').graphFor;
     const relationship = graphFor(this.store).get(this.identifier, key);
     assert(`Expected ${key} to be a belongs-to relationship`, isBelongsTo(relationship));
-    let resource = this.recordData.getRelationship(this.identifier, key);
+    let resource = this.cache.getRelationship(this.identifier, key);
     relationship.state.hasFailedLoadAttempt = false;
     relationship.state.shouldForceReload = true;
     let promise = this._findBelongsTo(key, resource, relationship, options);
@@ -2830,9 +2833,9 @@ class LegacySupport {
   getBelongsTo(key, options) {
     const {
       identifier,
-      recordData
+      cache
     } = this;
-    let resource = recordData.getRelationship(this.identifier, key);
+    let resource = cache.getRelationship(this.identifier, key);
     let relatedIdentifier = resource && resource.data ? resource.data : null;
     assert(`Expected a stable identifier`, !relatedIdentifier || isStableIdentifier(relatedIdentifier));
     const store = this.store;
@@ -2868,7 +2871,7 @@ class LegacySupport {
     }
   }
   setDirtyBelongsTo(key, value) {
-    return this.recordData.update({
+    return this.cache.mutate({
       op: 'replaceRelatedRecord',
       record: this.identifier,
       field: key,
@@ -2878,7 +2881,7 @@ class LegacySupport {
     true);
   }
   _getCurrentState(identifier, field) {
-    let jsonApi = this.recordData.getRelationship(identifier, field, true);
+    let jsonApi = this.cache.getRelationship(identifier, field, true);
     const cache = this.store._instanceCache;
     let identifiers = [];
     if (jsonApi.data) {
@@ -2905,7 +2908,7 @@ class LegacySupport {
           store: this.store,
           type: definition.type,
           identifier: this.identifier,
-          recordData: this.recordData,
+          cache: this.cache,
           identifiers,
           key,
           meta: doc.meta || null,
@@ -2929,7 +2932,7 @@ class LegacySupport {
       if (loadingPromise) {
         return loadingPromise;
       }
-      const jsonApi = this.recordData.getRelationship(this.identifier, key);
+      const jsonApi = this.cache.getRelationship(this.identifier, key);
       const promise = this._findHasManyByJsonApiResource(jsonApi, this.identifier, relationship, options);
       if (!promise) {
         manyArray.isLoaded = true;
@@ -3356,7 +3359,8 @@ function notifyRelationship(identifier, key, record, meta) {
 }
 function notifyAttribute(store, identifier, key, record) {
   let currentValue = cacheFor(record, key);
-  if (currentValue !== store._instanceCache.getRecordData(identifier).getAttr(identifier, key)) {
+  const cache = macroCondition(getOwnConfig().deprecations.DEPRECATE_V1_RECORD_DATA) ? peekCache(record) : store.cache;
+  if (currentValue !== cache.getAttr(identifier, key)) {
     record.notifyPropertyChange(key);
   }
 }
@@ -3491,11 +3495,11 @@ root
 let RecordState = (_class3 = class RecordState {
   constructor(record) {
     _initializerDefineProperty(this, "isSaving", _descriptor2, this);
-    const store = storeFor(record);
+    const store = storeFor$1(record);
     const identity = recordIdentifierFor$1(record);
     this.identifier = identity;
     this.record = record;
-    this.cache = store._instanceCache.getRecordData(identity);
+    this.cache = macroCondition(getOwnConfig().deprecations.DEPRECATE_V1_RECORD_DATA) ? peekCache(record) : store.cache;
     this.pendingCount = 0;
     this.fulfilledCount = 0;
     this.rejectedCount = 0;
@@ -3580,7 +3584,7 @@ let RecordState = (_class3 = class RecordState {
     });
   }
   destroy() {
-    storeFor(this.record).notifications.unsubscribe(this.handler);
+    storeFor$1(this.record).notifications.unsubscribe(this.handler);
   }
   notify(key) {
     getTag(this, key).notify();
@@ -3944,7 +3948,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     let store = this.store = _secretInit.store;
     super.init(options);
     let identity = _secretInit.identifier;
-    _secretInit.cb(this, _secretInit.recordData, identity, _secretInit.store);
+    _secretInit.cb(this, _secretInit.cache, identity, _secretInit.store);
     this.___recordState = macroCondition(isDevelopingApp()) ? new RecordState(this) : null;
     this.setProperties(createProps);
     let notifications = store.notifications;
@@ -3955,7 +3959,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
   destroy() {
     const identifier = recordIdentifierFor(this);
     this.___recordState?.destroy();
-    const store = storeFor(this);
+    const store = storeFor$1(this);
     store.notifications.unsubscribe(this.___private_notifications);
     // Legacy behavior is to notify the relationships on destroy
     // such that they "clear". It's uncertain this behavior would
@@ -4346,7 +4350,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     @return {Object} an object whose values are primitive JSON values only
   */
   serialize(options) {
-    return storeFor(this)._instanceCache.createSnapshot(recordIdentifierFor(this)).serialize(options);
+    return storeFor$1(this)._instanceCache.createSnapshot(recordIdentifierFor(this)).serialize(options);
   }
 
   /*
@@ -4395,7 +4399,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
   deleteRecord() {
     // ensure we've populated currentState prior to deleting a new record
     if (this.currentState) {
-      storeFor(this).deleteRecord(this);
+      storeFor$1(this).deleteRecord(this);
     }
   }
 
@@ -4462,7 +4466,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     if (this.currentState.isNew && (this.isDestroyed || this.isDestroying)) {
       return;
     }
-    storeFor(this).unloadRecord(this);
+    storeFor$1(this).unloadRecord(this);
   }
 
   /**
@@ -4518,7 +4522,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
       and value is an [oldProp, newProp] array.
   */
   changedAttributes() {
-    return recordDataFor(this).changedAttrs(recordIdentifierFor(this));
+    return peekCache(this).changedAttrs(recordIdentifierFor(this));
   }
 
   /**
@@ -4543,8 +4547,8 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     const {
       isNew
     } = currentState;
-    storeFor(this)._join(() => {
-      recordDataFor(this).rollbackAttrs(recordIdentifierFor(this));
+    storeFor$1(this)._join(() => {
+      peekCache(this).rollbackAttrs(recordIdentifierFor(this));
       this.errors.clear();
       currentState.cleanErrorRequests();
       if (isNew) {
@@ -4559,7 +4563,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
   */
   // TODO @deprecate in favor of a public API or examples of how to test successfully
   _createSnapshot() {
-    return storeFor(this)._instanceCache.createSnapshot(recordIdentifierFor(this));
+    return storeFor$1(this)._instanceCache.createSnapshot(recordIdentifierFor(this));
   }
 
   /**
@@ -4601,7 +4605,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     if (this.currentState.isNew && this.currentState.isDeleted) {
       promise = resolve(this);
     } else {
-      promise = storeFor(this).saveRecord(this, options);
+      promise = storeFor$1(this).saveRecord(this, options);
     }
     if (macroCondition(getOwnConfig().deprecations.DEPRECATE_SAVE_PROMISE_ACCESS)) {
       return deprecatedPromiseObject(promise);
@@ -4641,7 +4645,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     let identifier = recordIdentifierFor(this);
     assert(`You cannot reload a record without an ID`, identifier.id);
     this.isReloading = true;
-    const promise = storeFor(this)._fetchManager.scheduleFetch(identifier, options).then(() => this).finally(() => {
+    const promise = storeFor$1(this)._fetchManager.scheduleFetch(identifier, options).then(() => this).finally(() => {
       this.isReloading = false;
     });
     if (macroCondition(getOwnConfig().deprecations.DEPRECATE_SAVE_PROMISE_ACCESS)) {
@@ -4809,7 +4813,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     return this.constructor.relationshipsByName.get(name);
   }
   inverseFor(key) {
-    return this.constructor.inverseFor(key, storeFor(this));
+    return this.constructor.inverseFor(key, storeFor$1(this));
   }
   eachAttribute(callback, binding) {
     this.constructor.eachAttribute(callback, binding);