@warp-drive/legacy 5.6.0-beta.1 → 5.6.0-beta.3

package/dist/compat.js

@@ -1,7 +1,8 @@
 import { getOwner } from '@ember/application';
 import { recordIdentifierFor } from '@warp-drive/core';
-import { waitFor, _deprecatingNormalize } from '@warp-drive/core/store/-private';
-import { p as payloadIsNotBlank, n as normalizeResponseHelper, i as iterateData, F as FetchManager, S as SaveOp, a as assertIdentifierHasId, b as SnapshotRecordArray } from "./-private-CKrP0ogQ.js";
+import { assertPrivateStore, waitFor, _deprecatingNormalize } from '@warp-drive/core/store/-private';
+import '@warp-drive/core/reactive/-private';
+import { p as payloadIsNotBlank, n as normalizeResponseHelper, i as iterateData, F as FetchManager, S as SaveOp, a as assertIdentifierHasId, b as SnapshotRecordArray } from "./-private-8UmnAf9J.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 function _findHasMany(adapter, store, identifier, link, relationship, options) {
   const promise = Promise.resolve().then(() => {
@@ -424,6 +425,7 @@ function saveRecord(context) {
     options,
     record: identifier
   } = data;
+  assertPrivateStore(store);
   store.cache.willCommit(identifier, context);
   const saveOptions = Object.assign({
     [SaveOp]: operation
@@ -529,6 +531,7 @@ function findRecord(context) {
     record: identifier,
     options
   } = data;
+  assertPrivateStore(store);
   let promise;
 
   // if not loaded start loading
@@ -583,6 +586,7 @@ function findAll(context) {
     type,
     options
   } = data;
+  assertPrivateStore(store);
   const adapter = store.adapterFor(type);
   macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
     if (!test) {
@@ -647,6 +651,7 @@ function query(context) {
     store,
     data
   } = context.request;
+  assertPrivateStore(store);
   let {
     options
   } = data;

package/dist/{errors-BX5wowuz.js → errors-8kD2mSe_.js}

@@ -1,7 +1,8 @@
-import { memoized, defineSignal, defineNonEnumerableSignal, isStableIdentifier, recordIdentifierFor, storeFor, peekCache, SOURCE, fastPush, RelatedCollection, notifyInternalSignal, ARRAY_SIGNAL } from '@warp-drive/core/store/-private';
+import { Context } from '@warp-drive/core/reactive/-private';
+import { memoized, defineSignal, assertPrivateStore, defineNonEnumerableSignal, isResourceKey, recordIdentifierFor, isPrivateStore, storeFor, fastPush, createLegacyManyArray, notifyInternalSignal } from '@warp-drive/core/store/-private';
 import { getOrSetGlobal } from '@warp-drive/core/types/-private';
 import { EnableHydration } from '@warp-drive/core/types/request';
-import { u as upgradeStore } from "./-private-CKrP0ogQ.js";
+import { u as upgradeStore } from "./-private-8UmnAf9J.js";
 import { computed, get } from '@ember/object';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import ObjectProxy from '@ember/object/proxy';
@@ -420,7 +421,7 @@ class HasManyReference {
    * An array of identifiers for the records that this reference refers to.
    *
    * @property identifiers
-   * @type {StableRecordIdentifier[]}
+   * @type {ResourceKey[]}
    * @public
    */
   get identifiers() {
@@ -432,7 +433,7 @@ class HasManyReference {
     this.___relatedTokenMap = new Map();
     if (resource && resource.data) {
       return resource.data.map(resourceIdentifier => {
-        const identifier = this.store.identifierCache.getOrCreateRecordIdentifier(resourceIdentifier);
+        const identifier = this.store.cacheKeyManager.getOrCreateRecordIdentifier(resourceIdentifier);
         let token = map.get(identifier);
         if (token) {
           map.delete(identifier);
@@ -724,7 +725,7 @@ class HasManyReference {
         throw new Error(`You must provide at least one of 'links', 'meta' or 'data' when calling hasManyReference.push`);
       }
     })('links' in dataDoc || 'meta' in dataDoc || 'data' in dataDoc) : {};
-    const identifiers = !Array.isArray(dataDoc.data) ? [] : isResourceData ? store._push(dataDoc, true) : dataDoc.data.map(i => store.identifierCache.getOrCreateRecordIdentifier(i));
+    const identifiers = !Array.isArray(dataDoc.data) ? [] : isResourceData ? store._push(dataDoc, true) : dataDoc.data.map(i => store.cacheKeyManager.getOrCreateRecordIdentifier(i));
     const {
       identifier
     } = this.hasManyRelationship;
@@ -745,6 +746,7 @@ class HasManyReference {
     if ('meta' in dataDoc) {
       newData.meta = dataDoc.meta;
     }
+    assertPrivateStore(store);
     store._join(() => {
       this.graph.push({
         op: 'updateRelationship',
@@ -762,6 +764,7 @@ class HasManyReference {
     }
     const relationship = this.graph.getData(this.hasManyRelationship.identifier, this.key);
     return relationship.data ? relationship.data.every(identifier => {
+      assertPrivateStore(this.store);
       return this.store._instanceCache.recordIsLoaded(identifier, true) === true;
     }) : false;
   }
@@ -1022,7 +1025,7 @@ class BelongsToReference {
    * `null` if no related record is known.
    *
    * @property identifier
-   * @type {StableRecordIdentifier | null}
+   * @type {ResourceKey | null}
    * @public
    */
   get identifier() {
@@ -1032,7 +1035,7 @@ class BelongsToReference {
     }
     const resource = this._resource();
     if (resource && resource.data) {
-      const identifier = this.store.identifierCache.getOrCreateRecordIdentifier(resource.data);
+      const identifier = this.store.cacheKeyManager.getOrCreateRecordIdentifier(resource.data);
       this.___relatedToken = this.store.notifications.subscribe(identifier, (_, bucket, notifiedKey) => {
         if (bucket === 'identity' || bucket === 'attributes' && notifiedKey === 'id') {
           this._ref++;
@@ -1309,7 +1312,7 @@ class BelongsToReference {
       store
     } = this;
     const isResourceData = doc.data && isMaybeResource(doc.data);
-    const added = isResourceData ? store._push(doc, true) : doc.data ? store.identifierCache.getOrCreateRecordIdentifier(doc.data) : null;
+    const added = isResourceData ? store._push(doc, true) : doc.data ? store.cacheKeyManager.getOrCreateRecordIdentifier(doc.data) : null;
     const {
       identifier
     } = this.belongsToRelationship;
@@ -1330,6 +1333,7 @@ class BelongsToReference {
     if ('meta' in doc) {
       newData.meta = doc.meta;
     }
+    assertPrivateStore(store);
     store._join(() => {
       this.graph.push({
         op: 'updateRelationship',
@@ -1508,18 +1512,43 @@ function lookupLegacySupport(record) {
         throw new Error(`Memory Leak Detected`);
       }
     })(!record.isDestroyed && !record.isDestroying) : {};
-    support = new LegacySupport(record);
+    support = new LegacySupport(record, identifier);
     LEGACY_SUPPORT.set(identifier, support);
-    LEGACY_SUPPORT.set(record, support);
   }
   return support;
 }
+
+/**
+ * @hideconstructor
+ */
 class LegacySupport {
-  constructor(record) {
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  constructor(record, identifier) {
     this.record = record;
-    this.store = storeFor(record);
-    this.identifier = recordIdentifierFor(record);
-    this.cache = peekCache(record);
+    this.store = isPrivateStore(storeFor(record, false));
+    this.identifier = identifier;
+    this.cache = this.store.cache;
     if (this.store._graph) {
       this.graph = this.store._graph;
     }
@@ -1529,12 +1558,14 @@ class LegacySupport {
     this._pending = Object.create(null);
     this.references = Object.create(null);
   }
+
+  /** @private */
   _syncArray(array) {
     // It’s possible the parent side of the relationship may have been destroyed by this point
     if (this.isDestroyed || this.isDestroying) {
       return;
     }
-    const currentState = array[SOURCE];
+    const currentState = array[Context].source;
     const identifier = this.identifier;
     const [identifiers, jsonApi] = this._getCurrentState(identifier, array.key);
     if (jsonApi.meta) {
@@ -1588,7 +1619,7 @@ class LegacySupport {
       if (!test) {
         throw new Error(`Expected a stable identifier`);
       }
-    })(!relatedIdentifier || isStableIdentifier(relatedIdentifier)) : {};
+    })(!relatedIdentifier || isResourceKey(relatedIdentifier)) : {};
     const store = this.store;
     const relationship = this.graph.get(this.identifier, key);
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
@@ -1648,7 +1679,7 @@ class LegacySupport {
           if (!test) {
             throw new Error(`Expected a stable identifier`);
           }
-        })(isStableIdentifier(relatedIdentifier)) : {};
+        })(isResourceKey(relatedIdentifier)) : {};
         if (cache.recordIsLoaded(relatedIdentifier, true)) {
           identifiers.push(relatedIdentifier);
         }
@@ -1664,23 +1695,20 @@ class LegacySupport {
       }
       if (!manyArray) {
         const [identifiers, doc] = this._getCurrentState(this.identifier, key);
-        manyArray = new RelatedCollection({
+        manyArray = createLegacyManyArray({
           store: this.store,
-          type: definition.type,
-          identifier: this.identifier,
-          cache: this.cache,
-          field: this.store.schema.fields(this.identifier).get(key),
-          identifiers,
-          key,
-          meta: doc.meta || null,
-          links: doc.links || null,
-          isPolymorphic: definition.isPolymorphic,
-          isAsync: definition.isAsync,
-          _inverseIsAsync: definition.inverseIsAsync,
           // @ts-expect-error Typescript doesn't have a way for us to thread the generic backwards so it infers unknown instead of T
           manager: this,
+          source: identifiers,
+          type: definition.type,
           isLoaded: !definition.isAsync,
-          allowMutation: true
+          editable: true,
+          isAsync: definition.isAsync,
+          isPolymorphic: definition.isPolymorphic,
+          field: this.store.schema.fields(this.identifier).get(key),
+          identifier: this.identifier,
+          links: doc.links || null,
+          meta: doc.meta || null
         });
         this._manyArrayCache[key] = manyArray;
       }
@@ -1901,7 +1929,7 @@ class LegacySupport {
           if (!test) {
             throw new Error(`Expected stable identifiers`);
           }
-        })(!identifiers || identifiers.every(isStableIdentifier)) : {};
+        })(!identifiers || identifiers.every(isResourceKey)) : {};
         const req = field.options.linksMode ? {
           url: getRelatedLink(resource),
           op: 'findHasMany',
@@ -1936,7 +1964,7 @@ class LegacySupport {
           if (!test) {
             throw new Error(`Expected stable identifiers`);
           }
-        })(identifiers.every(isStableIdentifier)) : {};
+        })(identifiers.every(isResourceKey)) : {};
         options.reload = options.reload || !attemptLocalCache || undefined;
         return this.store.request({
           op: 'findHasMany',
@@ -1975,7 +2003,7 @@ class LegacySupport {
       if (!test) {
         throw new Error(`Expected a stable identifier`);
       }
-    })(!identifier || isStableIdentifier(identifier)) : {};
+    })(!identifier || isResourceKey(identifier)) : {};
     const {
       isStale,
       hasDematerializedInverse,
@@ -2104,7 +2132,7 @@ function handleCompletedRelationshipRequest(recordExt, key, relationship, value,
   if (isHasMany) {
     // we don't notify the record property here to avoid refetch
     // only the many array
-    notifyInternalSignal(value[ARRAY_SIGNAL]);
+    notifyInternalSignal(value[Context].signal);
   }
   if (error) {
     relationship.state.hasFailedLoadAttempt = true;
@@ -2142,6 +2170,7 @@ function extractIdentifierFromRecord(record) {
   return recordIdentifierFor(record);
 }
 function anyUnloaded(store, relationship) {
+  assertPrivateStore(store);
   const graph = store._graph;
   macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
     if (!test) {
@@ -2158,6 +2187,7 @@ function anyUnloaded(store, relationship) {
   return unloaded || false;
 }
 function areAllInverseRecordsLoaded(store, resource) {
+  assertPrivateStore(store);
   const instanceCache = store._instanceCache;
   const identifiers = resource.data;
   if (Array.isArray(identifiers)) {
@@ -2165,7 +2195,7 @@ function areAllInverseRecordsLoaded(store, resource) {
       if (!test) {
         throw new Error(`Expected stable identifiers`);
       }
-    })(identifiers.every(isStableIdentifier)) : {};
+    })(identifiers.every(isResourceKey)) : {};
     // treat as collection
     // check for unloaded records
     return identifiers.every(identifier => instanceCache.recordIsLoaded(identifier));
@@ -2177,7 +2207,7 @@ function areAllInverseRecordsLoaded(store, resource) {
     if (!test) {
       throw new Error(`Expected stable identifiers`);
     }
-  })(isStableIdentifier(identifiers)) : {};
+  })(isResourceKey(identifiers)) : {};
   return instanceCache.recordIsLoaded(identifiers);
 }
 function isBelongsTo(relationship) {

package/dist/model/-private.js

@@ -1,2 +1 @@
-export { E as Errors, L as LEGACY_SUPPORT, P as PromiseBelongsTo, a as PromiseManyArray, l as lookupLegacySupport } from "../errors-BX5wowuz.js";
-export { RelatedCollection as ManyArray } from '@warp-drive/core/store/-private';
+export { E as Errors, L as LEGACY_SUPPORT, P as PromiseBelongsTo, a as PromiseManyArray, l as lookupLegacySupport } from "../errors-8kD2mSe_.js";

package/dist/model/migration-support.js

@@ -1,9 +1,11 @@
+import { deprecate } from '@ember/debug';
 import { recordIdentifierFor } from '@warp-drive/core';
-import { notifyInternalSignal, ARRAY_SIGNAL } from '@warp-drive/core/store/-private';
+import { Context } from '@warp-drive/core/reactive/-private';
+import { notifyInternalSignal, assertPrivateStore } from '@warp-drive/core/store/-private';
 import { getOrSetGlobal } from '@warp-drive/core/types/-private';
 import { Type } from '@warp-drive/core/types/symbols';
-import { l as lookupLegacySupport, E as Errors } from "../errors-BX5wowuz.js";
-import { b as buildSchema, u as unloadRecord, s as serialize, a as save, r as rollbackAttributes, c as reload, h as hasMany, d as destroyRecord, e as deleteRecord, R as RecordState, f as changedAttributes, g as belongsTo, i as createSnapshot } from "../schema-provider-BdQhkT-Q.js";
+import { l as lookupLegacySupport, E as Errors } from "../errors-8kD2mSe_.js";
+import { b as buildSchema, u as unloadRecord, s as serialize, _ as _save, a as save, r as rollbackAttributes, c as _reload, d as reload, h as hasMany, e as _destroyRecord, f as destroyRecord, g as deleteRecord, R as RecordState, i as changedAttributes, j as belongsTo, k as createSnapshot } from "../schema-provider-DQu4Rjco.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 
 /**
@@ -25,7 +27,6 @@ import { macroCondition, getGlobalConfig } from '@embroider/macros';
  *
  * @module
  */
-
 // 'isDestroying', 'isDestroyed'
 const LegacyFields = ['_createSnapshot', 'adapterError', 'belongsTo', 'changedAttributes', 'constructor', 'currentState', 'deleteRecord', 'destroyRecord', 'dirtyType', 'errors', 'hasDirtyAttributes', 'hasMany', 'isDeleted', 'isEmpty', 'isError', 'isLoaded', 'isLoading', 'isNew', 'isSaving', 'isValid', 'reload', 'rollbackAttributes', 'save', 'serialize', 'unloadRecord'];
 
@@ -78,10 +79,13 @@ function legacySupport(record, options, prop) {
     state = {};
     LegacySupport.set(record, state);
   }
+  const suppressDeprecation = Boolean(options && options.suppressDeprecation);
   switch (prop) {
     case '_createSnapshot':
+      // FIXME should be deprecated too?
       return createSnapshot;
     case 'adapterError':
+      // FIXME should be deprecated too?
       return record.currentState.adapterError;
     case 'belongsTo':
       return belongsTo;
@@ -98,10 +102,11 @@ function legacySupport(record, options, prop) {
     case 'deleteRecord':
       return deleteRecord;
     case 'destroyRecord':
-      return destroyRecord;
+      return suppressDeprecation ? _destroyRecord : destroyRecord;
     case 'dirtyType':
       return record.currentState.dirtyType;
     case 'errors':
+      // FIXME should be deprecated too?
       // @ts-expect-error
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       return state.errors = state.errors || Errors.create({
@@ -128,12 +133,13 @@ function legacySupport(record, options, prop) {
     case 'isValid':
       return record.currentState.isValid;
     case 'reload':
-      return reload;
+      return suppressDeprecation ? _reload : reload;
     case 'rollbackAttributes':
       return rollbackAttributes;
     case 'save':
-      return save;
+      return suppressDeprecation ? _save : save;
     case 'serialize':
+      // FIXME should be deprecated too? (is somewhat deprecated via store.serializeRecord)
       return serialize;
     case 'unloadRecord':
       return unloadRecord;
@@ -214,6 +220,50 @@ function withDefaults(schema) {
       kind: 'derived'
     });
   });
+  schema.fields.push({
+    name: '_isReloading',
+    kind: '@local',
+    type: 'boolean',
+    options: {
+      defaultValue: false
+    }
+  });
+  schema.fields.push({
+    name: 'isDestroying',
+    kind: '@local',
+    type: 'boolean',
+    options: {
+      defaultValue: false
+    }
+  });
+  schema.fields.push({
+    name: 'isDestroyed',
+    kind: '@local',
+    type: 'boolean',
+    options: {
+      defaultValue: false
+    }
+  });
+  schema.objectExtensions = schema.objectExtensions || [];
+  schema.objectExtensions.push('deprecated-model-behaviors');
+  return schema;
+}
+function withRestoredDeprecatedModelRequestBehaviors(schema) {
+  schema.legacy = true;
+  schema.identity = {
+    kind: '@id',
+    name: 'id'
+  };
+  LegacyFields.forEach(field => {
+    schema.fields.push({
+      type: '@legacy',
+      name: field,
+      kind: 'derived',
+      options: {
+        suppressDeprecation: true
+      }
+    });
+  });
   schema.fields.push({
     name: 'isReloading',
     kind: '@local',
@@ -261,27 +311,34 @@ function registerDerivations(schema) {
   schema._registerMode('@legacy', {
     belongsTo: {
       get(store, record, cacheKey, field) {
+        // FIXME field.name here should likely be field.sourceKey || field.name
         return lookupLegacySupport(record).getBelongsTo(field.name);
       },
       set(store, record, cacheKey, field, value) {
+        assertPrivateStore(store);
         store._join(() => {
+          // FIXME field.name here should likely be field.sourceKey || field.name
           lookupLegacySupport(record).setDirtyBelongsTo(field.name, value);
         });
       }
     },
     hasMany: {
       get(store, record, cacheKey, field) {
+        // FIXME field.name here should likely be field.sourceKey || field.name
         return lookupLegacySupport(record).getHasMany(field.name);
       },
       set(store, record, cacheKey, field, value) {
+        assertPrivateStore(store);
         store._join(() => {
           const support = lookupLegacySupport(record);
+          // FIXME field.name here should likely be field.sourceKey || field.name
           const manyArray = support.getManyArray(field.name);
           manyArray.splice(0, manyArray.length, ...value);
         });
       },
       notify(store, record, cacheKey, field) {
         const support = lookupLegacySupport(record);
+        // FIXME field.name here should likely be field.sourceKey || field.name
         const manyArray = support && support._manyArrayCache[field.name];
         const hasPromise = support && support._relationshipPromisesCache[field.name];
         if (manyArray && hasPromise) {
@@ -290,13 +347,41 @@ function registerDerivations(schema) {
           return false;
         }
         if (manyArray) {
-          notifyInternalSignal(manyArray[ARRAY_SIGNAL]);
+          notifyInternalSignal(manyArray[Context].signal);
           return true;
         }
         return false;
       }
     }
   });
+  schema.CAUTION_MEGA_DANGER_ZONE_registerExtension({
+    name: 'deprecated-model-behaviors',
+    kind: 'object',
+    features: {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      get isReloading() {
+        deprecate(`record.isReloading is deprecated, please use store.request and either <Request> or getRequuestState to keep track of the request state instead.`, false, {
+          id: 'warp-drive:deprecate-legacy-request-methods',
+          until: '6.0',
+          for: '@warp-drive/core',
+          url: 'https://docs.warp-drive.io/api/@warp-drive/core/build-config/deprecations/variables/ENABLE_LEGACY_REQUEST_METHODS',
+          since: {
+            enabled: '5.7',
+            available: '5.7'
+          }
+        });
+        // @ts-expect-error
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return this._isReloading;
+      },
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      set isReloading(v) {
+        // @ts-expect-error
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        this._isReloading = v;
+      }
+    }
+  });
 }
 
 /**
@@ -403,8 +488,8 @@ class DelegatingSchemaService {
   CAUTION_MEGA_DANGER_ZONE_resourceExtensions(resource) {
     return this._preferred.CAUTION_MEGA_DANGER_ZONE_resourceExtensions(resource);
   }
-  CAUTION_MEGA_DANGER_ZONE_objectExtensions(field) {
-    return this._preferred.CAUTION_MEGA_DANGER_ZONE_objectExtensions(field);
+  CAUTION_MEGA_DANGER_ZONE_objectExtensions(field, resolvedType) {
+    return this._preferred.CAUTION_MEGA_DANGER_ZONE_objectExtensions(field, resolvedType);
   }
   CAUTION_MEGA_DANGER_ZONE_arrayExtensions(field) {
     return this._preferred.CAUTION_MEGA_DANGER_ZONE_arrayExtensions(field);
@@ -461,4 +546,4 @@ if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA
     return this._preferred.doesTypeExist?.(type) || this._secondary.doesTypeExist?.(type) || false;
   };
 }
-export { DelegatingSchemaService, registerDerivations, withDefaults };
+export { DelegatingSchemaService, registerDerivations, withDefaults, withRestoredDeprecatedModelRequestBehaviors };

package/dist/model.js

@@ -1,13 +1,14 @@
 import { computed } from '@ember/object';
 import { recordIdentifierFor } from '@warp-drive/core';
-import { peekCache, setRecordIdentifier, StoreMap, setCacheFor } from '@warp-drive/core/store/-private';
-import { j as isElementDescriptor, n as normalizeModelName, k as getModelFactory } from "./schema-provider-BdQhkT-Q.js";
-export { M as Model, b as buildSchema, M as default } from "./schema-provider-BdQhkT-Q.js";
+import { RecordStore } from '@warp-drive/core/types/symbols';
+import { i as isElementDescriptor, n as normalizeModelName } from "./util-Dul6TZts.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import { warn, deprecate } from '@ember/debug';
-import { RecordStore } from '@warp-drive/core/types/symbols';
-import { l as lookupLegacySupport } from "./errors-BX5wowuz.js";
+import { assertPrivateStore, setRecordIdentifier, StoreMap } from '@warp-drive/core/store/-private';
+import { l as lookupLegacySupport } from "./errors-8kD2mSe_.js";
 import { singularize, dasherize } from '@warp-drive/utilities/string';
+import { l as getModelFactory } from "./schema-provider-DQu4Rjco.js";
+export { M as Model, b as buildSchema, M as default, m as restoreDeprecatedModelRequestBehaviors } from "./schema-provider-DQu4Rjco.js";
 import { setOwner, getOwner } from '@ember/application';
 function _attr(type, options) {
   if (typeof type === 'object') {
@@ -33,7 +34,8 @@ function _attr(type, options) {
       if (this.isDestroyed || this.isDestroying) {
         return;
       }
-      return peekCache(this).getAttr(recordIdentifierFor(this), key);
+      const cache = this[RecordStore].cache;
+      return cache.getAttr(recordIdentifierFor(this), key);
     },
     set(key, value) {
       if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
@@ -47,7 +49,7 @@ function _attr(type, options) {
           throw new Error(`Attempted to set '${key}' on the deleted record ${identifier.type}:${identifier.id} (${identifier.lid})`);
         }
       })(!this.currentState.isDeleted) : {};
-      const cache = peekCache(this);
+      const cache = this[RecordStore].cache;
       const currentValue = cache.getAttr(identifier, key);
       if (currentValue !== value) {
         cache.setAttr(identifier, key, value);
@@ -245,6 +247,7 @@ function _belongsTo(type, options) {
           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()}`);
         }
       }
+      assertPrivateStore(this[RecordStore]);
       this[RecordStore]._join(() => {
         support.setDirtyBelongsTo(key, value);
       });
@@ -483,6 +486,7 @@ function _hasMany(type, options) {
           throw new Error(`You must pass an array of records to set a hasMany relationship`);
         }
       })(Array.isArray(records)) : {};
+      assertPrivateStore(this[RecordStore]);
       this[RecordStore]._join(() => {
         manyArray.splice(0, manyArray.length, ...records);
       });
@@ -666,14 +670,13 @@ function hasMany(type, options) {
 }
 function instantiateRecord(identifier, createRecordArgs) {
   const type = identifier.type;
-  const cache = this.cache;
+
   // TODO deprecate allowing unknown args setting
   const createOptions = {
     _createProps: createRecordArgs,
     // TODO @deprecate consider deprecating accessing record properties during init which the below is necessary for
     _secretInit: {
       identifier,
-      cache,
       store: this,
       cb: secretInit
     }
@@ -698,6 +701,7 @@ function teardownRecord(record) {
   record.destroy();
 }
 function modelFor(modelName) {
+  assertPrivateStore(this);
   macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`Attempted to call store.modelFor(), but the store instance has already been destroyed.`);
@@ -728,9 +732,8 @@ function modelFor(modelName) {
     type
   })) : {};
 }
-function secretInit(record, cache, identifier, store) {
+function secretInit(record, identifier, store) {
   setRecordIdentifier(record, identifier);
   StoreMap.set(record, store);
-  setCacheFor(record, cache);
 }
 export { attr, belongsTo, hasMany, instantiateRecord, modelFor, teardownRecord };