@ember-data/store 4.12.0-alpha.16 → 4.12.0-alpha.17

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-35424a6b";
+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-f7d3d5e5";

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

@@ -727,9 +727,9 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con
   return desc;
 }
 let tokenId = 0;
-const CacheOperations$1 = new Set(['added', 'removed', 'state', 'updated']);
+const CacheOperations = new Set(['added', 'removed', 'state', 'updated']);
 function isCacheOperationValue(value) {
-  return CacheOperations$1.has(value);
+  return CacheOperations.has(value);
 }
 function runLoopIsFlushing() {
   //@ts-expect-error
@@ -4888,8 +4888,10 @@ class Store {
     // we lazily set the cache handler when we issue the first request
     // because constructor doesn't allow for this to run after
     // the user has had the chance to set the prop.
+    const storeSymbol = Symbol.for('ember-data:enable-hydration');
     let opts = {
-      store: this
+      store: this,
+      [storeSymbol]: true
     };
     if (macroCondition(getOwnConfig().env.TESTING)) {
       if (this.DISABLE_WAITER) {
@@ -6798,11 +6800,7 @@ 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
@@ -6829,14 +6827,9 @@ function getHydratedContent(store, request, document) {
     }
     return managed;
   } else {
-    switch (request.op) {
-      case 'findBelongsTo':
-      case 'queryRecord':
-      case 'findRecord':
-        return document.data ? store.peekRecord(document.data) : null;
-      default:
-        return document.data;
-    }
+    return Object.assign({}, document, {
+      data: document.data ? store.peekRecord(document.data) : null
+    });
   }
 }
 function calcShouldFetch(store, request, hasCachedValue, lid) {
@@ -6859,12 +6852,13 @@ function fetchContentAndHydrate(next, context, shouldFetch, shouldBackgroundFetc
   const {
     store
   } = context.request;
+  const shouldHydrate = context.request[Symbol.for('ember-data:enable-hydration')] || false;
   return next(context.request).then(document => {
     store._enableAsyncFlush = true;
     let response;
     store._join(() => {
       response = store.cache.put(document);
-      if (shouldFetch) {
+      if (shouldFetch && shouldHydrate) {
         response = getHydratedContent(store, context.request, response);
       }
     });
@@ -6887,8 +6881,8 @@ 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 && CacheOperations.has(context.request.op) && !context.request.url) {
+    // if we have no cache or no cache-key skip cache handling
+    if (!context.request.store || !(context.request.cacheOptions?.key || context.request.url)) {
       return next(context.request);
     }
     const {
@@ -6916,7 +6910,8 @@ const CacheHandler = {
     if ('error' in peeked) {
       throw peeked.error;
     }
-    return Promise.resolve(getHydratedContent(store, context.request, peeked.content));
+    const shouldHydrate = context.request[Symbol.for('ember-data:enable-hydration')] || false;
+    return Promise.resolve(shouldHydrate ? getHydratedContent(store, context.request, peeked.content) : peeked.content);
   }
 };
 function normalizeModelName(modelName) {