@ember-data/model 4.8.0-alpha.4 → 4.8.0-beta.0

package/addon/-private/references/has-many.ts

@@ -1,3 +1,4 @@
+import { deprecate } from '@ember/debug';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { DEBUG } from '@glimmer/env';
 import { cached, tracked } from '@glimmer/tracking';
@@ -7,12 +8,13 @@ import { resolve } from 'rsvp';
 
 import { ManyArray } from 'ember-data/-private';
 
-import type { ManyRelationship } from '@ember-data/record-data/-private';
+import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations';
+import type { Graph } from '@ember-data/record-data/-private/graph/graph';
+import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many';
 import type Store from '@ember-data/store';
 import { recordIdentifierFor } from '@ember-data/store';
 import { assertPolymorphicType } from '@ember-data/store/-debug';
 import type { NotificationType } from '@ember-data/store/-private/managers/record-notification-manager';
-import type { DebugWeakCache } from '@ember-data/store/-private/utils/weak-cache';
 import type {
   CollectionResourceDocument,
   CollectionResourceRelationship,
@@ -53,6 +55,7 @@ function isResourceIdentiferWithRelatedLinks(
  @extends Reference
  */
 export default class HasManyReference {
+  declare graph: Graph;
   declare key: string;
   declare hasManyRelationship: ManyRelationship;
   declare type: string;
@@ -67,10 +70,12 @@ export default class HasManyReference {
 
   constructor(
     store: Store,
+    graph: Graph,
     parentIdentifier: StableRecordIdentifier,
     hasManyRelationship: ManyRelationship,
     key: string
   ) {
+    this.graph = graph;
     this.key = key;
     this.hasManyRelationship = hasManyRelationship;
     this.type = hasManyRelationship.definition.type;
@@ -394,7 +399,25 @@ export default class HasManyReference {
   async push(
     objectOrPromise: ExistingResourceObject[] | CollectionResourceDocument | { data: SingleResourceDocument[] }
   ): Promise<ManyArray> {
-    const payload = await resolve(objectOrPromise);
+    let payload = objectOrPromise;
+    if (DEPRECATE_PROMISE_PROXIES && (objectOrPromise as unknown as { then: unknown }).then) {
+      payload = await resolve(objectOrPromise);
+      if (payload !== objectOrPromise) {
+        deprecate(
+          `You passed in a Promise to a Reference 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.8',
+              available: '4.8',
+            },
+            for: 'ember-data',
+          }
+        );
+      }
+    }
     let array: Array<ExistingResourceObject | SingleResourceDocument>;
 
     if (!Array.isArray(payload) && typeof payload === 'object' && Array.isArray(payload.data)) {
@@ -424,9 +447,9 @@ export default class HasManyReference {
       return recordIdentifierFor(record);
     });
 
-    const { graph, identifier } = this.hasManyRelationship;
-    store._backburner.join(() => {
-      graph.push({
+    const { identifier } = this.hasManyRelationship;
+    store._join(() => {
+      this.graph.push({
         op: 'replaceRelatedRecords',
         record: identifier,
         field: this.key,
@@ -443,9 +466,9 @@ export default class HasManyReference {
       return false;
     }
 
-    let members = this.hasManyRelationship.currentState;
+    let localState = this.hasManyRelationship.localState;
 
-    return members.every((identifier) => {
+    return localState.every((identifier) => {
       return this.store._instanceCache.recordIsLoaded(identifier, true) === true;
     });
   }
@@ -492,9 +515,9 @@ export default class HasManyReference {
    @return {ManyArray}
    */
   value() {
-    const support: LegacySupport = (
-      LEGACY_SUPPORT as DebugWeakCache<StableRecordIdentifier, LegacySupport>
-    ).getWithError(this.___identifier);
+    const support: LegacySupport = (LEGACY_SUPPORT as Map<StableRecordIdentifier, LegacySupport>).get(
+      this.___identifier
+    )!;
 
     return this._isLoaded() ? support.getManyArray(this.key) : null;
   }
@@ -564,9 +587,9 @@ export default class HasManyReference {
    this has-many relationship.
    */
   async load(options?: FindOptions): Promise<ManyArray> {
-    const support: LegacySupport = (
-      LEGACY_SUPPORT as DebugWeakCache<StableRecordIdentifier, LegacySupport>
-    ).getWithError(this.___identifier);
+    const support: LegacySupport = (LEGACY_SUPPORT as Map<StableRecordIdentifier, LegacySupport>).get(
+      this.___identifier
+    )!;
     return support.getHasMany(this.key, options) as Promise<ManyArray> | ManyArray; // this cast is necessary because typescript does not work properly with custom thenables;
   }
 
@@ -621,9 +644,9 @@ export default class HasManyReference {
    @return {Promise} a promise that resolves with the ManyArray in this has-many relationship.
    */
   reload(options?: FindOptions) {
-    const support: LegacySupport = (
-      LEGACY_SUPPORT as DebugWeakCache<StableRecordIdentifier, LegacySupport>
-    ).getWithError(this.___identifier);
+    const support: LegacySupport = (LEGACY_SUPPORT as Map<StableRecordIdentifier, LegacySupport>).get(
+      this.___identifier
+    )!;
     return support.reloadHasMany(this.key, options);
   }
 }

package/addon/-private/relationship-meta.ts

@@ -75,7 +75,9 @@ class RelationshipDefinition implements RelationshipSchema {
 
     if (shouldFindInverse(this.meta)) {
       inverse = modelClass.inverseFor(this.key, store);
-    } else if (DEBUG) {
+    }
+    // TODO make this error again for the non-polymorphic case
+    if (DEBUG && !this.options.polymorphic) {
       modelClass.typeForRelationship(this.key, store);
     }
 

package/index.js

@@ -20,6 +20,8 @@ module.exports = Object.assign({}, addonBaseConfig, {
       '@ember/string',
       '@embroider/macros/es-compat',
 
+      '@ember/object/proxy',
+      '@ember/object/promise-proxy-mixin',
       '@ember/application',
       '@ember/array',
       '@ember/array/mutable',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.8.0-alpha.4",
+  "version": "4.8.0-beta.0",
   "description": "A presentation layer for apps built with @ember-data/store",
   "keywords": [
     "ember-addon"
@@ -22,9 +22,9 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.8.0-alpha.4",
-    "@ember-data/private-build-infra": "4.8.0-alpha.4",
-    "@ember-data/store": "4.8.0-alpha.4",
+    "@ember-data/canary-features": "4.8.0-beta.0",
+    "@ember-data/private-build-infra": "4.8.0-beta.0",
+    "@ember-data/store": "4.8.0-beta.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^3.0.0",
     "@embroider/macros": "^1.8.3",
@@ -38,7 +38,7 @@
     "inflection": "~1.13.2"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.8.0-alpha.4",
+    "@ember-data/unpublished-test-infra": "4.8.0-beta.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "~2.7.0",
     "broccoli-asset-rev": "^3.0.0",
@@ -71,7 +71,7 @@
     "configPath": "tests/dummy/config"
   },
   "volta": {
-    "node": "16.16.0",
+    "node": "16.17.0",
     "yarn": "1.22.19"
   }
 }