@ember-data/model 4.8.0-alpha.4 → 4.8.0-alpha.5

package/addon/-private/belongs-to.js

@@ -9,7 +9,7 @@ import {
   DEPRECATE_RELATIONSHIPS_WITHOUT_TYPE,
 } from '@ember-data/private-build-infra/deprecations';
 
-import { LEGACY_SUPPORT } from './model';
+import { lookupLegacySupport } from './model';
 import { computedMacroWithOptionalParams } from './util';
 
 function normalizeType(type) {
@@ -205,7 +205,7 @@ function belongsTo(modelName, options) {
       if (this.isDestroying || this.isDestroyed) {
         return null;
       }
-      const support = LEGACY_SUPPORT.lookup(this);
+      const support = lookupLegacySupport(this);
 
       if (DEBUG) {
         if (['currentState'].indexOf(key) !== -1) {
@@ -237,7 +237,7 @@ function belongsTo(modelName, options) {
       return support.getBelongsTo(key);
     },
     set(key, value) {
-      const support = LEGACY_SUPPORT.lookup(this);
+      const support = lookupLegacySupport(this);
       if (DEBUG) {
         if (['currentState'].indexOf(key) !== -1) {
           throw new Error(
@@ -245,7 +245,7 @@ function belongsTo(modelName, options) {
           );
         }
       }
-      this.store._backburner.join(() => {
+      this.store._join(() => {
         support.setDirtyBelongsTo(key, value);
       });
 

package/addon/-private/has-many.js

@@ -15,7 +15,7 @@ import {
   DEPRECATE_RELATIONSHIPS_WITHOUT_TYPE,
 } from '@ember-data/private-build-infra/deprecations';
 
-import { LEGACY_SUPPORT } from './model';
+import { lookupLegacySupport } from './model';
 import { computedMacroWithOptionalParams } from './util';
 
 function normalizeType(type) {
@@ -249,7 +249,7 @@ function hasMany(type, options) {
       if (this.isDestroying || this.isDestroyed) {
         return A();
       }
-      return LEGACY_SUPPORT.lookup(this).getHasMany(key);
+      return lookupLegacySupport(this).getHasMany(key);
     },
     set(key, records) {
       if (DEBUG) {
@@ -259,8 +259,8 @@ function hasMany(type, options) {
           );
         }
       }
-      const support = LEGACY_SUPPORT.lookup(this);
-      this.store._backburner.join(() => {
+      const support = lookupLegacySupport(this);
+      this.store._join(() => {
         support.setDirtyHasMany(key, records);
       });
 

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

@@ -5,9 +5,10 @@ import { importSync } from '@embroider/macros';
 import { all, resolve } from 'rsvp';
 
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
-import type { BelongsToRelationship, ManyRelationship } from '@ember-data/record-data/-private';
 import type { UpgradedMeta } from '@ember-data/record-data/-private/graph/-edge-definition';
-import ImplicitRelationship from '@ember-data/record-data/-private/relationships/state/implicit';
+import type { ImplicitRelationship } from '@ember-data/record-data/-private/graph/index';
+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 Store from '@ember-data/store';
 import { recordIdentifierFor, storeFor } from '@ember-data/store/-private';
 import { IdentifierCache } from '@ember-data/store/-private/caches/identifier-cache';
@@ -320,7 +321,8 @@ export class LegacySupport {
       const graphFor = (
         importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private')
       ).graphFor;
-      const relationship = graphFor(this.store).get(this.identifier, name);
+      const graph = graphFor(this.store);
+      const relationship = graph.get(this.identifier, name);
 
       if (DEBUG && kind) {
         let modelName = this.identifier.type;
@@ -334,9 +336,15 @@ export class LegacySupport {
       let relationshipKind = relationship.definition.kind;
 
       if (relationshipKind === 'belongsTo') {
-        reference = new BelongsToReference(this.store, this.identifier, relationship as BelongsToRelationship, name);
+        reference = new BelongsToReference(
+          this.store,
+          graph,
+          this.identifier,
+          relationship as BelongsToRelationship,
+          name
+        );
       } else if (relationshipKind === 'hasMany') {
-        reference = new HasManyReference(this.store, this.identifier, relationship as ManyRelationship, name);
+        reference = new HasManyReference(this.store, graph, this.identifier, relationship as ManyRelationship, name);
       }
 
       this.references[name] = reference;
@@ -662,7 +670,7 @@ function isPromiseRecord(record: PromiseProxyRecord | RecordInstance): record is
 }
 
 function anyUnloaded(store: Store, relationship: ManyRelationship) {
-  let state = relationship.currentState;
+  let state = relationship.localState;
   const cache = store._instanceCache;
   const unloaded = state.find((s) => {
     let isLoaded = cache.recordIsLoaded(s, true);
@@ -695,8 +703,8 @@ function areAllInverseRecordsLoaded(store: Store, resource: JsonApiRelationship)
 
 function isEmpty(store: Store, cache: IdentifierCache, resource: ResourceIdentifierObject): boolean {
   const identifier = cache.getOrCreateRecordIdentifier(resource);
-  const recordData = store._instanceCache.peek({ identifier, bucket: 'recordData' });
-  return !recordData || !!recordData.isEmpty?.(identifier);
+  const recordData = store._instanceCache.__instances.recordData.get(identifier);
+  return !recordData || recordData.isEmpty(identifier);
 }
 
 function isBelongsTo(

package/addon/-private/many-array.ts

@@ -280,7 +280,7 @@ export default class ManyArray extends MutableArrayWithObject<StableRecordIdenti
       !objects || Array.isArray(objects) || EmberArray.detect(objects)
     );
     const { store, identifier } = this;
-    store._backburner.join(() => {
+    store._join(() => {
       let identifiers: StableRecordIdentifier[];
       if (amt > 0) {
         identifiers = this.currentState.slice(idx, idx + amt);

package/addon/-private/model.js

@@ -23,7 +23,7 @@ import {
   DEPRECATE_SAVE_PROMISE_ACCESS,
 } from '@ember-data/private-build-infra/deprecations';
 import { recordIdentifierFor, storeFor } from '@ember-data/store';
-import { coerceId, deprecatedPromiseObject, recordDataFor, WeakCache } from '@ember-data/store/-private';
+import { coerceId, deprecatedPromiseObject, recordDataFor } from '@ember-data/store/-private';
 
 import Errors from './errors';
 import { LegacySupport } from './legacy-relationships-support';
@@ -32,18 +32,21 @@ import RecordState, { peekTag, tagged } from './record-state';
 import { relationshipFromMeta } from './relationship-meta';
 
 const { changeProperties } = Ember;
-export const LEGACY_SUPPORT = new WeakCache(DEBUG ? 'legacy-relationships' : '');
-LEGACY_SUPPORT._generator = (record) => {
+export const LEGACY_SUPPORT = new Map();
+
+export function lookupLegacySupport(record) {
   const identifier = recordIdentifierFor(record);
   let support = LEGACY_SUPPORT.get(identifier);
 
   if (!support) {
     support = new LegacySupport(record);
     LEGACY_SUPPORT.set(identifier, support);
+    LEGACY_SUPPORT.set(record, support);
   }
 
   return support;
-};
+}
+
 function findPossibleInverses(type, inverseType, name, relationshipsSoFar) {
   let possibleRelationships = relationshipsSoFar || [];
 
@@ -130,18 +133,18 @@ class Model extends EmberObject {
     }
     const createProps = options._createProps;
     const _secretInit = options._secretInit;
-    delete options._createProps;
-    delete options._secretInit;
+    options._createProps = null;
+    options._secretInit = null;
     super.init(options);
 
-    _secretInit(this);
+    let identity = _secretInit.identifier;
+    _secretInit.cb(this, _secretInit.recordData, identity, _secretInit.store);
     this.___recordState = DEBUG ? new RecordState(this) : null;
 
     this.setProperties(createProps);
 
     let store = storeFor(this);
     let notifications = store._notificationManager;
-    let identity = recordIdentifierFor(this);
 
     this.___private_notifications = notifications.subscribe(identity, (identifier, type, key) => {
       notifyChanges(identifier, type, key, this, store);
@@ -493,9 +496,8 @@ class Model extends EmberObject {
     }
   }
 
-  // TODO just write a nice toString
-  toStringExtension() {
-    return this.id;
+  toString() {
+    return `<model::${this.constructor.modelName}:${this.id}>`;
   }
 
   /**
@@ -838,12 +840,14 @@ class Model extends EmberObject {
   rollbackAttributes() {
     const { currentState } = this;
     const { isNew } = currentState;
-    recordDataFor(this).rollbackAttrs(recordIdentifierFor(this));
-    this.errors.clear();
-    currentState.cleanErrorRequests();
-    if (isNew) {
-      this.unloadRecord();
-    }
+    storeFor(this)._join(() => {
+      recordDataFor(this).rollbackAttrs(recordIdentifierFor(this));
+      this.errors.clear();
+      currentState.cleanErrorRequests();
+      if (isNew) {
+        this.unloadRecord();
+      }
+    });
   }
 
   /**
@@ -1037,7 +1041,7 @@ class Model extends EmberObject {
     @return {BelongsToReference} reference for this relationship
   */
   belongsTo(name) {
-    return LEGACY_SUPPORT.lookup(this).referenceFor('belongsTo', name);
+    return lookupLegacySupport(this).referenceFor('belongsTo', name);
   }
 
   /**
@@ -1100,7 +1104,7 @@ class Model extends EmberObject {
     @return {HasManyReference} reference for this relationship
   */
   hasMany(name) {
-    return LEGACY_SUPPORT.lookup(this).referenceFor('hasMany', name);
+    return lookupLegacySupport(this).referenceFor('hasMany', name);
   }
 
   /**

package/addon/-private/record-state.ts

@@ -105,7 +105,7 @@ export function tagged(_target, key, desc) {
 
 /**
 Historically EmberData managed a state machine
-for each record, the currentState for which
+for each record, the localState for which
 was reflected onto Model.
 
 This implements the flags and stateName for backwards compat

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

@@ -4,12 +4,12 @@ import { cached, tracked } from '@glimmer/tracking';
 import type { Object as JSONObject, Value as JSONValue } from 'json-typescript';
 import { resolve } from 'rsvp';
 
-import type { BelongsToRelationship } from '@ember-data/record-data/-private';
+import type { Graph } from '@ember-data/record-data/-private/graph';
+import type BelongsToRelationship from '@ember-data/record-data/-private/relationships/state/belongs-to';
 import type Store from '@ember-data/store';
 import { assertPolymorphicType } from '@ember-data/store/-debug';
 import { recordIdentifierFor } from '@ember-data/store/-private';
 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 {
   LinkObject,
   Links,
@@ -54,6 +54,7 @@ export default class BelongsToReference {
   declare type: string;
   ___identifier: StableRecordIdentifier;
   declare store: Store;
+  declare graph: Graph;
 
   // unsubscribe tokens given to us by the notification manager
   ___token!: object;
@@ -63,10 +64,12 @@ export default class BelongsToReference {
 
   constructor(
     store: Store,
+    graph: Graph,
     parentIdentifier: StableRecordIdentifier,
     belongsToRelationship: BelongsToRelationship,
     key: string
   ) {
+    this.graph = graph;
     this.key = key;
     this.belongsToRelationship = belongsToRelationship;
     this.type = belongsToRelationship.definition.type;
@@ -394,9 +397,9 @@ export default class BelongsToReference {
       this.store
     );
 
-    const { graph, identifier } = this.belongsToRelationship;
-    this.store._backburner.join(() => {
-      graph.push({
+    const { identifier } = this.belongsToRelationship;
+    this.store._join(() => {
+      this.graph.push({
         op: 'replaceRelatedRecord',
         record: identifier,
         field: this.key,
@@ -525,9 +528,9 @@ export default class BelongsToReference {
    @return {Promise} a promise that resolves with the record in this belongs-to relationship.
    */
   load(options?: Dict<unknown>) {
-    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.getBelongsTo(this.key, options);
   }
 
@@ -582,9 +585,9 @@ export default class BelongsToReference {
    @return {Promise} a promise that resolves with the record in this belongs-to relationship after the reload has completed.
    */
   reload(options?: Dict<unknown>) {
-    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.reloadBelongsTo(this.key, options).then(() => this.value());
   }
 }

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

@@ -7,12 +7,12 @@ import { resolve } from 'rsvp';
 
 import { ManyArray } from 'ember-data/-private';
 
-import type { ManyRelationship } from '@ember-data/record-data/-private';
+import type { Graph } from '@ember-data/record-data/-private/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 +53,7 @@ function isResourceIdentiferWithRelatedLinks(
  @extends Reference
  */
 export default class HasManyReference {
+  declare graph: Graph;
   declare key: string;
   declare hasManyRelationship: ManyRelationship;
   declare type: string;
@@ -67,10 +68,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;
@@ -424,9 +427,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 +446,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 +495,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 +567,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 +624,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.8.0-alpha.4",
+  "version": "4.8.0-alpha.5",
   "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-alpha.5",
+    "@ember-data/private-build-infra": "4.8.0-alpha.5",
+    "@ember-data/store": "4.8.0-alpha.5",
     "@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-alpha.5",
     "@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"
   }
 }