@ember-data/model 4.10.0-alpha.2 → 4.10.0-alpha.4

package/addon/-private/legacy-relationships-support.ts

@@ -749,7 +749,7 @@ function anyUnloaded(store: Store, relationship: ManyRelationship) {
   return unloaded || false;
 }
 
-function areAllInverseRecordsLoaded(store: Store, resource: JsonApiRelationship): boolean {
+export function areAllInverseRecordsLoaded(store: Store, resource: JsonApiRelationship): boolean {
   const instanceCache = store._instanceCache;
   const identifiers = resource.data;
 

package/addon/-private/promise-belongs-to.ts

@@ -2,6 +2,7 @@ import { assert } from '@ember/debug';
 import { computed } from '@ember/object';
 import type PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import type ObjectProxy from '@ember/object/proxy';
+import { cached } from '@glimmer/tracking';
 
 import type Store from '@ember-data/store';
 import type { RecordInstance } from '@ember-data/types/q/record-instance';
@@ -9,6 +10,7 @@ import type { Dict } from '@ember-data/types/q/utils';
 
 import { LegacySupport } from './legacy-relationships-support';
 import { PromiseObject } from './promise-proxy-base';
+import type BelongsToReference from './references/belongs-to';
 
 export interface BelongsToProxyMeta {
   key: string;
@@ -45,6 +47,15 @@ const Extended: PromiseObjectType<RecordInstance> = PromiseObject as unknown as
 */
 class PromiseBelongsTo extends Extended<RecordInstance> {
   declare _belongsToState: BelongsToProxyMeta;
+
+  @cached
+  get id() {
+    const { key, legacySupport } = this._belongsToState;
+    const ref = legacySupport.referenceFor('belongsTo', key) as BelongsToReference;
+
+    return ref.id();
+  }
+
   // we don't proxy meta because we would need to proxy it to the relationship state container
   //  however, meta on relationships does not trigger change notifications.
   //  if you need relationship meta, you should do `record.belongsTo(relationshipName).meta()`

package/addon/-private/references/belongs-to.ts

@@ -23,7 +23,7 @@ import type { RecordInstance } from '@ember-data/types/q/record-instance';
 import type { Dict } from '@ember-data/types/q/utils';
 
 import { assertPolymorphicType } from '../debug/assert-polymorphic-type';
-import type { LegacySupport } from '../legacy-relationships-support';
+import { areAllInverseRecordsLoaded, LegacySupport } from '../legacy-relationships-support';
 import { LEGACY_SUPPORT } from '../model';
 
 /**
@@ -112,7 +112,6 @@ export default class BelongsToReference {
   @cached
   @dependentKeyCompat
   get identifier(): StableRecordIdentifier | null {
-    this._ref; // consume the tracked prop
     if (this.___relatedToken) {
       this.store._notificationManager.unsubscribe(this.___relatedToken);
       this.___relatedToken = null;
@@ -293,6 +292,7 @@ export default class BelongsToReference {
   }
 
   _resource() {
+    this._ref; // subscribe
     return this.store._instanceCache
       .getRecordData(this.___identifier)
       .getRelationship(this.___identifier, this.key) as SingleResourceRelationship;
@@ -562,7 +562,11 @@ export default class BelongsToReference {
     const support: LegacySupport = (LEGACY_SUPPORT as Map<StableRecordIdentifier, LegacySupport>).get(
       this.___identifier
     )!;
-    return support.getBelongsTo(this.key, options);
+    const fetchSyncRel =
+      !this.belongsToRelationship.definition.isAsync && !areAllInverseRecordsLoaded(this.store, this._resource());
+    return fetchSyncRel
+      ? support.reloadBelongsTo(this.key, options).then(() => this.value())
+      : support.getBelongsTo(this.key, options);
   }
 
   /**

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

@@ -28,7 +28,7 @@ import type { FindOptions } from '@ember-data/types/q/store';
 import type { Dict } from '@ember-data/types/q/utils';
 
 import { assertPolymorphicType } from '../debug/assert-polymorphic-type';
-import type { LegacySupport } from '../legacy-relationships-support';
+import { areAllInverseRecordsLoaded, LegacySupport } from '../legacy-relationships-support';
 import { LEGACY_SUPPORT } from '../model';
 
 /**
@@ -607,7 +607,11 @@ export default class HasManyReference {
     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;
+    const fetchSyncRel =
+      !this.hasManyRelationship.definition.isAsync && !areAllInverseRecordsLoaded(this.store, this._resource());
+    return fetchSyncRel
+      ? (support.reloadHasMany(this.key, options) as Promise<ManyArray>)
+      : (support.getHasMany(this.key, options) as Promise<ManyArray> | ManyArray); // this cast is necessary because typescript does not work properly with custom thenables;
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.10.0-alpha.2",
+  "version": "4.10.0-alpha.4",
   "description": "A presentation layer for apps built with @ember-data/store",
   "keywords": [
     "ember-addon"
@@ -14,9 +14,9 @@
   "author": "",
   "directories": {},
   "peerDependencies": {
-    "@ember-data/record-data": "4.10.0-alpha.2",
-    "@ember-data/store": "4.10.0-alpha.2",
-    "@ember-data/tracking": "4.10.0-alpha.2",
+    "@ember-data/record-data": "4.10.0-alpha.4",
+    "@ember-data/store": "4.10.0-alpha.4",
+    "@ember-data/tracking": "4.10.0-alpha.4",
     "@ember/string": "^3.0.0",
     "ember-inflector": "^4.0.2"
   },
@@ -34,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.10.0-alpha.2",
-    "@ember-data/private-build-infra": "4.10.0-alpha.2",
+    "@ember-data/canary-features": "4.10.0-alpha.4",
+    "@ember-data/private-build-infra": "4.10.0-alpha.4",
     "@ember/edition-utils": "^1.2.0",
     "@embroider/macros": "^1.10.0",
     "ember-auto-import": "^2.5.0",
@@ -59,6 +59,6 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "packageManager": "pnpm@7.15.0",
+  "packageManager": "pnpm@7.18.0",
   "scripts": {}
 }