@ember-data/store 4.11.1 → 4.11.3

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

@@ -37,7 +37,7 @@ import { assertIdentifierHasId } from '../store-service';
 import coerceId, { ensureStringId } from '../utils/coerce-id';
 import constructResource from '../utils/construct-resource';
 import normalizeModelName from '../utils/normalize-model-name';
-import { removeRecordDataFor, setRecordDataFor } from './record-data-for';
+import { RecordDataForIdentifierCache, removeRecordDataFor, setRecordDataFor } from './record-data-for';
 
 let _peekGraph: peekGraph;
 if (HAS_RECORD_DATA_PACKAGE) {
@@ -237,6 +237,10 @@ export class InstanceCache {
     let record = this.__instances.record.get(identifier);
 
     if (!record) {
+      assert(
+        `Cannot create a new record instance while the store is being destroyed`,
+        !this.store.isDestroying && !this.store.isDestroyed
+      );
       const recordData = this.getRecordData(identifier);
 
       record = this.store.instantiateRecord(
@@ -693,3 +697,9 @@ function _isLoading(cache: InstanceCache, identifier: StableRecordIdentifier): b
     req.getPendingRequestsForRecord(identifier).some((req) => req.type === 'query')
   );
 }
+
+export function _clearCaches() {
+  RecordCache.clear();
+  StoreMap.clear();
+  RecordDataForIdentifierCache.clear();
+}

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

@@ -9,7 +9,7 @@ import type { RecordInstance } from '@ember-data/types/q/record-instance';
  * Model or Identifier
  */
 
-const RecordDataForIdentifierCache = new Map<StableRecordIdentifier | RecordInstance, RecordData>();
+export const RecordDataForIdentifierCache = new Map<StableRecordIdentifier | RecordInstance, RecordData>();
 
 export function setRecordDataFor(identifier: StableRecordIdentifier | RecordInstance, recordData: RecordData): void {
   assert(

package/addon/-private/index.ts

@@ -46,6 +46,7 @@ export {
   default as RecordArray,
   default as IdentifierArray,
   Collection as AdapterPopulatedRecordArray,
+  notifyArray,
   SOURCE,
   MUTATE,
   IDENTIFIER_ARRAY_TAG,
@@ -56,4 +57,5 @@ export { default as RecordArrayManager, fastPush } from './managers/record-array
 export { default as SnapshotRecordArray } from './network/snapshot-record-array';
 
 // leaked for private use / test use, should investigate removing
+export { _clearCaches } from './caches/instance-cache';
 export { default as recordDataFor, removeRecordDataFor } from './caches/record-data-for';

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

@@ -1,7 +1,7 @@
 /**
   @module @ember-data/store
 */
-import { addToTransaction } from '@ember-data/tracking/-private';
+import { addTransactionCB } 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';
@@ -10,6 +10,8 @@ import IdentifierArray, {
   Collection,
   CollectionCreateOptions,
   IDENTIFIER_ARRAY_TAG,
+  NOTIFY,
+  notifyArray,
   SOURCE,
 } from '../record-arrays/identifier-array';
 import type Store from '../store-service';
@@ -175,9 +177,9 @@ class RecordArrayManager {
     let tag = array[IDENTIFIER_ARRAY_TAG];
     if (!tag.shouldReset) {
       tag.shouldReset = true;
-      addToTransaction(tag);
-    } else if (delta > 0 && tag.t) {
-      addToTransaction(tag);
+      addTransactionCB(array[NOTIFY]);
+    } else if (delta > 0 && !tag.t) {
+      addTransactionCB(array[NOTIFY]);
     }
   }
 
@@ -244,7 +246,8 @@ class RecordArrayManager {
     const old = source.slice();
     source.length = 0;
     fastPush(source, identifiers);
-    array[IDENTIFIER_ARRAY_TAG].ref = null;
+
+    notifyArray(array);
     array.meta = payload.meta || null;
     array.links = payload.links || null;
     array.isLoaded = true;

package/addon/-private/proxies/promise-proxies.ts

@@ -135,7 +135,7 @@ export function promiseArray<I, T extends EmberArrayLike<I>>(promise: Promise<T>
         return Reflect.get(target, prop, receiver);
       }
       if (ALLOWABLE_PROPS.includes(prop)) {
-        return receiver[prop];
+        return target[prop];
       }
       if (!ALLOWABLE_METHODS.includes(prop)) {
         deprecate(
@@ -190,7 +190,7 @@ export function promiseObject<T>(promise: Promise<T>): PromiseObjectProxy<T> {
       }
 
       if (ALLOWABLE_PROPS.includes(prop)) {
-        return receiver[prop];
+        return target[prop];
       }
 
       if (!ALLOWABLE_METHODS.includes(prop)) {

package/addon/-private/record-arrays/identifier-array.ts

@@ -1,17 +1,22 @@
 /**
   @module @ember-data/store
 */
+// @ts-expect-error
+import { tagForProperty } from '@ember/-internals/metal';
 import { assert, deprecate } from '@ember/debug';
 import { get, set } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { compare } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 import { tracked } from '@glimmer/tracking';
+// @ts-expect-error
+import { dirtyTag } from '@glimmer/validator';
 import Ember from 'ember';
 
 import {
   DEPRECATE_A_USAGE,
   DEPRECATE_ARRAY_LIKE,
+  DEPRECATE_COMPUTED_CHAINS,
   DEPRECATE_PROMISE_PROXIES,
   DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS,
 } from '@ember-data/private-build-infra/deprecations';
@@ -63,6 +68,18 @@ function isArraySetter(prop: KeyType): boolean {
 export const IDENTIFIER_ARRAY_TAG = Symbol('#tag');
 export const SOURCE = Symbol('#source');
 export const MUTATE = Symbol('#update');
+export const NOTIFY = Symbol('#notify');
+
+export function notifyArray(arr: IdentifierArray) {
+  arr[IDENTIFIER_ARRAY_TAG].ref = null;
+
+  if (DEPRECATE_COMPUTED_CHAINS) {
+    // eslint-disable-next-line
+    dirtyTag(tagForProperty(arr, 'length'));
+    // eslint-disable-next-line
+    dirtyTag(tagForProperty(arr, '[]'));
+  }
+}
 
 function convertToInt(prop: KeyType): number | null {
   if (typeof prop === 'symbol') return null;
@@ -76,8 +93,16 @@ function convertToInt(prop: KeyType): number | null {
 
 class Tag {
   @tracked ref = null;
-  shouldReset: boolean = false;
-  t = false;
+  declare shouldReset: boolean;
+  /*
+   * whether this was part of a transaction when last mutated
+   */
+  declare t: boolean;
+
+  constructor() {
+    this.shouldReset = false;
+    this.t = false;
+  }
 }
 
 type ProxiedMethod = (...args: unknown[]) => unknown;
@@ -127,11 +152,9 @@ interface PrivateState {
   @class RecordArray
   @public
 */
-
-interface IdentifierArray {
+interface IdentifierArray extends Omit<Array<RecordInstance>, '[]'> {
   [MUTATE]?(prop: string, args: unknown[], result?: unknown): void;
 }
-interface IdentifierArray extends Array<RecordInstance> {}
 class IdentifierArray {
   declare DEPRECATED_CLASS_NAME: string;
   /**
@@ -155,6 +178,9 @@ class IdentifierArray {
 
   [IDENTIFIER_ARRAY_TAG] = new Tag();
   [SOURCE]: StableRecordIdentifier[];
+  [NOTIFY]() {
+    notifyArray(this);
+  }
 
   declare links: Links | PaginationLinks | null;
   declare meta: Dict<unknown> | null;
@@ -183,7 +209,7 @@ class IdentifierArray {
     // changing the reference breaks the Proxy
     // this[SOURCE] = [];
     this[SOURCE].length = 0;
-    this[IDENTIFIER_ARRAY_TAG].ref = null;
+    this[NOTIFY]();
     this.isDestroyed = true;
   }
 
@@ -196,6 +222,14 @@ class IdentifierArray {
     this[SOURCE].length = value;
   }
 
+  // here to support computed chains
+  // and {{#each}}
+  get '[]'() {
+    if (DEPRECATE_COMPUTED_CHAINS) {
+      return this;
+    }
+  }
+
   constructor(options: IdentifierArrayCreateOptions) {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     let self = this;
@@ -296,6 +330,10 @@ class IdentifierArray {
             }
           }
 
+          if (prop === NOTIFY || prop === IDENTIFIER_ARRAY_TAG || prop === SOURCE) {
+            return self[prop];
+          }
+
           let fn = boundFns.get(prop);
           if (fn) return fn;
 
@@ -403,6 +441,8 @@ class IdentifierArray {
       };
     }
 
+    this[NOTIFY] = this[NOTIFY].bind(proxy);
+
     return proxy;
   }
 
@@ -544,7 +584,7 @@ export class Collection extends IdentifierArray {
 Collection.prototype.query = null;
 
 // Ensure instanceof works correctly
-// Object.setPrototypeOf(IdentifierArray.prototype, Array.prototype);
+//Object.setPrototypeOf(IdentifierArray.prototype, Array.prototype);
 
 if (DEPRECATE_ARRAY_LIKE) {
   IdentifierArray.prototype.DEPRECATED_CLASS_NAME = 'RecordArray';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.11.1",
+  "version": "4.11.3",
   "description": "The core of EmberData. Provides the Store service which coordinates the cache with the network and presentation layers.",
   "keywords": [
     "ember-addon"
@@ -14,9 +14,9 @@
   "author": "",
   "directories": {},
   "peerDependencies": {
-    "@ember-data/model": "4.11.1",
-    "@ember-data/record-data": "4.11.1",
-    "@ember-data/tracking": "4.11.1",
+    "@ember-data/model": "4.11.3",
+    "@ember-data/record-data": "4.11.3",
+    "@ember-data/tracking": "4.11.3",
     "@ember/string": "^3.0.1",
     "@glimmer/tracking": "^1.1.2"
   },
@@ -37,8 +37,8 @@
     }
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.11.1",
-    "@ember-data/private-build-infra": "4.11.1",
+    "@ember-data/canary-features": "4.11.3",
+    "@ember-data/private-build-infra": "4.11.3",
     "@embroider/macros": "^1.10.0",
     "ember-auto-import": "^2.4.3",
     "ember-cached-decorator-polyfill": "^1.0.1",