@ember-data/store 4.11.0 → 4.11.2

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,

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

@@ -122,9 +122,11 @@ export function getModelFactory(store: Store, cache, normalizedModelName: string
     let owner: any = getOwner(store);
     factory = owner.factoryFor(`model:${normalizedModelName}`);
 
-    if (!factory && HAS_MODEL_PACKAGE) {
-      //Support looking up mixins as base types for polymorphic relationships
-      factory = _modelForMixin(store, normalizedModelName);
+    if (HAS_MODEL_PACKAGE) {
+      if (!factory) {
+        //Support looking up mixins as base types for polymorphic relationships
+        factory = _modelForMixin(store, normalizedModelName);
+      }
     }
 
     if (!factory) {

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/network/fetch-manager.ts

@@ -217,14 +217,16 @@ export default class FetchManager {
         const recordData = store._instanceCache.peek({ identifier, bucket: 'recordData' });
         if (!recordData || recordData.isEmpty(identifier) || isLoading) {
           let isReleasable = true;
-          if (!recordData && HAS_RECORD_DATA_PACKAGE) {
-            const graphFor = (
-              importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private')
-            ).graphFor;
-            const graph = graphFor(store);
-            isReleasable = graph.isReleasable(identifier);
-            if (!isReleasable) {
-              graph.unload(identifier, true);
+          if (HAS_RECORD_DATA_PACKAGE) {
+            if (!recordData) {
+              const graphFor = (
+                importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private')
+              ).graphFor;
+              const graph = graphFor(store);
+              isReleasable = graph.isReleasable(identifier);
+              if (!isReleasable) {
+                graph.unload(identifier, true);
+              }
             }
           }
           if (recordData || isReleasable) {

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/addon/-private/store-service.ts

@@ -392,10 +392,12 @@ class Store extends Service {
    * @public
    */
   getSchemaDefinitionService(): SchemaDefinitionService {
-    if (HAS_MODEL_PACKAGE && !this._schemaDefinitionService) {
-      // it is potentially a mistake for the RFC to have not enabled chaining these services, though highlander rule is nice.
-      // what ember-m3 did via private API to allow both worlds to interop would be much much harder using this.
-      this._schemaDefinitionService = new DSModelSchemaDefinitionService(this);
+    if (HAS_MODEL_PACKAGE) {
+      if (!this._schemaDefinitionService) {
+        // it is potentially a mistake for the RFC to have not enabled chaining these services, though highlander rule is nice.
+        // what ember-m3 did via private API to allow both worlds to interop would be much much harder using this.
+        this._schemaDefinitionService = new DSModelSchemaDefinitionService(this);
+      }
     }
     assert(
       `You must registerSchemaDefinitionService with the store to use custom model classes`,
@@ -2692,13 +2694,10 @@ export function assertIdentifierHasId(
 }
 
 function isDSModel(record: RecordInstance | null): record is DSModel {
-  return (
-    HAS_MODEL_PACKAGE &&
-    !!record &&
-    'constructor' in record &&
-    'isModel' in record.constructor &&
-    record.constructor.isModel === true
-  );
+  if (!HAS_MODEL_PACKAGE) {
+    return false;
+  }
+  return !!record && 'constructor' in record && 'isModel' in record.constructor && record.constructor.isModel === true;
 }
 
 type AdapterErrors = Error & { errors?: unknown[]; isAdapterError?: true; code?: string };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.11.0",
+  "version": "4.11.2",
   "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.0",
-    "@ember-data/record-data": "4.11.0",
-    "@ember-data/tracking": "4.11.0",
+    "@ember-data/model": "4.11.2",
+    "@ember-data/record-data": "4.11.2",
+    "@ember-data/tracking": "4.11.2",
     "@ember/string": "^3.0.1",
     "@glimmer/tracking": "^1.1.2"
   },
@@ -37,8 +37,8 @@
     }
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.11.0",
-    "@ember-data/private-build-infra": "4.11.0",
+    "@ember-data/canary-features": "4.11.2",
+    "@ember-data/private-build-infra": "4.11.2",
     "@embroider/macros": "^1.10.0",
     "ember-auto-import": "^2.4.3",
     "ember-cached-decorator-polyfill": "^1.0.1",