@ember-data/model 4.6.0 → 4.6.2

package/addon/-private/references/belongs-to.ts

@@ -56,8 +56,8 @@ export default class BelongsToReference {
   declare store: Store;
 
   // unsubscribe tokens given to us by the notification manager
-  #token!: Object;
-  #relatedToken: Object | null = null;
+  #token!: object;
+  #relatedToken: object | null = null;
 
   @tracked _ref = 0;
 
@@ -89,8 +89,10 @@ export default class BelongsToReference {
     // TODO @feature we need the notification manager often enough
     // we should potentially just expose it fully public
     this.store._notificationManager.unsubscribe(this.#token);
+    this.#token = null as unknown as object;
     if (this.#relatedToken) {
       this.store._notificationManager.unsubscribe(this.#relatedToken);
+      this.#relatedToken = null;
     }
   }
 
@@ -100,6 +102,7 @@ export default class BelongsToReference {
     this._ref; // consume the tracked prop
     if (this.#relatedToken) {
       this.store._notificationManager.unsubscribe(this.#relatedToken);
+      this.#relatedToken = null;
     }
 
     let resource = this._resource();

package/addon/-private/references/has-many.ts

@@ -104,29 +104,37 @@ export default class HasManyReference {
 
     let resource = this._resource();
 
-    this.#relatedTokenMap.forEach((token) => {
-      this.store._notificationManager.unsubscribe(token);
-    });
-    this.#relatedTokenMap.clear();
+    let map = this.#relatedTokenMap;
+    this.#relatedTokenMap = new Map();
 
     if (resource && resource.data) {
       return resource.data.map((resourceIdentifier) => {
         const identifier = this.store.identifierCache.getOrCreateRecordIdentifier(resourceIdentifier);
-        const token = this.store._notificationManager.subscribe(
-          identifier,
-          (_: StableRecordIdentifier, bucket: NotificationType, notifiedKey?: string) => {
-            if (bucket === 'identity' || ((bucket === 'attributes' || bucket === 'property') && notifiedKey === 'id')) {
-              this._ref++;
+        let token = map.get(identifier);
+
+        if (token) {
+          map.delete(identifier);
+        } else {
+          token = this.store._notificationManager.subscribe(
+            identifier,
+            (_: StableRecordIdentifier, bucket: NotificationType, notifiedKey?: string) => {
+              if (bucket === 'identity' || (bucket === 'attributes' && notifiedKey === 'id')) {
+                this._ref++;
+              }
             }
-          }
-        );
-
+          );
+        }
         this.#relatedTokenMap.set(identifier, token);
 
         return identifier;
       });
     }
 
+    map.forEach((token) => {
+      this.store._notificationManager.unsubscribe(token);
+    });
+    map.clear();
+
     return [];
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,9 +18,9 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.6.0",
-    "@ember-data/private-build-infra": "4.6.0",
-    "@ember-data/store": "4.6.0",
+    "@ember-data/canary-features": "4.6.2",
+    "@ember-data/private-build-infra": "4.6.2",
+    "@ember-data/store": "4.6.2",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^3.0.0",
     "@embroider/macros": "^1.8.3",
@@ -34,7 +34,7 @@
     "inflection": "~1.13.2"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.6.0",
+    "@ember-data/unpublished-test-infra": "4.6.2",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "~2.7.0",
     "broccoli-asset-rev": "^3.0.0",
@@ -61,8 +61,7 @@
     "webpack": "^5.74.0"
   },
   "engines": {
-    "node": "^14.8.0 || 16.* || >= 18.*",
-    "yarn": "1.22.19"
+    "node": "^14.8.0 || 16.* || >= 18.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"