@ember-data/store 4.9.0-alpha.6 → 4.9.0-beta.0

package/LICENSE.md

@@ -1,6 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2019
+Copyright (C) 2017-2022 Ember.js contributors
+Portions Copyright (C) 2011-2017 Tilde, Inc. and contributors.
+Portions Copyright (C) 2011 LivingSocial Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/addon/-private/caches/identifier-cache.ts

@@ -266,14 +266,16 @@ export class IdentifierCache {
           // one level up
           keyOptions.lid.set(identifier.lid, identifier);
 
-          if (LOG_IDENTIFIERS && shouldGenerate) {
-            // eslint-disable-next-line no-console
-            console.log(`Identifiers: generated ${String(identifier)} for`, resource);
-            if (resource[DEBUG_IDENTIFIER_BUCKET]) {
+          if (LOG_IDENTIFIERS) {
+            if (shouldGenerate) {
               // eslint-disable-next-line no-console
-              console.trace(
-                `[WARNING] Identifiers: generated a new identifier from a previously used identifier. This is likely a bug.`
-              );
+              console.log(`Identifiers: generated ${String(identifier)} for`, resource);
+              if (resource[DEBUG_IDENTIFIER_BUCKET]) {
+                // eslint-disable-next-line no-console
+                console.trace(
+                  `[WARNING] Identifiers: generated a new identifier from a previously used identifier. This is likely a bug.`
+                );
+              }
             }
           }
         }

package/addon/-private/caches/instance-cache.ts

@@ -84,8 +84,10 @@ export function recordIdentifierFor(record: RecordInstance): StableRecordIdentif
 }
 
 export function setRecordIdentifier(record: RecordInstance, identifier: StableRecordIdentifier): void {
-  if (DEBUG && RecordCache.has(record) && RecordCache.get(record) !== identifier) {
-    throw new Error(`${String(record)} was already assigned an identifier`);
+  if (DEBUG) {
+    if (RecordCache.has(record) && RecordCache.get(record) !== identifier) {
+      throw new Error(`${String(record)} was already assigned an identifier`);
+    }
   }
 
   /*
@@ -260,8 +262,8 @@ export class InstanceCache {
   getRecordData(identifier: StableRecordIdentifier): RecordData {
     let recordData = this.__instances.recordData.get(identifier);
 
-    if (!recordData) {
-      if (DEPRECATE_V1CACHE_STORE_APIS && this.store.createRecordDataFor.length > 2) {
+    if (DEPRECATE_V1CACHE_STORE_APIS) {
+      if (!recordData && this.store.createRecordDataFor.length > 2) {
         deprecate(
           `Store.createRecordDataFor(<type>, <id>, <lid>, <storeWrapper>) has been deprecated in favor of Store.createRecordDataFor(<identifier>, <storeWrapper>)`,
           false,
@@ -285,19 +287,22 @@ export class InstanceCache {
           recordData = this.__cacheManager =
             this.__cacheManager || new NonSingletonRecordDataManager(this.store, recordDataInstance, identifier);
         }
+      }
+    }
+
+    if (!recordData) {
+      let recordDataInstance = this.store.createRecordDataFor(identifier, this._storeWrapper);
+      if (DEPRECATE_V1_RECORD_DATA) {
+        recordData = new NonSingletonRecordDataManager(this.store, recordDataInstance, identifier);
       } else {
-        let recordDataInstance = this.store.createRecordDataFor(identifier, this._storeWrapper);
-        if (DEPRECATE_V1_RECORD_DATA) {
-          recordData = new NonSingletonRecordDataManager(this.store, recordDataInstance, identifier);
+        if (DEBUG) {
+          recordData = this.__cacheManager = this.__cacheManager || new SingletonRecordDataManager();
+          (recordData as SingletonRecordDataManager)._addRecordData(identifier, recordDataInstance as RecordData);
         } else {
-          if (DEBUG) {
-            recordData = this.__cacheManager = this.__cacheManager || new SingletonRecordDataManager();
-            (recordData as SingletonRecordDataManager)._addRecordData(identifier, recordDataInstance as RecordData);
-          } else {
-            recordData = recordDataInstance as RecordData;
-          }
+          recordData = recordDataInstance as RecordData;
         }
       }
+
       setRecordDataFor(identifier, recordData);
 
       this.__instances.recordData.set(identifier, recordData);

package/addon/-private/legacy-model-support/schema-definition-service.ts

@@ -39,18 +39,22 @@ export class DSModelSchemaDefinitionService {
   // Following the existing RD implementation
   attributesDefinitionFor(identifier: RecordIdentifier | { type: string }): AttributesSchema {
     let modelName, attributes;
-    if (DEPRECATE_STRING_ARG_SCHEMAS && typeof identifier === 'string') {
-      deprecate(
-        `attributesDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
-        false,
-        {
-          id: 'ember-data:deprecate-string-arg-schemas',
-          for: 'ember-data',
-          until: '5.0',
-          since: { enabled: '4.5', available: '4.5' },
-        }
-      );
-      modelName = identifier;
+    if (DEPRECATE_STRING_ARG_SCHEMAS) {
+      if (typeof identifier === 'string') {
+        deprecate(
+          `attributesDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
+          false,
+          {
+            id: 'ember-data:deprecate-string-arg-schemas',
+            for: 'ember-data',
+            until: '5.0',
+            since: { enabled: '4.5', available: '4.5' },
+          }
+        );
+        modelName = identifier;
+      } else {
+        modelName = identifier.type;
+      }
     } else {
       modelName = identifier.type;
     }
@@ -72,18 +76,22 @@ export class DSModelSchemaDefinitionService {
   // Following the existing RD implementation
   relationshipsDefinitionFor(identifier: RecordIdentifier | { type: string }): RelationshipsSchema {
     let modelName, relationships;
-    if (DEPRECATE_STRING_ARG_SCHEMAS && typeof identifier === 'string') {
-      deprecate(
-        `relationshipsDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
-        false,
-        {
-          id: 'ember-data:deprecate-string-arg-schemas',
-          for: 'ember-data',
-          until: '5.0',
-          since: { enabled: '4.5', available: '4.5' },
-        }
-      );
-      modelName = identifier;
+    if (DEPRECATE_STRING_ARG_SCHEMAS) {
+      if (typeof identifier === 'string') {
+        deprecate(
+          `relationshipsDefinitionFor expects either a record identifier or an argument of shape { type: string }, received a string.`,
+          false,
+          {
+            id: 'ember-data:deprecate-string-arg-schemas',
+            for: 'ember-data',
+            until: '5.0',
+            since: { enabled: '4.5', available: '4.5' },
+          }
+        );
+        modelName = identifier;
+      } else {
+        modelName = identifier.type;
+      }
     } else {
       modelName = identifier.type;
     }

package/addon/-private/managers/record-array-manager.ts

@@ -1,6 +1,7 @@
 /**
   @module @ember-data/store
 */
+import { addToTransaction } from '@ember-data/tracking/-private';
 import type { CollectionResourceDocument } from '@ember-data/types/q/ember-data-json-api';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { Dict } from '@ember-data/types/q/utils';
@@ -60,7 +61,7 @@ export function fastPush<T>(target: T[], source: T[]) {
   let newLength = source.length;
   while (newLength - startLength > SLICE_BATCH_SIZE) {
     // eslint-disable-next-line prefer-spread
-    target.push.apply(target, source.slice(startLength, SLICE_BATCH_SIZE));
+    target.push.apply(target, source.slice(startLength, startLength + SLICE_BATCH_SIZE));
     startLength += SLICE_BATCH_SIZE;
   }
   // eslint-disable-next-line prefer-spread
@@ -167,14 +168,16 @@ class RecordArrayManager {
     return array;
   }
 
-  dirtyArray(array: IdentifierArray): void {
+  dirtyArray(array: IdentifierArray, delta: number): void {
     if (array === FAKE_ARR) {
       return;
     }
     let tag = array[IDENTIFIER_ARRAY_TAG];
     if (!tag.shouldReset) {
       tag.shouldReset = true;
-      tag.ref = null;
+      addToTransaction(tag);
+    } else if (delta > 0 && tag.t) {
+      addToTransaction(tag);
     }
   }
 
@@ -257,9 +260,7 @@ class RecordArrayManager {
         } else {
           changes.set(identifier, 'add');
 
-          if (changes.size === 1) {
-            this.dirtyArray(array);
-          }
+          this.dirtyArray(array, changes.size);
         }
       });
     }
@@ -275,9 +276,7 @@ class RecordArrayManager {
         } else {
           changes.set(identifier, 'del');
 
-          if (changes.size === 1) {
-            this.dirtyArray(array);
-          }
+          this.dirtyArray(array, changes.size);
         }
       });
     }

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

@@ -297,19 +297,23 @@ class LegacyWrapper implements LegacyRecordDataStoreWrapper {
   disconnectRecord(type: StableRecordIdentifier): void;
   disconnectRecord(type: string | StableRecordIdentifier, id?: string | null, lid?: string | null): void {
     let identifier: StableRecordIdentifier;
-    if (DEPRECATE_V1CACHE_STORE_APIS && typeof type === 'string') {
-      deprecate(
-        `StoreWrapper.disconnectRecord(<type>) has been deprecated in favor of StoreWrapper.disconnectRecord(<identifier>)`,
-        false,
-        {
-          id: 'ember-data:deprecate-v1cache-store-apis',
-          for: 'ember-data',
-          until: '5.0',
-          since: { enabled: '4.7', available: '4.7' },
-        }
-      );
-      let resource = constructResource(type, id, lid) as RecordIdentifier;
-      identifier = this.identifierCache.peekRecordIdentifier(resource)!;
+    if (DEPRECATE_V1CACHE_STORE_APIS) {
+      if (typeof type === 'string') {
+        deprecate(
+          `StoreWrapper.disconnectRecord(<type>) has been deprecated in favor of StoreWrapper.disconnectRecord(<identifier>)`,
+          false,
+          {
+            id: 'ember-data:deprecate-v1cache-store-apis',
+            for: 'ember-data',
+            until: '5.0',
+            since: { enabled: '4.7', available: '4.7' },
+          }
+        );
+        let resource = constructResource(type, id, lid) as RecordIdentifier;
+        identifier = this.identifierCache.peekRecordIdentifier(resource)!;
+      } else {
+        identifier = type as StableRecordIdentifier;
+      }
     } else {
       identifier = type as StableRecordIdentifier;
     }

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

@@ -24,9 +24,11 @@ export interface NotificationCallback {
 // TODO this isn't importable anyway, remove and use a map on the manager?
 export function unsubscribe(token: UnsubscribeToken) {
   let identifier = Tokens.get(token);
-  if (LOG_NOTIFICATIONS && !identifier) {
-    // eslint-disable-next-line no-console
-    console.log('Passed unknown unsubscribe token to unsubscribe', identifier);
+  if (LOG_NOTIFICATIONS) {
+    if (!identifier) {
+      // eslint-disable-next-line no-console
+      console.log('Passed unknown unsubscribe token to unsubscribe', identifier);
+    }
   }
   if (identifier) {
     Tokens.delete(token);

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

@@ -5,7 +5,7 @@ import { assert, deprecate, warn } from '@ember/debug';
 import { _backburner as emberBackburner } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 
-import { importSync } from '@embroider/macros';
+import { importSync, isDevelopingApp } from '@embroider/macros';
 import { default as RSVP, resolve } from 'rsvp';
 
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
@@ -147,7 +147,7 @@ export default class FetchManager {
 
   scheduleFetch(identifier: StableExistingRecordIdentifier, options: FindOptions): Promise<StableRecordIdentifier> {
     // TODO Probably the store should pass in the query object
-    let shouldTrace = DEBUG && this._store.generateStackTracesForTrackedRequests;
+    let shouldTrace = isDevelopingApp() && this._store.generateStackTracesForTrackedRequests;
 
     let query: FindRecordQuery = {
       op: 'findRecord',

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

@@ -7,8 +7,8 @@ import { importSync } from '@embroider/macros';
 
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 import { DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS } from '@ember-data/private-build-infra/deprecations';
-import type BelongsToRelationship from '@ember-data/record-data/addon/-private/relationships/state/belongs-to';
-import type ManyRelationship from '@ember-data/record-data/addon/-private/relationships/state/has-many';
+import type BelongsToRelationship from '@ember-data/record-data/-private/relationships/state/belongs-to';
+import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { OptionsHash } from '@ember-data/types/q/minimum-serializer-interface';
 import type { ChangedAttributesHash } from '@ember-data/types/q/record-data';

package/addon/-private/proxies/promise-proxies.ts

@@ -1,6 +1,8 @@
 import { deprecate } from '@ember/debug';
+import { get } from '@ember/object';
 import type ComputedProperty from '@ember/object/computed';
 import { reads } from '@ember/object/computed';
+import { DEBUG } from '@glimmer/env';
 
 import { resolve } from 'rsvp';
 
@@ -105,6 +107,7 @@ function _promiseArray<I, T extends EmberArrayLike<I>>(promise: Promise<T>, labe
 
 // constructor is accessed in some internals but not including it in the copyright for the deprecation
 const ALLOWABLE_METHODS = ['constructor', 'then', 'catch', 'finally'];
+const ALLOWABLE_PROPS = ['__ec_yieldable__', '__ec_cancel__'];
 const PROXIED_ARRAY_PROPS = [
   'length',
   '[]',
@@ -123,11 +126,17 @@ const PROXIED_OBJECT_PROPS = ['content', 'isPending', 'isSettled', 'isRejected',
 
 export function promiseArray<I, T extends EmberArrayLike<I>>(promise: Promise<T>): PromiseArray<I, T> {
   const promiseObjectProxy: PromiseArray<I, T> = _promiseArray(promise);
+  if (!DEBUG) {
+    return promiseObjectProxy;
+  }
   const handler = {
-    get(target: object, prop: string, receiver?: object): unknown {
+    get(target: object, prop: string, receiver: object): unknown {
       if (typeof prop === 'symbol') {
         return Reflect.get(target, prop, receiver);
       }
+      if (ALLOWABLE_PROPS.includes(prop)) {
+        return receiver[prop];
+      }
       if (!ALLOWABLE_METHODS.includes(prop)) {
         deprecate(
           `Accessing ${prop} on this PromiseArray is deprecated. The return type is being changed from PromiseArray to a Promise. The only available methods to access on this promise are .then, .catch and .finally`,
@@ -160,13 +169,30 @@ export function promiseArray<I, T extends EmberArrayLike<I>>(promise: Promise<T>
   return new Proxy(promiseObjectProxy, handler);
 }
 
+const ProxySymbolString = String(Symbol.for('PROXY_CONTENT'));
+
 export function promiseObject<T>(promise: Promise<T>): PromiseObjectProxy<T> {
   const promiseObjectProxy: PromiseObjectProxy<T> = _promiseObject(promise);
+  if (!DEBUG) {
+    return promiseObjectProxy;
+  }
   const handler = {
-    get(target: object, prop: string, receiver?: object): unknown {
+    get(target: object, prop: string, receiver: object): unknown {
       if (typeof prop === 'symbol') {
+        if (String(prop) === ProxySymbolString) {
+          return;
+        }
         return Reflect.get(target, prop, receiver);
       }
+
+      if (prop === 'constructor') {
+        return target.constructor;
+      }
+
+      if (ALLOWABLE_PROPS.includes(prop)) {
+        return receiver[prop];
+      }
+
       if (!ALLOWABLE_METHODS.includes(prop)) {
         deprecate(
           `Accessing ${prop} on this PromiseObject is deprecated. The return type is being changed from PromiseObject to a Promise. The only available methods to access on this promise are .then, .catch and .finally`,
@@ -181,15 +207,17 @@ export function promiseObject<T>(promise: Promise<T>): PromiseObjectProxy<T> {
             },
           }
         );
+      } else {
+        return (target[prop] as () => unknown).bind(target);
       }
 
-      const value: unknown = target[prop];
-      if (value && typeof value === 'function' && typeof value.bind === 'function') {
-        return value.bind(target);
+      if (PROXIED_OBJECT_PROPS.includes(prop)) {
+        return target[prop];
       }
 
-      if (PROXIED_OBJECT_PROPS.includes(prop)) {
-        return value;
+      const value: unknown = get(target, prop);
+      if (value && typeof value === 'function' && typeof value.bind === 'function') {
+        return value.bind(receiver);
       }
 
       return undefined;

package/addon/-private/record-arrays/identifier-array.ts

@@ -15,6 +15,7 @@ import {
   DEPRECATE_PROMISE_PROXIES,
   DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS,
 } from '@ember-data/private-build-infra/deprecations';
+import { addToTransaction, subscribe } from '@ember-data/tracking/-private';
 import { Links, PaginationLinks } from '@ember-data/types/q/ember-data-json-api';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { RecordInstance } from '@ember-data/types/q/record-instance';
@@ -76,6 +77,7 @@ function convertToInt(prop: KeyType): number | null {
 class Tag {
   @tracked ref = null;
   shouldReset: boolean = false;
+  t = false;
 }
 
 type ProxiedMethod = (...args: unknown[]) => unknown;
@@ -219,27 +221,28 @@ class IdentifierArray {
         let index = convertToInt(prop);
         if (_TAG.shouldReset && (index !== null || SYNC_PROPS.has(prop) || isArrayGetter(prop))) {
           options.manager._syncArray(receiver as unknown as IdentifierArray);
+          _TAG.t = false;
           _TAG.shouldReset = false;
         }
 
         if (index !== null) {
           const identifier = target[index];
           if (!transaction) {
-            _TAG.ref;
+            subscribe(_TAG);
           }
           return identifier && store._instanceCache.getRecord(identifier);
         }
 
-        if (prop === 'meta') return _TAG.ref, PrivateState.meta;
-        if (prop === 'links') return _TAG.ref, PrivateState.links;
-        if (prop === '[]') return _TAG.ref, receiver;
+        if (prop === 'meta') return subscribe(_TAG), PrivateState.meta;
+        if (prop === 'links') return subscribe(_TAG), PrivateState.links;
+        if (prop === '[]') return subscribe(_TAG), receiver;
 
         if (isArrayGetter(prop)) {
           let fn = boundFns.get(prop);
 
           if (fn === undefined) {
             fn = function () {
-              _TAG.ref;
+              subscribe(_TAG);
               // array functions must run through Reflect to work properly
               // binding via other means will not work.
               transaction = true;
@@ -270,7 +273,7 @@ class IdentifierArray {
               transaction = true;
               let result = Reflect.apply(target[prop] as ProxiedMethod, receiver, args) as unknown;
               self[MUTATE]!(prop as string, args, result);
-              _TAG.ref = null;
+              addToTransaction(_TAG);
               // TODO handle cache updates
               transaction = false;
               return result;
@@ -300,7 +303,7 @@ class IdentifierArray {
 
           if (typeof outcome === 'function') {
             fn = function () {
-              _TAG.ref;
+              subscribe(_TAG);
               // array functions must run through Reflect to work properly
               // binding via other means will not work.
               return Reflect.apply(outcome as ProxiedMethod, receiver, arguments) as unknown;
@@ -310,7 +313,7 @@ class IdentifierArray {
             return fn;
           }
 
-          return _TAG.ref, outcome;
+          return subscribe(_TAG), outcome;
         }
 
         return target[prop];
@@ -320,7 +323,7 @@ class IdentifierArray {
         if (prop === 'length') {
           if (!transaction && value === 0) {
             transaction = true;
-            _TAG.ref = null;
+            addToTransaction(_TAG);
             Reflect.set(target, prop, value);
             self[MUTATE]!('length 0', []);
             transaction = false;
@@ -359,7 +362,7 @@ class IdentifierArray {
         (target as unknown as Record<KeyType, unknown>)[index] = newIdentifier;
         if (!transaction) {
           self[MUTATE]!('replace cell', [index, original, newIdentifier]);
-          _TAG.ref = null;
+          addToTransaction(_TAG);
         }
 
         return true;

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

@@ -73,6 +73,7 @@ import promiseRecord from './utils/promise-record';
 
 export { storeFor };
 
+// hello world
 type RecordDataConstruct = typeof RecordDataClass;
 let _RecordData: RecordDataConstruct | undefined;
 
@@ -2397,30 +2398,32 @@ class Store extends Service {
       // a cycle we can't easily fix (or clearly pin point) at present.
       //
       // it can be reproduced in partner tests by running
-      // node ./scripts/packages-for-commit.js && yarn test-external:ember-observer
+      // node ./scripts/packages-for-commit.js && pnpm test-external:ember-observer
       if (_RecordData === undefined) {
         _RecordData = (
           importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private')
         ).RecordData;
       }
 
-      if (DEPRECATE_V1CACHE_STORE_APIS && arguments.length === 4) {
-        deprecate(
-          `Store.createRecordDataFor(<type>, <id>, <lid>, <storeWrapper>) has been deprecated in favor of Store.createRecordDataFor(<identifier>, <storeWrapper>)`,
-          false,
-          {
-            id: 'ember-data:deprecate-v1cache-store-apis',
-            for: 'ember-data',
-            until: '5.0',
-            since: { enabled: '4.7', available: '4.7' },
-          }
-        );
-        identifier = this.identifierCache.getOrCreateRecordIdentifier({
-          type: arguments[0],
-          id: arguments[1],
-          lid: arguments[2],
-        });
-        storeWrapper = arguments[3];
+      if (DEPRECATE_V1CACHE_STORE_APIS) {
+        if (arguments.length === 4) {
+          deprecate(
+            `Store.createRecordDataFor(<type>, <id>, <lid>, <storeWrapper>) has been deprecated in favor of Store.createRecordDataFor(<identifier>, <storeWrapper>)`,
+            false,
+            {
+              id: 'ember-data:deprecate-v1cache-store-apis',
+              for: 'ember-data',
+              until: '5.0',
+              since: { enabled: '4.7', available: '4.7' },
+            }
+          );
+          identifier = this.identifierCache.getOrCreateRecordIdentifier({
+            type: arguments[0],
+            id: arguments[1],
+            lid: arguments[2],
+          });
+          storeWrapper = arguments[3];
+        }
       }
 
       this.__private_singleton_recordData = this.__private_singleton_recordData || new _RecordData(storeWrapper);
@@ -2850,26 +2853,28 @@ function extractIdentifierFromRecord(
   }
   const extract = isForV1 ? recordDataFor : recordIdentifierFor;
 
-  if (DEPRECATE_PROMISE_PROXIES && isPromiseRecord(recordOrPromiseRecord)) {
-    let content = recordOrPromiseRecord.content;
-    assert(
-      'You passed in a promise that did not originate from an EmberData relationship. You can only pass promises that come from a belongsTo or hasMany relationship to the get call.',
-      content !== undefined
-    );
-    deprecate(
-      `You passed in a PromiseProxy to a Relationship API that now expects a resolved value. await the value before setting it.`,
-      false,
-      {
-        id: 'ember-data:deprecate-promise-proxies',
-        until: '5.0',
-        since: {
-          enabled: '4.7',
-          available: '4.7',
-        },
-        for: 'ember-data',
-      }
-    );
-    return content ? extract(content) : null;
+  if (DEPRECATE_PROMISE_PROXIES) {
+    if (isPromiseRecord(recordOrPromiseRecord)) {
+      let content = recordOrPromiseRecord.content;
+      assert(
+        'You passed in a promise that did not originate from an EmberData relationship. You can only pass promises that come from a belongsTo or hasMany relationship to the get call.',
+        content !== undefined
+      );
+      deprecate(
+        `You passed in a PromiseProxy to a Relationship API that now expects a resolved value. await the value before setting it.`,
+        false,
+        {
+          id: 'ember-data:deprecate-promise-proxies',
+          until: '5.0',
+          since: {
+            enabled: '4.7',
+            available: '4.7',
+          },
+          for: 'ember-data',
+        }
+      );
+      return content ? extract(content) : null;
+    }
   }
 
   return extract(recordOrPromiseRecord);

package/index.js

@@ -13,7 +13,7 @@ module.exports = Object.assign({}, addonBaseConfig, {
       'ember-cached-decorator-polyfill',
 
       '@ember-data/canary-features',
-      '@ember-data/store/-debug',
+      '@ember-data/tracking/-private',
 
       '@ember/application',
       '@ember/array/proxy',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.9.0-alpha.6",
+  "version": "4.9.0-beta.0",
   "description": "The core of EmberData. Provides the Store service which coordinates the cache with the network and presentation layers.",
   "keywords": [
     "ember-addon"
@@ -13,57 +13,49 @@
   "license": "MIT",
   "author": "",
   "directories": {},
-  "scripts": {
-    "build": "ember build",
-    "start": "ember serve"
+  "peerDependencies": {
+    "@ember-data/model": "workspace:4.9.0-alpha.6",
+    "@ember-data/record-data": "workspace:4.9.0-alpha.6",
+    "@ember-data/tracking": "workspace:4.9.0-alpha.6",
+    "@ember/string": "^3.0.0",
+    "@glimmer/tracking": "^1.1.2"
+  },
+  "peerDependenciesMeta": {
+    "@ember-data/record-data": {
+      "optional": true
+    },
+    "@ember-data/model": {
+      "optional": true
+    }
+  },
+  "dependenciesMeta": {
+    "@ember-data/canary-features": {
+      "injected": true
+    },
+    "@ember-data/private-build-infra": {
+      "injected": true
+    }
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.9.0-alpha.6",
-    "@ember-data/private-build-infra": "4.9.0-alpha.6",
-    "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.8.3",
-    "@glimmer/tracking": "^1.1.2",
-    "ember-auto-import": "^2.4.2",
-    "ember-cached-decorator-polyfill": "^0.1.4",
-    "ember-cli-babel": "^7.26.11",
-    "ember-cli-path-utils": "^1.0.0",
-    "ember-cli-typescript": "^5.1.1"
+    "@ember-data/canary-features": "workspace:4.9.0-beta.0",
+    "@ember-data/private-build-infra": "workspace:4.9.0-beta.0",
+    "@embroider/macros": "^1.9.0",
+    "ember-auto-import": "^2.4.3",
+    "ember-cached-decorator-polyfill": "^1.0.1",
+    "ember-cli-babel": "^7.26.11"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.9.0-alpha.6",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
-    "@types/ember": "^4.0.1",
-    "@types/rsvp": "^4.0.4",
-    "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.7.0",
-    "ember-cli-dependency-checker": "^3.3.1",
-    "ember-cli-htmlbars": "^6.1.1",
-    "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "~4.0.2",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~4.7.0",
-    "ember-source-channel-url": "^3.0.0",
-    "ember-try": "^2.0.0",
-    "loader.js": "^4.7.0",
-    "qunit": "^2.19.1",
-    "qunit-dom": "^2.0.0",
+    "@babel/core": "^7.19.6",
+    "@glimmer/component": "^1.1.2",
+    "ember-source": "~4.8.0",
     "webpack": "^5.74.0"
   },
   "engines": {
     "node": "^14.8.0 || 16.* || >= 18.*"
   },
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
-  },
+  "ember-addon": {},
   "volta": {
-    "node": "16.17.0",
-    "yarn": "1.22.19"
-  }
+    "extends": "../../package.json"
+  },
+  "packageManager": "pnpm@7.14.1"
 }

package/addon/-debug/index.js

@@ -1,69 +0,0 @@
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-
-import { DEPRECATE_NON_EXPLICIT_POLYMORPHISM } from '@ember-data/private-build-infra/deprecations';
-
-/*
-  Assert that `addedRecord` has a valid type so it can be added to the
-  relationship of the `record`.
-
-  The assert basically checks if the `addedRecord` can be added to the
-  relationship (specified via `relationshipMeta`) of the `record`.
-
-  This utility should only be used internally, as both record parameters must
-  be stable record identifiers and the `relationshipMeta` needs to be the meta
-  information about the relationship, retrieved via
-  `record.relationshipFor(key)`.
-*/
-let assertPolymorphicType;
-
-if (DEBUG) {
-  let checkPolymorphic = function checkPolymorphic(modelClass, addedModelClass) {
-    if (modelClass.__isMixin) {
-      return (
-        modelClass.__mixin.detect(addedModelClass.PrototypeMixin) ||
-        // handle native class extension e.g. `class Post extends Model.extend(Commentable) {}`
-        modelClass.__mixin.detect(Object.getPrototypeOf(addedModelClass).PrototypeMixin)
-      );
-    }
-
-    return addedModelClass.prototype instanceof modelClass || modelClass.detect(addedModelClass);
-  };
-
-  assertPolymorphicType = function assertPolymorphicType(parentIdentifier, parentDefinition, addedIdentifier, store) {
-    let asserted = false;
-
-    if (parentDefinition.inverseIsImplicit) {
-      return;
-    }
-    if (parentDefinition.isPolymorphic) {
-      let meta = store.getSchemaDefinitionService().relationshipsDefinitionFor(addedIdentifier)[
-        parentDefinition.inverseKey
-      ];
-      if (meta?.options?.as) {
-        asserted = true;
-        assert(
-          `The schema for the relationship '${parentDefinition.inverseKey}' on '${addedIdentifier.type}' type does not implement '${parentDefinition.type}' and thus cannot be assigned to the '${parentDefinition.key}' relationship in '${parentIdentifier.type}'. The definition should specify 'as: "${parentDefinition.type}"' in options.`,
-          meta.options.as === parentDefinition.type
-        );
-      }
-    }
-
-    if (DEPRECATE_NON_EXPLICIT_POLYMORPHISM && !asserted) {
-      store = store._store ? store._store : store; // allow usage with storeWrapper
-      let addedModelName = addedIdentifier.type;
-      let parentModelName = parentIdentifier.type;
-      let key = parentDefinition.key;
-      let relationshipModelName = parentDefinition.type;
-      let relationshipClass = store.modelFor(relationshipModelName);
-      let addedClass = store.modelFor(addedModelName);
-
-      let assertionMessage = `The '${addedModelName}' type does not implement '${relationshipModelName}' and thus cannot be assigned to the '${key}' relationship in '${parentModelName}'. Make it a descendant of '${relationshipModelName}' or use a mixin of the same name.`;
-      let isPolymorphic = checkPolymorphic(relationshipClass, addedClass);
-
-      assert(assertionMessage, isPolymorphic);
-    }
-  };
-}
-
-export { assertPolymorphicType };

package/config/environment.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};