@ember-data/store 4.11.0 → 4.11.1

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/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/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.1",
   "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.1",
+    "@ember-data/record-data": "4.11.1",
+    "@ember-data/tracking": "4.11.1",
     "@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.1",
+    "@ember-data/private-build-infra": "4.11.1",
     "@embroider/macros": "^1.10.0",
     "ember-auto-import": "^2.4.3",
     "ember-cached-decorator-polyfill": "^1.0.1",