@ember-data/store 3.29.0-alpha.9 → 4.0.0-beta.3

package/addon/-private/identifiers/cache.ts

@@ -6,30 +6,27 @@ import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 
 import coerceId from '../system/coerce-id';
+import type CoreStore from '../system/core-store';
 import normalizeModelName from '../system/normalize-model-name';
+import type { ExistingResourceObject, ResourceIdentifierObject } from '../ts-interfaces/ember-data-json-api';
+import type {
+  ForgetMethod,
+  GenerationMethod,
+  Identifier,
+  IdentifierBucket,
+  RecordIdentifier,
+  ResetMethod,
+  ResourceData,
+  StableRecordIdentifier,
+  UpdateMethod,
+} from '../ts-interfaces/identifier';
 import { DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from '../ts-interfaces/identifier';
+import type { ConfidentDict } from '../ts-interfaces/utils';
 import isNonEmptyString from '../utils/is-non-empty-string';
 import { addSymbol } from '../utils/symbol';
 import isStableIdentifier, { markStableIdentifier, unmarkStableIdentifier } from './is-stable-identifier';
 import uuidv4 from './utils/uuid-v4';
 
-type IdentifierBucket = import('../ts-interfaces/identifier').IdentifierBucket;
-
-type ResourceData = import('../ts-interfaces/identifier').ResourceData;
-
-type Identifier = import('../ts-interfaces/identifier').Identifier;
-
-type CoreStore = import('../system/core-store').default;
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
-type GenerationMethod = import('../ts-interfaces/identifier').GenerationMethod;
-type UpdateMethod = import('../ts-interfaces/identifier').UpdateMethod;
-type ForgetMethod = import('../ts-interfaces/identifier').ForgetMethod;
-type ResetMethod = import('../ts-interfaces/identifier').ResetMethod;
-type RecordIdentifier = import('../ts-interfaces/identifier').RecordIdentifier;
-type ResourceIdentifierObject = import('../ts-interfaces/ember-data-json-api').ResourceIdentifierObject;
-type ExistingResourceObject = import('../ts-interfaces/ember-data-json-api').ExistingResourceObject;
-type ConfidentDict<T> = import('../ts-interfaces/utils').ConfidentDict<T>;
-
 function freeze<T>(obj: T): T {
   if (typeof Object.freeze === 'function') {
     return Object.freeze(obj);

package/addon/-private/identifiers/is-stable-identifier.ts

@@ -1,4 +1,4 @@
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
+import type { StableRecordIdentifier } from '../ts-interfaces/identifier';
 /**
   @module @ember-data/store
 */

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

@@ -7,6 +7,7 @@ import { assert, deprecate, inspect, warn } from '@ember/debug';
 import { computed, defineProperty, get, set } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { _backburner as emberBackburner } from '@ember/runloop';
+import type { Backburner } from '@ember/runloop/-private/backburner';
 import Service from '@ember/service';
 import { registerWaiter, unregisterWaiter } from '@ember/test';
 import { isNone, isPresent, typeOf } from '@ember/utils';
@@ -33,8 +34,38 @@ import {
   DEPRECATE_DEFAULT_SERIALIZER,
   DEPRECATE_LEGACY_TEST_REGISTRATIONS,
 } from '@ember-data/private-build-infra/deprecations';
-
+import type {
+  BelongsToRelationship,
+  ManyRelationship,
+  RecordData as RecordDataClass,
+} 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 type { DSModel } from '../ts-interfaces/ds-model';
+import type {
+  CollectionResourceDocument,
+  EmptyResourceDocument,
+  ExistingResourceObject,
+  JsonApiDocument,
+  ResourceIdentifierObject,
+  SingleResourceDocument,
+} from '../ts-interfaces/ember-data-json-api';
+import type {
+  RecordIdentifier,
+  StableExistingRecordIdentifier,
+  StableRecordIdentifier,
+} from '../ts-interfaces/identifier';
+import type { PromiseProxy } from '../ts-interfaces/promise-proxies';
+import type { RecordData } from '../ts-interfaces/record-data';
+import type { JsonApiRelationship } from '../ts-interfaces/record-data-json-api';
+import type { RecordDataRecordWrapper } from '../ts-interfaces/record-data-record-wrapper';
+import type { AttributesSchema } from '../ts-interfaces/record-data-schemas';
+import type { RecordInstance } from '../ts-interfaces/record-instance';
+import type { SchemaDefinitionService } from '../ts-interfaces/schema-definition-service';
+import type { FindOptions } from '../ts-interfaces/store';
+import type { Dict } from '../ts-interfaces/utils';
 import constructResource from '../utils/construct-resource';
 import promiseRecord from '../utils/promise-record';
 import { addSymbol } from '../utils/symbol';
@@ -42,62 +73,36 @@ import edBackburner from './backburner';
 import coerceId, { ensureStringId } from './coerce-id';
 import { errorsArrayToHash } from './errors-utils';
 import FetchManager, { SaveOp } from './fetch-manager';
+import type InternalModel from './model/internal-model';
 import {
   assertRecordsPassedToHasMany,
   extractRecordDataFromRecord,
   extractRecordDatasFromRecords,
 } from './model/internal-model';
+import type ShimModelClass from './model/shim-model-class';
 import { getShimClass } from './model/shim-model-class';
 import normalizeModelName from './normalize-model-name';
 import { promiseArray, promiseObject } from './promise-proxies';
 import RecordArrayManager from './record-array-manager';
 import { setRecordDataFor } from './record-data-for';
 import NotificationManager from './record-notification-manager';
+import type { BelongsToReference, HasManyReference } from './references';
 import { RecordReference } from './references';
-import { RequestPromise } from './request-cache';
+import type RequestCache from './request-cache';
+import type { default as Snapshot, PrivateSnapshot } from './snapshot';
 import { _bind, _guard, _objectIsAlive, guardDestroyedStore } from './store/common';
 import { _find, _findAll, _findBelongsTo, _findHasMany, _findMany, _query, _queryRecord } from './store/finders';
-import { internalModelFactoryFor, recordIdentifierFor, setRecordIdentifier } from './store/internal-model-factory';
+import {
+  internalModelFactoryFor,
+  peekRecordIdentifier,
+  recordIdentifierFor,
+  setRecordIdentifier,
+} from './store/internal-model-factory';
 import RecordDataStoreWrapper from './store/record-data-store-wrapper';
 import { normalizeResponseHelper } from './store/serializer-response';
 
-type BelongsToRelationship = import('@ember-data/record-data/-private').BelongsToRelationship;
-type ManyRelationship = import('@ember-data/record-data/-private').ManyRelationship;
-
-type RelationshipState = import('@ember-data/record-data/-private/graph/-state').RelationshipState;
-type ShimModelClass = import('./model/shim-model-class').default;
-type Snapshot = import('./snapshot').default;
-type Backburner = import('@ember/runloop/-private/backburner').Backburner;
-type RecordReference = import('./references').RecordReference;
-type HasManyReference = import('./references').HasManyReference;
-type BelongsToReference = import('./references').BelongsToReference;
-type IdentifierCache = import('../identifiers/cache').IdentifierCache;
-type InternalModel = import('./model/internal-model').default;
-
-type JsonApiRelationship = import('../ts-interfaces/record-data-json-api').JsonApiRelationship;
-type ResourceIdentifierObject = import('../ts-interfaces/ember-data-json-api').ResourceIdentifierObject;
-type EmptyResourceDocument = import('../ts-interfaces/ember-data-json-api').EmptyResourceDocument;
-type SingleResourceDocument = import('../ts-interfaces/ember-data-json-api').SingleResourceDocument;
-type CollectionResourceDocument = import('../ts-interfaces/ember-data-json-api').CollectionResourceDocument;
-type JsonApiDocument = import('../ts-interfaces/ember-data-json-api').JsonApiDocument;
-type ExistingResourceObject = import('../ts-interfaces/ember-data-json-api').ExistingResourceObject;
-type RecordIdentifier = import('../ts-interfaces/identifier').RecordIdentifier;
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
-type StableExistingRecordIdentifier = import('../ts-interfaces/identifier').StableExistingRecordIdentifier;
-type RecordInstance = import('../ts-interfaces/record-instance').RecordInstance;
-type RecordData = import('../ts-interfaces/record-data').RecordData;
-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>;
-type RecordDataRecordWrapper = import('../ts-interfaces/record-data-record-wrapper').RecordDataRecordWrapper;
-type AttributesSchema = import('../ts-interfaces/record-data-schemas').AttributesSchema;
-type SchemaDefinitionService = import('../ts-interfaces/schema-definition-service').SchemaDefinitionService;
-type PrivateSnapshot = import('./snapshot').PrivateSnapshot;
-type RecordDataClass = typeof import('@ember-data/record-data/-private').RecordData;
-type RequestCache = import('./request-cache').default;
-type FindOptions = import('../ts-interfaces/store').FindOptions;
-
-let _RecordData: RecordDataClass | undefined;
+type RecordDataConstruct = typeof RecordDataClass;
+let _RecordData: RecordDataConstruct | undefined;
 
 const { ENV } = Ember;
 type AsyncTrackingToken = Readonly<{ label: string; trace: Error | string }>;
@@ -714,10 +719,27 @@ abstract class CoreStore extends Service {
     }
     this._backburner.join(() => {
       if (CUSTOM_MODEL_CLASS) {
-        let identifier = recordIdentifierFor(record);
-        let internalModel = internalModelFactoryFor(this).peek(identifier);
-        if (internalModel) {
-          internalModel.deleteRecord();
+        let identifier = peekRecordIdentifier(record);
+        if (identifier) {
+          let internalModel = internalModelFactoryFor(this).peek(identifier);
+          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();
@@ -746,10 +768,27 @@ abstract class CoreStore extends Service {
       assertDestroyingStore(this, 'unloadRecord');
     }
     if (CUSTOM_MODEL_CLASS) {
-      let identifier = recordIdentifierFor(record);
-      let internalModel = internalModelFactoryFor(this).peek(identifier);
-      if (internalModel) {
-        internalModel.unloadRecord();
+      let identifier = peekRecordIdentifier(record);
+      if (identifier) {
+        let internalModel = internalModelFactoryFor(this).peek(identifier);
+        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();
@@ -1268,6 +1307,10 @@ 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));
+        }
         return this._scheduleFetch(internalModel, options);
       }
     }
@@ -2012,13 +2055,9 @@ abstract class CoreStore extends Service {
     if (internalModel) {
       // short circuit if we are already loading
       if (REQUEST_SERVICE) {
-        // Temporary fix for requests already loading until we move this inside the fetch manager
-        let pendingRequests = this.getRequestStateService()
-          .getPendingRequestsForRecord(internalModel.identifier)
-          .filter((req) => req.type === 'query');
-
-        if (pendingRequests.length > 0) {
-          return pendingRequests[0][RequestPromise].then(() => internalModel.getRecord());
+        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier);
+        if (pendingRequest) {
+          return pendingRequest.then(() => internalModel.getRecord());
         }
       } else {
         if (internalModel.currentState.isLoading) {
@@ -3387,7 +3426,7 @@ abstract class CoreStore extends Service {
       // it can be reproduced in partner tests by running
       // node ./scripts/packages-for-commit.js && yarn test-external:ember-observer
       if (_RecordData === undefined) {
-        _RecordData = require('@ember-data/record-data/-private').RecordData as RecordDataClass;
+        _RecordData = require('@ember-data/record-data/-private').RecordData as RecordDataConstruct;
       }
 
       let identifier = identifierCacheFor(this).getOrCreateRecordIdentifier({

package/addon/-private/system/ds-model-store.ts

@@ -7,21 +7,20 @@ import { isPresent } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 
 import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
+import type DSModelClass from '@ember-data/model';
 
+import type { DSModel } from '../ts-interfaces/ds-model';
+import type { StableRecordIdentifier } from '../ts-interfaces/identifier';
+import type { RecordDataRecordWrapper } from '../ts-interfaces/record-data-record-wrapper';
+import type { RelationshipsSchema } from '../ts-interfaces/record-data-schemas';
+import type { SchemaDefinitionService } from '../ts-interfaces/schema-definition-service';
 import CoreStore from './core-store';
+import type ShimModelClass from './model/shim-model-class';
 import { getShimClass } from './model/shim-model-class';
 import normalizeModelName from './normalize-model-name';
+import type NotificationManager from './record-notification-manager';
 import { DSModelSchemaDefinitionService, getModelFactory } from './schema-definition-service';
 
-type RelationshipsSchema = import('../ts-interfaces/record-data-schemas').RelationshipsSchema;
-type SchemaDefinitionService = import('../ts-interfaces/schema-definition-service').SchemaDefinitionService;
-type RecordDataRecordWrapper = import('../ts-interfaces/record-data-record-wrapper').RecordDataRecordWrapper;
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
-type NotificationManager = import('./record-notification-manager').default;
-type DSModel = import('../ts-interfaces/ds-model').DSModel;
-type ShimModelClass = import('./model/shim-model-class').default;
-type DSModelClass = import('@ember-data/model').default;
-
 class Store extends CoreStore {
   public _modelFactoryCache = Object.create(null);
   private _relationshipsDefCache = Object.create(null);

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

@@ -8,25 +8,20 @@ import { DEBUG } from '@glimmer/env';
 
 import { default as RSVP, Promise } from 'rsvp';
 
+import type { CollectionResourceDocument, SingleResourceDocument } from '../ts-interfaces/ember-data-json-api';
+import type { FindRecordQuery, Request, SaveRecordMutation } from '../ts-interfaces/fetch-manager';
+import type { ExistingRecordIdentifier, RecordIdentifier, StableRecordIdentifier } from '../ts-interfaces/identifier';
+import type { Dict } from '../ts-interfaces/utils';
 import { symbol } from '../utils/symbol';
 import coerceId from './coerce-id';
+import type CoreStore from './core-store';
 import { errorsArrayToHash } from './errors-utils';
-import RequestCache from './request-cache';
+import RequestCache, { RequestPromise } from './request-cache';
+import type { PrivateSnapshot } from './snapshot';
 import Snapshot from './snapshot';
 import { _bind, _guard, _objectIsAlive, guardDestroyedStore } from './store/common';
 import { normalizeResponseHelper } from './store/serializer-response';
 
-type CoreStore = import('./core-store').default;
-type FindRecordQuery = import('../ts-interfaces/fetch-manager').FindRecordQuery;
-type SaveRecordMutation = import('../ts-interfaces/fetch-manager').SaveRecordMutation;
-type Request = import('../ts-interfaces/fetch-manager').Request;
-type CollectionResourceDocument = import('../ts-interfaces/ember-data-json-api').CollectionResourceDocument;
-type SingleResourceDocument = import('../ts-interfaces/ember-data-json-api').SingleResourceDocument;
-type RecordIdentifier = import('../ts-interfaces/identifier').RecordIdentifier;
-type ExistingRecordIdentifier = import('../ts-interfaces/identifier').ExistingRecordIdentifier;
-type Dict<T> = import('../ts-interfaces/utils').Dict<T>;
-type PrivateSnapshot = import('./snapshot').PrivateSnapshot;
-
 function payloadIsNotBlank(adapterPayload): boolean {
   if (Array.isArray(adapterPayload)) {
     return true;
@@ -507,6 +502,16 @@ export default class FetchManager {
     }
   }
 
+  getPendingFetch(identifier: StableRecordIdentifier) {
+    let pendingRequests = this.requestCache
+      .getPendingRequestsForRecord(identifier)
+      .filter((req) => req.type === 'query');
+
+    if (pendingRequests.length > 0) {
+      return pendingRequests[0][RequestPromise];
+    }
+  }
+
   flushAllPendingFetches() {
     if (this.isDestroyed) {
       return;

package/addon/-private/system/identity-map.ts

@@ -1,7 +1,6 @@
+import type { ConfidentDict } from '../ts-interfaces/utils';
 import InternalModelMap from './internal-model-map';
 
-type ConfidentDict<T> = import('../ts-interfaces/utils').ConfidentDict<T>;
-
 /**
   @module @ember-data/store
 */

package/addon/-private/system/internal-model-map.ts

@@ -1,11 +1,9 @@
 import { assert } from '@ember/debug';
 
+import type { StableRecordIdentifier } from '../ts-interfaces/identifier';
+import type { ConfidentDict } from '../ts-interfaces/utils';
 import InternalModel from './model/internal-model';
 
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
-
-type ConfidentDict<T> = import('../ts-interfaces/utils').ConfidentDict<T>;
-
 /**
   @module @ember-data/store
 */

package/addon/-private/system/model/internal-model.ts

@@ -17,9 +17,23 @@ import {
   REQUEST_SERVICE,
 } from '@ember-data/canary-features';
 import { HAS_MODEL_PACKAGE, HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
+import type {
+  BelongsToRelationship,
+  ManyRelationship,
+  RecordData as DefaultRecordData,
+} from '@ember-data/record-data/-private';
+import type { UpgradedMeta } from '@ember-data/record-data/-private/graph/-edge-definition';
 
 import { identifierCacheFor } from '../../identifiers/cache';
+import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
+import type { RecordData } from '../../ts-interfaces/record-data';
+import type { JsonApiResource, JsonApiValidationError } from '../../ts-interfaces/record-data-json-api';
+import type { RecordInstance } from '../../ts-interfaces/record-instance';
+import type { FindOptions } from '../../ts-interfaces/store';
+import type { ConfidentDict } from '../../ts-interfaces/utils';
 import coerceId from '../coerce-id';
+import type CoreStore from '../core-store';
+import type Store from '../ds-model-store';
 import { errorsHashToArray } from '../errors-utils';
 import { recordArraysForIdentifier } from '../record-array-manager';
 import recordDataFor from '../record-data-for';
@@ -28,22 +42,6 @@ import Snapshot from '../snapshot';
 import { internalModelFactoryFor, setRecordIdentifier } from '../store/internal-model-factory';
 import RootState from './states';
 
-type BelongsToRelationship = import('@ember-data/record-data/-private').BelongsToRelationship;
-type ManyRelationship = import('@ember-data/record-data/-private').ManyRelationship;
-
-type UpgradedMeta = import('@ember-data/record-data/-private/graph/-edge-definition').UpgradedMeta;
-
-type CoreStore = import('../core-store').default;
-type StableRecordIdentifier = import('../../ts-interfaces/identifier').StableRecordIdentifier;
-type ConfidentDict<T> = import('../../ts-interfaces/utils').ConfidentDict<T>;
-type RecordInstance = import('../../ts-interfaces/record-instance').RecordInstance;
-type JsonApiResource = import('../../ts-interfaces/record-data-json-api').JsonApiResource;
-type JsonApiValidationError = import('../../ts-interfaces/record-data-json-api').JsonApiValidationError;
-type RecordData = import('../../ts-interfaces/record-data').RecordData;
-type FindOptions = import('../../ts-interfaces/store').FindOptions;
-type Store = import('../ds-model-store').default;
-type DefaultRecordData = import('@ember-data/record-data/-private').RecordData;
-
 // move to TS hacks module that we can delete when this is no longer a necessary recast
 type ManyArray = InstanceType<typeof import('@ember-data/model/-private').ManyArray>;
 type PromiseBelongsTo = InstanceType<typeof import('@ember-data/model/-private').PromiseBelongsTo>;

package/addon/-private/system/model/shim-model-class.ts

@@ -1,9 +1,7 @@
 import { ModelSchema } from '../../ts-interfaces/ds-model';
-
-type Dict<T> = import('../../ts-interfaces/utils').Dict<T>;
-type RelationshipSchema = import('../../ts-interfaces/record-data-schemas').RelationshipSchema;
-type AttributeSchema = import('../../ts-interfaces/record-data-schemas').AttributeSchema;
-type CoreStore = import('../core-store').default;
+import type { AttributeSchema, RelationshipSchema } from '../../ts-interfaces/record-data-schemas';
+import type { Dict } from '../../ts-interfaces/utils';
+import type CoreStore from '../core-store';
 
 const AvailableShims = new WeakMap<CoreStore, Dict<ShimModelClass>>();
 

package/addon/-private/system/record-data-for.ts

@@ -1,7 +1,8 @@
 import { assert } from '@ember/debug';
 
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
-type RecordData = import('../ts-interfaces/record-data').RecordData;
+import type { StableRecordIdentifier } from '../ts-interfaces/identifier';
+import type { RecordData } from '../ts-interfaces/record-data';
+
 /*
  * Returns the RecordData instance associated with a given
  * Model or InternalModel.

package/addon/-private/system/record-notification-manager.ts

@@ -1,8 +1,6 @@
 import { identifierCacheFor } from '../identifiers/cache';
-
-type CoreStore = import('./core-store').default;
-type RecordIdentifier = import('../ts-interfaces/identifier').RecordIdentifier;
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
+import type { RecordIdentifier, StableRecordIdentifier } from '../ts-interfaces/identifier';
+import type CoreStore from './core-store';
 
 type UnsubscribeToken = Object;
 

package/addon/-private/system/references/record.ts

@@ -1,11 +1,10 @@
 import RSVP, { resolve } from 'rsvp';
 
+import type { SingleResourceDocument } from '../../ts-interfaces/ember-data-json-api';
+import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
+import type { RecordInstance } from '../../ts-interfaces/record-instance';
 import Reference, { internalModelForReference, REFERENCE_CACHE } from './reference';
 
-type SingleResourceDocument = import('../../ts-interfaces/ember-data-json-api').SingleResourceDocument;
-type RecordInstance = import('../../ts-interfaces/record-instance').RecordInstance;
-type StableRecordIdentifier = import('../../ts-interfaces/identifier').StableRecordIdentifier;
-
 /**
   @module @ember-data/store
 */

package/addon/-private/system/references/reference.ts

@@ -1,19 +1,17 @@
 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';
+import type { Dict } from '../../ts-interfaces/utils';
+import type CoreStore from '../core-store';
+import type InternalModel from '../model/internal-model';
 import { internalModelFactoryFor } from '../store/internal-model-factory';
 
-type Dict<T> = import('../../ts-interfaces/utils').Dict<T>;
-type JsonApiRelationship = import('../../ts-interfaces/record-data-json-api').JsonApiRelationship;
-type PaginationLinks = import('../../ts-interfaces/ember-data-json-api').PaginationLinks;
-type LinkObject = import('../../ts-interfaces/ember-data-json-api').LinkObject;
-type CoreStore = import('../core-store').default;
-type JSONObject = import('json-typescript').Object;
-type JSONValue = import('json-typescript').Value;
-type InternalModel = import('../model/internal-model').default;
-type StableRecordIdentifier = import('../../ts-interfaces/identifier').StableRecordIdentifier;
-
 /**
   @module @ember-data/store
 */

package/addon/-private/system/request-cache.ts

@@ -1,13 +1,14 @@
+import type {
+  FindRecordQuery,
+  Operation,
+  Request,
+  RequestState,
+  SaveRecordMutation,
+} from '../ts-interfaces/fetch-manager';
 import { RequestStateEnum } from '../ts-interfaces/fetch-manager';
+import type { RecordIdentifier } from '../ts-interfaces/identifier';
 import { addSymbol, symbol } from '../utils/symbol';
 
-type FindRecordQuery = import('../ts-interfaces/fetch-manager').FindRecordQuery;
-type SaveRecordMutation = import('../ts-interfaces/fetch-manager').SaveRecordMutation;
-type Request = import('../ts-interfaces/fetch-manager').Request;
-type RequestState = import('../ts-interfaces/fetch-manager').RequestState;
-type Operation = import('../ts-interfaces/fetch-manager').Operation;
-type RecordIdentifier = import('../ts-interfaces/identifier').RecordIdentifier;
-
 const Touching: unique symbol = symbol('touching');
 export const RequestPromise: unique symbol = symbol('promise');
 

package/addon/-private/system/schema-definition-service.ts

@@ -3,16 +3,14 @@ import { get } from '@ember/object';
 
 import require from 'require';
 
+import type Model from '@ember-data/model';
 import { HAS_MODEL_PACKAGE } from '@ember-data/private-build-infra';
 
+import type { RecordIdentifier } from '../ts-interfaces/identifier';
+import type { AttributesSchema, RelationshipsSchema } from '../ts-interfaces/record-data-schemas';
+import type Store from './ds-model-store';
 import normalizeModelName from './normalize-model-name';
 
-type RelationshipsSchema = import('../ts-interfaces/record-data-schemas').RelationshipsSchema;
-type AttributesSchema = import('../ts-interfaces/record-data-schemas').AttributesSchema;
-type RecordIdentifier = import('../ts-interfaces/identifier').RecordIdentifier;
-type Store = import('./ds-model-store').default;
-
-type Model = import('@ember-data/model').default;
 type ModelForMixin = (store: Store, normalizedModelName: string) => Model | null;
 
 let _modelForMixin: ModelForMixin;

package/addon/-private/system/snapshot-record-array.ts

@@ -1,10 +1,11 @@
-type Dict<T> = import('../ts-interfaces/utils').Dict<T>;
 /**
   @module @ember-data/store
 */
-type RecordArray = import('./record-arrays/record-array').default;
-type Snapshot = import('./snapshot').default;
-type ModelSchema = import('../ts-interfaces/ds-model').ModelSchema;
+
+import type { ModelSchema } from '../ts-interfaces/ds-model';
+import type { Dict } from '../ts-interfaces/utils';
+import type RecordArray from './record-arrays/record-array';
+import type Snapshot from './snapshot';
 /**
   SnapshotRecordArray is not directly instantiable.
   Instances are provided to consuming application's

package/addon/-private/system/snapshot.ts

@@ -8,20 +8,17 @@ import { assign } from '@ember/polyfills';
 import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 
+import type { DSModel, DSModelSchema, ModelSchema } from '../ts-interfaces/ds-model';
+import type { StableRecordIdentifier } from '../ts-interfaces/identifier';
+import type { ChangedAttributesHash } from '../ts-interfaces/record-data';
+import type { AttributeSchema, RelationshipSchema } from '../ts-interfaces/record-data-schemas';
+import type { RecordInstance } from '../ts-interfaces/record-instance';
+import type { FindOptions } from '../ts-interfaces/store';
+import type { Dict } from '../ts-interfaces/utils';
+import type Store from './core-store';
+import type InternalModel from './model/internal-model';
 import recordDataFor from './record-data-for';
 
-type InternalModel = import('./model/internal-model').default;
-type Dict<T> = import('../ts-interfaces/utils').Dict<T>;
-type StableRecordIdentifier = import('../ts-interfaces/identifier').StableRecordIdentifier;
-type ChangedAttributesHash = import('../ts-interfaces/record-data').ChangedAttributesHash;
-type RecordInstance = import('../ts-interfaces/record-instance').RecordInstance;
-type DSModel = import('../ts-interfaces/ds-model').DSModel;
-type DSModelSchema = import('../ts-interfaces/ds-model').DSModelSchema;
-type ModelSchema = import('../ts-interfaces/ds-model').ModelSchema;
-type AttributeSchema = import('../ts-interfaces/record-data-schemas').AttributeSchema;
-type RelationshipSchema = import('../ts-interfaces/record-data-schemas').RelationshipSchema;
-type Store = import('./core-store').default;
-type FindOptions = import('../ts-interfaces/store').FindOptions;
 type RecordId = string | null;
 
 function schemaIsDSModel(schema: ModelSchema | DSModelSchema): schema is DSModelSchema {

package/addon/-private/system/store/internal-model-factory.ts

@@ -2,20 +2,21 @@ import { assert, warn } from '@ember/debug';
 import { isNone } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 
+import type { IdentifierCache } from '../../identifiers/cache';
 import { identifierCacheFor } from '../../identifiers/cache';
+import type {
+  ExistingResourceObject,
+  NewResourceIdentifierObject,
+  ResourceIdentifierObject,
+} from '../../ts-interfaces/ember-data-json-api';
+import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
+import type { RecordInstance } from '../../ts-interfaces/record-instance';
 import constructResource from '../../utils/construct-resource';
+import type CoreStore from '../core-store';
 import IdentityMap from '../identity-map';
+import type InternalModelMap from '../internal-model-map';
 import InternalModel from '../model/internal-model';
 
-type CoreStore = import('../core-store').default;
-type ResourceIdentifierObject = import('../../ts-interfaces/ember-data-json-api').ResourceIdentifierObject;
-type ExistingResourceObject = import('../../ts-interfaces/ember-data-json-api').ExistingResourceObject;
-type NewResourceIdentifierObject = import('../../ts-interfaces/ember-data-json-api').NewResourceIdentifierObject;
-type RecordInstance = import('../../ts-interfaces/record-instance').RecordInstance;
-type InternalModelMap = import('../internal-model-map').default;
-type StableRecordIdentifier = import('../../ts-interfaces/identifier').StableRecordIdentifier;
-type IdentifierCache = import('../../identifiers/cache').IdentifierCache;
-
 /**
   @module @ember-data/store
 */

package/addon/-private/system/store/record-data-store-wrapper.ts

@@ -1,20 +1,21 @@
 import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
+import type { RelationshipDefinition } from '@ember-data/model/-private/system/relationships/relationship-meta';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 
+import type { IdentifierCache } from '../../identifiers/cache';
 import { identifierCacheFor } from '../../identifiers/cache';
+import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
+import type { RecordData } from '../../ts-interfaces/record-data';
+import type {
+  AttributesSchema,
+  RelationshipSchema,
+  RelationshipsSchema,
+} from '../../ts-interfaces/record-data-schemas';
+import type { RecordDataStoreWrapper as StoreWrapper } from '../../ts-interfaces/record-data-store-wrapper';
 import constructResource from '../../utils/construct-resource';
+import type CoreStore from '../core-store';
 import { internalModelFactoryFor } from './internal-model-factory';
 
-type StoreWrapper = import('../../ts-interfaces/record-data-store-wrapper').RecordDataStoreWrapper;
-type StableRecordIdentifier = import('../../ts-interfaces/identifier').StableRecordIdentifier;
-type CoreStore = import('../core-store').default;
-type IdentifierCache = import('../../identifiers/cache').IdentifierCache;
-type RecordData = import('../../ts-interfaces/record-data').RecordData;
-type AttributesSchema = import('../../ts-interfaces/record-data-schemas').AttributesSchema;
-type RelationshipsSchema = import('../../ts-interfaces/record-data-schemas').RelationshipsSchema;
-type RelationshipSchema = import('../../ts-interfaces/record-data-schemas').RelationshipSchema;
-type RelationshipDefinition =
-  import('@ember-data/model/-private/system/relationships/relationship-meta').RelationshipDefinition;
 /**
   @module @ember-data/store
 */

package/addon/-private/ts-interfaces/ds-model.ts

@@ -2,12 +2,10 @@ import EmberObject from '@ember/object';
 
 import RSVP from 'rsvp';
 
+import type { JsonApiValidationError } from './record-data-json-api';
+import type { AttributeSchema, RelationshipSchema } from './record-data-schemas';
 import { RecordInstance } from './record-instance';
 
-type RelationshipSchema = import('./record-data-schemas').RelationshipSchema;
-type AttributeSchema = import('./record-data-schemas').AttributeSchema;
-type JsonApiValidationError = import('./record-data-json-api').JsonApiValidationError;
-
 // Placeholder until model.js is typed
 export interface DSModel extends RecordInstance, EmberObject {
   toString(): string;

package/addon/-private/ts-interfaces/ember-data-json-api.ts

@@ -1,5 +1,6 @@
-type Dict<T> = import('./utils').Dict<T>;
-type JSONValue = import('json-typescript').Value;
+import type { Value as JSONValue } from 'json-typescript';
+
+import type { Dict } from './utils';
 
 /**
   @module @ember-data/store

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

@@ -1,4 +1,5 @@
-type RecordIdentifier = import('./identifier').RecordIdentifier;
+import type { RecordIdentifier } from './identifier';
+
 export interface Operation {
   op: string;
 }

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

@@ -2,9 +2,7 @@
   @module @ember-data/store
 */
 import { symbol } from '../utils/symbol';
-
-type ExistingResourceObject = import('./ember-data-json-api').ExistingResourceObject;
-type ResourceIdentifierObject = import('./ember-data-json-api').ResourceIdentifierObject;
+import type { ExistingResourceObject, ResourceIdentifierObject } from './ember-data-json-api';
 
 export type ResourceData = ResourceIdentifierObject | ExistingResourceObject;
 export type IdentifierBucket = 'record';

package/addon/-private/ts-interfaces/minimum-adapter-interface.ts

@@ -2,13 +2,14 @@
 // the above eslint rule checks return types. This is an interface
 // and we intend Promise whether it is Native or polyfilled is of
 // no consequence.
-type Dict<T> = import('./utils').Dict<T>;
-type Snapshot = import('../system/snapshot').default;
-type SnapshotRecordArray = import('../system/snapshot-record-array').default;
-type Store = import('../system/core-store').default;
-type ModelSchema = import('../ts-interfaces/ds-model').ModelSchema;
-type AdapterPopulatedRecordArray = import('../system/record-arrays/adapter-populated-record-array').default;
-type RelationshipSchema = import('./record-data-schemas').RelationshipSchema;
+
+import type Store from '../system/core-store';
+import type AdapterPopulatedRecordArray from '../system/record-arrays/adapter-populated-record-array';
+import type Snapshot from '../system/snapshot';
+import type SnapshotRecordArray from '../system/snapshot-record-array';
+import type { ModelSchema } from '../ts-interfaces/ds-model';
+import type { RelationshipSchema } from './record-data-schemas';
+import type { Dict } from './utils';
 
 type Group = Snapshot[];
 

package/addon/-private/ts-interfaces/minimum-serializer-interface.ts

@@ -1,10 +1,10 @@
-type Dict<T> = import('./utils').Dict<T>;
-type ModelSchema = import('./ds-model').ModelSchema;
-type Snapshot = import('../system/snapshot').default;
-type JsonApiDocument = import('./ember-data-json-api').JsonApiDocument;
-type SingleResourceDocument = import('./ember-data-json-api').SingleResourceDocument;
-type Store = import('../system/core-store').default;
-type JSONObject = import('json-typescript').Object;
+import type { Object as JSONObject } from 'json-typescript';
+
+import type Store from '../system/core-store';
+import type Snapshot from '../system/snapshot';
+import type { ModelSchema } from './ds-model';
+import type { JsonApiDocument, SingleResourceDocument } from './ember-data-json-api';
+import type { Dict } from './utils';
 
 type OptionsHash = Dict<any>;
 

package/addon/-private/ts-interfaces/record-data-json-api.ts

@@ -1,6 +1,6 @@
-type Dict<T> = import('./utils').Dict<T>;
-type SingleResourceRelationship = import('./ember-data-json-api').SingleResourceRelationship;
-type CollectionResourceRelationship = import('./ember-data-json-api').CollectionResourceRelationship;
+import type { CollectionResourceRelationship, SingleResourceRelationship } from './ember-data-json-api';
+import type { Dict } from './utils';
+
 /**
   @module @ember-data/store
 */

package/addon/-private/ts-interfaces/record-data-record-wrapper.ts

@@ -1,8 +1,7 @@
-type ChangedAttributesHash = import('./record-data').ChangedAttributesHash;
-type RecordIdentifier = import('./identifier').RecordIdentifier;
-type SingleResourceRelationship = import('./ember-data-json-api').SingleResourceRelationship;
-type CollectionResourceRelationship = import('./ember-data-json-api').CollectionResourceRelationship;
-type JsonApiValidationError = import('./record-data-json-api').JsonApiValidationError;
+import type { CollectionResourceRelationship, SingleResourceRelationship } from './ember-data-json-api';
+import type { RecordIdentifier } from './identifier';
+import type { ChangedAttributesHash } from './record-data';
+import type { JsonApiValidationError } from './record-data-json-api';
 
 /**
   @module @ember-data/store

package/addon/-private/ts-interfaces/record-data-schemas.ts

@@ -2,7 +2,8 @@
   @module @ember-data/store
 */
 
-type Dict<T> = import('./utils').Dict<T>;
+import type { Dict } from './utils';
+
 export interface RelationshipSchema {
   kind: 'belongsTo' | 'hasMany';
   type: string; // related type

package/addon/-private/ts-interfaces/record-data-store-wrapper.ts

@@ -1,7 +1,5 @@
-type RecordData = import('./record-data').RecordData;
-
-type RelationshipsSchema = import('./record-data-schemas').RelationshipsSchema;
-type AttributesSchema = import('./record-data-schemas').AttributesSchema;
+import type { RecordData } from './record-data';
+import type { AttributesSchema, RelationshipsSchema } from './record-data-schemas';
 
 /**
   @module @ember-data/store

package/addon/-private/ts-interfaces/record-data.ts

@@ -1,8 +1,6 @@
-type RecordIdentifier = import('./identifier').RecordIdentifier;
-type SingleResourceRelationship = import('./ember-data-json-api').SingleResourceRelationship;
-type CollectionResourceRelationship = import('./ember-data-json-api').CollectionResourceRelationship;
-type JsonApiResource = import('./record-data-json-api').JsonApiResource;
-type JsonApiValidationError = import('./record-data-json-api').JsonApiValidationError;
+import type { CollectionResourceRelationship, SingleResourceRelationship } from './ember-data-json-api';
+import type { RecordIdentifier } from './identifier';
+import type { JsonApiResource, JsonApiValidationError } from './record-data-json-api';
 
 /**
   @module @ember-data/store

package/addon/-private/ts-interfaces/schema-definition-service.ts

@@ -2,9 +2,8 @@
   @module @ember-data/store
 */
 
-type AttributesSchema = import('./record-data-schemas').AttributesSchema;
-type RelationshipsSchema = import('./record-data-schemas').RelationshipsSchema;
-type RecordIdentifier = import('./identifier').RecordIdentifier;
+import type { RecordIdentifier } from './identifier';
+import type { AttributesSchema, RelationshipsSchema } from './record-data-schemas';
 
 export interface SchemaDefinitionService {
   doesTypeExist(modelName: string): boolean;

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

@@ -1,4 +1,4 @@
-type Dict<T> = import('./utils').Dict<T>;
+import type { Dict } from './utils';
 
 export interface FindOptions {
   reload?: boolean;

package/addon/-private/utils/construct-resource.ts

@@ -2,11 +2,9 @@ import { assert } from '@ember/debug';
 
 import isStableIdentifier from '../identifiers/is-stable-identifier';
 import coerceId from '../system/coerce-id';
+import type { ExistingResourceIdentifierObject, ResourceIdentifierObject } from '../ts-interfaces/ember-data-json-api';
 import isNonEmptyString from './is-non-empty-string';
 
-type ResourceIdentifierObject = import('../ts-interfaces/ember-data-json-api').ResourceIdentifierObject;
-type ExistingResourceIdentifierObject = import('../ts-interfaces/ember-data-json-api').ExistingResourceIdentifierObject;
-
 function constructResource(type: ResourceIdentifierObject): ResourceIdentifierObject;
 function constructResource(type: string, id: string, lid: string): ExistingResourceIdentifierObject;
 function constructResource(

package/addon/-private/utils/promise-record.ts

@@ -1,8 +1,8 @@
+import type InternalModel from '../system/model/internal-model';
 import { promiseObject } from '../system/promise-proxies';
+import type { DSModel } from '../ts-interfaces/ds-model';
+import type { PromiseProxy } from '../ts-interfaces/promise-proxies';
 
-type DSModel = import('../ts-interfaces/ds-model').DSModel;
-type PromiseProxy<T> = import('../ts-interfaces/promise-proxies').PromiseProxy<T>;
-type InternalModel = import('../system/model/internal-model').default;
 /**
   @module @ember-data/store
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "3.29.0-alpha.9",
+  "version": "4.0.0-beta.3",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,16 +17,16 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@ember-data/canary-features": "3.29.0-alpha.9",
-    "@ember-data/private-build-infra": "3.29.0-alpha.9",
-    "@ember/string": "^1.0.0",
+    "@ember-data/canary-features": "4.0.0-beta.3",
+    "@ember-data/private-build-infra": "4.0.0-beta.3",
+    "@ember/string": "^3.0.0",
     "@glimmer/tracking": "^1.0.4",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-typescript": "^4.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "3.29.0-alpha.9",
+    "@ember-data/unpublished-test-infra": "4.0.0-beta.3",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "@types/ember": "^3.16.5",