@ember-data/store 4.10.0-beta.3 → 4.11.0

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

@@ -423,21 +423,16 @@ export class InstanceCache {
         }
       }
 
-      let removeFromRecordArray = true;
       if (recordData) {
-        removeFromRecordArray = !recordData.isDeletionCommitted(identifier);
         recordData.unloadRecord(identifier);
         this.__instances.recordData.delete(identifier);
         removeRecordDataFor(identifier);
       } else {
-        removeFromRecordArray = false;
         this.disconnect(identifier);
       }
 
       this.store._fetchManager.clearEntries(identifier);
-      if (removeFromRecordArray) {
-        this.store.recordArrayManager.identifierRemoved(identifier);
-      }
+      this.store.recordArrayManager.identifierRemoved(identifier);
       if (LOG_INSTANCE_CACHE) {
         // eslint-disable-next-line no-console
         console.log(`InstanceCache: unloaded RecordData for ${String(identifier)}`);
@@ -476,6 +471,12 @@ export class InstanceCache {
     const isEmpty = _isEmpty(this, identifier);
     const isLoading = _isLoading(this, identifier);
 
+    if (options.preload) {
+      this.store._join(() => {
+        preloadData(this.store, identifier, options.preload!);
+      });
+    }
+
     let promise: Promise<StableRecordIdentifier>;
     if (isEmpty) {
       assertIdentifierHasId(identifier);
@@ -611,7 +612,7 @@ export function recordDataIsFullyDeleted(cache: InstanceCache, identifier: Stabl
     models.
   */
 type PreloadRelationshipValue = RecordInstance | string;
-export function preloadData(store: Store, identifier: StableRecordIdentifier, preload: Dict<unknown>) {
+function preloadData(store: Store, identifier: StableRecordIdentifier, preload: Dict<unknown>) {
   let jsonPayload: JsonApiResource = {};
   //TODO(Igor) consider the polymorphic case
   const schemas = store.getSchemaDefinitionService();

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

@@ -81,11 +81,16 @@ export default class ShimModelClass implements ModelSchema {
     });
   }
 
-  eachTransformedAttribute<T>(callback: (this: T | undefined, key: string, type: string) => void, binding?: T) {
-    const attrDefs = this.__store.getSchemaDefinitionService().attributesDefinitionFor({ type: this.modelName });
-    Object.keys(attrDefs).forEach((key) => {
-      if (attrDefs[key]!.type) {
-        callback.call(binding, key, attrDefs[key]!.type);
+  eachTransformedAttribute<T>(
+    callback: (this: T | undefined, key: string, relationship: RelationshipSchema) => void,
+    binding?: T
+  ) {
+    let relationshipDefs = this.__store
+      .getSchemaDefinitionService()
+      .relationshipsDefinitionFor({ type: this.modelName });
+    Object.keys(relationshipDefs).forEach((key) => {
+      if (relationshipDefs[key]!.type) {
+        callback.call(binding, key, relationshipDefs[key] as RelationshipSchema);
       }
     });
   }

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

@@ -357,10 +357,7 @@ function sync(array: IdentifierArray, changes: Map<StableRecordIdentifier, 'add'
       // state = array[SOURCE] = [];
     } else {
       removes.forEach((i) => {
-        const index = state.indexOf(i);
-        if (index !== -1) {
-          state.splice(index, 1);
-        }
+        state.splice(state.indexOf(i), 1);
       });
     }
   }

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

@@ -119,7 +119,7 @@ export class NonSingletonRecordDataManager implements RecordData {
     // called by something V1
     if (!isStableIdentifier(identifier)) {
       data = identifier as JsonApiResource;
-      hasRecord = data as unknown as boolean;
+      hasRecord = data as boolean;
       identifier = this.#identifier;
     }
     if (this.#isDeprecated(recordData)) {

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

@@ -114,33 +114,6 @@ interface PrivateState {
   links: Links | PaginationLinks | null;
   meta: Dict<unknown> | null;
 }
-type ForEachCB = (record: RecordInstance, index: number, context: IdentifierArray) => void;
-function safeForEach(
-  instance: IdentifierArray,
-  arr: StableRecordIdentifier[],
-  store: Store,
-  callback: ForEachCB,
-  target: unknown
-) {
-  if (target === undefined) {
-    target = null;
-  }
-  // clone to prevent mutation
-  arr = arr.slice();
-  assert('`forEach` expects a function as first argument.', typeof callback === 'function');
-
-  // because we retrieveLatest above we need not worry if array is mutated during iteration
-  // by unloadRecord/rollbackAttributes
-  // push/add/removeObject may still be problematic
-  // but this is a more traditionally expected forEach bug.
-  const length = arr.length; // we need to access length to ensure we are consumed
-
-  for (let index = 0; index < length; index++) {
-    callback.call(target, store._instanceCache.getRecord(arr[index]), index, instance);
-  }
-
-  return instance;
-}
 
 /**
   A record array is an array that contains records of a certain type (or modelName).
@@ -268,25 +241,15 @@ class IdentifierArray {
           let fn = boundFns.get(prop);
 
           if (fn === undefined) {
-            if (prop === 'forEach') {
-              fn = function () {
-                subscribe(_TAG);
-                transaction = true;
-                let result = safeForEach(receiver, target, store, arguments[0] as ForEachCB, arguments[1]);
-                transaction = false;
-                return result;
-              };
-            } else {
-              fn = function () {
-                subscribe(_TAG);
-                // array functions must run through Reflect to work properly
-                // binding via other means will not work.
-                transaction = true;
-                let result = Reflect.apply(target[prop] as ProxiedMethod, receiver, arguments) as unknown;
-                transaction = false;
-                return result;
-              };
-            }
+            fn = function () {
+              subscribe(_TAG);
+              // array functions must run through Reflect to work properly
+              // binding via other means will not work.
+              transaction = true;
+              let result = Reflect.apply(target[prop] as ProxiedMethod, receiver, arguments) as unknown;
+              transaction = false;
+              return result;
+            };
 
             boundFns.set(prop, fn);
           }
@@ -308,7 +271,7 @@ class IdentifierArray {
               const args: unknown[] = Array.prototype.slice.call(arguments);
               assert(`Cannot start a new array transaction while a previous transaction is underway`, !transaction);
               transaction = true;
-              let result: unknown = Reflect.apply(target[prop] as ProxiedMethod, receiver, args);
+              let result = Reflect.apply(target[prop] as ProxiedMethod, receiver, args) as unknown;
               self[MUTATE]!(prop as string, args, result);
               addToTransaction(_TAG);
               // TODO handle cache updates
@@ -695,21 +658,13 @@ if (DEPRECATE_ARRAY_LIKE) {
 
   IdentifierArray.prototype.removeObject = function (obj: RecordInstance) {
     deprecateArrayLike(this.DEPRECATED_CLASS_NAME, 'removeObject', 'splice');
-    const index = this.indexOf(obj);
-    if (index !== -1) {
-      this.splice(index, 1);
-    }
+    this.splice(this.indexOf(obj), 1);
     return this;
   };
 
   IdentifierArray.prototype.removeObjects = function (objs: RecordInstance[]) {
     deprecateArrayLike(this.DEPRECATED_CLASS_NAME, 'removeObjects', 'splice');
-    objs.forEach((obj) => {
-      const index = this.indexOf(obj);
-      if (index !== -1) {
-        this.splice(index, 1);
-      }
-    });
+    objs.forEach((obj) => this.splice(this.indexOf(obj), 1));
     return this;
   };
 

package/addon/-private/store-service.ts

@@ -45,7 +45,6 @@ import { IdentifierCache } from './caches/identifier-cache';
 import {
   InstanceCache,
   peekRecordIdentifier,
-  preloadData,
   recordDataIsFullyDeleted,
   recordIdentifierFor,
   setRecordIdentifier,
@@ -483,7 +482,6 @@ class Store extends Service {
     @return {subclass of Model | ShimModelClass}
     */
   // TODO @deprecate in favor of schema APIs, requires adapter/serializer overhaul or replacement
-  declare _forceShim: boolean;
   modelFor(modelName: string): ShimModelClass | DSModelClass {
     if (DEBUG) {
       assertDestroyedStoreOnly(this, 'modelFor');
@@ -499,7 +497,7 @@ class Store extends Service {
 
       // for factorFor factory/class split
       let klass = maybeFactory && maybeFactory.class ? maybeFactory.class : maybeFactory;
-      if (!klass || !klass.isModel || this._forceShim) {
+      if (!klass || !klass.isModel) {
         assert(
           `No model was found for '${modelName}' and no schema handles the type`,
           this.getSchemaDefinitionService().doesTypeExist(modelName)
@@ -1129,12 +1127,6 @@ class Store extends Service {
     let promise;
     options = options || {};
 
-    if (options.preload) {
-      this._join(() => {
-        preloadData(this, identifier, options!.preload!);
-      });
-    }
-
     // if not loaded start loading
     if (!this._instanceCache.recordIsLoaded(identifier)) {
       promise = this._instanceCache._fetchDataIfNeededForIdentifier(identifier, options);
@@ -1142,7 +1134,6 @@ class Store extends Service {
       // Refetch if the reload option is passed
     } else if (options.reload) {
       assertIdentifierHasId(identifier);
-
       promise = this._fetchManager.scheduleFetch(identifier, options);
     } else {
       let snapshot: Snapshot | null = null;
@@ -2319,8 +2310,8 @@ class Store extends Service {
 
     const saveOptions = Object.assign({ [SaveOp]: operation }, options);
     let fetchManagerPromise = this._fetchManager.scheduleSave(identifier, saveOptions);
-    return fetchManagerPromise
-      .then((payload) => {
+    return fetchManagerPromise.then(
+      (payload) => {
         if (LOG_PAYLOADS) {
           try {
             let data = payload ? JSON.parse(JSON.stringify(payload)) : payload;
@@ -2375,8 +2366,8 @@ class Store extends Service {
           }
         });
         return record;
-      })
-      .catch((e) => {
+      },
+      (e) => {
         let err = e;
         if (!e) {
           err = new Error(`Unknown Error Occurred During Request`);
@@ -2385,7 +2376,8 @@ class Store extends Service {
         }
         adapterDidInvalidate(this, identifier, err);
         throw err;
-      });
+      }
+    );
   }
 
   /**

package/index.js

@@ -19,7 +19,6 @@ module.exports = Object.assign({}, addonBaseConfig, {
       '@ember/array/proxy',
       '@ember/array',
       '@ember/debug',
-      '@ember/error',
       '@ember/object',
       '@ember/object/computed',
       '@ember/object/evented',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.10.0-beta.3",
+  "version": "4.11.0",
   "description": "The core of EmberData. Provides the Store service which coordinates the cache with the network and presentation layers.",
   "keywords": [
     "ember-addon"
@@ -14,10 +14,10 @@
   "author": "",
   "directories": {},
   "peerDependencies": {
-    "@ember-data/model": "4.10.0-beta.3",
-    "@ember-data/record-data": "4.10.0-beta.3",
-    "@ember-data/tracking": "4.10.0-beta.3",
-    "@ember/string": "^3.0.0",
+    "@ember-data/model": "4.11.0",
+    "@ember-data/record-data": "4.11.0",
+    "@ember-data/tracking": "4.11.0",
+    "@ember/string": "^3.0.1",
     "@glimmer/tracking": "^1.1.2"
   },
   "peerDependenciesMeta": {
@@ -37,10 +37,10 @@
     }
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.10.0-beta.3",
-    "@ember-data/private-build-infra": "4.10.0-beta.3",
+    "@ember-data/canary-features": "4.11.0",
+    "@ember-data/private-build-infra": "4.11.0",
     "@embroider/macros": "^1.10.0",
-    "ember-auto-import": "^2.5.0",
+    "ember-auto-import": "^2.4.3",
     "ember-cached-decorator-polyfill": "^1.0.1",
     "ember-cli-babel": "^7.26.11"
   },
@@ -57,5 +57,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "packageManager": "pnpm@7.18.0"
+  "packageManager": "pnpm@7.15.0"
 }