@ember-data/store 4.1.0 → 4.2.0-beta.0

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

@@ -723,21 +723,6 @@ abstract class CoreStore extends Service {
           if (internalModel) {
             internalModel.deleteRecord();
           }
-        } else {
-          deprecate(
-            `You passed a non ember-data managed record ${record} to store.deleteRecord. Ember Data store is not meant to manage non store records. This is not supported and will be removed`,
-            false,
-            {
-              id: 'ember-data:delete-record-non-store',
-              until: '4.0',
-              for: '@ember-data/store',
-              since: {
-                available: '3.28',
-                enabled: '3.28',
-              },
-            }
-          );
-          record.deleteRecord();
         }
       } else {
         record.deleteRecord();
@@ -772,21 +757,6 @@ abstract class CoreStore extends Service {
         if (internalModel) {
           internalModel.unloadRecord();
         }
-      } else {
-        deprecate(
-          `You passed a non ember-data managed record ${record} to store.unloadRecord. Ember Data store is not meant to manage non store records. This is not supported and will be removed`,
-          false,
-          {
-            id: 'ember-data:unload-record-non-store',
-            until: '4.0',
-            for: '@ember-data/store',
-            since: {
-              available: '3.28',
-              enabled: '3.28',
-            },
-          }
-        );
-        record.unloadRecord();
       }
     } else {
       record.unloadRecord();
@@ -1278,7 +1248,7 @@ abstract class CoreStore extends Service {
     return Promise.resolve(internalModel);
   }
 
-  _findByInternalModel(internalModel: InternalModel, options: FindOptions = {}) {
+  _findByInternalModel(internalModel, options: { preload?: any } = {}) {
     if (options.preload) {
       this._backburner.join(() => {
         internalModel.preloadData(options.preload);
@@ -1293,7 +1263,7 @@ abstract class CoreStore extends Service {
     );
   }
 
-  _findEmptyInternalModel(internalModel: InternalModel, options: FindOptions) {
+  _findEmptyInternalModel(internalModel, options) {
     if (internalModel.currentState.isEmpty) {
       return this._scheduleFetch(internalModel, options);
     }
@@ -1305,9 +1275,9 @@ abstract class CoreStore extends Service {
       }
     } else {
       if (internalModel.currentState.isLoading) {
-        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier, options);
-        if (pendingRequest) {
-          return pendingRequest.then(() => Promise.resolve(internalModel));
+        let pending = this._fetchManager.getPendingFetch(internalModel.identifier);
+        if (pending) {
+          return pending.then(() => Promise.resolve(internalModel));
         }
         return this._scheduleFetch(internalModel, options);
       }
@@ -2049,7 +2019,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, options);
+        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier);
         if (pendingRequest) {
           return pendingRequest.then(() => internalModel.getRecord());
         }
@@ -2081,10 +2051,6 @@ 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, options) {
-    let pendingRequests = this.requestCache.getPendingRequestsForRecord(identifier).filter((req) => {
-      return req.type === 'query' && isSameRequest(options, req.request.data[0].options);
-    });
+  getPendingFetch(identifier: StableRecordIdentifier) {
+    let pendingRequests = this.requestCache
+      .getPendingRequestsForRecord(identifier)
+      .filter((req) => req.type === 'query');
 
     if (pendingRequests.length > 0) {
       return pendingRequests[0][RequestPromise];
@@ -532,8 +532,3 @@ 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/system/references/reference.ts

@@ -1,9 +1,5 @@
-import { deprecate } from '@ember/debug';
-
 import type { Object as JSONObject, Value as JSONValue } from 'json-typescript';
 
-import { DEPRECATE_REFERENCE_INTERNAL_MODEL } from '@ember-data/private-build-infra/deprecations';
-
 import type { LinkObject, PaginationLinks } from '../../ts-interfaces/ember-data-json-api';
 import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
 import type { JsonApiRelationship } from '../../ts-interfaces/record-data-json-api';
@@ -185,9 +181,9 @@ abstract class Reference {
               related: {
                 href: '/articles/1/author'
               },
-              meta: {
-                lastUpdated: 1458014400000
-              }
+            },
+            meta: {
+              lastUpdated: 1458014400000
             }
           }
         }
@@ -213,22 +209,4 @@ abstract class Reference {
   }
 }
 
-if (DEPRECATE_REFERENCE_INTERNAL_MODEL) {
-  Object.defineProperty(Reference.prototype, 'internalModel', {
-    get() {
-      deprecate('Accessing the internalModel property of Reference is deprecated', false, {
-        id: 'ember-data:reference-internal-model',
-        until: '3.21',
-        for: '@ember-data/store',
-        since: {
-          available: '3.19',
-          enabled: '3.19',
-        },
-      });
-
-      return REFERENCE_CACHE.get(this);
-    },
-  });
-}
-
 export default Reference;

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

@@ -1,11 +1,7 @@
-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.1.0",
+  "version": "4.2.0-beta.0",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,8 +17,8 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.1.0",
-    "@ember-data/private-build-infra": "4.1.0",
+    "@ember-data/canary-features": "4.2.0-beta.0",
+    "@ember-data/private-build-infra": "4.2.0-beta.0",
     "@ember/string": "^3.0.0",
     "@glimmer/tracking": "^1.0.4",
     "ember-auto-import": "^2.2.4",
@@ -28,7 +28,7 @@
     "ember-cli-typescript": "^4.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0",
+    "@ember-data/unpublished-test-infra": "4.2.0-beta.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
     "@types/ember": "^3.16.5",
@@ -46,7 +46,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.0",
-    "ember-source": "~4.0.0",
+    "ember-source": "~3.28.6",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",
     "loader.js": "^4.7.0",