@ember-data/store 3.28.5 → 3.28.6

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

@@ -90,6 +90,7 @@ type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecord
 type StableExistingRecordIdentifier = import('../ts-interfaces/identifier').StableExistingRecordIdentifier;
 type RecordInstance = import('../ts-interfaces/record-instance').RecordInstance;
 type RecordData = import('../ts-interfaces/record-data').RecordData;
+type FindOptions = import('../ts-interfaces/store').FindOptions;
 type DSModel = import('../ts-interfaces/ds-model').DSModel;
 type PromiseProxy<T> = import('../ts-interfaces/promise-proxies').PromiseProxy<T>;
 type Dict<T> = import('../ts-interfaces/utils').Dict<T>;
@@ -1162,7 +1163,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);
@@ -1177,7 +1178,7 @@ abstract class CoreStore extends Service {
     );
   }
 
-  _findEmptyInternalModel(internalModel, options) {
+  _findEmptyInternalModel(internalModel: InternalModel, options: FindOptions) {
     if (internalModel.currentState.isEmpty) {
       return this._scheduleFetch(internalModel, options);
     }
@@ -1189,9 +1190,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);
       }
@@ -1888,7 +1889,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());
         }
@@ -1920,6 +1921,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

@@ -508,10 +508,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];
@@ -539,3 +539,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,6 +1,11 @@
+type Dict<T> = import('@ember-data/store/-private/ts-interfaces/utils').Dict<T>;
+
 type RecordIdentifier = import('./identifier').RecordIdentifier;
+
 export interface Operation {
   op: string;
+  options: Dict<unknown> | undefined;
+  recordIdentifier: RecordIdentifier;
 }
 
 export interface FindRecordQuery extends Operation {

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

@@ -0,0 +1,9 @@
+type Dict<T> = import('@ember-data/store/-private/ts-interfaces/utils').Dict<T>;
+
+export interface FindOptions {
+  reload?: boolean;
+  backgroundReload?: boolean;
+  include?: string;
+  adapterOptions?: Dict<unknown>;
+  preload?: Dict<unknown>;
+}

package/package.json

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