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

package/addon/-private/caches/record-data-for.ts

@@ -1,20 +1,15 @@
 import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
 
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { RecordData } from '@ember-data/types/q/record-data';
 import type { RecordInstance } from '@ember-data/types/q/record-instance';
 
-import WeakCache from '../utils/weak-cache';
-
 /*
  * Returns the RecordData instance associated with a given
  * Model or Identifier
  */
 
-const RecordDataForIdentifierCache = new WeakCache<StableRecordIdentifier | RecordInstance, RecordData>(
-  DEBUG ? 'recordData' : ''
-);
+const RecordDataForIdentifierCache = new Map<StableRecordIdentifier | RecordInstance, RecordData>();
 
 export function setRecordDataFor(identifier: StableRecordIdentifier | RecordInstance, recordData: RecordData): void {
   assert(

package/addon/-private/index.ts

@@ -18,6 +18,7 @@ export {
   setIdentifierUpdateMethod,
   setIdentifierForgetMethod,
   setIdentifierResetMethod,
+  isStableIdentifier,
 } from './caches/identifier-cache';
 
 export function normalizeModelName(modelName: string) {
@@ -37,20 +38,22 @@ export function normalizeModelName(modelName: string) {
   assert(`normalizeModelName support has been removed`);
 }
 
+// TODO this should be a deprecated helper but we have so much usage of it
+// to also eliminate
 export { default as coerceId } from './utils/coerce-id';
 
-export { PromiseArray, PromiseObject, deprecatedPromiseObject } from './proxies/promise-proxies';
-
-export { default as RecordArray } from './record-arrays/record-array';
-export { default as AdapterPopulatedRecordArray } from './record-arrays/adapter-populated-record-array';
-
-export { default as RecordArrayManager } from './managers/record-array-manager';
+export {
+  default as RecordArray,
+  default as IdentifierArray,
+  Collection as AdapterPopulatedRecordArray,
+  SOURCE,
+  MUTATE,
+  IDENTIFIER_ARRAY_TAG,
+} from './record-arrays/identifier-array';
+export { default as RecordArrayManager, fastPush } from './managers/record-array-manager';
 
 // // Used by tests
 export { default as SnapshotRecordArray } from './network/snapshot-record-array';
 
-// New
+// leaked for private use / test use, should investigate removing
 export { default as recordDataFor, removeRecordDataFor } from './caches/record-data-for';
-export { default as RecordDataStoreWrapper } from './managers/record-data-store-wrapper';
-
-export { default as WeakCache } from './utils/weak-cache';

package/addon/-private/legacy-model-support/record-reference.ts

@@ -27,18 +27,20 @@ import type Store from '../store-service';
    @extends Reference
 */
 export default class RecordReference {
+  declare store: Store;
   // unsubscribe token given to us by the notification manager
-  #token!: Object;
-  #identifier: StableRecordIdentifier;
+  ___token!: Object;
+  ___identifier: StableRecordIdentifier;
 
   @tracked _ref = 0;
 
-  constructor(public store: Store, identifier: StableRecordIdentifier) {
-    this.#identifier = identifier;
-    this.#token = store._notificationManager.subscribe(
+  constructor(store: Store, identifier: StableRecordIdentifier) {
+    this.store = store;
+    this.___identifier = identifier;
+    this.___token = store._notificationManager.subscribe(
       identifier,
       (_: StableRecordIdentifier, bucket: NotificationType, notifiedKey?: string) => {
-        if (bucket === 'identity' || ((bucket === 'attributes' || bucket === 'property') && notifiedKey === 'id')) {
+        if (bucket === 'identity' || (bucket === 'attributes' && notifiedKey === 'id')) {
           this._ref++;
         }
       }
@@ -46,7 +48,7 @@ export default class RecordReference {
   }
 
   destroy() {
-    unsubscribe(this.#token);
+    unsubscribe(this.___token);
   }
 
   get type(): string {
@@ -73,7 +75,7 @@ export default class RecordReference {
   */
   id() {
     this._ref; // consume the tracked prop
-    return this.#identifier.id;
+    return this.___identifier.id;
   }
 
   /**
@@ -95,7 +97,7 @@ export default class RecordReference {
      @return {String} The identifier of the record.
   */
   identifier(): StableRecordIdentifier {
-    return this.#identifier;
+    return this.___identifier;
   }
 
   /**
@@ -183,7 +185,7 @@ export default class RecordReference {
      @return {Model} the record for this RecordReference
   */
   value(): RecordInstance | null {
-    return this.store.peekRecord(this.#identifier);
+    return this.store.peekRecord(this.___identifier);
   }
 
   /**

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

@@ -26,10 +26,15 @@ if (HAS_MODEL_PACKAGE) {
 }
 
 export class DSModelSchemaDefinitionService {
-  private _relationshipsDefCache = Object.create(null);
-  private _attributesDefCache = Object.create(null);
-
-  constructor(public store: Store) {}
+  declare store: Store;
+  declare _relationshipsDefCache;
+  declare _attributesDefCache;
+
+  constructor(store: Store) {
+    this.store = store;
+    this._relationshipsDefCache = Object.create(null);
+    this._attributesDefCache = Object.create(null);
+  }
 
   // Following the existing RD implementation
   attributesDefinitionFor(identifier: RecordIdentifier | { type: string }): AttributesSchema {

package/addon/-private/legacy-model-support/shim-model-class.ts

@@ -1,18 +1,21 @@
-import { DEBUG } from '@glimmer/env';
-
 import type { ModelSchema } from '@ember-data/types/q/ds-model';
 import type { AttributeSchema, RelationshipSchema } from '@ember-data/types/q/record-data-schemas';
 import type { Dict } from '@ember-data/types/q/utils';
 
 import type Store from '../store-service';
-import WeakCache from '../utils/weak-cache';
 
-const AvailableShims = new WeakCache<Store, Dict<ShimModelClass>>(DEBUG ? 'schema-shims' : '');
-AvailableShims._generator = () => {
-  return Object.create(null) as Dict<ShimModelClass>;
-};
+// if modelFor turns out to be a bottleneck we should replace with a Map
+// and clear it during store teardown.
+const AvailableShims = new WeakMap<Store, Dict<ShimModelClass>>();
+
 export function getShimClass(store: Store, modelName: string): ShimModelClass {
-  let shims = AvailableShims.lookup(store);
+  let shims = AvailableShims.get(store);
+
+  if (!shims) {
+    shims = Object.create(null) as Dict<ShimModelClass>;
+    AvailableShims.set(store, shims);
+  }
+
   let shim = shims[modelName];
   if (shim === undefined) {
     shim = shims[modelName] = new ShimModelClass(store, modelName);
@@ -33,8 +36,12 @@ function mapFromHash<T>(hash: Dict<T>): Map<string, T> {
 
 // Mimics the static apis of DSModel
 export default class ShimModelClass implements ModelSchema {
-  // TODO Maybe expose the class here?
-  constructor(private __store: Store, public modelName: string) {}
+  declare __store: Store;
+  declare modelName: string;
+  constructor(store: Store, modelName: string) {
+    this.__store = store;
+    this.modelName = modelName;
+  }
 
   get fields(): Map<string, 'attribute' | 'belongsTo' | 'hasMany'> {
     let attrs = this.__store.getSchemaDefinitionService().attributesDefinitionFor({ type: this.modelName });