@ember-data/store 4.4.0 → 4.5.0-alpha.2

package/addon/-private/system/store/common.js

@@ -1,8 +1,11 @@
+import { deprecate } from '@ember/debug';
 import { get } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 
 import { resolve } from 'rsvp';
 
+import { DEPRECATE_RSVP_PROMISE } from '@ember-data/private-build-infra/deprecations';
+
 /**
   @module @ember-data/store
 */
@@ -32,7 +35,27 @@ export function guardDestroyedStore(promise, store, label) {
   if (DEBUG) {
     token = store._trackAsyncRequestStart(label);
   }
-  let wrapperPromise = resolve(promise, label).then((v) => promise);
+  let wrapperPromise = resolve(promise, label).then((_v) => {
+    if (!_objectIsAlive(store)) {
+      if (DEPRECATE_RSVP_PROMISE) {
+        deprecate(
+          `A Promise did not resolve by the time the store was destroyed. This will error in a future release.`,
+          false,
+          {
+            id: 'ember-data:rsvp-unresolved-async',
+            until: '5.0',
+            for: '@ember-data/store',
+            since: {
+              available: '4.5',
+              enabled: '4.5',
+            },
+          }
+        );
+      }
+    }
+
+    return promise;
+  });
 
   return _guard(wrapperPromise, () => {
     if (DEBUG) {

package/addon/-private/system/store/finders.js

@@ -1,8 +1,10 @@
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 import { Promise } from 'rsvp';
 
+import { DEPRECATE_RSVP_PROMISE } from '@ember-data/private-build-infra/deprecations';
+
 import { _bind, _guard, _objectIsAlive, guardDestroyedStore } from './common';
 import { normalizeResponseHelper } from './serializer-response';
 
@@ -212,10 +214,26 @@ export function _findHasMany(adapter, store, internalModel, link, relationship,
   let label = `DS: Handle Adapter#findHasMany of '${internalModel.modelName}' : '${relationship.type}'`;
 
   promise = guardDestroyedStore(promise, store, label);
-  promise = _guard(promise, _bind(_objectIsAlive, internalModel));
-
-  return promise.then(
+  promise = promise.then(
     (adapterPayload) => {
+      if (!_objectIsAlive(internalModel)) {
+        if (DEPRECATE_RSVP_PROMISE) {
+          deprecate(
+            `A Promise for fetching ${relationship.type} did not resolve by the time your model was destroyed. This will error in a future release.`,
+            false,
+            {
+              id: 'ember-data:rsvp-unresolved-async',
+              until: '5.0',
+              for: '@ember-data/store',
+              since: {
+                available: '4.5',
+                enabled: '4.5',
+              },
+            }
+          );
+        }
+      }
+
       assert(
         `You made a 'findHasMany' request for a ${internalModel.modelName}'s '${relationship.key}' relationship, using link '${link}' , but the adapter's response did not have any data`,
         payloadIsNotBlank(adapterPayload)
@@ -236,6 +254,12 @@ export function _findHasMany(adapter, store, internalModel, link, relationship,
     null,
     `DS: Extract payload of '${internalModel.modelName}' : hasMany '${relationship.type}'`
   );
+
+  if (DEPRECATE_RSVP_PROMISE) {
+    promise = _guard(promise, _bind(_objectIsAlive, internalModel));
+  }
+
+  return promise;
 }
 
 export function _findBelongsTo(adapter, store, internalModel, link, relationship, options) {
@@ -249,8 +273,26 @@ export function _findBelongsTo(adapter, store, internalModel, link, relationship
   promise = guardDestroyedStore(promise, store, label);
   promise = _guard(promise, _bind(_objectIsAlive, internalModel));
 
-  return promise.then(
+  promise = promise.then(
     (adapterPayload) => {
+      if (!_objectIsAlive(internalModel)) {
+        if (DEPRECATE_RSVP_PROMISE) {
+          deprecate(
+            `A Promise for fetching ${relationship.type} did not resolve by the time your model was destroyed. This will error in a future release.`,
+            false,
+            {
+              id: 'ember-data:rsvp-unresolved-async',
+              until: '5.0',
+              for: '@ember-data/store',
+              since: {
+                available: '4.5',
+                enabled: '4.5',
+              },
+            }
+          );
+        }
+      }
+
       let serializer = store.serializerFor(relationship.type);
       let payload = normalizeResponseHelper(serializer, store, modelClass, adapterPayload, null, 'findBelongsTo');
 
@@ -271,6 +313,12 @@ export function _findBelongsTo(adapter, store, internalModel, link, relationship
     null,
     `DS: Extract payload of ${internalModel.modelName} : ${relationship.type}`
   );
+
+  if (DEPRECATE_RSVP_PROMISE) {
+    promise = _guard(promise, _bind(_objectIsAlive, internalModel));
+  }
+
+  return promise;
 }
 
 export function _findAll(adapter, store, modelName, options) {

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

@@ -9,6 +9,7 @@ import type {
   ResourceIdentifierObject,
 } from '../../ts-interfaces/ember-data-json-api';
 import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
+import type { RecordData } from '../../ts-interfaces/record-data';
 import type { RecordInstance } from '../../ts-interfaces/record-instance';
 import constructResource from '../../utils/construct-resource';
 import type CoreStore from '../core-store';
@@ -20,19 +21,19 @@ import WeakCache from '../weak-cache';
 /**
   @module @ember-data/store
 */
-
 const FactoryCache = new WeakCache<CoreStore, InternalModelFactory>(DEBUG ? 'internal-model-factory' : '');
 FactoryCache._generator = (store: CoreStore) => {
   return new InternalModelFactory(store);
 };
 type NewResourceInfo = { type: string; id: string | null };
 
-const RecordCache = new WeakCache<RecordInstance, StableRecordIdentifier>(DEBUG ? 'identifier' : '');
+const RecordCache = new WeakCache<RecordInstance | RecordData, StableRecordIdentifier>(DEBUG ? 'identifier' : '');
 if (DEBUG) {
-  RecordCache._expectMsg = (key: RecordInstance) => `${key} is not a record instantiated by @ember-data/store`;
+  RecordCache._expectMsg = (key: RecordInstance | RecordData) =>
+    `${String(key)} is not a record instantiated by @ember-data/store`;
 }
 
-export function peekRecordIdentifier(record: any): StableRecordIdentifier | undefined {
+export function peekRecordIdentifier(record: RecordInstance | RecordData): StableRecordIdentifier | undefined {
   return RecordCache.get(record);
 }
 
@@ -60,11 +61,11 @@ export function peekRecordIdentifier(record: any): StableRecordIdentifier | unde
   @param {Object} record a record instance previously obstained from the store.
   @returns {StableRecordIdentifier}
  */
-export function recordIdentifierFor(record: RecordInstance): StableRecordIdentifier {
+export function recordIdentifierFor(record: RecordInstance | RecordData): StableRecordIdentifier {
   return RecordCache.getWithError(record);
 }
 
-export function setRecordIdentifier(record: RecordInstance, identifier: StableRecordIdentifier): void {
+export function setRecordIdentifier(record: RecordInstance | RecordData, identifier: StableRecordIdentifier): void {
   if (DEBUG && RecordCache.has(record)) {
     throw new Error(`${record} was already assigned an identifier`);
   }
@@ -160,7 +161,7 @@ export default class InternalModelFactory {
       TODO @runspired consider adding this to make polymorphism even nicer
       if (HAS_RECORD_DATA_PACKAGE) {
         if (identifier.type !== matchedIdentifier.type) {
-          const graphFor = require('@ember-data/record-data/-private').graphFor;
+          const graphFor = importSync('@ember-data/record-data/-private').graphFor;
           graphFor(this).registerPolymorphicType(identifier.type, matchedIdentifier.type);
         }
       }

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

@@ -1,3 +1,5 @@
+import { importSync } from '@embroider/macros';
+
 import type { RelationshipDefinition } from '@ember-data/model/-private/system/relationships/relationship-meta';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 
@@ -10,6 +12,7 @@ import type {
   RelationshipsSchema,
 } from '../../ts-interfaces/record-data-schemas';
 import type { RecordDataStoreWrapper as StoreWrapper } from '../../ts-interfaces/record-data-store-wrapper';
+import { RecordInstance } from '../../ts-interfaces/record-instance';
 import constructResource from '../../utils/construct-resource';
 import type CoreStore from '../core-store';
 import { internalModelFactoryFor } from './internal-model-factory';
@@ -26,7 +29,9 @@ let peekGraph;
 if (HAS_RECORD_DATA_PACKAGE) {
   let _peekGraph;
   peekGraph = (wrapper) => {
-    _peekGraph = _peekGraph || require('@ember-data/record-data/-private').peekGraph;
+    _peekGraph =
+      _peekGraph ||
+      (importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private')).peekGraph;
     return _peekGraph(wrapper);
   };
 }
@@ -220,7 +225,7 @@ export default class RecordDataStoreWrapper implements StoreWrapper {
       return false;
     }
 
-    const record = internalModel._record;
+    const record = internalModel._record as RecordInstance;
     return record && !(record.isDestroyed || record.isDestroying);
   }
 

package/addon/-private/system/store/serializer-response.ts

@@ -0,0 +1,85 @@
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+
+import { JsonApiDocument } from '../../ts-interfaces/ember-data-json-api';
+import { AdapterPayload } from '../../ts-interfaces/minimum-adapter-interface';
+import { MinimumSerializerInterface, RequestType } from '../../ts-interfaces/minimum-serializer-interface';
+import CoreStore from '../core-store';
+import ShimModelClass from '../model/shim-model-class';
+
+/**
+  This is a helper method that validates a JSON API top-level document
+
+  The format of a document is described here:
+  http://jsonapi.org/format/#document-top-level
+
+  @internal
+*/
+function validateDocumentStructure(doc?: AdapterPayload | JsonApiDocument): asserts doc is JsonApiDocument {
+  if (DEBUG) {
+    let errors: string[] = [];
+    if (!doc || typeof doc !== 'object') {
+      errors.push('Top level of a JSON API document must be an object');
+    } else {
+      if (!('data' in doc) && !('errors' in doc) && !('meta' in doc)) {
+        errors.push('One or more of the following keys must be present: "data", "errors", "meta".');
+      } else {
+        if ('data' in doc && 'errors' in doc) {
+          errors.push('Top level keys "errors" and "data" cannot both be present in a JSON API document');
+        }
+      }
+      if ('data' in doc) {
+        if (!(doc.data === null || Array.isArray(doc.data) || typeof doc.data === 'object')) {
+          errors.push('data must be null, an object, or an array');
+        }
+      }
+      if ('meta' in doc) {
+        if (typeof doc.meta !== 'object') {
+          errors.push('meta must be an object');
+        }
+      }
+      if ('errors' in doc) {
+        if (!Array.isArray(doc.errors)) {
+          errors.push('errors must be an array');
+        }
+      }
+      if ('links' in doc) {
+        if (typeof doc.links !== 'object') {
+          errors.push('links must be an object');
+        }
+      }
+      if ('jsonapi' in doc) {
+        if (typeof doc.jsonapi !== 'object') {
+          errors.push('jsonapi must be an object');
+        }
+      }
+      if ('included' in doc) {
+        if (typeof doc.included !== 'object') {
+          errors.push('included must be an array');
+        }
+      }
+    }
+
+    assert(
+      `Response must be normalized to a valid JSON API document:\n\t* ${errors.join('\n\t* ')}`,
+      errors.length === 0
+    );
+  }
+}
+
+export function normalizeResponseHelper(
+  serializer: MinimumSerializerInterface | null,
+  store: CoreStore,
+  modelClass: ShimModelClass,
+  payload: AdapterPayload,
+  id: string | null,
+  requestType: RequestType
+): JsonApiDocument {
+  let normalizedResponse = serializer
+    ? serializer.normalizeResponse(store, modelClass, payload, id, requestType)
+    : payload;
+
+  validateDocumentStructure(normalizedResponse);
+
+  return normalizedResponse;
+}

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

@@ -1,15 +1,20 @@
-import EmberObject from '@ember/object';
+import type EmberObject from '@ember/object';
 
-import RSVP from 'rsvp';
+import type { Errors } from '@ember-data/model/-private';
 
+import type CoreStore from '../system/core-store';
+import type InternalModel from '../system/model/internal-model';
 import type { JsonApiValidationError } from './record-data-json-api';
-import type { AttributeSchema, RelationshipSchema } from './record-data-schemas';
-import { RecordInstance } from './record-instance';
+import type { AttributeSchema, RelationshipSchema, RelationshipsSchema } from './record-data-schemas';
 
 // Placeholder until model.js is typed
-export interface DSModel extends RecordInstance, EmberObject {
+export interface DSModel extends EmberObject {
+  constructor: DSModelSchema;
+  store: CoreStore;
+  errors: Errors;
+  _internalModel: InternalModel;
   toString(): string;
-  save(): RSVP.Promise<DSModel>;
+  save(): Promise<DSModel>;
   eachRelationship<T>(callback: (this: T, key: string, meta: RelationshipSchema) => void, binding?: T): void;
   eachAttribute<T>(callback: (this: T, key: string, meta: AttributeSchema) => void, binding?: T): void;
   invalidErrorsChanged(errors: JsonApiValidationError[]): void;
@@ -17,7 +22,7 @@ export interface DSModel extends RecordInstance, EmberObject {
   isDeleted: boolean;
   deleteRecord(): void;
   unloadRecord(): void;
-  errors: any;
+  _notifyProperties(keys: string[]): void;
 }
 
 // Implemented by both ShimModelClass and DSModel
@@ -39,4 +44,7 @@ export interface ModelSchema {
 //  once we can type it.
 export interface DSModelSchema extends ModelSchema {
   isModel: true;
+  relationshipsObject: RelationshipsSchema;
+  extend(...mixins: unknown[]): DSModelSchema;
+  reopenClass(...mixins: unknown[]): void;
 }

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

@@ -125,6 +125,9 @@ export interface ExistingResourceObject extends ExistingResourceIdentifierObject
 interface Document {
   meta?: Dict<JSONValue>;
   included?: ExistingResourceObject[];
+  jsonapi?: Dict<JSONValue>;
+  links?: Dict<string | JSONValue>;
+  errors?: JSONValue[];
 }
 
 export interface EmptyResourceDocument extends Document {

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

@@ -1,7 +1,3 @@
-// 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.
-
 import type Store from '../system/core-store';
 import type AdapterPopulatedRecordArray from '../system/record-arrays/adapter-populated-record-array';
 import type Snapshot from '../system/snapshot';
@@ -11,7 +7,12 @@ import type { RelationshipSchema } from './record-data-schemas';
 import type { Dict } from './utils';
 
 type Group = Snapshot[];
-
+// TODO this should probably just alias unknown
+// since in theory a user could pass a blob or a string
+// however those deserialization cases are handled
+// far easier in the adapter itself and are unlikely
+// to be passed to the serializer today.
+export type AdapterPayload = Dict<unknown> | unknown[];
 /**
  * @module @ember-data/adapter
  */
@@ -26,7 +27,7 @@ type Group = Snapshot[];
   @class MinimumAdapterInterface
   @public
 */
-interface Adapter {
+export interface MinimumAdapterInterface {
   /**
    * `adapter.findRecord` takes a request for a resource of a given `type` and `id` combination
    * and should return a `Promise` which fulfills with data for a single resource matching that
@@ -54,7 +55,7 @@ interface Adapter {
    * @param {Snapshot} snapshot
    * @return {Promise} a promise resolving with resource data to feed to the associated serializer
    */
-  findRecord(store: Store, schema: ModelSchema, id: string, snapshot: Snapshot): Promise<unknown>;
+  findRecord(store: Store, schema: ModelSchema, id: string, snapshot: Snapshot): Promise<AdapterPayload>;
 
   /**
    * `adapter.findAll` takes a request for resources of a given `type` and should return
@@ -91,7 +92,7 @@ interface Adapter {
     schema: ModelSchema,
     sinceToken: null,
     snapshotRecordArray: SnapshotRecordArray
-  ): Promise<unknown>;
+  ): Promise<AdapterPayload>;
 
   /**
    * `adapter.query` takes a request for resources of a given `type` and should return
@@ -127,10 +128,10 @@ interface Adapter {
   query(
     store: Store,
     schema: ModelSchema,
-    query: Dict<any>,
+    query: Dict<unknown>,
     recordArray: AdapterPopulatedRecordArray,
     options: { adapterOptions?: unknown }
-  ): Promise<unknown>;
+  ): Promise<AdapterPayload>;
 
   /**
    * `adapter.queryRecord` takes a request for resource of a given `type` and should return
@@ -158,9 +159,9 @@ interface Adapter {
   queryRecord(
     store: Store,
     schema: ModelSchema,
-    query: Dict<any>,
+    query: Dict<unknown>,
     options: { adapterOptions?: unknown }
-  ): Promise<unknown>;
+  ): Promise<AdapterPayload>;
 
   /**
    * `adapter.createRecord` takes a request to create a resource of a given `type` and should
@@ -213,7 +214,7 @@ interface Adapter {
    * @param {Snapshot} snapshot
    * @return {Promise} a promise resolving with resource data to feed to the associated serializer
    */
-  createRecord(store: Store, schema: ModelSchema, snapshot: Snapshot): Promise<unknown>;
+  createRecord(store: Store, schema: ModelSchema, snapshot: Snapshot): Promise<AdapterPayload>;
 
   /**
    * `adapter.updateRecord` takes a request to update a resource of a given `type` and should
@@ -265,7 +266,7 @@ interface Adapter {
    *  the type, attributes and relationships of the primary type associated with the request.
    * @param {Snapshot} snapshot
    */
-  updateRecord(store: Store, schema: ModelSchema, snapshot: Snapshot): Promise<unknown>;
+  updateRecord(store: Store, schema: ModelSchema, snapshot: Snapshot): Promise<AdapterPayload>;
 
   /**
    * `adapter.deleteRecord` takes a request to delete a resource of a given `type` and
@@ -293,7 +294,7 @@ interface Adapter {
    * @param {Snapshot} snapshot A Snapshot containing the record's current data
    * @return
    */
-  deleteRecord(store: Store, schema: ModelSchema, snapshot: Snapshot): Promise<unknown>;
+  deleteRecord(store: Store, schema: ModelSchema, snapshot: Snapshot): Promise<AdapterPayload>;
 
   /**
    * `adapter.findBelongsTo` takes a request to fetch a related resource located at a
@@ -330,7 +331,7 @@ interface Adapter {
     snapshot: Snapshot,
     relatedLink: string,
     relationship: RelationshipSchema
-  ): Promise<unknown>;
+  ): Promise<AdapterPayload>;
 
   /**
    * `adapter.findHasMany` takes a request to fetch a related resource collection located
@@ -368,7 +369,7 @@ interface Adapter {
     snapshot: Snapshot,
     relatedLink: string,
     relationship: RelationshipSchema
-  ): Promise<unknown>;
+  ): Promise<AdapterPayload>;
 
   /**
    * ⚠️ This Method is only called if `coalesceFindRequests` is `true`. The array passed to it is determined
@@ -399,7 +400,7 @@ interface Adapter {
    * @param {Array<Snapshot>} snapshots An array of snapshots of the available data for the resources to fetch
    * @return {Promise} a promise resolving with resource data to feed to the associated serializer
    */
-  findMany?(store: Store, schema: ModelSchema, ids: string[], snapshots: Snapshot[]): Promise<unknown>;
+  findMany?(store: Store, schema: ModelSchema, ids: string[], snapshots: Snapshot[]): Promise<AdapterPayload>;
 
   /**
    * This method provides the ability to generate an ID to assign to a new record whenever `store.createRecord`
@@ -581,5 +582,3 @@ interface Adapter {
    */
   destroy?(): void;
 }
-
-export default Adapter;

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

@@ -4,10 +4,21 @@ 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 { AdapterPayload } from './minimum-adapter-interface';
 import type { Dict } from './utils';
 
-type OptionsHash = Dict<any>;
-
+export type OptionsHash = Dict<unknown>;
+export type RequestType =
+  | 'findRecord'
+  | 'queryRecord'
+  | 'findAll'
+  | 'findBelongsTo'
+  | 'findHasMany'
+  | 'findMany'
+  | 'query'
+  | 'createRecord'
+  | 'deleteRecord'
+  | 'updateRecord';
 /**
   @module @ember-data/serializer
  */
@@ -22,7 +33,7 @@ type OptionsHash = Dict<any>;
   @class MinimumSerializerInterface
   @public
 */
-interface Serializer {
+export interface MinimumSerializerInterface {
   /**
    * This method is responsible for normalizing the value resolved from the promise returned
    * by an Adapter request into the format expected by the `Store`.
@@ -56,7 +67,7 @@ interface Serializer {
   normalizeResponse(
     store: Store,
     schema: ModelSchema,
-    rawPayload: JSONObject,
+    rawPayload: AdapterPayload,
     id: string | null,
     requestType:
       | 'findRecord'
@@ -231,6 +242,16 @@ interface Serializer {
    * @returns {void}
    */
   pushPayload?(store: Store, rawPayload: JSONObject): void;
-}
 
-export default Serializer;
+  /**
+   * In some situations the serializer may need to perform cleanup when destroyed,
+   * that cleanup can be done in `destroy`.
+   *
+   * If not implemented, the store does not inform the serializer of destruction.
+   *
+   * @method destroy [OPTIONAL]
+   * @public
+   * @optional
+   */
+  destroy?(): void;
+}

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

@@ -12,7 +12,10 @@ export interface ChangedAttributesHash {
 
 export interface RecordData {
   getResourceIdentifier(): RecordIdentifier | undefined;
-  pushData(data: JsonApiResource, calculateChange?: boolean): void;
+
+  pushData(data: JsonApiResource, calculateChange: true): string[];
+  pushData(data: JsonApiResource, calculateChange?: false): void;
+  pushData(data: JsonApiResource, calculateChange?: boolean): string[] | void;
   clientDidCreate(): void;
   willCommit(): void;
 

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

@@ -1,3 +1,5 @@
+import type { DSModel } from './ds-model';
+import type { Dict } from './utils';
 /**
   @module @ember-data/store
 */
@@ -13,4 +15,4 @@
   The type belows allows for anything extending object.
 */
 
-export type RecordInstance = Object;
+export type RecordInstance = DSModel | Dict<unknown>;

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

@@ -6,4 +6,5 @@ export interface FindOptions {
   include?: string;
   adapterOptions?: Dict<unknown>;
   preload?: Dict<unknown>;
+  isReloading?: boolean;
 }

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

@@ -1,7 +1,7 @@
 import type InternalModel from '../system/model/internal-model';
+import type { PromiseObject } from '../system/promise-proxies';
 import { promiseObject } from '../system/promise-proxies';
-import type { DSModel } from '../ts-interfaces/ds-model';
-import type { PromiseProxy } from '../ts-interfaces/promise-proxies';
+import type { RecordInstance } from '../ts-interfaces/record-instance';
 
 /**
   @module @ember-data/store
@@ -18,7 +18,7 @@ import type { PromiseProxy } from '../ts-interfaces/promise-proxies';
 export default function promiseRecord(
   internalModelPromise: Promise<InternalModel>,
   label: string
-): PromiseProxy<DSModel> {
+): PromiseObject<RecordInstance> {
   let toReturn = internalModelPromise.then((internalModel) => internalModel.getRecord());
 
   return promiseObject(toReturn, label);

package/index.js

@@ -35,6 +35,9 @@ module.exports = Object.assign({}, addonBaseConfig, {
       '@ember/test',
       '@ember/utils',
 
+      '@embroider/macros/es-compat',
+      '@embroider/macros/runtime',
+
       'ember-inflector',
       'ember',
       'rsvp',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.4.0",
+  "version": "4.5.0-alpha.2",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,9 +17,10 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.4.0",
-    "@ember-data/private-build-infra": "4.4.0",
+    "@ember-data/canary-features": "4.5.0-alpha.2",
+    "@ember-data/private-build-infra": "4.5.0-alpha.2",
     "@ember/string": "^3.0.0",
+    "@embroider/macros": "^1.2.0",
     "@glimmer/tracking": "^1.0.4",
     "ember-auto-import": "^2.2.4",
     "ember-cached-decorator-polyfill": "^0.1.4",
@@ -28,14 +29,14 @@
     "ember-cli-typescript": "^5.0.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.4.0",
+    "@ember-data/unpublished-test-infra": "4.5.0-alpha.2",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
     "@types/ember": "^4.0.0",
     "@types/rsvp": "^4.0.4",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.3.0",
-    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
@@ -46,7 +47,7 @@
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.4.0",
+    "ember-source": "~4.3.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^2.0.0",
     "loader.js": "^4.7.0",