@ember-data/store 4.2.0-alpha.8 → 4.3.0-beta.0

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

@@ -3,8 +3,8 @@
  */
 import { getOwner } from '@ember/application';
 import { A } from '@ember/array';
-import { assert, deprecate, inspect, warn } from '@ember/debug';
-import { computed, defineProperty, set } from '@ember/object';
+import { assert, inspect, warn } from '@ember/debug';
+import { set } from '@ember/object';
 import { _backburner as emberBackburner } from '@ember/runloop';
 import type { Backburner } from '@ember/runloop/-private/backburner';
 import Service from '@ember/service';
@@ -16,16 +16,7 @@ import Ember from 'ember';
 import require from 'require';
 import { all, default as RSVP, Promise, resolve } from 'rsvp';
 
-import {
-  HAS_ADAPTER_PACKAGE,
-  HAS_EMBER_DATA_PACKAGE,
-  HAS_RECORD_DATA_PACKAGE,
-  HAS_SERIALIZER_PACKAGE,
-} from '@ember-data/private-build-infra';
-import {
-  DEPRECATE_DEFAULT_ADAPTER,
-  DEPRECATE_LEGACY_TEST_REGISTRATIONS,
-} from '@ember-data/private-build-infra/deprecations';
+import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 import type {
   BelongsToRelationship,
   ManyRelationship,
@@ -33,8 +24,7 @@ import type {
 } from '@ember-data/record-data/-private';
 import type { RelationshipState } from '@ember-data/record-data/-private/graph/-state';
 
-import type { IdentifierCache } from '../identifiers/cache';
-import { identifierCacheFor } from '../identifiers/cache';
+import { IdentifierCache } from '../identifiers/cache';
 import type { DSModel } from '../ts-interfaces/ds-model';
 import type {
   CollectionResourceDocument,
@@ -79,8 +69,7 @@ import NotificationManager from './record-notification-manager';
 import type { BelongsToReference, HasManyReference } from './references';
 import { RecordReference } from './references';
 import type RequestCache from './request-cache';
-import type { default as Snapshot } from './snapshot';
-import { _find, _findAll, _findBelongsTo, _findHasMany, _findMany, _query, _queryRecord } from './store/finders';
+import { _findAll, _findBelongsTo, _findHasMany, _query, _queryRecord } from './store/finders';
 import {
   internalModelFactoryFor,
   peekRecordIdentifier,
@@ -88,6 +77,7 @@ import {
   setRecordIdentifier,
 } from './store/internal-model-factory';
 import RecordDataStoreWrapper from './store/record-data-store-wrapper';
+import WeakCache from './weak-cache';
 
 type RecordDataConstruct = typeof RecordDataClass;
 let _RecordData: RecordDataConstruct | undefined;
@@ -95,18 +85,8 @@ let _RecordData: RecordDataConstruct | undefined;
 const { ENV } = Ember;
 type AsyncTrackingToken = Readonly<{ label: string; trace: Error | string }>;
 type PromiseArray<T> = Promise<T[]>;
-type PendingFetchItem = {
-  internalModel: InternalModel;
-  resolver: RSVP.Deferred<InternalModel>;
-  options: any;
-  trace?: Error;
-};
-type PendingSaveItem = {
-  snapshot: Snapshot;
-  resolver: RSVP.Deferred<void>;
-};
-
-const RECORD_REFERENCES = new WeakMap<StableRecordIdentifier, RecordReference>();
+
+const RECORD_REFERENCES = new WeakCache<StableRecordIdentifier, RecordReference>(DEBUG ? 'reference' : '');
 
 function freeze<T>(obj: T): T {
   if (typeof Object.freeze === 'function') {
@@ -116,26 +96,6 @@ function freeze<T>(obj: T): T {
   return obj;
 }
 
-function deprecateTestRegistration(factoryType: 'adapter', factoryName: '-json-api'): void;
-function deprecateTestRegistration(factoryType: 'serializer', factoryName: '-json-api' | '-rest' | '-default'): void;
-function deprecateTestRegistration(
-  factoryType: 'serializer' | 'adapter',
-  factoryName: '-json-api' | '-rest' | '-default'
-): void {
-  deprecate(
-    `You looked up the ${factoryType} "${factoryName}" but it was not found. Likely this means you are using a legacy ember-qunit moduleFor helper. Add "needs: ['${factoryType}:${factoryName}']", "integration: true", or refactor to modern syntax to resolve this deprecation.`,
-    false,
-    {
-      id: 'ember-data:-legacy-test-registrations',
-      until: '3.17',
-      for: '@ember-data/store',
-      since: {
-        available: '3.15',
-        enabled: '3.15',
-      },
-    }
-  );
-}
 /**
   The store contains all of the data for records loaded from the server.
   It is also responsible for creating instances of `Model` that wrap
@@ -209,9 +169,6 @@ function deprecateTestRegistration(
   @public
   @extends Ember.Service
 */
-interface CoreStore {
-  adapter: string;
-}
 
 abstract class CoreStore extends Service {
   /**
@@ -223,6 +180,7 @@ abstract class CoreStore extends Service {
   public recordArrayManager: RecordArrayManager = new RecordArrayManager({ store: this });
 
   declare _notificationManager: NotificationManager;
+  declare identifierCache: IdentifierCache;
   private _adapterCache = Object.create(null);
   private _serializerCache = Object.create(null);
   public _storeWrapper = new RecordDataStoreWrapper(this);
@@ -234,20 +192,14 @@ abstract class CoreStore extends Service {
     These queues are currently controlled by a flush scheduled into
     ember-data's custom backburner instance.
     */
-  // used for coalescing record save requests
-  private _pendingSave: PendingSaveItem[] = [];
   // used for coalescing internal model updates
   private _updatedInternalModels: InternalModel[] = [];
 
-  // used to keep track of all the find requests that need to be coalesced
-  private _pendingFetch = new Map<string, PendingFetchItem[]>();
-
   declare _fetchManager: FetchManager;
   declare _schemaDefinitionService: SchemaDefinitionService;
 
   // DEBUG-only properties
   declare _trackedAsyncRequests: AsyncTrackingToken[];
-  shouldAssertMethodCallsOnDestroyedStore: boolean = true;
   shouldTrackAsyncRequests: boolean = false;
   generateStackTracesForTrackedRequests: boolean = false;
   declare _trackAsyncRequestStart: (str: string) => void;
@@ -301,60 +253,27 @@ abstract class CoreStore extends Service {
   constructor() {
     super(...arguments);
 
+    RECORD_REFERENCES._generator = (identifier) => {
+      return new RecordReference(this, identifier);
+    };
+
     this._fetchManager = new FetchManager(this);
     this._notificationManager = new NotificationManager(this);
     this.__recordDataFor = this.__recordDataFor.bind(this);
 
-    if (DEBUG) {
-      if (HAS_EMBER_DATA_PACKAGE && HAS_SERIALIZER_PACKAGE) {
-        // support for legacy moduleFor style unit tests
-        // that did not include transforms in "needs"
-        // or which were not set to integration:true
-        // that were relying on ember-test-helpers
-        // doing an auto-registration of the transform
-        // or us doing one
-        const Mapping = {
-          date: 'DateTransform',
-          boolean: 'BooleanTransform',
-          number: 'NumberTransform',
-          string: 'StringTransform',
-        };
-        type MapKeys = keyof typeof Mapping;
-        const keys = Object.keys(Mapping) as MapKeys[];
-        let shouldWarn = false;
-
-        let owner = getOwner(this);
-        keys.forEach((attributeType) => {
-          const transformFactory = owner.factoryFor(`transform:${attributeType}`);
-
-          if (!transformFactory) {
-            // we don't deprecate this because the moduleFor style tests with the closed
-            // resolver will be deprecated on their own. When that deprecation completes
-            // we can drop this.
-            const Transform = require(`@ember-data/serializer/-private`)[Mapping[attributeType]];
-            owner.register(`transform:${attributeType}`, Transform);
-            shouldWarn = true;
-          }
-        });
+    /**
+     * Provides access to the IdentifierCache instance
+     * for this store.
+     *
+     * The IdentifierCache can be used to generate or
+     * retrieve a stable unique identifier for any resource.
+     *
+     * @property {IdentifierCache} identifierCache
+     * @public
+     */
+    this.identifierCache = new IdentifierCache();
 
-        if (shouldWarn) {
-          deprecate(
-            `You are relying on the automatic registration of the transforms "date", "number", "boolean", and "string". Likely this means you are using a legacy ember-qunit moduleFor helper. Add "needs: ['transform:date', 'transform:boolean', 'transform:number', 'transform:string']", "integration: true", or refactor to modern syntax to resolve this deprecation.`,
-            false,
-            {
-              id: 'ember-data:-legacy-test-registrations',
-              until: '3.17',
-              for: '@ember-data/store',
-              since: {
-                available: '3.15',
-                enabled: '3.15',
-              },
-            }
-          );
-        }
-      }
-
-      this.shouldAssertMethodCallsOnDestroyedStore = this.shouldAssertMethodCallsOnDestroyedStore || false;
+    if (DEBUG) {
       if (this.shouldTrackAsyncRequests === undefined) {
         this.shouldTrackAsyncRequests = false;
       }
@@ -364,14 +283,14 @@ abstract class CoreStore extends Service {
 
       this._trackedAsyncRequests = [];
       this._trackAsyncRequestStart = (label) => {
-        let trace =
+        let trace: string | Error =
           'set `store.generateStackTracesForTrackedRequests = true;` to get a detailed trace for where this request originated';
 
         if (this.generateStackTracesForTrackedRequests) {
           try {
             throw new Error(`EmberData TrackedRequest: ${label}`);
           } catch (e) {
-            trace = e;
+            trace = e as Error;
           }
         }
 
@@ -411,20 +330,6 @@ abstract class CoreStore extends Service {
     return this._fetchManager.requestCache;
   }
 
-  /**
-   * Provides access to the IdentifierCache instance
-   * for this store.
-   *
-   * The IdentifierCache can be used to generate or
-   * retrieve a stable unique identifier for any resource.
-   *
-   * @property {IdentifierCache} identifierCache
-   * @public
-   */
-  get identifierCache(): IdentifierCache {
-    return identifierCacheFor(this);
-  }
-
   _instantiateRecord(
     internalModel: InternalModel,
     modelName: string,
@@ -444,7 +349,7 @@ abstract class CoreStore extends Service {
       }
 
       // convert relationship Records to RecordDatas before passing to RecordData
-      let defs = this._relationshipsDefinitionFor(modelName);
+      let defs = this._relationshipsDefinitionFor({ type: modelName });
 
       if (defs !== null) {
         let keys = Object.keys(properties);
@@ -493,20 +398,12 @@ abstract class CoreStore extends Service {
   }
 
   // FeatureFlagged in the DSModelStore claas
-  _attributesDefinitionFor(modelName: string, identifier?: StableRecordIdentifier): AttributesSchema {
-    if (identifier) {
-      return this.getSchemaDefinitionService().attributesDefinitionFor(identifier);
-    } else {
-      return this.getSchemaDefinitionService().attributesDefinitionFor(modelName);
-    }
+  _attributesDefinitionFor(identifier: RecordIdentifier | { type: string }): AttributesSchema {
+    return this.getSchemaDefinitionService().attributesDefinitionFor(identifier);
   }
 
-  _relationshipsDefinitionFor(modelName: string, identifier?: StableRecordIdentifier) {
-    if (identifier) {
-      return this.getSchemaDefinitionService().relationshipsDefinitionFor(identifier);
-    } else {
-      return this.getSchemaDefinitionService().relationshipsDefinitionFor(modelName);
-    }
+  _relationshipsDefinitionFor(identifier: RecordIdentifier | { type: string }) {
+    return this.getSchemaDefinitionService().relationshipsDefinitionFor(identifier);
   }
 
   registerSchemaDefinitionService(schema: SchemaDefinitionService) {
@@ -519,7 +416,7 @@ abstract class CoreStore extends Service {
 
   // TODO Double check this return value is correct
   _relationshipMetaFor(modelName: string, id: string | null, key: string) {
-    return this._relationshipsDefinitionFor(modelName)[key];
+    return this._relationshipsDefinitionFor({ type: modelName })[key];
   }
 
   /**
@@ -1278,29 +1175,6 @@ abstract class CoreStore extends Service {
     return promiseArray(all(promises).then(A, null, `DS: Store#findByIds of ${normalizedModelName} complete`));
   }
 
-  /**
-    This method is called by `findRecord` if it discovers that a particular
-    type/id pair hasn't been loaded yet to kick off a request to the
-    adapter.
-
-    @method _fetchRecord
-    @private
-    @param {InternalModel} internalModel model
-    @return {Promise} promise
-   */
-  _fetchRecord(internalModel: InternalModel, options): Promise<InternalModel> {
-    let modelName = internalModel.modelName;
-    let adapter = this.adapterFor(modelName);
-
-    assert(`You tried to find a record but you have no adapter (for ${modelName})`, adapter);
-    assert(
-      `You tried to find a record but your adapter (for ${modelName}) does not implement 'findRecord'`,
-      typeof adapter.findRecord === 'function'
-    );
-
-    return _find(adapter, this, internalModel.modelClass, internalModel.id, internalModel, options);
-  }
-
   _scheduleFetchMany(internalModels, options) {
     let fetches = new Array(internalModels.length);
 
@@ -1311,7 +1185,7 @@ abstract class CoreStore extends Service {
     return Promise.all(fetches);
   }
 
-  _scheduleFetchThroughFetchManager(internalModel: InternalModel, options = {}): RSVP.Promise<InternalModel> {
+  _scheduleFetch(internalModel: InternalModel, options = {}): RSVP.Promise<InternalModel> {
     let generateStackTrace = this.generateStackTracesForTrackedRequests;
     // TODO  remove this once we don't rely on state machine
     internalModel.send('loadingData');
@@ -1346,165 +1220,6 @@ abstract class CoreStore extends Service {
     );
   }
 
-  _scheduleFetch(internalModel: InternalModel, options): RSVP.Promise<InternalModel> {
-    return this._scheduleFetchThroughFetchManager(internalModel, options);
-  }
-
-  flushAllPendingFetches() {
-    return;
-    //assert here
-  }
-
-  _flushPendingFetchForType(pendingFetchItems: PendingFetchItem[], modelName: string) {
-    let store = this;
-    let adapter = store.adapterFor(modelName);
-    let shouldCoalesce = !!adapter.findMany && adapter.coalesceFindRequests;
-    let totalItems = pendingFetchItems.length;
-    let internalModels = new Array(totalItems);
-    let seeking = Object.create(null);
-
-    let optionsMap = new WeakMap();
-
-    for (let i = 0; i < totalItems; i++) {
-      let pendingItem = pendingFetchItems[i];
-      let internalModel = pendingItem.internalModel;
-      internalModels[i] = internalModel;
-      optionsMap.set(internalModel, pendingItem.options);
-      // We can remove this "not null" cast once we have enough typing
-      // to know we are only dealing with ExistingResourceIdentifierObjects
-      seeking[internalModel.id!] = pendingItem;
-    }
-
-    function _fetchRecord(recordResolverPair) {
-      let recordFetch = store._fetchRecord(recordResolverPair.internalModel, recordResolverPair.options);
-
-      recordResolverPair.resolver.resolve(recordFetch);
-    }
-
-    function handleFoundRecords(foundInternalModels: InternalModel[], expectedInternalModels: InternalModel[]) {
-      // resolve found records
-      let found = Object.create(null);
-      for (let i = 0, l = foundInternalModels.length; i < l; i++) {
-        let internalModel = foundInternalModels[i];
-
-        // We can remove this "not null" cast once we have enough typing
-        // to know we are only dealing with ExistingResourceIdentifierObjects
-        let pair = seeking[internalModel.id!];
-        found[internalModel.id!] = internalModel;
-
-        if (pair) {
-          let resolver = pair.resolver;
-          resolver.resolve(internalModel);
-        }
-      }
-
-      // reject missing records
-      let missingInternalModels: InternalModel[] = [];
-
-      for (let i = 0, l = expectedInternalModels.length; i < l; i++) {
-        let internalModel = expectedInternalModels[i];
-
-        // We can remove this "not null" cast once we have enough typing
-        // to know we are only dealing with ExistingResourceIdentifierObjects
-        if (!found[internalModel.id!]) {
-          missingInternalModels.push(internalModel);
-        }
-      }
-
-      if (missingInternalModels.length) {
-        warn(
-          'Ember Data expected to find records with the following ids in the adapter response but they were missing: [ "' +
-            missingInternalModels.map((r) => r.id).join('", "') +
-            '" ]',
-          false,
-          {
-            id: 'ds.store.missing-records-from-adapter',
-          }
-        );
-        rejectInternalModels(missingInternalModels);
-      }
-    }
-
-    function rejectInternalModels(internalModels: InternalModel[], error?: Error) {
-      for (let i = 0, l = internalModels.length; i < l; i++) {
-        let internalModel = internalModels[i];
-
-        // We can remove this "not null" cast once we have enough typing
-        // to know we are only dealing with ExistingResourceIdentifierObjects
-        let pair = seeking[internalModel.id!];
-
-        if (pair) {
-          pair.resolver.reject(
-            error ||
-              new Error(
-                `Expected: '${internalModel}' to be present in the adapter provided payload, but it was not found.`
-              )
-          );
-        }
-      }
-    }
-
-    if (shouldCoalesce) {
-      // TODO: Improve records => snapshots => records => snapshots
-      //
-      // We want to provide records to all store methods and snapshots to all
-      // adapter methods. To make sure we're doing that we're providing an array
-      // of snapshots to adapter.groupRecordsForFindMany(), which in turn will
-      // return grouped snapshots instead of grouped records.
-      //
-      // But since the _findMany() finder is a store method we need to get the
-      // records from the grouped snapshots even though the _findMany() finder
-      // will once again convert the records to snapshots for adapter.findMany()
-      let snapshots = new Array(totalItems);
-      for (let i = 0; i < totalItems; i++) {
-        let internalModel = internalModels[i];
-        snapshots[i] = internalModel.createSnapshot(optionsMap.get(internalModel));
-      }
-
-      let groups;
-      if (adapter.groupRecordsForFindMany) {
-        groups = adapter.groupRecordsForFindMany(this, snapshots);
-      } else {
-        groups = [snapshots];
-      }
-
-      for (let i = 0, l = groups.length; i < l; i++) {
-        let group = groups[i];
-        let totalInGroup = groups[i].length;
-        let ids = new Array(totalInGroup);
-        let groupedInternalModels = new Array(totalInGroup);
-
-        for (let j = 0; j < totalInGroup; j++) {
-          let internalModel = group[j]._internalModel;
-
-          groupedInternalModels[j] = internalModel;
-          ids[j] = internalModel.id;
-        }
-
-        if (totalInGroup > 1) {
-          (function (groupedInternalModels) {
-            _findMany(adapter, store, modelName, ids, groupedInternalModels, optionsMap)
-              .then(function (foundInternalModels) {
-                handleFoundRecords(foundInternalModels, groupedInternalModels);
-              })
-              .catch(function (error) {
-                rejectInternalModels(groupedInternalModels, error);
-              });
-          })(groupedInternalModels);
-        } else if (ids.length === 1) {
-          let pair = seeking[groupedInternalModels[0].id];
-          _fetchRecord(pair);
-        } else {
-          assert("You cannot return an empty array from adapter's method groupRecordsForFindMany");
-        }
-      }
-    } else {
-      for (let i = 0; i < totalItems; i++) {
-        _fetchRecord(pendingFetchItems[i]);
-      }
-    }
-  }
-
   /**
     Get the reference for the specified record.
 
@@ -1562,15 +1277,9 @@ abstract class CoreStore extends Service {
       isMaybeIdentifier(resourceIdentifier)
     );
 
-    let identifier: StableRecordIdentifier = identifierCacheFor(this).getOrCreateRecordIdentifier(resourceIdentifier);
+    let identifier: StableRecordIdentifier = this.identifierCache.getOrCreateRecordIdentifier(resourceIdentifier);
     if (identifier) {
-      if (RECORD_REFERENCES.has(identifier)) {
-        return RECORD_REFERENCES.get(identifier);
-      }
-
-      let reference = new RecordReference(this, identifier);
-      RECORD_REFERENCES.set(identifier, reference);
-      return reference;
+      return RECORD_REFERENCES.lookup(identifier);
     }
   }
 
@@ -1626,7 +1335,7 @@ abstract class CoreStore extends Service {
   peekRecord(identifier: ResourceIdentifierObject): RecordInstance | null;
   peekRecord(identifier: ResourceIdentifierObject | string, id?: string | number): RecordInstance | null {
     if (arguments.length === 1 && isMaybeIdentifier(identifier)) {
-      let stableIdentifier = identifierCacheFor(this).peekRecordIdentifier(identifier);
+      let stableIdentifier = this.identifierCache.peekRecordIdentifier(identifier);
       if (stableIdentifier) {
         return internalModelFactoryFor(this).peek(stableIdentifier)?.getRecord() || null;
       }
@@ -1716,7 +1425,7 @@ abstract class CoreStore extends Service {
     const trueId = ensureStringId(id);
     const resource = { type, id: trueId };
 
-    const identifier = identifierCacheFor(this).peekRecordIdentifier(resource);
+    const identifier = this.identifierCache.peekRecordIdentifier(resource);
     const internalModel = identifier && internalModelFactoryFor(this).peek(identifier);
 
     return !!internalModel && internalModel.currentState.isLoaded;
@@ -2646,7 +2355,7 @@ abstract class CoreStore extends Service {
       );
     }
 
-    const cache = identifierCacheFor(this);
+    const cache = this.identifierCache;
     const identifier = internalModel.identifier;
 
     if (op !== 'deleteRecord' && data) {
@@ -2734,7 +2443,7 @@ abstract class CoreStore extends Service {
     // exclude store.push (root.empty) case
     let identifier = internalModel.identifier;
     if (isUpdate || isLoading) {
-      let updatedIdentifier = identifierCacheFor(this).updateRecordIdentifier(identifier, data);
+      let updatedIdentifier = this.identifierCache.updateRecordIdentifier(identifier, data);
 
       if (updatedIdentifier !== identifier) {
         // we encountered a merge of identifiers in which
@@ -3153,7 +2862,7 @@ abstract class CoreStore extends Service {
   }
 
   relationshipReferenceFor(identifier: RecordIdentifier, key: string): BelongsToReference | HasManyReference {
-    let stableIdentifier = identifierCacheFor(this).getOrCreateRecordIdentifier(identifier);
+    let stableIdentifier = this.identifierCache.getOrCreateRecordIdentifier(identifier);
     let internalModel = internalModelFactoryFor(this).peek(stableIdentifier);
     // TODO we used to check if the record was destroyed here
     return internalModel!.referenceFor(null, key);
@@ -3202,7 +2911,7 @@ abstract class CoreStore extends Service {
         _RecordData = require('@ember-data/record-data/-private').RecordData as RecordDataConstruct;
       }
 
-      let identifier = identifierCacheFor(this).getOrCreateRecordIdentifier({
+      let identifier = this.identifierCache.getOrCreateRecordIdentifier({
         type: modelName,
         id,
         lid: clientId,
@@ -3217,7 +2926,7 @@ abstract class CoreStore extends Service {
    * @internal
    */
   __recordDataFor(resource: RecordIdentifier) {
-    const identifier = identifierCacheFor(this).getOrCreateRecordIdentifier(resource);
+    const identifier = this.identifierCache.getOrCreateRecordIdentifier(resource);
     return this.recordDataFor(identifier, false);
   }
 
@@ -3335,25 +3044,15 @@ abstract class CoreStore extends Service {
 
     let owner = getOwner(this);
 
+    // name specific adapter
     adapter = owner.lookup(`adapter:${normalizedModelName}`);
-
-    // in production this is handled by the re-export
-    if (DEBUG && HAS_EMBER_DATA_PACKAGE && HAS_ADAPTER_PACKAGE && adapter === undefined) {
-      if (normalizedModelName === '-json-api') {
-        const Adapter = require('@ember-data/adapter/json-api').default;
-        owner.register(`adapter:-json-api`, Adapter);
-        adapter = owner.lookup(`adapter:-json-api`);
-        deprecateTestRegistration('adapter', '-json-api');
-      }
-    }
-
     if (adapter !== undefined) {
       set(adapter, 'store', this);
       _adapterCache[normalizedModelName] = adapter;
       return adapter;
     }
 
-    // no adapter found for the specific model, fallback and check for application adapter
+    // no adapter found for the specific name, fallback and check for application adapter
     adapter = _adapterCache.application || owner.lookup('adapter:application');
     if (adapter !== undefined) {
       set(adapter, 'store', this);
@@ -3362,30 +3061,9 @@ abstract class CoreStore extends Service {
       return adapter;
     }
 
-    // no model specific adapter or application adapter, check for an `adapter`
-    // property defined on the store
-    let adapterName = this.adapter || '-json-api';
-    adapter = adapterName ? _adapterCache[adapterName] || owner.lookup(`adapter:${adapterName}`) : undefined;
-
-    // in production this is handled by the re-export
-    if (DEBUG && HAS_EMBER_DATA_PACKAGE && HAS_ADAPTER_PACKAGE && adapter === undefined) {
-      if (adapterName === '-json-api') {
-        const Adapter = require('@ember-data/adapter/json-api').default;
-        owner.register(`adapter:-json-api`, Adapter);
-        adapter = owner.lookup(`adapter:-json-api`);
-        deprecateTestRegistration('adapter', '-json-api');
-      }
-    }
-
-    if (adapter !== undefined) {
-      set(adapter, 'store', this);
-      _adapterCache[normalizedModelName] = adapter;
-      _adapterCache[adapterName] = adapter;
-      return adapter;
-    }
-
     // final fallback, no model specific adapter, no application adapter, no
     // `adapter` property on store: use json-api adapter
+    // TODO we should likely deprecate this?
     adapter = _adapterCache['-json-api'] || owner.lookup('adapter:-json-api');
     assert(
       `No adapter was found for '${modelName}' and no 'application' adapter was found as a fallback.`,
@@ -3437,30 +3115,8 @@ abstract class CoreStore extends Service {
 
     let owner = getOwner(this);
 
+    // by name
     serializer = owner.lookup(`serializer:${normalizedModelName}`);
-
-    if (DEPRECATE_LEGACY_TEST_REGISTRATIONS) {
-      // in production this is handled by the re-export
-      if (DEBUG && HAS_EMBER_DATA_PACKAGE && HAS_SERIALIZER_PACKAGE && serializer === undefined) {
-        if (normalizedModelName === '-json-api') {
-          const Serializer = require('@ember-data/serializer/json-api').default;
-          owner.register(`serializer:-json-api`, Serializer);
-          serializer = owner.lookup(`serializer:-json-api`);
-          deprecateTestRegistration('serializer', '-json-api');
-        } else if (normalizedModelName === '-rest') {
-          const Serializer = require('@ember-data/serializer/rest').default;
-          owner.register(`serializer:-rest`, Serializer);
-          serializer = owner.lookup(`serializer:-rest`);
-          deprecateTestRegistration('serializer', '-rest');
-        } else if (normalizedModelName === '-default') {
-          const Serializer = require('@ember-data/serializer/json').default;
-          owner.register(`serializer:-default`, Serializer);
-          serializer = owner.lookup(`serializer:-default`);
-          serializer && deprecateTestRegistration('serializer', '-default');
-        }
-      }
-    }
-
     if (serializer !== undefined) {
       set(serializer, 'store', this);
       _serializerCache[normalizedModelName] = serializer;
@@ -3476,37 +3132,6 @@ abstract class CoreStore extends Service {
       return serializer;
     }
 
-    let serializerName;
-
-    if (DEPRECATE_LEGACY_TEST_REGISTRATIONS) {
-      // in production this is handled by the re-export
-      if (DEBUG && HAS_EMBER_DATA_PACKAGE && HAS_SERIALIZER_PACKAGE && serializer === undefined) {
-        if (serializerName === '-json-api') {
-          const Serializer = require('@ember-data/serializer/json-api').default;
-          owner.register(`serializer:-json-api`, Serializer);
-          serializer = owner.lookup(`serializer:-json-api`);
-          deprecateTestRegistration('serializer', '-json-api');
-        } else if (serializerName === '-rest') {
-          const Serializer = require('@ember-data/serializer/rest').default;
-          owner.register(`serializer:-rest`, Serializer);
-          serializer = owner.lookup(`serializer:-rest`);
-          deprecateTestRegistration('serializer', '-rest');
-        } else if (serializerName === '-default') {
-          const Serializer = require('@ember-data/serializer/json').default;
-          owner.register(`serializer:-default`, Serializer);
-          serializer = owner.lookup(`serializer:-default`);
-          serializer && deprecateTestRegistration('serializer', '-default');
-        }
-      }
-
-      if (serializer !== undefined) {
-        set(serializer, 'store', this);
-        _serializerCache[normalizedModelName] = serializer;
-        _serializerCache[serializerName] = serializer;
-        return serializer;
-      }
-    }
-
     assert(
       `No serializer was found for '${modelName}' and no 'application' serializer was found as a fallback`,
       serializer !== undefined
@@ -3544,7 +3169,7 @@ abstract class CoreStore extends Service {
     super.willDestroy();
     this.recordArrayManager.destroy();
 
-    identifierCacheFor(this).destroy();
+    this.identifierCache.destroy();
 
     // destroy the graph before unloadAll
     // since then we avoid churning relationships
@@ -3604,39 +3229,6 @@ abstract class CoreStore extends Service {
   }
 }
 
-if (DEPRECATE_DEFAULT_ADAPTER) {
-  defineProperty(
-    CoreStore.prototype,
-    'defaultAdapter',
-    computed('adapter', function () {
-      deprecate(
-        `store.adapterFor(modelName) resolved the ("${
-          this.adapter || '-json-api'
-        }") adapter via the deprecated \`store.defaultAdapter\` property.\n\n\tPreviously, applications could define the store's \`adapter\` property which would be used by \`defaultAdapter\` and \`adapterFor\` as a fallback for when an adapter was not found by an exact name match. This behavior is deprecated in favor of explicitly defining an application or type-specific adapter.`,
-        false,
-        {
-          id: 'ember-data:default-adapter',
-          until: '4.0',
-          url: 'https://deprecations.emberjs.com/ember-data/v3.x/#toc_ember-data-default-adapter',
-          for: '@ember-data/store',
-          since: {
-            available: '3.15',
-            enabled: '3.15',
-          },
-        }
-      );
-      let adapter = this.adapter || '-json-api';
-
-      assert(
-        'You tried to set `adapter` property to an instance of `Adapter`, where it should be a name',
-        typeof adapter === 'string'
-      );
-
-      return this.adapterFor(adapter);
-    })
-  );
-}
-
 export default CoreStore;
 
 let assertDestroyingStore: Function;
@@ -3644,48 +3236,16 @@ let assertDestroyedStoreOnly: Function;
 
 if (DEBUG) {
   assertDestroyingStore = function assertDestroyedStore(store, method) {
-    if (!store.shouldAssertMethodCallsOnDestroyedStore) {
-      deprecate(
-        `Attempted to call store.${method}(), but the store instance has already been destroyed.`,
-        !(store.isDestroying || store.isDestroyed),
-        {
-          id: 'ember-data:method-calls-on-destroyed-store',
-          until: '3.8',
-          for: '@ember-data/store',
-          since: {
-            available: '3.8',
-            enabled: '3.8',
-          },
-        }
-      );
-    } else {
-      assert(
-        `Attempted to call store.${method}(), but the store instance has already been destroyed.`,
-        !(store.isDestroying || store.isDestroyed)
-      );
-    }
+    assert(
+      `Attempted to call store.${method}(), but the store instance has already been destroyed.`,
+      !(store.isDestroying || store.isDestroyed)
+    );
   };
   assertDestroyedStoreOnly = function assertDestroyedStoreOnly(store, method) {
-    if (!store.shouldAssertMethodCallsOnDestroyedStore) {
-      deprecate(
-        `Attempted to call store.${method}(), but the store instance has already been destroyed.`,
-        !store.isDestroyed,
-        {
-          id: 'ember-data:method-calls-on-destroyed-store',
-          until: '3.8',
-          for: '@ember-data/store',
-          since: {
-            available: '3.8',
-            enabled: '3.8',
-          },
-        }
-      );
-    } else {
-      assert(
-        `Attempted to call store.${method}(), but the store instance has already been destroyed.`,
-        !store.isDestroyed
-      );
-    }
+    assert(
+      `Attempted to call store.${method}(), but the store instance has already been destroyed.`,
+      !store.isDestroyed
+    );
   };
 }
 
@@ -3700,7 +3260,7 @@ if (DEBUG) {
  * @return {boolean}
  */
 function areAllInverseRecordsLoaded(store: CoreStore, resource: JsonApiRelationship): boolean {
-  const cache = identifierCacheFor(store);
+  const cache = store.identifierCache;
 
   if (Array.isArray(resource.data)) {
     // treat as collection