@ember-data/store 5.4.0-alpha.5 → 5.4.0-alpha.6

package/addon/-private.js

@@ -1 +1 @@
-export { f as AdapterPopulatedRecordArray, C as CacheHandler, h as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, g as SOURCE, S as Store, m as StoreMap, _ as _clearCaches, e as coerceId, j as fastPush, i as isStableIdentifier, n as notifyArray, p as peekCache, r as recordIdentifierFor, k as removeRecordDataFor, o as setCacheFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, l as setRecordIdentifier, s as storeFor } from "./store-service-aa7f91c0";
+export { f as AdapterPopulatedRecordArray, C as CacheHandler, h as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, g as SOURCE, S as Store, m as StoreMap, _ as _clearCaches, e as coerceId, j as fastPush, i as isStableIdentifier, n as notifyArray, p as peekCache, r as recordIdentifierFor, k as removeRecordDataFor, o as setCacheFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, l as setRecordIdentifier, s as storeFor } from "./store-service-7ffc4d68";

package/addon/index.js

@@ -1 +1 @@
-export { C as CacheHandler, S as default, r as recordIdentifierFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./store-service-aa7f91c0";
+export { C as CacheHandler, S as default, r as recordIdentifierFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./store-service-7ffc4d68";

package/addon/{store-service-aa7f91c0.js → store-service-7ffc4d68.js}

@@ -664,7 +664,7 @@ class IdentifierCache {
       console.log(`Identifiers: ${lid ? 'no ' : ''}lid ${lid ? lid + ' ' : ''}determined for resource`, resource);
     }
     let identifier = /*#__NOINLINE__*/getIdentifierFromLid(this._cache, lid, resource);
-    if (identifier !== undefined) {
+    if (identifier !== null) {
       if (macroCondition(getOwnConfig().debug.LOG_IDENTIFIERS)) {
         // eslint-disable-next-line no-console
         console.groupEnd();
@@ -1048,7 +1048,7 @@ function detectMerge(cache, keyInfo, identifier, data) {
     // we trigger a merge of the identifiers
     // though probably we should just throw an error here
     if (id !== null && id === newId && newType === type && hasLid(data) && data.lid !== lid) {
-      return cache.resources.get(data.lid) || false;
+      return getIdentifierFromLid(cache, data.lid, data) || false;
 
       // If the lids are the same, and ids are the same, but types are different we should trigger a merge of the identifiers
     } else if (id !== null && id === newId && newType && newType !== type && hasLid(data) && data.lid === lid) {
@@ -1065,7 +1065,7 @@ function getIdentifierFromLid(cache, lid, resource) {
     // eslint-disable-next-line no-console
     console.log(`Identifiers: cache ${identifier ? 'HIT' : 'MISS'} - Non-Stable ${lid}`, resource);
   }
-  return identifier;
+  return identifier || null;
 }
 function addResourceToCache(cache, identifier) {
   cache.resources.set(identifier.lid, identifier);