@ember-data/store 4.0.0 → 4.0.1

package/addon/-private/system/core-store.ts

@@ -1278,7 +1278,7 @@ abstract class CoreStore extends Service {
     return Promise.resolve(internalModel);
   }
 
-  _findByInternalModel(internalModel, options: { preload?: any } = {}) {
+  _findByInternalModel(internalModel: InternalModel, options: FindOptions = {}) {
     if (options.preload) {
       this._backburner.join(() => {
         internalModel.preloadData(options.preload);
@@ -1293,7 +1293,7 @@ abstract class CoreStore extends Service {
     );
   }
 
-  _findEmptyInternalModel(internalModel, options) {
+  _findEmptyInternalModel(internalModel: InternalModel, options: FindOptions) {
     if (internalModel.currentState.isEmpty) {
       return this._scheduleFetch(internalModel, options);
     }
@@ -1305,9 +1305,9 @@ abstract class CoreStore extends Service {
       }
     } else {
       if (internalModel.currentState.isLoading) {
-        let pending = this._fetchManager.getPendingFetch(internalModel.identifier);
-        if (pending) {
-          return pending.then(() => Promise.resolve(internalModel));
+        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier, options);
+        if (pendingRequest) {
+          return pendingRequest.then(() => Promise.resolve(internalModel));
         }
         return this._scheduleFetch(internalModel, options);
       }
@@ -2049,7 +2049,7 @@ abstract class CoreStore extends Service {
     if (internalModel) {
       // short circuit if we are already loading
       if (REQUEST_SERVICE) {
-        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier);
+        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier, options);
         if (pendingRequest) {
           return pendingRequest.then(() => internalModel.getRecord());
         }
@@ -2081,6 +2081,10 @@ abstract class CoreStore extends Service {
         return resolve(null);
       }
 
+      if (!internalModel) {
+        assert(`No InternalModel found for ${resource.lid}`, internalModel);
+      }
+
       return this._findByInternalModel(internalModel, options);
     }
 

package/addon/-private/system/fetch-manager.ts

@@ -501,10 +501,10 @@ export default class FetchManager {
     }
   }
 
-  getPendingFetch(identifier: StableRecordIdentifier) {
-    let pendingRequests = this.requestCache
-      .getPendingRequestsForRecord(identifier)
-      .filter((req) => req.type === 'query');
+  getPendingFetch(identifier: StableRecordIdentifier, options) {
+    let pendingRequests = this.requestCache.getPendingRequestsForRecord(identifier).filter((req) => {
+      return req.type === 'query' && isSameRequest(options, req.request.data[0].options);
+    });
 
     if (pendingRequests.length > 0) {
       return pendingRequests[0][RequestPromise];
@@ -532,3 +532,8 @@ function assertIsString(id: string | null): asserts id is string {
     }
   }
 }
+
+// this function helps resolve whether we have a pending request that we should use instead
+function isSameRequest(options: Dict<unknown> = {}, reqOptions: Dict<unknown> = {}) {
+  return options.include === reqOptions.include;
+}

package/addon/-private/ts-interfaces/fetch-manager.ts

@@ -1,7 +1,11 @@
+import type { Dict } from '@ember-data/store/-private/ts-interfaces/utils';
+
 import type { RecordIdentifier } from './identifier';
 
 export interface Operation {
   op: string;
+  options: Dict<unknown> | undefined;
+  recordIdentifier: RecordIdentifier;
 }
 
 export interface FindRecordQuery extends Operation {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,8 +17,8 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.0.0",
-    "@ember-data/private-build-infra": "4.0.0",
+    "@ember-data/canary-features": "4.0.1",
+    "@ember-data/private-build-infra": "4.0.1",
     "@ember/string": "^3.0.0",
     "@glimmer/tracking": "^1.0.4",
     "ember-auto-import": "^2.2.4",
@@ -27,7 +27,7 @@
     "ember-cli-typescript": "^4.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.0.0",
+    "@ember-data/unpublished-test-infra": "4.0.1",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
     "@types/ember": "^3.16.5",