@ember-data/store 4.12.0-beta.5 → 4.12.0-beta.6

package/addon/-private.js

@@ -1 +1 @@
-export { f as AdapterPopulatedRecordArray, C as CacheHandler, j as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, h as SOURCE, S as Store, _ as _clearCaches, e as coerceId, k as fastPush, i as isStableIdentifier, n as normalizeModelName, g as notifyArray, p as peekCache, r as recordIdentifierFor, l as removeRecordDataFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./index-123f3e7e";
+export { f as AdapterPopulatedRecordArray, C as CacheHandler, j as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, h as SOURCE, S as Store, _ as _clearCaches, e as coerceId, k as fastPush, i as isStableIdentifier, n as normalizeModelName, g as notifyArray, p as peekCache, r as recordIdentifierFor, l as removeRecordDataFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./index-35424a6b";

package/addon/{index-123f3e7e.js → index-35424a6b.js}

@@ -727,9 +727,9 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con
   return desc;
 }
 let tokenId = 0;
-const CacheOperations = new Set(['added', 'removed', 'state', 'updated']);
+const CacheOperations$1 = new Set(['added', 'removed', 'state', 'updated']);
 function isCacheOperationValue(value) {
-  return CacheOperations.has(value);
+  return CacheOperations$1.has(value);
 }
 function runLoopIsFlushing() {
   //@ts-expect-error
@@ -2826,7 +2826,7 @@ class InstanceCache {
     return reference;
   }
   recordIsLoaded(identifier, filterDeleted = false) {
-    const cache = macroCondition(getOwnConfig().deprecations.DEPRECATE_V1_RECORD_DATA) ? this.__instances.resourceCache.get(identifier) : this.cache;
+    const cache = macroCondition(getOwnConfig().deprecations.DEPRECATE_V1_RECORD_DATA) ? this.__instances.resourceCache.get(identifier) || this.cache : this.cache;
     if (!cache) {
       return false;
     }
@@ -4294,6 +4294,7 @@ class RecordArrayManager {
     this._managed = new Set();
     this._pending = new Map();
     this._staged = new Map();
+    this._keyedArrays = new Map();
     this._identifiers = RecordArraysCache;
     this._subscription = this.store.notifications.subscribe('resource', (identifier, type) => {
       if (type === 'added') {
@@ -6797,7 +6798,11 @@ function secretInit(record, cache, identifier, store) {
   StoreMap.set(record, store);
   setCacheFor(record, cache);
 }
+const CacheOperations = new Set(['findRecord', 'findAll', 'query', 'queryRecord', 'findBelongsTo', 'findHasMany', 'updateRecord', 'createRecord', 'deleteRecord']);
 function getHydratedContent(store, request, document) {
+  if (!request.op || !CacheOperations.has(request.op)) {
+    return document;
+  }
   if (Array.isArray(document.data)) {
     const {
       lid
@@ -6824,7 +6829,14 @@ function getHydratedContent(store, request, document) {
     }
     return managed;
   } else {
-    return document.data ? store.peekRecord(document.data) : null;
+    switch (request.op) {
+      case 'findBelongsTo':
+      case 'queryRecord':
+      case 'findRecord':
+        return document.data ? store.peekRecord(document.data) : null;
+      default:
+        return document.data;
+    }
   }
 }
 function calcShouldFetch(store, request, hasCachedValue, lid) {
@@ -6833,7 +6845,7 @@ function calcShouldFetch(store, request, hasCachedValue, lid) {
     url,
     method
   } = request;
-  return cacheOptions?.reload || !hasCachedValue || store.lifetimes && lid && url && method ? store.lifetimes.isHardExpired(lid, url, method) : false;
+  return cacheOptions?.reload || !hasCachedValue || (store.lifetimes && lid && url && method ? store.lifetimes.isHardExpired(lid, url, method) : false);
 }
 function calcShouldBackgroundFetch(store, request, willFetch, lid) {
   const {
@@ -6841,19 +6853,32 @@ function calcShouldBackgroundFetch(store, request, willFetch, lid) {
     url,
     method
   } = request;
-  return !willFetch && (cacheOptions?.backgroundReload || store.lifetimes && lid && url && method ? store.lifetimes.isSoftExpired(lid, url, method) : false);
+  return !willFetch && (cacheOptions?.backgroundReload || (store.lifetimes && lid && url && method ? store.lifetimes.isSoftExpired(lid, url, method) : false));
 }
 function fetchContentAndHydrate(next, context, shouldFetch, shouldBackgroundFetch) {
   const {
     store
   } = context.request;
   return next(context.request).then(document => {
-    const response = store.cache.put(document);
+    store._enableAsyncFlush = true;
+    let response;
+    store._join(() => {
+      response = store.cache.put(document);
+      if (shouldFetch) {
+        response = getHydratedContent(store, context.request, response);
+      }
+    });
+    store._enableAsyncFlush = null;
     if (shouldFetch) {
-      return getHydratedContent(store, context.request, response);
+      return response;
     }
   }, error => {
-    store.cache.put(error);
+    store._enableAsyncFlush = true;
+    store._join(() => {
+      store.cache.put(error);
+    });
+    store._enableAsyncFlush = null;
+
     // TODO @runspired this is probably not the right thing to throw so make sure we add a test
     if (!shouldBackgroundFetch) {
       throw error;
@@ -6863,7 +6888,7 @@ function fetchContentAndHydrate(next, context, shouldFetch, shouldBackgroundFetc
 const CacheHandler = {
   request(context, next) {
     // if we are a legacy request or did not originate from the store, skip cache handling
-    if (!context.request.store || context.request.op && !context.request.url) {
+    if (!context.request.store || context.request.op && CacheOperations.has(context.request.op) && !context.request.url) {
       return next(context.request);
     }
     const {