@ember-data/store 4.8.0-alpha.6 → 4.8.0

package/LICENSE.md

@@ -1,6 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2019
+Copyright (C) 2017-2022 Ember.js contributors
+Portions Copyright (C) 2011-2017 Tilde, Inc. and contributors.
+Portions Copyright (C) 2011 LivingSocial Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/addon/-private/caches/identifier-cache.ts

@@ -4,7 +4,7 @@
 import { assert, warn } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
-import { getOwnConfig, importSync, macroCondition } from '@embroider/macros';
+import { getOwnConfig, macroCondition } from '@embroider/macros';
 
 import { LOG_IDENTIFIERS } from '@ember-data/private-build-infra/debugging';
 import type { ExistingResourceObject, ResourceIdentifierObject } from '@ember-data/types/q/ember-data-json-api';
@@ -25,6 +25,7 @@ import coerceId from '../utils/coerce-id';
 import { DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from '../utils/identifer-debug-consts';
 import isNonEmptyString from '../utils/is-non-empty-string';
 import normalizeModelName from '../utils/normalize-model-name';
+import installPolyfill from '../utils/uuid-polyfill';
 
 const IDENTIFIERS = new Set();
 
@@ -36,7 +37,7 @@ const isFastBoot = typeof FastBoot !== 'undefined';
 const _crypto: Crypto = isFastBoot ? (FastBoot.require('crypto') as Crypto) : window.crypto;
 
 if (macroCondition(getOwnConfig<{ polyfillUUID: boolean }>().polyfillUUID)) {
-  importSync('./utils/uuid-polyfill');
+  installPolyfill();
 }
 
 function uuidv4(): string {
@@ -265,14 +266,16 @@ export class IdentifierCache {
           // one level up
           keyOptions.lid.set(identifier.lid, identifier);
 
-          if (LOG_IDENTIFIERS && shouldGenerate) {
-            // eslint-disable-next-line no-console
-            console.log(`Identifiers: generated ${String(identifier)} for`, resource);
-            if (resource[DEBUG_IDENTIFIER_BUCKET]) {
+          if (LOG_IDENTIFIERS) {
+            if (shouldGenerate) {
               // eslint-disable-next-line no-console
-              console.trace(
-                `[WARNING] Identifiers: generated a new identifier from a previously used identifier. This is likely a bug.`
-              );
+              console.log(`Identifiers: generated ${String(identifier)} for`, resource);
+              if (resource[DEBUG_IDENTIFIER_BUCKET]) {
+                // eslint-disable-next-line no-console
+                console.trace(
+                  `[WARNING] Identifiers: generated a new identifier from a previously used identifier. This is likely a bug.`
+                );
+              }
             }
           }
         }

package/addon/-private/caches/instance-cache.ts

@@ -7,7 +7,8 @@ import { resolve } from 'rsvp';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 import { LOG_INSTANCE_CACHE } from '@ember-data/private-build-infra/debugging';
 import { DEPRECATE_V1_RECORD_DATA, DEPRECATE_V1CACHE_STORE_APIS } from '@ember-data/private-build-infra/deprecations';
-import type { Graph, peekGraph } from '@ember-data/record-data/-private/graph/index';
+import type { Graph } from '@ember-data/record-data/-private/graph/graph';
+import type { peekGraph } from '@ember-data/record-data/-private/graph/index';
 import type {
   ExistingResourceIdentifierObject,
   ExistingResourceObject,
@@ -83,8 +84,10 @@ export function recordIdentifierFor(record: RecordInstance): StableRecordIdentif
 }
 
 export function setRecordIdentifier(record: RecordInstance, identifier: StableRecordIdentifier): void {
-  if (DEBUG && RecordCache.has(record) && RecordCache.get(record) !== identifier) {
-    throw new Error(`${String(record)} was already assigned an identifier`);
+  if (DEBUG) {
+    if (RecordCache.has(record) && RecordCache.get(record) !== identifier) {
+      throw new Error(`${String(record)} was already assigned an identifier`);
+    }
   }
 
   /*
@@ -128,44 +131,6 @@ export class InstanceCache {
     reference: new WeakMap<StableRecordIdentifier, RecordReference>(),
   };
 
-  recordIsLoaded(identifier: StableRecordIdentifier, filterDeleted: boolean = false) {
-    const recordData = this.__instances.recordData.get(identifier);
-    if (!recordData) {
-      return false;
-    }
-    const isNew = recordData.isNew(identifier);
-    const isEmpty = recordData.isEmpty(identifier);
-
-    // if we are new we must consider ourselves loaded
-    if (isNew) {
-      return !recordData.isDeleted(identifier);
-    }
-    // even if we have a past request, if we are now empty we are not loaded
-    // typically this is true after an unloadRecord call
-
-    // if we are not empty, not new && we have a fulfilled request then we are loaded
-    // we should consider allowing for something to be loaded that is simply "not empty".
-    // which is how RecordState currently handles this case; however, RecordState is buggy
-    // in that it does not account for unloading.
-    return filterDeleted && recordData.isDeletionCommitted(identifier) ? false : !isEmpty;
-
-    /*
-    const req = this.store.getRequestStateService();
-    const fulfilled = req.getLastRequestForRecord(identifier);
-    const isLocallyLoaded = !isEmpty;
-    const isLoading =
-      !isLocallyLoaded &&
-      fulfilled === null &&
-      req.getPendingRequestsForRecord(identifier).some((req) => req.type === 'query');
-
-    if (isEmpty || (filterDeleted && recordData.isDeletionCommitted(identifier)) || isLoading) {
-      return false;
-    }
-
-    return true;
-    */
-  }
-
   constructor(store: Store) {
     this.store = store;
 
@@ -178,25 +143,24 @@ export class InstanceCache {
 
     store.identifierCache.__configureMerge(
       (identifier: StableRecordIdentifier, matchedIdentifier: StableRecordIdentifier, resourceData) => {
-        let intendedIdentifier = identifier;
+        let keptIdentifier = identifier;
         if (identifier.id !== matchedIdentifier.id) {
-          intendedIdentifier =
-            'id' in resourceData && identifier.id === resourceData.id ? identifier : matchedIdentifier;
+          keptIdentifier = 'id' in resourceData && identifier.id === resourceData.id ? identifier : matchedIdentifier;
         } else if (identifier.type !== matchedIdentifier.type) {
-          intendedIdentifier =
+          keptIdentifier =
             'type' in resourceData && identifier.type === resourceData.type ? identifier : matchedIdentifier;
         }
-        let altIdentifier = identifier === intendedIdentifier ? matchedIdentifier : identifier;
+        let staleIdentifier = identifier === keptIdentifier ? matchedIdentifier : identifier;
 
         // check for duplicate entities
-        let imHasRecord = this.__instances.record.has(intendedIdentifier);
-        let otherHasRecord = this.__instances.record.has(altIdentifier);
-        let imRecordData = this.__instances.recordData.get(intendedIdentifier) || null;
-        let otherRecordData = this.__instances.recordData.get(altIdentifier) || null;
+        let keptHasRecord = this.__instances.record.has(keptIdentifier);
+        let staleHasRecord = this.__instances.record.has(staleIdentifier);
+        let keptRecordData = this.__instances.recordData.get(keptIdentifier) || null;
+        let staleRecordData = this.__instances.recordData.get(staleIdentifier) || null;
 
         // we cannot merge entities when both have records
         // (this may not be strictly true, we could probably swap the recordData the record points at)
-        if (imHasRecord && otherHasRecord) {
+        if (keptHasRecord && staleHasRecord) {
           // TODO we probably don't need to throw these errors anymore
           // we can probably just "swap" what data source the abandoned
           // record points at so long as
@@ -210,7 +174,7 @@ export class InstanceCache {
               }:${String(matchedIdentifier.id)} (${matchedIdentifier.lid})'`
             );
           }
-          // TODO @runspired determine when this is even possible
+
           assert(
             `Failed to update the RecordIdentifier '${identifier.type}:${String(identifier.id)} (${
               identifier.lid
@@ -220,33 +184,26 @@ export class InstanceCache {
           );
         }
 
-        // remove "other" from cache
-        if (otherHasRecord) {
-          // TODO probably need to release other things
+        let recordData = keptRecordData || staleRecordData;
+
+        if (recordData) {
+          recordData.sync({
+            op: 'mergeIdentifiers',
+            record: staleIdentifier,
+            value: keptIdentifier,
+          });
+        } else if (HAS_RECORD_DATA_PACKAGE) {
+          // TODO notify cache always, this requires it always being a singleton
+          // and not ever specific to one record-data
+          this.store.__private_singleton_recordData?.sync({
+            op: 'mergeIdentifiers',
+            record: staleIdentifier,
+            value: keptIdentifier,
+          });
         }
 
-        if (imRecordData === null && otherRecordData === null) {
-          // nothing more to do
-          return intendedIdentifier;
-
-          // only the other has a RecordData
-          // OR only the other has a Record
-        } else if (
-          (imRecordData === null && otherRecordData !== null) ||
-          (imRecordData && !imHasRecord && otherRecordData && otherHasRecord)
-        ) {
-          if (imRecordData) {
-            // TODO check if we are retained in any async relationships
-            // TODO probably need to release other things
-            // im.destroy();
-          }
-          imRecordData = otherRecordData!;
-          // TODO do we need to notify the id change?
-          // TODO swap recordIdentifierFor result?
-
-          // just use im
-        } else {
-          // otherIm.destroy();
+        if (staleRecordData === null) {
+          return keptIdentifier;
         }
 
         /*
@@ -259,7 +216,8 @@ export class InstanceCache {
       }
       */
 
-        return intendedIdentifier;
+        this.unloadRecord(staleIdentifier);
+        return keptIdentifier;
       }
     );
   }
@@ -304,8 +262,8 @@ export class InstanceCache {
   getRecordData(identifier: StableRecordIdentifier): RecordData {
     let recordData = this.__instances.recordData.get(identifier);
 
-    if (!recordData) {
-      if (DEPRECATE_V1CACHE_STORE_APIS && this.store.createRecordDataFor.length > 2) {
+    if (DEPRECATE_V1CACHE_STORE_APIS) {
+      if (!recordData && this.store.createRecordDataFor.length > 2) {
         deprecate(
           `Store.createRecordDataFor(<type>, <id>, <lid>, <storeWrapper>) has been deprecated in favor of Store.createRecordDataFor(<identifier>, <storeWrapper>)`,
           false,
@@ -313,7 +271,7 @@ export class InstanceCache {
             id: 'ember-data:deprecate-v1cache-store-apis',
             for: 'ember-data',
             until: '5.0',
-            since: { enabled: '4.8', available: '4.8' },
+            since: { enabled: '4.7', available: '4.7' },
           }
         );
         let recordDataInstance = this.store.createRecordDataFor(
@@ -329,19 +287,22 @@ export class InstanceCache {
           recordData = this.__cacheManager =
             this.__cacheManager || new NonSingletonRecordDataManager(this.store, recordDataInstance, identifier);
         }
+      }
+    }
+
+    if (!recordData) {
+      let recordDataInstance = this.store.createRecordDataFor(identifier, this._storeWrapper);
+      if (DEPRECATE_V1_RECORD_DATA) {
+        recordData = new NonSingletonRecordDataManager(this.store, recordDataInstance, identifier);
       } else {
-        let recordDataInstance = this.store.createRecordDataFor(identifier, this._storeWrapper);
-        if (DEPRECATE_V1_RECORD_DATA) {
-          recordData = new NonSingletonRecordDataManager(this.store, recordDataInstance, identifier);
+        if (DEBUG) {
+          recordData = this.__cacheManager = this.__cacheManager || new SingletonRecordDataManager();
+          (recordData as SingletonRecordDataManager)._addRecordData(identifier, recordDataInstance as RecordData);
         } else {
-          if (DEBUG) {
-            recordData = this.__cacheManager = this.__cacheManager || new SingletonRecordDataManager();
-            (recordData as SingletonRecordDataManager)._addRecordData(identifier, recordDataInstance as RecordData);
-          } else {
-            recordData = recordDataInstance as RecordData;
-          }
+          recordData = recordDataInstance as RecordData;
         }
       }
+
       setRecordDataFor(identifier, recordData);
 
       this.__instances.recordData.set(identifier, recordData);
@@ -365,6 +326,44 @@ export class InstanceCache {
     return reference;
   }
 
+  recordIsLoaded(identifier: StableRecordIdentifier, filterDeleted: boolean = false) {
+    const recordData = this.__instances.recordData.get(identifier);
+    if (!recordData) {
+      return false;
+    }
+    const isNew = recordData.isNew(identifier);
+    const isEmpty = recordData.isEmpty(identifier);
+
+    // if we are new we must consider ourselves loaded
+    if (isNew) {
+      return !recordData.isDeleted(identifier);
+    }
+    // even if we have a past request, if we are now empty we are not loaded
+    // typically this is true after an unloadRecord call
+
+    // if we are not empty, not new && we have a fulfilled request then we are loaded
+    // we should consider allowing for something to be loaded that is simply "not empty".
+    // which is how RecordState currently handles this case; however, RecordState is buggy
+    // in that it does not account for unloading.
+    return filterDeleted && recordData.isDeletionCommitted(identifier) ? false : !isEmpty;
+
+    /*
+    const req = this.store.getRequestStateService();
+    const fulfilled = req.getLastRequestForRecord(identifier);
+    const isLocallyLoaded = !isEmpty;
+    const isLoading =
+      !isLocallyLoaded &&
+      fulfilled === null &&
+      req.getPendingRequestsForRecord(identifier).some((req) => req.type === 'query');
+
+    if (isEmpty || (filterDeleted && recordData.isDeletionCommitted(identifier)) || isLoading) {
+      return false;
+    }
+
+    return true;
+    */
+  }
+
   createSnapshot(identifier: StableRecordIdentifier, options: FindOptions = {}): Snapshot {
     return new Snapshot(options, identifier, this.store);
   }

package/addon/-private/index.ts

@@ -30,7 +30,7 @@ export function normalizeModelName(modelName: string) {
         id: 'ember-data:deprecate-normalize-modelname-helper',
         for: 'ember-data',
         until: '5.0',
-        since: { available: '4.8', enabled: '4.8' },
+        since: { available: '4.7', enabled: '4.7' },
       }
     );
     return _normalize(modelName);

package/addon/-private/legacy-model-support/schema-definition-service.ts

@@ -39,18 +39,22 @@ export class DSModelSchemaDefinitionService {
   // Following the existing RD implementation
   attributesDefinitionFor(identifier: RecordIdentifier | { type: string }): AttributesSchema {
     let modelName, attributes;
-    if (DEPRECATE_STRING_ARG_SCHEMAS && typeof identifier === 'string') {
-      deprecate(
-        `attributesDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
-        false,
-        {
-          id: 'ember-data:deprecate-string-arg-schemas',
-          for: 'ember-data',
-          until: '5.0',
-          since: { enabled: '4.5', available: '4.5' },
-        }
-      );
-      modelName = identifier;
+    if (DEPRECATE_STRING_ARG_SCHEMAS) {
+      if (typeof identifier === 'string') {
+        deprecate(
+          `attributesDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
+          false,
+          {
+            id: 'ember-data:deprecate-string-arg-schemas',
+            for: 'ember-data',
+            until: '5.0',
+            since: { enabled: '4.5', available: '4.5' },
+          }
+        );
+        modelName = identifier;
+      } else {
+        modelName = identifier.type;
+      }
     } else {
       modelName = identifier.type;
     }
@@ -72,18 +76,22 @@ export class DSModelSchemaDefinitionService {
   // Following the existing RD implementation
   relationshipsDefinitionFor(identifier: RecordIdentifier | { type: string }): RelationshipsSchema {
     let modelName, relationships;
-    if (DEPRECATE_STRING_ARG_SCHEMAS && typeof identifier === 'string') {
-      deprecate(
-        `relationshipsDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
-        false,
-        {
-          id: 'ember-data:deprecate-string-arg-schemas',
-          for: 'ember-data',
-          until: '5.0',
-          since: { enabled: '4.5', available: '4.5' },
-        }
-      );
-      modelName = identifier;
+    if (DEPRECATE_STRING_ARG_SCHEMAS) {
+      if (typeof identifier === 'string') {
+        deprecate(
+          `relationshipsDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
+          false,
+          {
+            id: 'ember-data:deprecate-string-arg-schemas',
+            for: 'ember-data',
+            until: '5.0',
+            since: { enabled: '4.5', available: '4.5' },
+          }
+        );
+        modelName = identifier;
+      } else {
+        modelName = identifier.type;
+      }
     } else {
       modelName = identifier.type;
     }

package/addon/-private/managers/record-array-manager.ts

@@ -1,6 +1,7 @@
 /**
   @module @ember-data/store
 */
+import { addToTransaction } from '@ember-data/tracking/-private';
 import type { CollectionResourceDocument } from '@ember-data/types/q/ember-data-json-api';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { Dict } from '@ember-data/types/q/utils';
@@ -60,7 +61,7 @@ export function fastPush<T>(target: T[], source: T[]) {
   let newLength = source.length;
   while (newLength - startLength > SLICE_BATCH_SIZE) {
     // eslint-disable-next-line prefer-spread
-    target.push.apply(target, source.slice(startLength, SLICE_BATCH_SIZE));
+    target.push.apply(target, source.slice(startLength, startLength + SLICE_BATCH_SIZE));
     startLength += SLICE_BATCH_SIZE;
   }
   // eslint-disable-next-line prefer-spread
@@ -167,14 +168,16 @@ class RecordArrayManager {
     return array;
   }
 
-  dirtyArray(array: IdentifierArray): void {
+  dirtyArray(array: IdentifierArray, delta: number): void {
     if (array === FAKE_ARR) {
       return;
     }
     let tag = array[IDENTIFIER_ARRAY_TAG];
     if (!tag.shouldReset) {
       tag.shouldReset = true;
-      tag.ref = null;
+      addToTransaction(tag);
+    } else if (delta > 0 && tag.t) {
+      addToTransaction(tag);
     }
   }
 
@@ -257,9 +260,7 @@ class RecordArrayManager {
         } else {
           changes.set(identifier, 'add');
 
-          if (changes.size === 1) {
-            this.dirtyArray(array);
-          }
+          this.dirtyArray(array, changes.size);
         }
       });
     }
@@ -275,9 +276,7 @@ class RecordArrayManager {
         } else {
           changes.set(identifier, 'del');
 
-          if (changes.size === 1) {
-            this.dirtyArray(array);
-          }
+          this.dirtyArray(array, changes.size);
         }
       });
     }

package/addon/-private/managers/record-data-manager.ts

@@ -6,7 +6,7 @@ import type {
   SingleResourceRelationship,
 } from '@ember-data/types/q/ember-data-json-api';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
-import type { ChangedAttributesHash, RecordData, RecordDataV1 } from '@ember-data/types/q/record-data';
+import type { ChangedAttributesHash, MergeOperation, RecordData, RecordDataV1 } from '@ember-data/types/q/record-data';
 import type { JsonApiResource, JsonApiValidationError } from '@ember-data/types/q/record-data-json-api';
 import type { Dict } from '@ember-data/types/q/utils';
 
@@ -76,7 +76,7 @@ export class NonSingletonRecordDataManager implements RecordData {
         {
           id: 'ember-data:deprecate-v1-cache',
           until: '5.0',
-          since: { available: '4.8', enabled: '4.8' },
+          since: { available: '4.7', enabled: '4.7' },
           for: 'ember-data',
         }
       );
@@ -128,6 +128,25 @@ export class NonSingletonRecordDataManager implements RecordData {
     return recordData.pushData(identifier, data, hasRecord);
   }
 
+  /**
+   * Perform an operation on the cache to update the remote state.
+   *
+   * Note: currently the only valid operation is a MergeOperation
+   * which occurs when a collision of identifiers is detected.
+   *
+   * @method sync
+   * @public
+   * @param op the operation to perform
+   * @returns {void}
+   */
+  sync(op: MergeOperation): void {
+    const recordData = this.#recordData;
+    if (this.#isDeprecated(recordData)) {
+      return;
+    }
+    recordData.sync(op);
+  }
+
   /**
    * Update resource data with a local mutation. Currently supports operations
    * on relationships only.
@@ -395,7 +414,7 @@ export class NonSingletonRecordDataManager implements RecordData {
    * @method hasChangedAttributes
    * @public
    * @deprecated
-   * @returns
+   * @returns {boolean}
    */
   hasChangedAttributes(): boolean {
     const recordData = this.#recordData;
@@ -410,7 +429,7 @@ export class NonSingletonRecordDataManager implements RecordData {
    * @method hasChangedAttrs
    * @public
    * @param identifier
-   * @returns
+   * @returns {boolean}
    */
   hasChangedAttrs(identifier: StableRecordIdentifier): boolean {
     const recordData = this.#recordData;
@@ -740,6 +759,10 @@ export class SingletonRecordDataManager implements RecordData {
     return this.#recordData(identifier).pushData(identifier, data, hasRecord);
   }
 
+  sync(op: MergeOperation): void {
+    this.#recordData(op.record).sync(op);
+  }
+
   clientDidCreate(identifier: StableRecordIdentifier, options?: Dict<unknown>): Dict<unknown> {
     return this.#recordData(identifier).clientDidCreate(identifier, options);
   }

package/addon/-private/managers/record-data-store-wrapper.ts

@@ -99,7 +99,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
         id: 'ember-data:deprecate-v1cache-store-apis',
         for: 'ember-data',
         until: '5.0',
-        since: { enabled: '4.8', available: '4.8' },
+        since: { enabled: '4.7', available: '4.7' },
       });
     }
     const resource = constructResource(type, id, lid);
@@ -117,7 +117,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
           id: 'ember-data:deprecate-v1cache-store-apis',
           for: 'ember-data',
           until: '5.0',
-          since: { enabled: '4.8', available: '4.8' },
+          since: { enabled: '4.7', available: '4.7' },
         }
       );
     }
@@ -133,7 +133,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
           id: 'ember-data:deprecate-v1cache-store-apis',
           for: 'ember-data',
           until: '5.0',
-          since: { enabled: '4.8', available: '4.8' },
+          since: { enabled: '4.7', available: '4.7' },
         }
       );
     }
@@ -152,7 +152,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
         id: 'ember-data:deprecate-v1cache-store-apis',
         for: 'ember-data',
         until: '5.0',
-        since: { enabled: '4.8', available: '4.8' },
+        since: { enabled: '4.7', available: '4.7' },
       });
     }
     const resource = constructResource(type, id, lid);
@@ -169,7 +169,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
         id: 'ember-data:deprecate-v1cache-store-apis',
         for: 'ember-data',
         until: '5.0',
-        since: { enabled: '4.8', available: '4.8' },
+        since: { enabled: '4.7', available: '4.7' },
       });
     }
     const resource = constructResource(type, id, lid);
@@ -185,7 +185,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
         id: 'ember-data:deprecate-v1cache-store-apis',
         for: 'ember-data',
         until: '5.0',
-        since: { enabled: '4.8', available: '4.8' },
+        since: { enabled: '4.7', available: '4.7' },
       });
     }
     const resource = constructResource(type, id, lid);
@@ -202,7 +202,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
         id: 'ember-data:deprecate-v1cache-store-apis',
         for: 'ember-data',
         until: '5.0',
-        since: { enabled: '4.8', available: '4.8' },
+        since: { enabled: '4.7', available: '4.7' },
       });
     }
     const resource = constructResource(type, id, lid);
@@ -277,7 +277,7 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
         id: 'ember-data:deprecate-v1cache-store-apis',
         for: 'ember-data',
         until: '5.0',
-        since: { enabled: '4.8', available: '4.8' },
+        since: { enabled: '4.7', available: '4.7' },
       });
     }
     const resource = constructResource(type, id, lid);
@@ -297,19 +297,23 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
   disconnectRecord(type: StableRecordIdentifier): void;
   disconnectRecord(type: string | StableRecordIdentifier, id?: string | null, lid?: string | null): void {
     let identifier: StableRecordIdentifier;
-    if (DEPRECATE_V1CACHE_STORE_APIS && typeof type === 'string') {
-      deprecate(
-        `StoreWrapper.disconnectRecord(<type>) has been deprecated in favor of StoreWrapper.disconnectRecord(<identifier>)`,
-        false,
-        {
-          id: 'ember-data:deprecate-v1cache-store-apis',
-          for: 'ember-data',
-          until: '5.0',
-          since: { enabled: '4.8', available: '4.8' },
-        }
-      );
-      let resource = constructResource(type, id, lid) as RecordIdentifier;
-      identifier = this.identifierCache.peekRecordIdentifier(resource)!;
+    if (DEPRECATE_V1CACHE_STORE_APIS) {
+      if (typeof type === 'string') {
+        deprecate(
+          `StoreWrapper.disconnectRecord(<type>) has been deprecated in favor of StoreWrapper.disconnectRecord(<identifier>)`,
+          false,
+          {
+            id: 'ember-data:deprecate-v1cache-store-apis',
+            for: 'ember-data',
+            until: '5.0',
+            since: { enabled: '4.7', available: '4.7' },
+          }
+        );
+        let resource = constructResource(type, id, lid) as RecordIdentifier;
+        identifier = this.identifierCache.peekRecordIdentifier(resource)!;
+      } else {
+        identifier = type as StableRecordIdentifier;
+      }
     } else {
       identifier = type as StableRecordIdentifier;
     }

package/addon/-private/managers/record-notification-manager.ts

@@ -24,9 +24,11 @@ export interface NotificationCallback {
 // TODO this isn't importable anyway, remove and use a map on the manager?
 export function unsubscribe(token: UnsubscribeToken) {
   let identifier = Tokens.get(token);
-  if (LOG_NOTIFICATIONS && !identifier) {
-    // eslint-disable-next-line no-console
-    console.log('Passed unknown unsubscribe token to unsubscribe', identifier);
+  if (LOG_NOTIFICATIONS) {
+    if (!identifier) {
+      // eslint-disable-next-line no-console
+      console.log('Passed unknown unsubscribe token to unsubscribe', identifier);
+    }
   }
   if (identifier) {
     Tokens.delete(token);