@ember-data-mirror/store 5.3.8 → 5.3.10

package/dist/{cache-handler-C5ilAUZ5.js → handler-CW2kp6Ua.js}

@@ -1,8 +1,8 @@
 import { deprecate, warn } from '@ember/debug';
 import { macroCondition, getGlobalConfig, dependencySatisfies, importSync } from '@embroider/macros';
-import { SkipCache, EnableHydration } from '@warp-drive/core-types/request';
-import { getOrSetGlobal, setTransient, peekTransient } from '@warp-drive/core-types/-private';
-import { CACHE_OWNER, DEBUG_STALE_CACHE_OWNER, DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from '@warp-drive/core-types/identifier';
+import { SkipCache, EnableHydration } from '@warp-drive-mirror/core-types/request';
+import { getOrSetGlobal, setTransient, peekTransient } from '@warp-drive-mirror/core-types/-private';
+import { CACHE_OWNER, DEBUG_STALE_CACHE_OWNER, DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from '@warp-drive-mirror/core-types/identifier';
 import { dasherize } from '@ember-data-mirror/request-utils/string';
 import { defineSignal, createSignal, subscribe, createArrayTags, addToTransaction, addTransactionCB } from '@ember-data-mirror/tracking/-private';
 import { _backburner } from '@ember/runloop';
@@ -13,7 +13,7 @@ import { compat } from '@ember-data-mirror/tracking';
 */
 
 function coerceId(id) {
-  if (macroCondition(getGlobalConfig().WarpDrive.deprecations.DEPRECATE_NON_STRICT_ID)) {
+  if (macroCondition(getGlobalConfig().WarpDriveMirror.deprecations.DEPRECATE_NON_STRICT_ID)) {
     let normalized;
     if (id === null || id === undefined || id === '') {
       normalized = null;
@@ -25,13 +25,13 @@ function coerceId(id) {
       until: '6.0',
       for: 'ember-data-mirror',
       since: {
-        available: '5.3',
+        available: '4.13',
         enabled: '5.3'
       }
     });
     return normalized;
   }
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`Resource IDs must be a non-empty string or null. Received '${String(id)}'.`);
     }
@@ -45,7 +45,7 @@ function ensureStringId(id) {
   } else if (typeof id === 'number' && !isNaN(id)) {
     normalized = String(id);
   }
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`Expected id to be a string or number, received ${String(id)}`);
     }
@@ -53,14 +53,14 @@ function ensureStringId(id) {
   return normalized;
 }
 function normalizeModelName(type) {
-  if (macroCondition(getGlobalConfig().WarpDrive.deprecations.DEPRECATE_NON_STRICT_TYPES)) {
+  if (macroCondition(getGlobalConfig().WarpDriveMirror.deprecations.DEPRECATE_NON_STRICT_TYPES)) {
     const result = dasherize(type);
     deprecate(`The resource type '${type}' is not normalized. Update your application code to use '${result}' instead of '${type}'.`, result === type, {
       id: 'ember-data-mirror:deprecate-non-strict-types',
       until: '6.0',
       for: 'ember-data-mirror',
       since: {
-        available: '5.3',
+        available: '4.13',
         enabled: '5.3'
       }
     });
@@ -75,7 +75,7 @@ function normalizeModelName(type) {
 
 function installPolyfill() {
   const isFastBoot = typeof FastBoot !== 'undefined';
-  const CRYPTO = isFastBoot ? FastBoot.require('crypto') : window.crypto;
+  const CRYPTO = isFastBoot ? FastBoot.require('crypto') : globalThis.crypto;
   if (!CRYPTO.randomUUID) {
     // we might be able to optimize this by requesting more bytes than we need at a time
     const rng = function () {
@@ -138,12 +138,12 @@ function isDocumentIdentifier(identifier) {
   return DOCUMENTS.has(identifier);
 }
 const isFastBoot = typeof FastBoot !== 'undefined';
-const _crypto = isFastBoot ? FastBoot.require('crypto') : window.crypto;
-if (macroCondition(getGlobalConfig().WarpDrive.polyfillUUID)) {
+const _crypto = isFastBoot ? FastBoot.require('crypto') : globalThis.crypto;
+if (macroCondition(getGlobalConfig().WarpDriveMirror.polyfillUUID)) {
   installPolyfill();
 }
 function uuidv4() {
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error('crypto.randomUUID needs to be avaliable. Some browsers incorrectly disallow it in insecure contexts. You maybe want to enable the polyfill: https://github.com/emberjs/data#randomuuid-polyfill');
     }
@@ -192,7 +192,7 @@ function updateTypeIdMapping(typeMap, identifier, id) {
 }
 function defaultUpdateMethod(identifier, data, bucket) {
   if (bucket === 'record') {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected identifier to be a StableRecordIdentifier`);
       }
@@ -206,7 +206,7 @@ function defaultKeyInfoMethod(resource, known) {
   // TODO RFC something to make this configurable
   const id = hasId(resource) ? coerceId(resource.id) : null;
   const type = hasType(resource) ? normalizeModelName(resource.type) : known ? known.type : null;
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`Expected keyInfoForResource to provide a type for the resource`);
     }
@@ -221,7 +221,7 @@ function defaultGenerationMethod(data, bucket) {
     if (hasLid(data)) {
       return data.lid;
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Cannot generate an identifier for a resource without a type`);
       }
@@ -241,7 +241,7 @@ function defaultGenerationMethod(data, bucket) {
     }
     return null;
   }
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     {
       throw new Error(`Unknown bucket ${bucket}`);
     }
@@ -252,7 +252,7 @@ function defaultMergeMethod(a, _b, _c) {
   return a;
 }
 let DEBUG_MAP;
-if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
   DEBUG_MAP = getOrSetGlobal('DEBUG_MAP', new WeakMap());
 }
 
@@ -310,19 +310,19 @@ class IdentifierCache {
    */
 
   _getRecordIdentifier(resource, shouldGenerate) {
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
       // eslint-disable-next-line no-console
       console.groupCollapsed(`Identifiers: ${shouldGenerate ? 'Generating' : 'Peeking'} Identifier`, resource);
     }
     // short circuit if we're already the stable version
     if (isStableIdentifier(resource)) {
-      if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
         // TODO should we instead just treat this case as a new generation skipping the short circuit?
         if (!this._cache.resources.has(resource.lid) || this._cache.resources.get(resource.lid) !== resource) {
           throw new Error(`The supplied identifier ${JSON.stringify(resource)} does not belong to this store instance`);
         }
       }
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
         // eslint-disable-next-line no-console
         console.log(`Identifiers: cache HIT - Stable ${resource.lid}`);
         // eslint-disable-next-line no-console
@@ -333,20 +333,20 @@ class IdentifierCache {
 
     // the resource is unknown, ask the application to identify this data for us
     const lid = this._generate(resource, 'record');
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
       // eslint-disable-next-line no-console
       console.log(`Identifiers: ${lid ? 'no ' : ''}lid ${lid ? lid + ' ' : ''}determined for resource`, resource);
     }
     let identifier = /*#__NOINLINE__*/getIdentifierFromLid(this._cache, lid, resource);
     if (identifier !== null) {
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
         // eslint-disable-next-line no-console
         console.groupEnd();
       }
       return identifier;
     }
     if (shouldGenerate === 0) {
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
         // eslint-disable-next-line no-console
         console.groupEnd();
       }
@@ -366,7 +366,7 @@ class IdentifierCache {
       identifier = /*#__NOINLINE__*/makeStableRecordIdentifier(keyInfo, 'record', false);
     }
     addResourceToCache(this._cache, identifier);
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
       // eslint-disable-next-line no-console
       console.groupEnd();
     }
@@ -408,7 +408,7 @@ class IdentifierCache {
       identifier = {
         lid: cacheKey
       };
-      if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
         Object.freeze(identifier);
       }
       DOCUMENTS.add(identifier);
@@ -454,7 +454,7 @@ class IdentifierCache {
     }, 'record', true);
 
     // populate our unique table
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       if (this._cache.resources.has(identifier.lid)) {
         throw new Error(`The lid generated for the new record is not unique as it matches an existing identifier`);
       }
@@ -462,7 +462,7 @@ class IdentifierCache {
 
     /*#__NOINLINE__*/
     addResourceToCache(this._cache, identifier);
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
       // eslint-disable-next-line no-console
       console.log(`Identifiers: created identifier ${String(identifier)} for newly generated resource`, data);
     }
@@ -511,7 +511,7 @@ class IdentifierCache {
       if (hadLid) {
         data.lid = identifier.lid;
       }
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
         // eslint-disable-next-line no-console
         console.log(`Identifiers: merged identifiers ${generatedIdentifier.lid} and ${existingIdentifier.lid} for resource into ${identifier.lid}`, data);
       }
@@ -523,12 +523,12 @@ class IdentifierCache {
 
     // add to our own secondary lookup table
     if (id !== newId && newId !== null) {
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
         // eslint-disable-next-line no-console
         console.log(`Identifiers: updated id for identifier ${identifier.lid} from '${String(id)}' to '${String(newId)}' for resource`, data);
       }
       const typeSet = this._cache.resourcesByType[identifier.type];
-      macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
         if (!test) {
           throw new Error(`Expected to find a typeSet for ${identifier.type}`);
         }
@@ -537,7 +537,7 @@ class IdentifierCache {
       if (id !== null) {
         typeSet.id.delete(id);
       }
-    } else if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+    } else if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
       // eslint-disable-next-line no-console
       console.log(`Identifiers: updated identifier ${identifier.lid} resource`, data);
     }
@@ -549,7 +549,7 @@ class IdentifierCache {
    * @private
    */
   _mergeRecordIdentifiers(keyInfo, identifier, existingIdentifier, data) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected keyInfo to contain an id`);
       }
@@ -600,7 +600,7 @@ class IdentifierCache {
   forgetRecordIdentifier(identifierObject) {
     const identifier = this.getOrCreateRecordIdentifier(identifierObject);
     const typeSet = this._cache.resourcesByType[identifier.type];
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected to find a typeSet for ${identifier.type}`);
       }
@@ -617,13 +617,13 @@ class IdentifierCache {
       });
       this._cache.polymorphicLidBackMap.delete(identifier.lid);
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       identifier[DEBUG_STALE_CACHE_OWNER] = identifier[CACHE_OWNER];
     }
     identifier[CACHE_OWNER] = undefined;
     IDENTIFIERS.delete(identifier);
     this._forget(identifier, 'record');
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
       // eslint-disable-next-line no-console
       console.log(`Identifiers: released identifier ${identifierObject.lid}`);
     }
@@ -638,7 +638,7 @@ class IdentifierCache {
 }
 function makeStableRecordIdentifier(recordIdentifier, bucket, clientOriginated) {
   IDENTIFIERS.add(recordIdentifier);
-  if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+  if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
     // we enforce immutability in dev
     //  but preserve our ability to do controlled updates to the reference
     let wrapper = {
@@ -700,7 +700,7 @@ function makeStableRecordIdentifier(recordIdentifier, bucket, clientOriginated)
   return recordIdentifier;
 }
 function performRecordIdentifierUpdate(identifier, keyInfo, data, updateFn) {
-  if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+  if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
     const {
       id,
       type
@@ -775,7 +775,7 @@ function detectMerge(cache, keyInfo, identifier, data) {
 }
 function getIdentifierFromLid(cache, lid, resource) {
   const identifier = cache.resources.get(lid);
-  if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_IDENTIFIERS)) {
+  if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_IDENTIFIERS)) {
     // eslint-disable-next-line no-console
     console.log(`Identifiers: cache ${identifier ? 'HIT' : 'MISS'} - Non-Stable ${lid}`, resource);
   }
@@ -842,6 +842,7 @@ class RecordReference {
      @return {String} The id of the record.
   */
   id() {
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     this._ref; // consume the tracked prop
     return this.___identifier.id;
   }
@@ -955,7 +956,7 @@ class RecordReference {
     if (id !== null) {
       return this.store.findRecord(this.type, id);
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       {
         throw new Error(`Unable to fetch record of type ${this.type} without an id`);
       }
@@ -982,7 +983,7 @@ class RecordReference {
         reload: true
       });
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       {
         throw new Error(`Unable to fetch record of type ${this.type} without an id`);
       }
@@ -1038,7 +1039,7 @@ class CacheCapabilitiesManager {
     });
   }
   notifyChange(identifier, namespace, key) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected a stable identifier`);
       }
@@ -1057,7 +1058,7 @@ class CacheCapabilitiesManager {
     return this._store.schema;
   }
   setRecordId(identifier, id) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected a stable identifier`);
       }
@@ -1068,7 +1069,7 @@ class CacheCapabilitiesManager {
     return Boolean(this._store._instanceCache.peek(identifier));
   }
   disconnectRecord(identifier) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected a stable identifier`);
       }
@@ -1077,7 +1078,7 @@ class CacheCapabilitiesManager {
     this._pendingNotifies.delete(identifier);
   }
 }
-if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA_SERVICE)) {
+if (macroCondition(getGlobalConfig().WarpDriveMirror.deprecations.ENABLE_LEGACY_SCHEMA_SERVICE)) {
   CacheCapabilitiesManager.prototype.getSchemaDefinitionService = function () {
     // FIXME add deprecation for this
     return this._store.schema;
@@ -1091,7 +1092,7 @@ if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA
 
 const CacheForIdentifierCache = getOrSetGlobal('CacheForIdentifierCache', new Map());
 function setCacheFor(identifier, cache) {
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`Illegal set of identifier`);
     }
@@ -1141,7 +1142,7 @@ function peekRecordIdentifier(record) {
  */
 
 function recordIdentifierFor(record) {
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`${String(record)} is not a record instantiated by @ember-data-mirror/store`);
     }
@@ -1149,7 +1150,7 @@ function recordIdentifierFor(record) {
   return RecordCache.get(record);
 }
 function setRecordIdentifier(record, identifier) {
-  if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+  if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
     if (RecordCache.has(record) && RecordCache.get(record) !== identifier) {
       throw new Error(`${String(record)} was already assigned an identifier`);
     }
@@ -1168,7 +1169,7 @@ function setRecordIdentifier(record, identifier) {
 const StoreMap = getOrSetGlobal('StoreMap', new Map());
 function storeFor(record) {
   const store = StoreMap.get(record);
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`A record in a disconnected state cannot utilize the store. This typically means the record has been destroyed, most commonly by unloading it.`);
     }
@@ -1210,7 +1211,7 @@ class InstanceCache {
         if ('id' in resourceData) {
           throw new Error(`Failed to update the 'id' for the RecordIdentifier '${identifier.type}:${String(identifier.id)} (${identifier.lid})' to '${String(resourceData.id)}', because that id is already in use by '${matchedIdentifier.type}:${String(matchedIdentifier.id)} (${matchedIdentifier.lid})'`);
         }
-        macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+        macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
           {
             throw new Error(`Failed to update the RecordIdentifier '${identifier.type}:${String(identifier.id)} (${identifier.lid})' to merge with the detected duplicate identifier '${matchedIdentifier.type}:${String(matchedIdentifier.id)} (${String(matchedIdentifier.lid)})'`);
           }
@@ -1239,7 +1240,7 @@ class InstanceCache {
   getRecord(identifier, properties) {
     let record = this.__instances.record.get(identifier);
     if (!record) {
-      macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
         if (!test) {
           throw new Error(`Cannot create a new record instance while the store is being destroyed`);
         }
@@ -1251,7 +1252,7 @@ class InstanceCache {
       setCacheFor(record, cache);
       StoreMap.set(record, this.store);
       this.__instances.record.set(identifier, record);
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_INSTANCE_CACHE)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_INSTANCE_CACHE)) {
         // eslint-disable-next-line no-console
         console.log(`InstanceCache: created Record for ${String(identifier)}`, properties);
       }
@@ -1290,7 +1291,7 @@ class InstanceCache {
   }
   disconnect(identifier) {
     const record = this.__instances.record.get(identifier);
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error('Cannot destroy record while it is still materialized');
       }
@@ -1299,25 +1300,25 @@ class InstanceCache {
     this.store.identifierCache.forgetRecordIdentifier(identifier);
     removeRecordDataFor(identifier);
     this.store._requestCache._clearEntries(identifier);
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_INSTANCE_CACHE)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_INSTANCE_CACHE)) {
       // eslint-disable-next-line no-console
       console.log(`InstanceCache: disconnected ${String(identifier)}`);
     }
   }
   unloadRecord(identifier) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       const requests = this.store.getRequestStateService().getPendingRequestsForRecord(identifier);
       if (requests.some(req => {
         return req.type === 'mutation';
       })) {
-        macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+        macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
           {
             throw new Error(`You can only unload a record which is not inFlight. '${String(identifier)}'`);
           }
         })() : {};
       }
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_INSTANCE_CACHE)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_INSTANCE_CACHE)) {
       // eslint-disable-next-line no-console
       console.groupCollapsed(`InstanceCache: unloading record for ${String(identifier)}`);
     }
@@ -1332,7 +1333,7 @@ class InstanceCache {
         StoreMap.delete(record);
         RecordCache.delete(record);
         removeRecordDataFor(record);
-        if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_INSTANCE_CACHE)) {
+        if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_INSTANCE_CACHE)) {
           // eslint-disable-next-line no-console
           console.log(`InstanceCache: destroyed record for ${String(identifier)}`);
         }
@@ -1340,7 +1341,7 @@ class InstanceCache {
       if (cache) {
         cache.unloadRecord(identifier);
         removeRecordDataFor(identifier);
-        if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_INSTANCE_CACHE)) {
+        if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_INSTANCE_CACHE)) {
           // eslint-disable-next-line no-console
           console.log(`InstanceCache: destroyed cache for ${String(identifier)}`);
         }
@@ -1348,7 +1349,7 @@ class InstanceCache {
         this.disconnect(identifier);
       }
       this.store._requestCache._clearEntries(identifier);
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_INSTANCE_CACHE)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_INSTANCE_CACHE)) {
         // eslint-disable-next-line no-console
         console.log(`InstanceCache: unloaded RecordData for ${String(identifier)}`);
         // eslint-disable-next-line no-console
@@ -1387,7 +1388,7 @@ class InstanceCache {
     const oldId = identifier.id;
 
     // ID absolutely can't be missing if the oldID is empty (missing Id in response for a new record)
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`'${type}' was saved to the server, but the response does not have an id and your record does not either.`);
       }
@@ -1395,7 +1396,7 @@ class InstanceCache {
 
     // ID absolutely can't be different than oldID if oldID is not null
     // TODO this assertion and restriction may not strictly be needed in the identifiers world
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Cannot update the id for '${type}:${lid}' from '${String(oldId)}' to '${id}'.`);
       }
@@ -1407,7 +1408,7 @@ class InstanceCache {
       warn(`Your ${type} record was saved to the server, but the response does not have an id.`, !(oldId !== null && id === null));
       return;
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_INSTANCE_CACHE)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_INSTANCE_CACHE)) {
       // eslint-disable-next-line no-console
       console.log(`InstanceCache: updating id to '${id}' for record ${String(identifier)}`);
     }
@@ -1415,7 +1416,7 @@ class InstanceCache {
       type,
       id
     });
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`'${type}' was saved to the server, but the response returned the new id '${id}', which has already been used with another record.'`);
       }
@@ -1480,7 +1481,7 @@ function preloadData(store, identifier, preload) {
 function preloadRelationship(schema, preloadValue) {
   const relatedType = schema.type;
   if (schema.kind === 'hasMany') {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error('You need to pass in an array to set a hasMany property on a record');
       }
@@ -1489,7 +1490,7 @@ function preloadRelationship(schema, preloadValue) {
       data: preloadValue.map(value => _convertPreloadRelationshipToJSON(value, relatedType))
     };
   }
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error('You should not pass in an array to set a belongsTo property on a record');
     }
@@ -2156,9 +2157,9 @@ class CacheManager {
 /**
  * @module @ember-data-mirror/store
  */
-// eslint-disable-next-line no-restricted-imports
+
 let tokenId = 0;
-const CacheOperations = new Set(['added', 'removed', 'state', 'updated']);
+const CacheOperations = new Set(['added', 'removed', 'state', 'updated', 'invalidated']);
 function isCacheOperationValue(value) {
   return CacheOperations.has(value);
 }
@@ -2168,7 +2169,7 @@ function runLoopIsFlushing() {
 }
 function _unsubscribe(tokens, token, cache) {
   const identifier = tokens.get(token);
-  if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_NOTIFICATIONS)) {
+  if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_NOTIFICATIONS)) {
     if (!identifier) {
       // eslint-disable-next-line no-console
       console.log('Passed unknown unsubscribe token to unsubscribe', identifier);
@@ -2230,7 +2231,7 @@ class NotificationManager {
    */
 
   subscribe(identifier, callback) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected to receive a stable Identifier to subscribe to`);
       }
@@ -2240,7 +2241,7 @@ class NotificationManager {
       map = new Map();
       this._cache.set(identifier, map);
     }
-    const unsubToken = macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? {
+    const unsubToken = macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? {
       _tokenRef: tokenId++
     } : {};
     map.set(unsubToken, callback);
@@ -2273,19 +2274,19 @@ class NotificationManager {
    */
 
   notify(identifier, value, key) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Notify does not accept a key argument for the namespace '${value}'. Received key '${key || ''}'.`);
       }
     })(!key || value === 'attributes' || value === 'relationships') : {};
     if (!isStableIdentifier(identifier) && !isDocumentIdentifier(identifier)) {
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_NOTIFICATIONS)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_NOTIFICATIONS)) {
         // eslint-disable-next-line no-console
         console.log(`Notifying: Expected to receive a stable Identifier to notify '${value}' '${key || ''}' with, but ${String(identifier)} is not in the cache`, identifier);
       }
       return false;
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_NOTIFICATIONS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_NOTIFICATIONS)) {
       // eslint-disable-next-line no-console
       console.log(`Buffering Notify: ${String(identifier.lid)}\t${value}\t${key || ''}`);
     }
@@ -2318,21 +2319,22 @@ class NotificationManager {
     this._flush();
   }
   _flush() {
-    if (this._buffered.size) {
-      this._buffered.forEach((states, identifier) => {
+    const buffered = this._buffered;
+    if (buffered.size) {
+      this._buffered = new Map();
+      buffered.forEach((states, identifier) => {
         states.forEach(args => {
           // @ts-expect-error
           this._flushNotification(identifier, args[0], args[1]);
         });
       });
-      this._buffered = new Map();
     }
     this._hasFlush = false;
     this._onFlushCB?.();
     this._onFlushCB = undefined;
   }
   _flushNotification(identifier, value, key) {
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_NOTIFICATIONS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_NOTIFICATIONS)) {
       // eslint-disable-next-line no-console
       console.log(`Notifying: ${String(identifier)}\t${value}\t${key || ''}`);
     }
@@ -2372,71 +2374,6 @@ class NotificationManager {
 */
 
 const NativeProxy = Proxy;
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
-};
-
-// src/runtime.ts
-var runtime_exports = {};
-__export(runtime_exports, {
-  c: () => decorateClass,
-  f: () => decorateFieldV1,
-  g: () => decorateFieldV2,
-  i: () => initializeDeferredDecorator,
-  m: () => decorateMethodV1,
-  n: () => decorateMethodV2,
-  p: () => decoratePOJO
-});
-var deferred = /* @__PURE__ */new WeakMap();
-function deferDecorator(proto, prop, desc) {
-  let map = deferred.get(proto);
-  if (!map) {
-    map = /* @__PURE__ */new Map();
-    deferred.set(proto, map);
-  }
-  map.set(prop, desc);
-}
-function findDeferredDecorator(target, prop) {
-  let cursor = target.prototype;
-  while (cursor) {
-    let desc = deferred.get(cursor)?.get(prop);
-    if (desc) {
-      return desc;
-    }
-    cursor = cursor.prototype;
-  }
-}
-function decorateFieldV1(target, prop, decorators, initializer) {
-  return decorateFieldV2(target.prototype, prop, decorators, initializer);
-}
-function decorateFieldV2(prototype, prop, decorators, initializer) {
-  let desc = {
-    configurable: true,
-    enumerable: true,
-    writable: true,
-    initializer: null
-  };
-  if (initializer) {
-    desc.initializer = initializer;
-  }
-  for (let decorator of decorators) {
-    desc = decorator(prototype, prop, desc) || desc;
-  }
-  if (desc.initializer === void 0) {
-    Object.defineProperty(prototype, prop, desc);
-  } else {
-    deferDecorator(prototype, prop, desc);
-  }
-}
-function decorateMethodV1({
-  prototype
-}, prop, decorators) {
-  return decorateMethodV2(prototype, prop, decorators);
-}
 function decorateMethodV2(prototype, prop, decorators) {
   const origDesc = Object.getOwnPropertyDescriptor(prototype, prop);
   let desc = {
@@ -2451,46 +2388,6 @@ function decorateMethodV2(prototype, prop, decorators) {
   }
   Object.defineProperty(prototype, prop, desc);
 }
-function initializeDeferredDecorator(target, prop) {
-  let desc = findDeferredDecorator(target.constructor, prop);
-  if (desc) {
-    Object.defineProperty(target, prop, {
-      enumerable: desc.enumerable,
-      configurable: desc.configurable,
-      writable: desc.writable,
-      value: desc.initializer ? desc.initializer.call(target) : void 0
-    });
-  }
-}
-function decorateClass(target, decorators) {
-  return decorators.reduce((accum, decorator) => decorator(accum) || accum, target);
-}
-function decoratePOJO(pojo, decorated) {
-  for (let [type, prop, decorators] of decorated) {
-    if (type === "field") {
-      decoratePojoField(pojo, prop, decorators);
-    } else {
-      decorateMethodV2(pojo, prop, decorators);
-    }
-  }
-  return pojo;
-}
-function decoratePojoField(pojo, prop, decorators) {
-  let desc = {
-    configurable: true,
-    enumerable: true,
-    writable: true,
-    initializer: () => Object.getOwnPropertyDescriptor(pojo, prop)?.value
-  };
-  for (let decorator of decorators) {
-    desc = decorator(pojo, prop, desc) || desc;
-  }
-  if (desc.initializer) {
-    desc.value = desc.initializer.call(pojo);
-    delete desc.initializer;
-  }
-  Object.defineProperty(pojo, prop, desc);
-}
 
 /**
   @module @ember-data-mirror/store
@@ -2527,7 +2424,7 @@ function safeForEach(instance, arr, store, callback, target) {
   }
   // clone to prevent mutation
   arr = arr.slice();
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error('`forEach` expects a function as first argument.');
     }
@@ -2681,7 +2578,7 @@ class IdentifierArray {
               // array functions must run through Reflect to work properly
               // binding via other means will not work.
               if (!options.allowMutation) {
-                macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+                macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
                   if (!test) {
                     throw new Error(`Mutating this array of records via ${String(prop)} is not allowed.`);
                   }
@@ -2689,7 +2586,7 @@ class IdentifierArray {
                 return;
               }
               const args = Array.prototype.slice.call(arguments);
-              macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+              macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
                 if (!test) {
                   throw new Error(`Cannot start a new array transaction while a previous transaction is underway`);
                 }
@@ -2735,7 +2632,7 @@ class IdentifierArray {
           } else if (transaction) {
             return Reflect.set(target, prop, value);
           } else {
-            macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+            macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
               {
                 throw new Error(`unexpected length set`);
               }
@@ -2762,7 +2659,7 @@ class IdentifierArray {
         if (index === null || index > target.length) {
           if (index !== null && transaction) {
             const identifier = recordIdentifierFor(value);
-            macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+            macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
               if (!test) {
                 throw new Error(`Cannot set index ${index} past the end of the array.`);
               }
@@ -2777,7 +2674,7 @@ class IdentifierArray {
           return false;
         }
         if (!options.allowMutation) {
-          macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+          macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
             if (!test) {
               throw new Error(`Mutating ${String(prop)} on this Array is not allowed.`);
             }
@@ -2786,8 +2683,7 @@ class IdentifierArray {
         }
         const original = target[index];
         const newIdentifier = extractIdentifierFromRecord$1(value);
-        target[index] = newIdentifier;
-        macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+        macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
           if (!test) {
             throw new Error(`Expected a record`);
           }
@@ -2816,7 +2712,7 @@ class IdentifierArray {
         return true;
       },
       deleteProperty(target, prop) {
-        macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+        macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
           if (!test) {
             throw new Error(`Deleting keys on managed arrays is disallowed`);
           }
@@ -2872,7 +2768,7 @@ class IdentifierArray {
     is finished.
    */
   _update() {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`_update cannot be used with this array`);
       }
@@ -2915,7 +2811,11 @@ const desc = {
   enumerable: true,
   configurable: false,
   get: function () {
-    return this;
+    // here to support computed chains
+    // and {{#each}}
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.deprecations.DEPRECATE_COMPUTED_CHAINS)) {
+      return this;
+    }
   }
 };
 compat(desc);
@@ -2935,12 +2835,12 @@ class Collection extends IdentifierArray {
     } = this;
 
     // TODO save options from initial request?
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`update cannot be used with this array`);
       }
     })(this.modelName) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`update cannot be used with no query`);
       }
@@ -2967,7 +2867,7 @@ Collection.prototype.query = null;
 // Object.setPrototypeOf(IdentifierArray.prototype, Array.prototype);
 
 function assertRecordPassedToHasMany(record) {
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`All elements of a hasMany relationship must be instances of Model, you passed $${typeof record}`);
     }
@@ -3342,7 +3242,7 @@ function sync(array, changes, arraySet) {
 
 const Touching = getOrSetGlobal('Touching', Symbol('touching'));
 const RequestPromise = getOrSetGlobal('RequestPromise', Symbol('promise'));
-const EMPTY_ARR = macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? Object.freeze([]) : [];
+const EMPTY_ARR = macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? Object.freeze([]) : [];
 function hasRecordIdentifier(op) {
   return 'recordIdentifier' in op;
 }
@@ -3413,7 +3313,7 @@ class RequestStateService {
         throw error;
       });
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       {
         throw new Error(`Expected a well formed  query`);
       }
@@ -3550,12 +3450,12 @@ function constructResource(type, id, lid) {
     if ('id' in resource) {
       resource.id = coerceId(resource.id);
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error('Expected either id or lid to be a valid string');
       }
     })('id' in resource && isNonEmptyString(resource.id) || isNonEmptyString(resource.lid)) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error('if id is present, the type must be a string');
       }
@@ -3571,7 +3471,7 @@ function constructResource(type, id, lid) {
       }
       throw new Error('Expected either id or lid to be a valid string');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error('type must be a string');
       }
@@ -3639,7 +3539,8 @@ const EmptyClass = class {
   // eslint-disable-next-line @typescript-eslint/no-useless-constructor
   constructor(args) {}
 };
-const BaseClass = macroCondition(dependencySatisfies('ember-source', '*')) ? macroCondition(getGlobalConfig().WarpDrive.deprecations.DEPRECATE_STORE_EXTENDS_EMBER_OBJECT) ? importSync('@ember/object') : EmptyClass : EmptyClass;
+const _BaseClass = macroCondition(dependencySatisfies('ember-source', '*')) ? macroCondition(getGlobalConfig().WarpDriveMirror.deprecations.DEPRECATE_STORE_EXTENDS_EMBER_OBJECT) ? importSync('@ember/object') : EmptyClass : EmptyClass;
+const BaseClass = _BaseClass.default ? _BaseClass.default : _BaseClass;
 if (BaseClass !== EmptyClass) {
   deprecate(`The Store class extending from EmberObject is deprecated.
 Please remove usage of EmberObject APIs and mark your class as not requiring it.
@@ -3661,7 +3562,7 @@ const app = new EmberApp(defaults, {
     until: '6.0',
     for: 'ember-data-mirror',
     since: {
-      available: '5.4',
+      available: '4.13',
       enabled: '5.4'
     }
   });
@@ -3766,6 +3667,17 @@ class Store extends BaseClass {
 
   // Private
 
+  /**
+   * Async flush buffers notifications until flushed
+   * by finalization of a future configured by store.request
+   *
+   * This is useful for ensuring that notifications are delivered
+   * prior to the promise resolving but without risk of promise
+   * interleaving.
+   *
+   * @internal
+   */
+
   // DEBUG-only properties
 
   get isDestroying() {
@@ -3804,13 +3716,13 @@ class Store extends BaseClass {
     this.isDestroyed = false;
   }
   _run(cb) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`EmberData should never encounter a nested run`);
       }
     })(!this._cbs) : {};
     const _cbs = this._cbs = {};
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       try {
         cb();
         if (_cbs.coalesce) {
@@ -3839,6 +3751,16 @@ class Store extends BaseClass {
       this._cbs = null;
     }
   }
+
+  /**
+   * Executes the callback, ensurng that any work that calls
+   * store._schedule is executed after in the right order.
+   *
+   * When queues already exist, scheduled callbacks will
+   * join the existing queue.
+   *
+   * @internal
+   */
   _join(cb) {
     if (this._cbs) {
       cb();
@@ -3847,12 +3769,12 @@ class Store extends BaseClass {
     }
   }
   _schedule(name, cb) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`EmberData expects to schedule only when there is an active run`);
       }
     })(!!this._cbs) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`EmberData expects only one flush per queue name, cannot schedule ${name}`);
       }
@@ -3875,7 +3797,7 @@ class Store extends BaseClass {
     return this._requestCache;
   }
   _getAllPending() {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.TESTING)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.TESTING)) {
       const all = [];
       const pending = this._requestCache._pending;
       pending.forEach(requests => {
@@ -3953,12 +3875,12 @@ class Store extends BaseClass {
       const identifierCache = this.identifierCache;
       opts.records = requestConfig.records.map(r => identifierCache.getOrCreateRecordIdentifier(r));
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.env.TESTING)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.TESTING)) {
       if (this.DISABLE_WAITER) {
         opts.disableTestWaiter = typeof requestConfig.disableTestWaiter === 'boolean' ? requestConfig.disableTestWaiter : true;
       }
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_REQUESTS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_REQUESTS)) {
       let options;
       try {
         options = JSON.parse(JSON.stringify(requestConfig));
@@ -3971,7 +3893,7 @@ class Store extends BaseClass {
     const request = Object.assign({}, requestConfig, opts);
     const future = this.requestManager.request(request);
     future.onFinalize(() => {
-      if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_REQUESTS)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_REQUESTS)) {
         // eslint-disable-next-line no-console
         console.log(`request: [[FINALIZE]] ${requestConfig.op && !requestConfig.url ? '(LEGACY) ' : ''}${requestConfig.op || '<unknown operation>'} ${requestConfig.url || '<empty url>'}  ${requestConfig.method || '<empty method>'}`);
       }
@@ -4036,15 +3958,15 @@ class Store extends BaseClass {
   modelFor(type) {
     // FIXME add deprecation and deprecation stripping
     // FIXME/TODO update RFC to remove this method
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyedStoreOnly(this, 'modelFor');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass <type> to the store's modelFor method`);
       }
     })(typeof type === 'string' && type.length) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`No model was found for '${type}' and no schema handles the type`);
       }
@@ -4080,15 +4002,15 @@ class Store extends BaseClass {
   */
 
   createRecord(type, inputProperties) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'createRecord');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a model name to the store's createRecord method`);
       }
     })(type) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${type}`);
       }
@@ -4127,7 +4049,7 @@ class Store extends BaseClass {
       };
       if (resource.id) {
         const identifier = this.identifierCache.peekRecordIdentifier(resource);
-        macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+        macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
           if (!test) {
             throw new Error(`The id ${String(properties.id)} has already been used with another '${normalizedModelName}' record.`);
           }
@@ -4156,12 +4078,12 @@ class Store extends BaseClass {
     @param {unknown} record
   */
   deleteRecord(record) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'deleteRecord');
     }
     const identifier = peekRecordIdentifier(record);
     const cache = this.cache;
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`expected the record to be connected to a cache`);
       }
@@ -4188,7 +4110,7 @@ class Store extends BaseClass {
     @param {Model} record
   */
   unloadRecord(record) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'unloadRecord');
     }
     const identifier = peekRecordIdentifier(record);
@@ -4402,7 +4324,7 @@ class Store extends BaseClass {
      ```app/routes/post.js
     export default class PostRoute extends Route {
       model(params) {
-        return this.store.findRecord('post', params.post_id, { include: 'comments' });
+        return this.store.findRecord('post', params.post_id, { include: ['comments'] });
       }
     }
     ```
@@ -4424,13 +4346,13 @@ class Store extends BaseClass {
      In this case, the post's comments would then be available in your template as
     `model.comments`.
      Multiple relationships can be requested using an `include` parameter consisting of a
-    comma-separated list (without white-space) while nested relationships can be specified
+    list of relationship names, while nested relationships can be specified
     using a dot-separated sequence of relationship names. So to request both the post's
     comments and the authors of those comments the request would look like this:
      ```app/routes/post.js
     export default class PostRoute extends Route {
       model(params) {
-        return this.store.findRecord('post', params.post_id, { include: 'comments,comments.author' });
+        return this.store.findRecord('post', params.post_id, { include: ['comments','comments.author'] });
       }
     }
     ```
@@ -4476,10 +4398,10 @@ class Store extends BaseClass {
   */
 
   findRecord(resource, id, options) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'findRecord');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a modelName or resource identifier as the first argument to the store's findRecord method`);
       }
@@ -4487,7 +4409,7 @@ class Store extends BaseClass {
     if (isMaybeIdentifier(resource)) {
       options = id;
     } else {
-      macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
         if (!test) {
           throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${resource}`);
         }
@@ -4555,7 +4477,7 @@ class Store extends BaseClass {
   */
   // TODO @deprecate getReference (and references generally)
   getReference(resource, id) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'getReference');
     }
     let resourceIdentifier;
@@ -4566,7 +4488,7 @@ class Store extends BaseClass {
       const normalizedId = ensureStringId(id);
       resourceIdentifier = constructResource(type, normalizedId);
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error('getReference expected to receive either a resource identifier or type and id as arguments');
       }
@@ -4618,15 +4540,15 @@ class Store extends BaseClass {
       // this is basically an "are we not empty" query.
       return isLoaded ? this._instanceCache.getRecord(stableIdentifier) : null;
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'peekRecord');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a model name to the store's peekRecord method`);
       }
     })(identifier) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${String(identifier)}`);
       }
@@ -4681,20 +4603,20 @@ class Store extends BaseClass {
   */
 
   query(type, query, options = {}) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'query');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a model name to the store's query method`);
       }
     })(type) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a query hash to the store's query method`);
       }
     })(query) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${type}`);
       }
@@ -4796,20 +4718,20 @@ class Store extends BaseClass {
   */
 
   queryRecord(type, query, options) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'queryRecord');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a model name to the store's queryRecord method`);
       }
     })(type) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a query hash to the store's queryRecord method`);
       }
     })(query) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${type}`);
       }
@@ -4951,18 +4873,18 @@ class Store extends BaseClass {
      ```app/routes/posts.js
     export default class PostsRoute extends Route {
       model() {
-        return this.store.findAll('post', { include: 'comments' });
+        return this.store.findAll('post', { include: ['comments'] });
       }
     }
     ```
     Multiple relationships can be requested using an `include` parameter consisting of a
-    comma-separated list (without white-space) while nested relationships can be specified
+    list or relationship names, while nested relationships can be specified
     using a dot-separated sequence of relationship names. So to request both the posts'
     comments and the authors of those comments the request would look like this:
      ```app/routes/posts.js
     export default class PostsRoute extends Route {
       model() {
-        return this.store.findAll('post', { include: 'comments,comments.author' });
+        return this.store.findAll('post', { include: ['comments','comments.author'] });
       }
     }
     ```
@@ -4976,15 +4898,15 @@ class Store extends BaseClass {
   */
 
   findAll(type, options = {}) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'findAll');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a model name to the store's findAll method`);
       }
     })(type) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${type}`);
       }
@@ -5024,15 +4946,15 @@ class Store extends BaseClass {
   */
 
   peekAll(type) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'peekAll');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You need to pass a model name to the store's peekAll method`);
       }
     })(type) : {};
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${type}`);
       }
@@ -5054,10 +4976,10 @@ class Store extends BaseClass {
   */
 
   unloadAll(type) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyedStoreOnly(this, 'unloadAll');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${String(type)}`);
       }
@@ -5208,7 +5130,7 @@ class Store extends BaseClass {
   */
 
   push(data) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'push');
     }
     const pushed = this._push(data, false);
@@ -5230,15 +5152,15 @@ class Store extends BaseClass {
     @return {StableRecordIdentifier|Array<StableRecordIdentifier>|null} identifiers for the primary records that had data loaded
   */
   _push(jsonApiDoc, asyncFlush) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, '_push');
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.debug.LOG_PAYLOADS)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.debug.LOG_PAYLOADS)) {
       try {
         const data = JSON.parse(JSON.stringify(jsonApiDoc));
         // eslint-disable-next-line no-console
         console.log('EmberData | Payload - push', data);
-      } catch (e) {
+      } catch {
         // eslint-disable-next-line no-console
         console.log('EmberData | Payload - push', jsonApiDoc);
       }
@@ -5268,10 +5190,10 @@ class Store extends BaseClass {
    * @return {Promise<record>}
    */
   saveRecord(record, options = {}) {
-    if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+    if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       assertDestroyingStore(this, 'saveRecord');
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Unable to initiate save for a record in a disconnected state`);
       }
@@ -5283,7 +5205,7 @@ class Store extends BaseClass {
       // but just in case we reject here to prevent bad things.
       return Promise.reject(new Error(`Record Is Disconnected`));
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Cannot initiate a save request for an unloaded record: ${identifier.lid}`);
       }
@@ -5340,7 +5262,7 @@ class Store extends BaseClass {
     } = this._instanceCache;
     if (!cache) {
       cache = this._instanceCache.cache = this.createCache(this._instanceCache._storeWrapper);
-      if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+      if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
         cache = new CacheManager(cache);
       }
     }
@@ -5364,19 +5286,19 @@ class Store extends BaseClass {
     return new this(args);
   }
 }
-if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA_SERVICE)) {
+if (macroCondition(getGlobalConfig().WarpDriveMirror.deprecations.ENABLE_LEGACY_SCHEMA_SERVICE)) {
   Store.prototype.getSchemaDefinitionService = function () {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You must registerSchemaDefinitionService with the store to use custom model classes`);
       }
     })(this._schema) : {};
     deprecate(`Use \`store.schema\` instead of \`store.getSchemaDefinitionService()\``, false, {
       id: 'ember-data-mirror:schema-service-updates',
-      until: '5.0',
+      until: '6.0',
       for: 'ember-data-mirror',
       since: {
-        available: '5.4',
+        available: '4.13',
         enabled: '5.4'
       }
     });
@@ -5385,10 +5307,10 @@ if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA
   Store.prototype.registerSchemaDefinitionService = function (schema) {
     deprecate(`Use \`store.createSchemaService\` instead of \`store.registerSchemaDefinitionService()\``, false, {
       id: 'ember-data-mirror:schema-service-updates',
-      until: '5.0',
+      until: '6.0',
       for: 'ember-data-mirror',
       since: {
-        available: '5.4',
+        available: '4.13',
         enabled: '5.4'
       }
     });
@@ -5397,10 +5319,10 @@ if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA
   Store.prototype.registerSchema = function (schema) {
     deprecate(`Use \`store.createSchemaService\` instead of \`store.registerSchema()\``, false, {
       id: 'ember-data-mirror:schema-service-updates',
-      until: '5.0',
+      until: '6.0',
       for: 'ember-data-mirror',
       since: {
-        available: '5.4',
+        available: '4.13',
         enabled: '5.4'
       }
     });
@@ -5409,10 +5331,10 @@ if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA
 }
 let assertDestroyingStore;
 let assertDestroyedStoreOnly;
-if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
   // eslint-disable-next-line @typescript-eslint/no-shadow
   assertDestroyingStore = function assertDestroyingStore(store, method) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Attempted to call store.${method}(), but the store instance has already been destroyed.`);
       }
@@ -5420,7 +5342,7 @@ if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
   };
   // eslint-disable-next-line @typescript-eslint/no-shadow
   assertDestroyedStoreOnly = function assertDestroyedStoreOnly(store, method) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Attempted to call store.${method}(), but the store instance has already been destroyed.`);
       }
@@ -5434,13 +5356,13 @@ function normalizeProperties(store, identifier, properties) {
   // assert here
   if (properties !== undefined) {
     if ('id' in properties) {
-      macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
         if (!test) {
           throw new Error(`expected id to be a string or null`);
         }
       })(properties.id !== undefined) : {};
     }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`You passed '${typeof properties}' as properties for record creation instead of an object.`);
       }
@@ -5460,7 +5382,7 @@ function normalizeProperties(store, identifier, properties) {
         const field = defs.get(prop);
         if (!field) continue;
         if (field.kind === 'hasMany') {
-          if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
+          if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
             assertRecordsPassedToHasMany(properties[prop]);
           }
           properties[prop] = extractIdentifiersFromRecords(properties[prop]);
@@ -5473,12 +5395,12 @@ function normalizeProperties(store, identifier, properties) {
   return properties;
 }
 function assertRecordsPassedToHasMany(records) {
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`You must pass an array of records to set a hasMany relationship`);
     }
   })(Array.isArray(records)) : {};
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`All elements of a hasMany relationship must be instances of Model, you passed ${records.map(r => `${typeof r}`).join(', ')}`);
     }
@@ -5608,7 +5530,7 @@ class Document {
    * @return Promise<Document>
    */
   fetch(options = {}) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`No self or related link`);
       }
@@ -5709,61 +5631,219 @@ defineSignal(Document.prototype, 'data');
 defineSignal(Document.prototype, 'links');
 defineSignal(Document.prototype, 'errors');
 defineSignal(Document.prototype, 'meta');
+const MUTATION_OPS = new Set(['createRecord', 'updateRecord', 'deleteRecord']);
+function calcShouldFetch(store, request, hasCachedValue, identifier) {
+  const {
+    cacheOptions
+  } = request;
+  return request.op && MUTATION_OPS.has(request.op) || cacheOptions?.reload || !hasCachedValue || (store.lifetimes && identifier ? store.lifetimes.isHardExpired(identifier, store) : false);
+}
+function calcShouldBackgroundFetch(store, request, willFetch, identifier) {
+  const {
+    cacheOptions
+  } = request;
+  return cacheOptions?.backgroundReload || (store.lifetimes && identifier ? store.lifetimes.isSoftExpired(identifier, store) : false);
+}
+function isMutation(request) {
+  return Boolean(request.op && MUTATION_OPS.has(request.op));
+}
+function copyDocumentProperties(target, source) {
+  if ('links' in source) {
+    target.links = source.links;
+  }
+  if ('meta' in source) {
+    target.meta = source.meta;
+  }
+  if ('errors' in source) {
+    target.errors = source.errors;
+  }
+}
+function isCacheAffecting(document) {
+  if (!isMutation(document.request)) {
+    return true;
+  }
+  // a mutation combined with a 204 has no cache impact when no known records were involved
+  // a createRecord with a 201 with an empty response and no known records should similarly
+  // have no cache impact
+
+  if (document.request.op === 'createRecord' && document.response?.status === 201) {
+    return document.content ? Object.keys(document.content).length > 0 : false;
+  }
+  return document.response?.status !== 204;
+}
+function isAggregateError(error) {
+  return error instanceof AggregateError || error.name === 'AggregateError' && Array.isArray(error.errors);
+}
+// TODO @runspired, consider if we should deep freeze errors (potentially only in debug) vs cloning them
+function cloneError(error) {
+  const isAggregate = isAggregateError(error);
+  const cloned = isAggregate ? new AggregateError(structuredClone(error.errors), error.message) : new Error(error.message);
+  cloned.stack = error.stack;
+  cloned.error = error.error;
+
+  // copy over enumerable properties
+  Object.assign(cloned, error);
+  return cloned;
+}
+function isErrorDocument(document) {
+  return 'errors' in document;
+}
+function getPriority(identifier, deduped, priority) {
+  if (identifier) {
+    const existing = deduped.get(identifier);
+    if (existing) {
+      return existing.priority;
+    }
+  }
+  return priority;
+}
 
 /**
  * @module @ember-data-mirror/store
  */
 
 /**
- * A service which an application may provide to the store via
- * the store's `lifetimes` property to configure the behavior
- * of the CacheHandler.
+ * A CacheHandler that adds support for using an EmberData Cache with a RequestManager.
  *
- * The default behavior for request lifetimes is to never expire
- * unless manually refreshed via `cacheOptions.reload` or `cacheOptions.backgroundReload`.
+ * This handler will only run when a request has supplied a `store` instance. Requests
+ * issued by the store via `store.request()` will automatically have the `store` instance
+ * attached to the request.
  *
- * Implementing this service allows you to programatically define
- * when a request should be considered expired.
+ * ```ts
+ * requestManager.request({
+ *   store: store,
+ *   url: '/api/posts',
+ *   method: 'GET'
+ * });
+ * ```
  *
- * @class <Interface> CachePolicy
- * @public
+ * When this handler elects to handle a request, it will return the raw `StructuredDocument`
+ * unless the request has `[EnableHydration]` set to `true`. In this case, the handler will
+ * return a `Document` instance that will automatically update the UI when the cache is updated
+ * in the future and will hydrate any identifiers in the StructuredDocument into Record instances.
+ *
+ * When issuing a request via the store, [EnableHydration] is automatically set to `true`. This
+ * means that if desired you can issue requests that utilize the cache without needing to also
+ * utilize Record instances if desired.
+ *
+ * Said differently, you could elect to issue all requests via a RequestManager, without ever using
+ * the store directly, by setting [EnableHydration] to `true` and providing a store instance. Not
+ * necessarily the most useful thing, but the decoupled nature of the RequestManager and incremental-feature
+ * approach of EmberData allows for this flexibility.
+ *
+ * ```ts
+ * import { EnableHydration } from '@warp-drive-mirror/core-types/request';
+ *
+ * requestManager.request({
+ *   store: store,
+ *   url: '/api/posts',
+ *   method: 'GET',
+ *   [EnableHydration]: true
+ * });
+ *
+ * @typedoc
  */
-const MUTATION_OPS = new Set(['createRecord', 'updateRecord', 'deleteRecord']);
-function isErrorDocument(document) {
-  return 'errors' in document;
-}
+const CacheHandler = {
+  request(context, next) {
+    // if we have no cache or no cache-key skip cache handling
+    if (!context.request.store || context.request.cacheOptions?.[SkipCache]) {
+      return next(context.request);
+    }
+    const {
+      store
+    } = context.request;
+    const identifier = store.identifierCache.getOrCreateDocumentIdentifier(context.request);
+    if (identifier) {
+      context.setIdentifier(identifier);
+    }
+
+    // used to dedupe existing requests that match
+    const DEDUPE = store.requestManager._deduped;
+    const activeRequest = identifier && DEDUPE.get(identifier);
+    const peeked = identifier ? store.cache.peekRequest(identifier) : null;
+
+    // determine if we should skip cache
+    if (calcShouldFetch(store, context.request, !!peeked, identifier)) {
+      if (activeRequest) {
+        activeRequest.priority = {
+          blocking: true
+        };
+        return activeRequest.promise;
+      }
+      let promise = fetchContentAndHydrate(next, context, identifier, {
+        blocking: true
+      });
+      if (identifier) {
+        promise = promise.finally(() => {
+          DEDUPE.delete(identifier);
+          store.notifications.notify(identifier, 'state');
+        });
+        DEDUPE.set(identifier, {
+          priority: {
+            blocking: true
+          },
+          promise
+        });
+        store.notifications.notify(identifier, 'state');
+      }
+      return promise;
+    }
+
+    // if we have not skipped cache, determine if we should update behind the scenes
+    if (calcShouldBackgroundFetch(store, context.request, false, identifier)) {
+      let promise = activeRequest?.promise || fetchContentAndHydrate(next, context, identifier, {
+        blocking: false
+      });
+      if (identifier && !activeRequest) {
+        promise = promise.finally(() => {
+          DEDUPE.delete(identifier);
+          store.notifications.notify(identifier, 'state');
+        });
+        DEDUPE.set(identifier, {
+          priority: {
+            blocking: false
+          },
+          promise
+        });
+        store.notifications.notify(identifier, 'state');
+      }
+      store.requestManager._pending.set(context.id, promise);
+    }
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
+      if (!test) {
+        throw new Error(`Expected a peeked request to be present`);
+      }
+    })(peeked) : {};
+    const shouldHydrate = context.request[EnableHydration] || false;
+    context.setResponse(peeked.response);
+    if ('error' in peeked) {
+      const content = shouldHydrate ? maybeUpdateErrorUiObjects(store, {
+        shouldHydrate,
+        identifier
+      }, peeked.content, true) : peeked.content;
+      const newError = cloneError(peeked);
+      newError.content = content;
+      throw newError;
+    }
+    const result = shouldHydrate ? maybeUpdateUiObjects(store, context.request, {
+      shouldHydrate,
+      identifier
+    }, peeked.content, true) : peeked.content;
+    return result;
+  }
+};
 function maybeUpdateUiObjects(store, request, options, document, isFromCache) {
   const {
     identifier
   } = options;
   if (!document) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`The CacheHandler expected response content but none was found`);
       }
     })(!options.shouldHydrate) : {};
     return document;
   }
-  if (isErrorDocument(document)) {
-    if (!identifier && !options.shouldHydrate) {
-      return document;
-    }
-    let doc;
-    if (identifier) {
-      doc = store._documentCache.get(identifier);
-    }
-    if (!doc) {
-      doc = new Document(store, identifier);
-      copyDocumentProperties(doc, document);
-      if (identifier) {
-        store._documentCache.set(identifier, doc);
-      }
-    } else if (!isFromCache) {
-      doc.data = undefined;
-      copyDocumentProperties(doc, document);
-    }
-    return options.shouldHydrate ? doc : document;
-  }
   if (Array.isArray(document.data)) {
     const {
       recordArrayManager
@@ -5831,32 +5911,125 @@ function maybeUpdateUiObjects(store, request, options, document, isFromCache) {
     return options.shouldHydrate ? doc : document;
   }
 }
-function calcShouldFetch(store, request, hasCachedValue, identifier) {
+function maybeUpdateErrorUiObjects(store, options, document, isFromCache) {
   const {
-    cacheOptions
-  } = request;
-  return request.op && MUTATION_OPS.has(request.op) || cacheOptions?.reload || !hasCachedValue || (store.lifetimes && identifier ? store.lifetimes.isHardExpired(identifier, store) : false);
+    identifier
+  } = options;
+
+  // TODO investigate why ResourceErrorDocument is insufficient for expressing all error types
+  if (!isErrorDocument(document) || !identifier && !options.shouldHydrate) {
+    return document;
+  }
+  let doc;
+  if (identifier) {
+    doc = store._documentCache.get(identifier);
+  }
+  if (!doc) {
+    doc = new Document(store, identifier);
+    copyDocumentProperties(doc, document);
+    if (identifier) {
+      store._documentCache.set(identifier, doc);
+    }
+  } else if (!isFromCache) {
+    doc.data = undefined;
+    copyDocumentProperties(doc, document);
+  }
+  return options.shouldHydrate ? doc : document;
 }
-function calcShouldBackgroundFetch(store, request, willFetch, identifier) {
+function updateCacheForSuccess(store, request, options, document) {
+  let response = null;
+  if (isMutation(request)) {
+    const record = request.data?.record || request.records?.[0];
+    if (record) {
+      response = store.cache.didCommit(record, document);
+
+      // a mutation combined with a 204 has no cache impact when no known records were involved
+      // a createRecord with a 201 with an empty response and no known records should similarly
+      // have no cache impact
+    } else if (isCacheAffecting(document)) {
+      response = store.cache.put(document);
+    }
+  } else {
+    response = store.cache.put(document);
+  }
+  return maybeUpdateUiObjects(store, request, options, response, false);
+}
+function handleFetchSuccess(store, context, options, document) {
   const {
-    cacheOptions
-  } = request;
-  return cacheOptions?.backgroundReload || (store.lifetimes && identifier ? store.lifetimes.isSoftExpired(identifier, store) : false);
+    request
+  } = context;
+  store.requestManager._pending.delete(context.id);
+  store._enableAsyncFlush = true;
+  let response;
+  store._join(() => {
+    response = updateCacheForSuccess(store, request, options, document);
+  });
+  store._enableAsyncFlush = null;
+  if (store.lifetimes?.didRequest) {
+    store.lifetimes.didRequest(context.request, document.response, options.identifier, store);
+  }
+  const finalPriority = getPriority(options.identifier, store.requestManager._deduped, options.priority);
+  if (finalPriority.blocking) {
+    return response;
+  } else {
+    store.notifications._flush();
+  }
 }
-function isMutation(request) {
-  return Boolean(request.op && MUTATION_OPS.has(request.op));
+function updateCacheForError(store, context, options, error) {
+  let response;
+  if (isMutation(context.request)) {
+    // TODO similar to didCommit we should spec this to be similar to cache.put for handling full response
+    // currently we let the response remain undefiend.
+    const errors = error && error.content && typeof error.content === 'object' && 'errors' in error.content && Array.isArray(error.content.errors) ? error.content.errors : undefined;
+    const record = context.request.data?.record || context.request.records?.[0];
+    store.cache.commitWasRejected(record, errors);
+  } else {
+    response = store.cache.put(error);
+    return maybeUpdateErrorUiObjects(store, options, response, false);
+  }
 }
-function fetchContentAndHydrate(next, context, identifier, shouldFetch, shouldBackgroundFetch) {
+function handleFetchError(store, context, options, error) {
+  store.requestManager._pending.delete(context.id);
+  if (context.request.signal?.aborted) {
+    throw error;
+  }
+  store._enableAsyncFlush = true;
+  let response;
+  store._join(() => {
+    response = updateCacheForError(store, context, options, error);
+  });
+  store._enableAsyncFlush = null;
+  if (options.identifier && store.lifetimes?.didRequest) {
+    store.lifetimes.didRequest(context.request, error.response, options.identifier, store);
+  }
+  if (isMutation(context.request)) {
+    throw error;
+  }
+  const finalPriority = getPriority(options.identifier, store.requestManager._deduped, options.priority);
+  if (finalPriority.blocking) {
+    const newError = cloneError(error);
+    newError.content = response;
+    throw newError;
+  } else {
+    store.notifications._flush();
+  }
+}
+function fetchContentAndHydrate(next, context, identifier, priority) {
   const {
     store
   } = context.request;
   const shouldHydrate = context.request[EnableHydration] || false;
+  const options = {
+    shouldHydrate,
+    identifier,
+    priority
+  };
   let isMut = false;
   if (isMutation(context.request)) {
     isMut = true;
     // TODO should we handle multiple records in request.records by iteratively calling willCommit for each
     const record = context.request.data?.record || context.request.records?.[0];
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+    macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`Expected to receive a list of records included in the ${context.request.op} request`);
       }
@@ -5869,83 +6042,14 @@ function fetchContentAndHydrate(next, context, identifier, shouldFetch, shouldBa
     store.lifetimes.willRequest(context.request, identifier, store);
   }
   const promise = next(context.request).then(document => {
-    store.requestManager._pending.delete(context.id);
-    store._enableAsyncFlush = true;
-    let response;
-    store._join(() => {
-      if (isMutation(context.request)) {
-        const record = context.request.data?.record || context.request.records?.[0];
-        if (record) {
-          response = store.cache.didCommit(record, document);
-
-          // a mutation combined with a 204 has no cache impact when no known records were involved
-          // a createRecord with a 201 with an empty response and no known records should similarly
-          // have no cache impact
-        } else if (isCacheAffecting(document)) {
-          response = store.cache.put(document);
-        }
-      } else {
-        response = store.cache.put(document);
-      }
-      response = maybeUpdateUiObjects(store, context.request, {
-        shouldHydrate,
-        shouldFetch,
-        shouldBackgroundFetch,
-        identifier
-      }, response, false);
-    });
-    store._enableAsyncFlush = null;
-    if (store.lifetimes?.didRequest) {
-      store.lifetimes.didRequest(context.request, document.response, identifier, store);
-    }
-    if (shouldFetch) {
-      return response;
-    } else if (shouldBackgroundFetch) {
-      store.notifications._flush();
-    }
+    return handleFetchSuccess(store, context, options, document);
   }, error => {
-    store.requestManager._pending.delete(context.id);
-    if (context.request.signal?.aborted) {
-      throw error;
-    }
-    store.requestManager._pending.delete(context.id);
-    store._enableAsyncFlush = true;
-    let response;
-    store._join(() => {
-      if (isMutation(context.request)) {
-        // TODO similar to didCommit we should spec this to be similar to cache.put for handling full response
-        // currently we let the response remain undefiend.
-        const errors = error && error.content && typeof error.content === 'object' && 'errors' in error.content && Array.isArray(error.content.errors) ? error.content.errors : undefined;
-        const record = context.request.data?.record || context.request.records?.[0];
-        store.cache.commitWasRejected(record, errors);
-        // re-throw the original error to preserve `errors` property.
-        throw error;
-      } else {
-        response = store.cache.put(error);
-        response = maybeUpdateUiObjects(store, context.request, {
-          shouldHydrate,
-          shouldFetch,
-          shouldBackgroundFetch,
-          identifier
-        }, response, false);
-      }
-    });
-    store._enableAsyncFlush = null;
-    if (identifier && store.lifetimes?.didRequest) {
-      store.lifetimes.didRequest(context.request, error.response, identifier, store);
-    }
-    if (!shouldBackgroundFetch) {
-      const newError = cloneError(error);
-      newError.content = response;
-      throw newError;
-    } else {
-      store.notifications._flush();
-    }
+    return handleFetchError(store, context, options, error);
   });
   if (!isMut) {
     return promise;
   }
-  macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`Expected a mutation`);
     }
@@ -5962,129 +6066,4 @@ function fetchContentAndHydrate(next, context, identifier, shouldFetch, shouldBa
     }]
   });
 }
-function isAggregateError(error) {
-  return error instanceof AggregateError || error.name === 'AggregateError' && Array.isArray(error.errors);
-}
-// TODO @runspired, consider if we should deep freeze errors (potentially only in debug) vs cloning them
-function cloneError(error) {
-  const isAggregate = isAggregateError(error);
-  const cloned = isAggregate ? new AggregateError(structuredClone(error.errors), error.message) : new Error(error.message);
-  cloned.stack = error.stack;
-  cloned.error = error.error;
-
-  // copy over enumerable properties
-  Object.assign(cloned, error);
-  return cloned;
-}
-
-/**
- * A CacheHandler that adds support for using an EmberData Cache with a RequestManager.
- *
- * This handler will only run when a request has supplied a `store` instance. Requests
- * issued by the store via `store.request()` will automatically have the `store` instance
- * attached to the request.
- *
- * ```ts
- * requestManager.request({
- *   store: store,
- *   url: '/api/posts',
- *   method: 'GET'
- * });
- * ```
- *
- * When this handler elects to handle a request, it will return the raw `StructuredDocument`
- * unless the request has `[EnableHydration]` set to `true`. In this case, the handler will
- * return a `Document` instance that will automatically update the UI when the cache is updated
- * in the future and will hydrate any identifiers in the StructuredDocument into Record instances.
- *
- * When issuing a request via the store, [EnableHydration] is automatically set to `true`. This
- * means that if desired you can issue requests that utilize the cache without needing to also
- * utilize Record instances if desired.
- *
- * Said differently, you could elect to issue all requests via a RequestManager, without ever using
- * the store directly, by setting [EnableHydration] to `true` and providing a store instance. Not
- * necessarily the most useful thing, but the decoupled nature of the RequestManager and incremental-feature
- * approach of EmberData allows for this flexibility.
- *
- * ```ts
- * import { EnableHydration } from '@warp-drive/core-types/request';
- *
- * requestManager.request({
- *   store: store,
- *   url: '/api/posts',
- *   method: 'GET',
- *   [EnableHydration]: true
- * });
- *
- * @typedoc
- */
-const CacheHandler = {
-  request(context, next) {
-    // if we have no cache or no cache-key skip cache handling
-    if (!context.request.store || context.request.cacheOptions?.[SkipCache]) {
-      return next(context.request);
-    }
-    const {
-      store
-    } = context.request;
-    const identifier = store.identifierCache.getOrCreateDocumentIdentifier(context.request);
-    const peeked = identifier ? store.cache.peekRequest(identifier) : null;
-
-    // determine if we should skip cache
-    if (calcShouldFetch(store, context.request, !!peeked, identifier)) {
-      return fetchContentAndHydrate(next, context, identifier, true, false);
-    }
-
-    // if we have not skipped cache, determine if we should update behind the scenes
-    if (calcShouldBackgroundFetch(store, context.request, false, identifier)) {
-      const promise = fetchContentAndHydrate(next, context, identifier, false, true);
-      store.requestManager._pending.set(context.id, promise);
-    }
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
-      if (!test) {
-        throw new Error(`Expected a peeked request to be present`);
-      }
-    })(peeked) : {};
-    const shouldHydrate = context.request[EnableHydration] || false;
-    context.setResponse(peeked.response);
-    if ('error' in peeked) {
-      const content = shouldHydrate ? maybeUpdateUiObjects(store, context.request, {
-        shouldHydrate,
-        identifier
-      }, peeked.content, true) : peeked.content;
-      const newError = cloneError(peeked);
-      newError.content = content;
-      throw newError;
-    }
-    const result = shouldHydrate ? maybeUpdateUiObjects(store, context.request, {
-      shouldHydrate,
-      identifier
-    }, peeked.content, true) : peeked.content;
-    return result;
-  }
-};
-function copyDocumentProperties(target, source) {
-  if ('links' in source) {
-    target.links = source.links;
-  }
-  if ('meta' in source) {
-    target.meta = source.meta;
-  }
-  if ('errors' in source) {
-    target.errors = source.errors;
-  }
-}
-function isCacheAffecting(document) {
-  if (!isMutation(document.request)) {
-    return true;
-  }
-  // a mutation combined with a 204 has no cache impact when no known records were involved
-  // a createRecord with a 201 with an empty response and no known records should similarly
-  // have no cache impact
-
-  if (document.request.op === 'createRecord' && document.response?.status === 201) {
-    return document.content ? Object.keys(document.content).length > 0 : false;
-  }
-  return document.response?.status !== 204;
-}
 export { ARRAY_SIGNAL as A, CacheHandler as C, IdentifierArray as I, MUTATE as M, RecordArrayManager as R, Store as S, _clearCaches as _, setIdentifierGenerationMethod as a, setIdentifierUpdateMethod as b, setIdentifierForgetMethod as c, setIdentifierResetMethod as d, setKeyInfoForResource as e, constructResource as f, coerceId as g, ensureStringId as h, isStableIdentifier as i, Collection as j, SOURCE as k, fastPush as l, removeRecordDataFor as m, notifyArray as n, setRecordIdentifier as o, peekCache as p, StoreMap as q, recordIdentifierFor as r, storeFor as s, setCacheFor as t, normalizeModelName as u };