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

package/addon/{has-many-a275fe0d.js → has-many-27395cb2.js}

@@ -1,8 +1,8 @@
-import { macroCondition, isDevelopingApp, getOwnConfig, importSync, moduleExists } from '@embroider/macros';
+import { isDevelopingApp, macroCondition, getOwnConfig, importSync } 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, 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';
@@ -103,9 +103,7 @@ function computedMacroWithOptionalParams(fn) {
   ```
 
   ```app/transforms/text.js
-  import Transform from '@ember-data/serializer/transform';
-
-  export default class TextTransform extends Transform {
+  export default class TextTransform {
     serialize(value, options) {
       if (options.uppercase) {
         return value.toUpperCase();
@@ -117,6 +115,10 @@ function computedMacroWithOptionalParams(fn) {
     deserialize(value) {
       return value;
     }
+
+    static create() {
+      return new this();
+    }
   }
   ```
 
@@ -142,7 +144,7 @@ function attr(type, options) {
   };
   return computed({
     get(key) {
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         if (['currentState'].indexOf(key) !== -1) {
           throw new Error(`'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your attr on ${this.constructor.toString()}`);
         }
@@ -150,20 +152,20 @@ 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())) {
+      if (isDevelopingApp()) {
         if (['currentState'].indexOf(key) !== -1) {
           throw new Error(`'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your attr on ${this.constructor.toString()}`);
         }
       }
       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
@@ -225,7 +227,7 @@ const PROXIED_OBJECT_PROPS = ['content', 'isPending', 'isSettled', 'isRejected',
 const ProxySymbolString = String(Symbol.for('PROXY_CONTENT'));
 function deprecatedPromiseObject(promise) {
   const promiseObjectProxy = promiseObject(promise);
-  if (macroCondition(!isDevelopingApp())) {
+  if (!isDevelopingApp()) {
     return promiseObjectProxy;
   }
   const handler = {
@@ -648,7 +650,7 @@ function normalizeResponseHelper(serializer, store, modelClass, payload, id, req
   return normalizedResponse;
 }
 function validateDocumentStructure(doc) {
-  if (macroCondition(isDevelopingApp())) {
+  if (isDevelopingApp()) {
     let errors = [];
     if (!doc || typeof doc !== 'object') {
       errors.push('Top level of a JSON API document must be an object');
@@ -835,7 +837,7 @@ function ensureRelationshipIsSetToParent(payload, parentIdentifier, store, paren
       kind
     } = inverse;
     let relationshipData = relationships[inverseKey] && relationships[inverseKey].data;
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       if (typeof relationshipData !== 'undefined' && !relationshipDataPointsToParent(relationshipData, parentIdentifier)) {
         let inspect = function inspect(thing) {
           return `'${JSON.stringify(thing)}'`;
@@ -984,7 +986,7 @@ function payloadIsNotBlank(adapterPayload) {
 }
 function guardDestroyedStore(promise, store, label) {
   let token;
-  if (macroCondition(isDevelopingApp())) {
+  if (isDevelopingApp()) {
     token = store._trackAsyncRequestStart(label);
   }
   let wrapperPromise = resolve(promise, label).then(_v => {
@@ -1004,7 +1006,7 @@ function guardDestroyedStore(promise, store, label) {
     return promise;
   });
   return _guard(wrapperPromise, () => {
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       store._trackAsyncRequestEnd(token);
     }
     return _objectIsAlive(store);
@@ -1118,7 +1120,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 +1131,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 +1142,7 @@ class RelatedCollection extends RecordArray {
           break;
         }
       case 'push':
-        this._manager.updateCache({
+        this._manager.mutate({
           op: 'addToRelatedRecords',
           record: this.identifier,
           field: this.key,
@@ -1149,7 +1151,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 +1160,7 @@ class RelatedCollection extends RecordArray {
         }
         break;
       case 'unshift':
-        this._manager.updateCache({
+        this._manager.mutate({
           op: 'addToRelatedRecords',
           record: this.identifier,
           field: this.key,
@@ -1168,7 +1170,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 +1180,7 @@ class RelatedCollection extends RecordArray {
         }
         break;
       case 'sort':
-        this._manager.updateCache({
+        this._manager.mutate({
           op: 'sortRelatedRecords',
           record: this.identifier,
           field: this.key,
@@ -1190,7 +1192,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 +1201,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 +1210,7 @@ class RelatedCollection extends RecordArray {
             });
           }
           if (adds?.length) {
-            this._manager.updateCache({
+            this._manager.mutate({
               op: 'addToRelatedRecords',
               record: this.identifier,
               field: this.key,
@@ -1224,8 +1226,9 @@ class RelatedCollection extends RecordArray {
   }
   notify() {
     const tag = this[IDENTIFIER_ARRAY_TAG];
-    tag.ref = null;
     tag.shouldReset = true;
+    // @ts-expect-error
+    notifyArray(this);
   }
 
   /**
@@ -1277,6 +1280,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;
@@ -1285,7 +1289,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';
@@ -1429,7 +1433,7 @@ let PromiseManyArray = (_class$4 = class PromiseManyArray {
         }
         return false;
       };
-    } else if (macroCondition(isDevelopingApp())) {
+    } else if (isDevelopingApp()) {
       const meta = Ember.meta(this);
       meta.hasMixin = mixin => {
         assert(`Do not use A() on an EmberData PromiseManyArray`);
@@ -1714,7 +1718,7 @@ if (macroCondition(getOwnConfig().deprecations.DEPRECATE_PROMISE_MANY_ARRAY_BEHA
   `record.relationshipFor(key)`.
 */
 let assertPolymorphicType;
-if (macroCondition(isDevelopingApp())) {
+if (isDevelopingApp()) {
   let checkPolymorphic = function checkPolymorphic(modelClass, addedModelClass) {
     if (modelClass.__isMixin) {
       return modelClass.__mixin.detect(addedModelClass.PrototypeMixin) ||
@@ -1966,7 +1970,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);
   }
 
   /**
@@ -2071,7 +2076,7 @@ let BelongsToReference = (_class$3 = class BelongsToReference {
       }
     }
     let record = this.store.push(jsonApiDoc);
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       assertPolymorphicType(this.belongsToRelationship.identifier, this.belongsToRelationship.definition, recordIdentifierFor$1(record), this.store);
     }
@@ -2331,7 +2336,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);
   }
 
   /**
@@ -2581,7 +2587,7 @@ let HasManyReference = (_class$2 = class HasManyReference {
           data: obj
         });
       }
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         let relationshipMeta = this.hasManyRelationship.definition;
         let identifier = this.hasManyRelationship.identifier;
 
@@ -2774,9 +2780,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);
@@ -2799,8 +2805,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
@@ -2815,7 +2821,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);
@@ -2829,9 +2835,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;
@@ -2867,7 +2873,7 @@ class LegacySupport {
     }
   }
   setDirtyBelongsTo(key, value) {
-    return this.recordData.update({
+    return this.cache.mutate({
       op: 'replaceRelatedRecord',
       record: this.identifier,
       field: key,
@@ -2877,7 +2883,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) {
@@ -2892,7 +2898,7 @@ class LegacySupport {
     return [identifiers, jsonApi];
   }
   getManyArray(key, definition) {
-    if (moduleExists("@ember-data/json-api")) {
+    if (macroCondition(getOwnConfig().packages.HAS_JSON_API_PACKAGE)) {
       let manyArray = this._manyArrayCache[key];
       if (!definition) {
         const graphFor = importSync('@ember-data/graph/-private').graphFor;
@@ -2904,7 +2910,7 @@ class LegacySupport {
           store: this.store,
           type: definition.type,
           identifier: this.identifier,
-          recordData: this.recordData,
+          cache: this.cache,
           identifiers,
           key,
           meta: doc.meta || null,
@@ -2923,12 +2929,12 @@ class LegacySupport {
     assert('hasMany only works with the @ember-data/json-api package');
   }
   fetchAsyncHasMany(key, relationship, manyArray, options) {
-    if (moduleExists("@ember-data/json-api")) {
+    if (macroCondition(getOwnConfig().packages.HAS_JSON_API_PACKAGE)) {
       let loadingPromise = this._relationshipPromisesCache[key];
       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;
@@ -2941,7 +2947,7 @@ class LegacySupport {
     assert('hasMany only works with the @ember-data/json-api package');
   }
   reloadHasMany(key, options) {
-    if (moduleExists("@ember-data/json-api")) {
+    if (macroCondition(getOwnConfig().packages.HAS_JSON_API_PACKAGE)) {
       let loadingPromise = this._relationshipPromisesCache[key];
       if (loadingPromise) {
         return loadingPromise;
@@ -2966,7 +2972,7 @@ class LegacySupport {
     assert(`hasMany only works with the @ember-data/json-api package`);
   }
   getHasMany(key, options) {
-    if (moduleExists("@ember-data/json-api")) {
+    if (macroCondition(getOwnConfig().packages.HAS_JSON_API_PACKAGE)) {
       const graphFor = importSync('@ember-data/graph/-private').graphFor;
       const relationship = graphFor(this.store).get(this.identifier, key);
       const {
@@ -3024,7 +3030,7 @@ class LegacySupport {
   referenceFor(kind, name) {
     let reference = this.references[name];
     if (!reference) {
-      if (!moduleExists("@ember-data/json-api")) {
+      if (macroCondition(!getOwnConfig().packages.HAS_JSON_API_PACKAGE)) {
         // TODO @runspired while this feels odd, it is not a regression in capability because we do
         // not today support references pulling from RecordDatas other than our own
         // because of the intimate API access involved. This is something we will need to redesign.
@@ -3033,7 +3039,7 @@ class LegacySupport {
       const graphFor = importSync('@ember-data/graph/-private').graphFor;
       const graph = graphFor(this.store);
       const relationship = graph.get(this.identifier, name);
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         if (kind) {
           let modelName = this.identifier.type;
           let actualRelationshipKind = relationship.definition.kind;
@@ -3051,7 +3057,7 @@ class LegacySupport {
     return reference;
   }
   _findHasManyByJsonApiResource(resource, parentIdentifier, relationship, options = {}) {
-    if (moduleExists("@ember-data/json-api")) {
+    if (macroCondition(getOwnConfig().packages.HAS_JSON_API_PACKAGE)) {
       if (!resource) {
         return;
       }
@@ -3105,11 +3111,11 @@ class LegacySupport {
           return;
         }
         let finds = new Array(resource.data.length);
-        let cache = this.store._instanceCache;
+        let cache = this.store._fetchManager;
         for (let i = 0; i < resource.data.length; i++) {
           const identifier = resource.data[i];
           assert(`expected a stable identifier`, isStableIdentifier(identifier));
-          finds[i] = cache._fetchDataIfNeededForIdentifier(identifier, options);
+          finds[i] = cache.fetchDataIfNeededForIdentifier(identifier, options);
         }
         return all(finds);
       }
@@ -3180,7 +3186,7 @@ class LegacySupport {
       if (!identifier) {
         assert(`No Information found for ${resource.data.lid}`, identifier);
       }
-      return this.store._instanceCache._fetchDataIfNeededForIdentifier(identifier, options);
+      return this.store._fetchManager.fetchDataIfNeededForIdentifier(identifier, options);
     }
     let resourceIsLocal = !localDataIsEmpty && resource.data.id === null;
     if (identifier && resourceIsLocal) {
@@ -3355,7 +3361,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);
   }
 }
@@ -3384,6 +3391,9 @@ let Tag = (_class$1 = class Tag {
     this.rev = 1;
     this.isDirty = true;
     this.value = undefined;
+    /*
+     * whether this was part of a transaction when mutated
+     */
     this.t = false;
   }
   notify() {
@@ -3487,11 +3497,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;
@@ -3551,7 +3561,7 @@ let RecordState = (_class3 = class RecordState {
 
     // we instantiate lazily
     // so we grab anything we don't have yet
-    if (macroCondition(!isDevelopingApp())) {
+    if (!isDevelopingApp()) {
       const lastRequest = requests.getLastRequestForRecord(identity);
       if (lastRequest) {
         handleRequest(lastRequest);
@@ -3576,7 +3586,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();
@@ -3810,7 +3820,7 @@ class RelationshipDefinition {
       inverse = modelClass.inverseFor(this.key, store);
     }
     // TODO make this error again for the non-polymorphic case
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       if (!this.options.polymorphic) {
         modelClass.typeForRelationship(this.key, store);
       }
@@ -3835,6 +3845,7 @@ function lookupLegacySupport(record) {
   const identifier = recordIdentifierFor(record);
   let support = LEGACY_SUPPORT.get(identifier);
   if (!support) {
+    assert(`Memory Leak Detected`, !record.isDestroyed && !record.isDestroying);
     support = new LegacySupport(record);
     LEGACY_SUPPORT.set(identifier, support);
     LEGACY_SUPPORT.set(record, support);
@@ -3927,7 +3938,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     _initializerDefineProperty(this, "isReloading", _descriptor, this);
   }
   init(options = {}) {
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       if (!options._secretInit && !options._createProps) {
         throw new Error('You should not call `create` on a model. Instead, call `store.createRecord` with the attributes you would like to set.');
       }
@@ -3939,8 +3950,8 @@ 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);
-    this.___recordState = macroCondition(isDevelopingApp()) ? new RecordState(this) : null;
+    _secretInit.cb(this, _secretInit.cache, identity, _secretInit.store);
+    this.___recordState = isDevelopingApp() ? new RecordState(this) : null;
     this.setProperties(createProps);
     let notifications = store.notifications;
     this.___private_notifications = notifications.subscribe(identity, (identifier, type, key) => {
@@ -3950,7 +3961,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
@@ -4185,7 +4196,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     return this.currentState.isError;
   }
   set isError(v) {
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       throw new Error(`isError is not directly settable`);
     }
   }
@@ -4210,7 +4221,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     // this guard exists, because some dev-only deprecation code
     // (addListener via validatePropertyInjections) invokes toString before the
     // object is real.
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       try {
         return recordIdentifierFor(this).id;
       } catch {
@@ -4245,7 +4256,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     // when using legacy/classic ember classes. Basically: lazy in prod and eager in dev.
     // so we do this to try to steer folks to the nicer "dont user currentState"
     // error.
-    if (macroCondition(!isDevelopingApp())) {
+    if (!isDevelopingApp()) {
       if (!this.___recordState) {
         this.___recordState = new RecordState(this);
       }
@@ -4341,7 +4352,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);
   }
 
   /*
@@ -4390,7 +4401,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);
     }
   }
 
@@ -4457,7 +4468,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);
   }
 
   /**
@@ -4513,7 +4524,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));
   }
 
   /**
@@ -4538,8 +4549,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) {
@@ -4554,7 +4565,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));
   }
 
   /**
@@ -4596,7 +4607,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);
@@ -4636,7 +4647,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)) {
@@ -4804,7 +4815,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);
@@ -4976,7 +4987,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
       if (possibleRelationships.length === 0) {
         return null;
       }
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         let filteredRelationships = possibleRelationships.filter(possibleRelationship => {
           let optionsForRelationship = possibleRelationship.options;
           return name === optionsForRelationship.inverse;
@@ -4994,7 +5005,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     }
 
     // ensure inverse is properly configured
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       if (isPolymorphic) {
         if (macroCondition(getOwnConfig().deprecations.DEPRECATE_NON_EXPLICIT_POLYMORPHISM)) {
           if (!inverseOptions.as) {
@@ -5016,7 +5027,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
     }
 
     // ensure we are properly configured
-    if (macroCondition(isDevelopingApp())) {
+    if (isDevelopingApp()) {
       if (inverseOptions.polymorphic) {
         if (macroCondition(getOwnConfig().deprecations.DEPRECATE_NON_EXPLICIT_POLYMORPHISM)) {
           if (!options.as) {
@@ -5182,7 +5193,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
    import { get } from '@ember/object';
    import Blog from 'app/models/blog';
     let relatedTypes = Blog.relatedTypes');
-   //=> [ User, Post ]
+   //=> ['user', 'post']
    ```
     @property relatedTypes
     @public
@@ -5702,7 +5713,7 @@ let Model = (_class = (_class2 = class Model extends EmberObject {
 // the values initialized during create to `setUnknownProperty`
 Model.prototype._createProps = null;
 Model.prototype._secretInit = null;
-if (getOwnConfig().includeDataAdapter) {
+if (macroCondition(getOwnConfig().includeDataAdapter)) {
   /**
    Provides info about the model for debugging purposes
    by grouping the properties into more semantic groups.
@@ -5754,7 +5765,7 @@ if (getOwnConfig().includeDataAdapter) {
     };
   };
 }
-if (macroCondition(isDevelopingApp())) {
+if (isDevelopingApp()) {
   let lookupDescriptor = function lookupDescriptor(obj, keyName) {
     let current = obj;
     do {
@@ -6003,7 +6014,7 @@ function belongsTo(modelName, options) {
         return null;
       }
       const support = lookupLegacySupport(this);
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         if (['currentState'].indexOf(key) !== -1) {
           throw new Error(`'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your belongsTo on ${this.constructor.toString()}`);
         }
@@ -6022,7 +6033,7 @@ function belongsTo(modelName, options) {
     },
     set(key, value) {
       const support = lookupLegacySupport(this);
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         if (['currentState'].indexOf(key) !== -1) {
           throw new Error(`'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your belongsTo on ${this.constructor.toString()}`);
         }
@@ -6253,7 +6264,7 @@ function hasMany(type, options) {
   };
   return computed({
     get(key) {
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         if (['currentState'].indexOf(key) !== -1) {
           throw new Error(`'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your hasMany on ${this.constructor.toString()}`);
         }
@@ -6264,7 +6275,7 @@ function hasMany(type, options) {
       return lookupLegacySupport(this).getHasMany(key);
     },
     set(key, records) {
-      if (macroCondition(isDevelopingApp())) {
+      if (isDevelopingApp()) {
         if (['currentState'].indexOf(key) !== -1) {
           throw new Error(`'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your hasMany on ${this.constructor.toString()}`);
         }