@ember-data/model 4.6.1 → 4.7.0

package/addon/-private/notify-changes.ts

@@ -1,7 +1,7 @@
 import { cacheFor } from '@ember/object/internals';
 
 import type Store from '@ember-data/store';
-import type { NotificationType } from '@ember-data/store/-private/record-notification-manager';
+import type { NotificationType } from '@ember-data/store/-private/managers/record-notification-manager';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 
 import type Model from './model';
@@ -66,7 +66,7 @@ function notifyRelationship(identifier: StableRecordIdentifier, key: string, rec
 function notifyAttribute(store: Store, identifier: StableRecordIdentifier, key: string, record: Model) {
   let currentValue = cacheFor(record, key);
 
-  if (currentValue !== store._instanceCache.getRecordData(identifier).getAttr(key)) {
+  if (currentValue !== store._instanceCache.getRecordData(identifier).getAttr(identifier, key)) {
     record.notifyPropertyChange(key);
   }
 }

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

@@ -4,11 +4,11 @@ import type PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import type ObjectProxy from '@ember/object/proxy';
 
 import type Store from '@ember-data/store';
-import { PromiseObject } from '@ember-data/store/-private';
 import type { RecordInstance } from '@ember-data/types/q/record-instance';
 import type { Dict } from '@ember-data/types/q/utils';
 
 import { LegacySupport } from './legacy-relationships-support';
+import { PromiseObject } from './promise-proxy-base';
 
 export interface BelongsToProxyMeta {
   key: string;

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

@@ -1,16 +1,23 @@
 import ArrayMixin, { NativeArray } from '@ember/array';
 import type ArrayProxy from '@ember/array/proxy';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { dependentKeyCompat } from '@ember/object/compat';
+import { DEBUG } from '@glimmer/env';
 import { tracked } from '@glimmer/tracking';
 import Ember from 'ember';
 
 import { resolve } from 'rsvp';
 
-import type { ManyArray } from 'ember-data/-private';
-
-import type { InternalModel } from '@ember-data/store/-private';
+import {
+  DEPRECATE_A_USAGE,
+  DEPRECATE_COMPUTED_CHAINS,
+  DEPRECATE_PROMISE_MANY_ARRAY_BEHAVIORS,
+} from '@ember-data/private-build-infra/deprecations';
+import { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { RecordInstance } from '@ember-data/types/q/record-instance';
+import { FindOptions } from '@ember-data/types/q/store';
+
+import type ManyArray from './many-array';
 
 export interface HasManyProxyCreateArgs {
   promise: Promise<ManyArray>;
@@ -24,16 +31,10 @@ export interface HasManyProxyCreateArgs {
   This class is returned as the result of accessing an async hasMany relationship
   on an instance of a Model extending from `@ember-data/model`.
 
-  A PromiseManyArray is an array-like proxy that also proxies certain method calls
-  to the underlying ManyArray in addition to being "promisified".
-
-  Right now we proxy:
-
-    * `reload()`
-    * `createRecord()`
+  A PromiseManyArray is an iterable proxy that allows templates to consume related
+  ManyArrays and update once their contents are no longer pending.
 
-  This promise-proxy behavior is primarily to ensure that async relationship interact
-  nicely with templates. In your JS code you should resolve the promise first.
+  In your JS code you should resolve the promise first.
 
   ```js
   const comments = await post.comments;
@@ -42,10 +43,14 @@ export interface HasManyProxyCreateArgs {
   @class PromiseManyArray
   @public
 */
-export default interface PromiseManyArray extends Omit<ArrayProxy<InternalModel, RecordInstance>, 'destroy'> {}
+export default interface PromiseManyArray extends Omit<ArrayProxy<StableRecordIdentifier, RecordInstance>, 'destroy'> {
+  createRecord(): RecordInstance;
+  reload(options: FindOptions): PromiseManyArray;
+}
 export default class PromiseManyArray {
   declare promise: Promise<ManyArray> | null;
   declare isDestroyed: boolean;
+  // @deprecated (isDestroyed is not deprecated)
   declare isDestroying: boolean;
 
   constructor(promise: Promise<ManyArray>, content?: ManyArray) {
@@ -53,13 +58,27 @@ export default class PromiseManyArray {
     this.isDestroyed = false;
     this.isDestroying = false;
 
-    const meta = Ember.meta(this);
-    meta.hasMixin = (mixin: Object) => {
-      if (mixin === NativeArray || mixin === ArrayMixin) {
-        return true;
-      }
-      return false;
-    };
+    if (DEPRECATE_A_USAGE) {
+      const meta = Ember.meta(this);
+      meta.hasMixin = (mixin: Object) => {
+        deprecate(`Do not use A() on an EmberData PromiseManyArray`, false, {
+          id: 'ember-data:no-a-with-array-like',
+          until: '5.0',
+          since: { enabled: '4.8', available: '4.8' },
+          for: 'ember-data',
+        });
+        // @ts-expect-error ArrayMixin is more than a type
+        if (mixin === NativeArray || mixin === ArrayMixin) {
+          return true;
+        }
+        return false;
+      };
+    } else if (DEBUG) {
+      const meta = Ember.meta(this);
+      meta.hasMixin = (mixin: Object) => {
+        assert(`Do not use A() on an EmberData PromiseManyArray`);
+      };
+    }
   }
 
   //---- Methods/Properties on ArrayProxy that we will keep as our API
@@ -75,7 +94,9 @@ export default class PromiseManyArray {
   get length(): number {
     // shouldn't be needed, but ends up being needed
     // for computed chains even in 4.x
-    this['[]'];
+    if (DEPRECATE_COMPUTED_CHAINS) {
+      this['[]'];
+    }
     return this.content ? this.content.length : 0;
   }
 
@@ -85,11 +106,15 @@ export default class PromiseManyArray {
   // to recompute. We entangle the '[]' tag from
   @dependentKeyCompat
   get '[]'() {
-    return this.content ? this.content['[]'] : this.content;
+    if (DEPRECATE_COMPUTED_CHAINS) {
+      return this.content?.length && this.content;
+    }
   }
 
   /**
    * Iterate the proxied content. Called by the glimmer iterator in #each
+   * We do not guarantee that forEach will always be available. This
+   * may eventually be made to use Symbol.Iterator once glimmer supports it.
    *
    * @method forEach
    * @param cb
@@ -97,12 +122,24 @@ export default class PromiseManyArray {
    * @private
    */
   forEach(cb) {
-    this['[]']; // needed for < 3.23 support e.g. 3.20 lts
     if (this.content && this.length) {
       this.content.forEach(cb);
     }
   }
 
+  /**
+   * Reload the relationship
+   * @method reload
+   * @public
+   * @param options
+   * @returns
+   */
+  reload(options: FindOptions) {
+    assert('You are trying to reload an async manyArray before it has been created', this.content);
+    this.content.reload(options);
+    return this;
+  }
+
   //----  Properties/Methods from the PromiseProxyMixin that we will keep as our API
 
   /**
@@ -201,19 +238,6 @@ export default class PromiseManyArray {
     return this.content ? this.content.meta : undefined;
   }
 
-  /**
-   * Reload the relationship
-   * @method reload
-   * @public
-   * @param options
-   * @returns
-   */
-  reload(options) {
-    assert('You are trying to reload an async manyArray before it has been created', this.content);
-    this.content.reload(options);
-    return this;
-  }
-
   //---- Our own stuff
 
   _update(promise: Promise<ManyArray>, content?: ManyArray) {
@@ -227,22 +251,55 @@ export default class PromiseManyArray {
   static create({ promise, content }: HasManyProxyCreateArgs): PromiseManyArray {
     return new this(promise, content);
   }
+}
 
-  // Methods on ManyArray which people should resolve the relationship first before calling
-  createRecord(...args) {
+if (DEPRECATE_PROMISE_MANY_ARRAY_BEHAVIORS) {
+  PromiseManyArray.prototype.createRecord = function createRecord(...args) {
+    deprecate(
+      `The createRecord method on ember-data's PromiseManyArray is deprecated. await the promise and work with the ManyArray directly.`,
+      false,
+      {
+        id: 'ember-data:deprecate-promise-many-array-behaviors',
+        until: '5.0',
+        since: { enabled: '4.8', available: '4.8' },
+        for: 'ember-data',
+      }
+    );
     assert('You are trying to createRecord on an async manyArray before it has been created', this.content);
     return this.content.createRecord(...args);
-  }
-
-  // Properties/Methods on ArrayProxy we should deprecate
-
-  get firstObject() {
-    return this.content ? this.content.firstObject : undefined;
-  }
+  };
 
-  get lastObject() {
-    return this.content ? this.content.lastObject : undefined;
-  }
+  Object.defineProperty(PromiseManyArray.prototype, 'firstObject', {
+    get() {
+      deprecate(
+        `The firstObject property on ember-data's PromiseManyArray is deprecated. await the promise and work with the ManyArray directly.`,
+        false,
+        {
+          id: 'ember-data:deprecate-promise-many-array-behaviors',
+          until: '5.0',
+          since: { enabled: '4.8', available: '4.8' },
+          for: 'ember-data',
+        }
+      );
+      return this.content ? this.content.firstObject : undefined;
+    },
+  });
+
+  Object.defineProperty(PromiseManyArray.prototype, 'lastObject', {
+    get() {
+      deprecate(
+        `The lastObject property on ember-data's PromiseManyArray is deprecated. await the promise and work with the ManyArray directly.`,
+        false,
+        {
+          id: 'ember-data:deprecate-promise-many-array-behaviors',
+          until: '5.0',
+          since: { enabled: '4.8', available: '4.8' },
+          for: 'ember-data',
+        }
+      );
+      return this.content ? this.content.lastObject : undefined;
+    },
+  });
 }
 
 function tapPromise(proxy: PromiseManyArray, promise: Promise<ManyArray>) {
@@ -268,78 +325,101 @@ function tapPromise(proxy: PromiseManyArray, promise: Promise<ManyArray>) {
   );
 }
 
-const EmberObjectMethods = [
-  'addObserver',
-  'cacheFor',
-  'decrementProperty',
-  'get',
-  'getProperties',
-  'incrementProperty',
-  'notifyPropertyChange',
-  'removeObserver',
-  'set',
-  'setProperties',
-  'toggleProperty',
-];
-EmberObjectMethods.forEach((method) => {
-  PromiseManyArray.prototype[method] = function delegatedMethod(...args) {
-    return Ember[method](this, ...args);
-  };
-});
-
-const InheritedProxyMethods = [
-  'addArrayObserver',
-  'addObject',
-  'addObjects',
-  'any',
-  'arrayContentDidChange',
-  'arrayContentWillChange',
-  'clear',
-  'compact',
-  'every',
-  'filter',
-  'filterBy',
-  'find',
-  'findBy',
-  'getEach',
-  'includes',
-  'indexOf',
-  'insertAt',
-  'invoke',
-  'isAny',
-  'isEvery',
-  'lastIndexOf',
-  'map',
-  'mapBy',
-  'objectAt',
-  'objectsAt',
-  'popObject',
-  'pushObject',
-  'pushObjects',
-  'reduce',
-  'reject',
-  'rejectBy',
-  'removeArrayObserver',
-  'removeAt',
-  'removeObject',
-  'removeObjects',
-  'replace',
-  'reverseObjects',
-  'setEach',
-  'setObjects',
-  'shiftObject',
-  'slice',
-  'sortBy',
-  'toArray',
-  'uniq',
-  'uniqBy',
-  'unshiftObject',
-  'unshiftObjects',
-  'without',
-];
-InheritedProxyMethods.forEach((method) => {
-  PromiseManyArray.prototype[method] = function proxiedMethod(...args) {
-    assert(`Cannot call ${method} before content is assigned.`, this.content);
-    return this.content[method](...args);
-  };
-});
+if (DEPRECATE_PROMISE_MANY_ARRAY_BEHAVIORS) {
+  const EmberObjectMethods = [
+    'addObserver',
+    'cacheFor',
+    'decrementProperty',
+    'get',
+    'getProperties',
+    'incrementProperty',
+    'notifyPropertyChange',
+    'removeObserver',
+    'set',
+    'setProperties',
+    'toggleProperty',
+  ];
+  EmberObjectMethods.forEach((method) => {
+    PromiseManyArray.prototype[method] = function delegatedMethod(...args) {
+      deprecate(
+        `The ${method} method on ember-data's PromiseManyArray is deprecated. await the promise and work with the ManyArray directly.`,
+        false,
+        {
+          id: 'ember-data:deprecate-promise-many-array-behaviors',
+          until: '5.0',
+          since: { enabled: '4.8', available: '4.8' },
+          for: 'ember-data',
+        }
+      );
+      return Ember[method](this, ...args);
+    };
+  });
+
+  const InheritedProxyMethods = [
+    'addArrayObserver',
+    'addObject',
+    'addObjects',
+    'any',
+    'arrayContentDidChange',
+    'arrayContentWillChange',
+    'clear',
+    'compact',
+    'every',
+    'filter',
+    'filterBy',
+    'find',
+    'findBy',
+    'getEach',
+    'includes',
+    'indexOf',
+    'insertAt',
+    'invoke',
+    'isAny',
+    'isEvery',
+    'lastIndexOf',
+    'map',
+    'mapBy',
+    // TODO update RFC to note objectAt was deprecated (forEach was left for iteration)
+    'objectAt',
+    'objectsAt',
+    'popObject',
+    'pushObject',
+    'pushObjects',
+    'reduce',
+    'reject',
+    'rejectBy',
+    'removeArrayObserver',
+    'removeAt',
+    'removeObject',
+    'removeObjects',
+    'replace',
+    'reverseObjects',
+    'setEach',
+    'setObjects',
+    'shiftObject',
+    'slice',
+    'sortBy',
+    'toArray',
+    'uniq',
+    'uniqBy',
+    'unshiftObject',
+    'unshiftObjects',
+    'without',
+  ];
+  InheritedProxyMethods.forEach((method) => {
+    PromiseManyArray.prototype[method] = function proxiedMethod(...args) {
+      deprecate(
+        `The ${method} method on ember-data's PromiseManyArray is deprecated. await the promise and work with the ManyArray directly.`,
+        false,
+        {
+          id: 'ember-data:deprecate-promise-many-array-behaviors',
+          until: '5.0',
+          since: { enabled: '4.8', available: '4.8' },
+          for: 'ember-data',
+        }
+      );
+      assert(`Cannot call ${method} before content is assigned.`, this.content);
+      return this.content[method](...args);
+    };
+  });
+}

package/addon/-private/promise-proxy-base.js

@@ -0,0 +1,4 @@
+import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
+import ObjectProxy from '@ember/object/proxy';
+
+export const PromiseObject = ObjectProxy.extend(PromiseProxyMixin);

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

@@ -5,14 +5,17 @@ import { cached, tracked } from '@glimmer/tracking';
 
 import type Store from '@ember-data/store';
 import { storeFor } from '@ember-data/store';
-import { errorsArrayToHash, recordIdentifierFor } from '@ember-data/store/-private';
-import type { NotificationType } from '@ember-data/store/-private/record-notification-manager';
-import type RequestCache from '@ember-data/store/-private/request-cache';
+import { recordIdentifierFor } from '@ember-data/store/-private';
+import type { NotificationType } from '@ember-data/store/-private/managers/record-notification-manager';
+import type RequestCache from '@ember-data/store/-private/network/request-cache';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { RecordData } from '@ember-data/types/q/record-data';
 
 type Model = InstanceType<typeof import('./model')>;
 
+const SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
+const SOURCE_POINTER_PRIMARY_REGEXP = /^\/?data/;
+const PRIMARY_ATTRIBUTE_KEY = 'base';
 function isInvalidError(error) {
   return error && error.isAdapterError === true && error.code === 'InvalidError';
 }
@@ -101,8 +104,9 @@ export function tagged(_target, key, desc) {
 }
 
 /**
-Historically InternalModel managed a state machine
-the currentState for which was reflected onto Model.
+Historically EmberData managed a state machine
+for each record, the localState for which
+was reflected onto Model.
 
 This implements the flags and stateName for backwards compat
 with the state tree that used to be possible (listed below).
@@ -150,6 +154,7 @@ export default class RecordState {
   declare recordData: RecordData;
   declare _errorRequests: any[];
   declare _lastError: any;
+  declare handler: object;
 
   constructor(record: Model) {
     const store = storeFor(record)!;
@@ -176,7 +181,6 @@ export default class RecordState {
             break;
           case 'rejected':
             this.isSaving = false;
-
             this._lastError = req;
             if (!(req.response && isInvalidError(req.response.data))) {
               this._errorRequests.push(req);
@@ -230,47 +234,63 @@ export default class RecordState {
       }
     }
 
-    notifications.subscribe(identity, (identifier: StableRecordIdentifier, type: NotificationType, key?: string) => {
-      switch (type) {
-        case 'state':
-          this.notify('isNew');
-          this.notify('isDeleted');
-          this.notify('isDirty');
-          break;
-        case 'attributes':
-          this.notify('isEmpty');
-          this.notify('isDirty');
-          break;
-        case 'unload':
-          this.notify('isNew');
-          this.notify('isDeleted');
-          break;
-        case 'errors':
-          // we only hit this if a foreign RecordData notifies
-          // errors changed. Our own implementation does not
-          // take this path currently, but we should probably
-          // fix that.
-          this.updateInvalidErrors();
-          this.notify('isValid');
-          break;
+    this.handler = notifications.subscribe(
+      identity,
+      (identifier: StableRecordIdentifier, type: NotificationType, key?: string) => {
+        switch (type) {
+          case 'state':
+            this.notify('isNew');
+            this.notify('isDeleted');
+            this.notify('isDirty');
+            break;
+          case 'attributes':
+            this.notify('isEmpty');
+            this.notify('isDirty');
+            break;
+          case 'errors':
+            this.updateInvalidErrors(this.record.errors);
+            this.notify('isValid');
+            break;
+        }
       }
-    });
+    );
+  }
+
+  destroy() {
+    storeFor(this.record)!._notificationManager.unsubscribe(this.handler);
   }
 
   notify(key) {
     getTag(this, key).notify();
   }
 
-  updateInvalidErrors() {
-    let jsonApiErrors = this.recordData.getErrors!(this.identifier);
+  updateInvalidErrors(errors) {
+    assert(
+      `Expected the RecordData instance for ${this.identifier}  to implement getErrors(identifier)`,
+      typeof this.recordData.getErrors === 'function'
+    );
+    let jsonApiErrors = this.recordData.getErrors(this.identifier);
 
-    const { errors } = this.record;
     errors.clear();
-    let newErrors = errorsArrayToHash(jsonApiErrors);
-    let errorKeys = Object.keys(newErrors);
 
-    for (let i = 0; i < errorKeys.length; i++) {
-      errors.add(errorKeys[i], newErrors[errorKeys[i]]);
+    for (let i = 0; i < jsonApiErrors.length; i++) {
+      let error = jsonApiErrors[i];
+
+      if (error.source && error.source.pointer) {
+        let keyMatch = error.source.pointer.match(SOURCE_POINTER_REGEXP);
+        let key: string | undefined;
+
+        if (keyMatch) {
+          key = keyMatch[2];
+        } else if (error.source.pointer.search(SOURCE_POINTER_PRIMARY_REGEXP) !== -1) {
+          key = PRIMARY_ATTRIBUTE_KEY;
+        }
+
+        if (key) {
+          let errMsg = error.detail || error.title;
+          errors.add(key, errMsg);
+        }
+      }
     }
   }
 
@@ -289,7 +309,6 @@ export default class RecordState {
     return !this.isLoaded && this.pendingCount > 0 && this.fulfilledCount === 0;
   }
 
-  // TODO @runspired handle "unloadRecord" see note in InternalModel
   @tagged
   get isLoaded() {
     if (this.isNew) {
@@ -303,7 +322,7 @@ export default class RecordState {
     let rd = this.recordData;
     if (this.isDeleted) {
       assert(`Expected RecordData to implement isDeletionCommitted()`, rd.isDeletionCommitted);
-      return rd.isDeletionCommitted();
+      return rd.isDeletionCommitted(this.identifier);
     }
     if (this.isNew || this.isEmpty || !this.isValid || this.isDirty || this.isLoading) {
       return false;
@@ -317,21 +336,21 @@ export default class RecordState {
     // TODO this is not actually an RFC'd concept. Determine the
     // correct heuristic to replace this with.
     assert(`Expected RecordData to implement isEmpty()`, rd.isEmpty);
-    return !this.isNew && rd.isEmpty();
+    return !this.isNew && rd.isEmpty(this.identifier);
   }
 
   @tagged
   get isNew() {
     let rd = this.recordData;
     assert(`Expected RecordData to implement isNew()`, rd.isNew);
-    return rd.isNew();
+    return rd.isNew(this.identifier);
   }
 
   @tagged
   get isDeleted() {
     let rd = this.recordData;
     assert(`Expected RecordData to implement isDeleted()`, rd.isDeleted);
-    return rd.isDeleted();
+    return rd.isDeleted(this.identifier);
   }
 
   @tagged
@@ -342,12 +361,10 @@ export default class RecordState {
   @tagged
   get isDirty() {
     let rd = this.recordData;
-    assert(`Expected RecordData to implement hasChangedAttributes()`, rd.hasChangedAttributes);
-    assert(`Expected RecordData to implement isDeletionCommitted()`, rd.isDeletionCommitted);
-    if (rd.isDeletionCommitted() || (this.isDeleted && this.isNew)) {
+    if (rd.isDeletionCommitted(this.identifier) || (this.isDeleted && this.isNew)) {
       return false;
     }
-    return this.isNew || rd.hasChangedAttributes();
+    return this.isNew || rd.hasChangedAttrs(this.identifier);
   }
 
   @tagged