@ember-data/store 4.2.0-alpha.8 → 4.2.0-alpha.9

package/addon/-private/identifiers/cache.ts

@@ -5,8 +5,8 @@ import { assert, warn } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 import coerceId from '../system/coerce-id';
-import type CoreStore from '../system/core-store';
 import normalizeModelName from '../system/normalize-model-name';
+import WeakCache from '../system/weak-cache';
 import type { ExistingResourceObject, ResourceIdentifierObject } from '../ts-interfaces/ember-data-json-api';
 import type {
   ForgetMethod,
@@ -81,24 +81,11 @@ function defaultGenerationMethod(data: ResourceData | { type: string }, bucket:
   return uuidv4();
 }
 
-const IdentifierCaches = new WeakMap<CoreStore, IdentifierCache>();
-
-export function identifierCacheFor(store: CoreStore): IdentifierCache {
-  let cache = IdentifierCaches.get(store);
-
-  if (cache === undefined) {
-    cache = new IdentifierCache();
-    IdentifierCaches.set(store, cache);
-  }
-
-  return cache;
-}
-
 function defaultEmptyCallback(...args: any[]): any {}
 
 let DEBUG_MAP;
 if (DEBUG) {
-  DEBUG_MAP = new WeakMap<StableRecordIdentifier, StableRecordIdentifier>();
+  DEBUG_MAP = new WeakCache<StableRecordIdentifier, StableRecordIdentifier>('identifier-proxy-target');
 }
 
 /**
@@ -511,9 +498,9 @@ function makeStableRecordIdentifier(
     };
     wrapper[DEBUG_CLIENT_ORIGINATED] = clientOriginated;
     wrapper[DEBUG_IDENTIFIER_BUCKET] = bucket;
-    wrapper = freeze(wrapper);
     markStableIdentifier(wrapper);
     DEBUG_MAP.set(wrapper, recordIdentifier);
+    wrapper = freeze(wrapper);
     return wrapper;
   }
 

package/addon/-private/identifiers/is-stable-identifier.ts

@@ -3,14 +3,14 @@ import type { StableRecordIdentifier } from '../ts-interfaces/identifier';
   @module @ember-data/store
 */
 
-const IDENTIFIERS = new WeakMap();
+const IDENTIFIERS = new WeakSet();
 
 export default function isStableIdentifier(identifier: Object): identifier is StableRecordIdentifier {
   return IDENTIFIERS.has(identifier);
 }
 
 export function markStableIdentifier(identifier: Object) {
-  IDENTIFIERS.set(identifier, 'is-identifier');
+  IDENTIFIERS.add(identifier);
 }
 
 export function unmarkStableIdentifier(identifier: Object) {

package/addon/-private/index.ts

@@ -8,7 +8,6 @@ export { recordIdentifierFor } from './system/store/internal-model-factory';
 
 export { default as Snapshot } from './system/snapshot';
 export {
-  identifierCacheFor,
   setIdentifierGenerationMethod,
   setIdentifierUpdateMethod,
   setIdentifierForgetMethod,
@@ -37,5 +36,4 @@ export { default as SnapshotRecordArray } from './system/snapshot-record-array';
 export { default as recordDataFor, removeRecordDataFor } from './system/record-data-for';
 export { default as RecordDataStoreWrapper } from './system/store/record-data-store-wrapper';
 
-// for Model
-export { default as DeprecatedEvented } from './system/deprecated-evented';
+export { default as WeakCache } from './system/weak-cache';