Fix: PromiseProxy Deprecation for Save

packages/-ember-data/tests/integration/records/save-test.js

@@ -46,10 +46,17 @@ module('integration/records/save - Save Record', function (hooks) {
     assert.ok(true, 'save operation was resolved');
     if (DEPRECATE_SAVE_PROMISE_ACCESS) {
       assert.strictEqual(saved.get('id'), '123');
+      assert.strictEqual(saved.id, undefined);
+    } else {
+      assert.strictEqual(saved.id, undefined);
     }
     assert.strictEqual(model, post, 'resolves with the model');
     if (DEPRECATE_SAVE_PROMISE_ACCESS) {
-      assert.expectDeprecation({ id: 'ember-data:model-save-promise', count: 2 });
+      // We don't care about the exact value of the property, but accessing it
+      // should not throw an error and only show a deprecation.
+      assert.strictEqual(saved.__ec_cancel__, undefined);
+
+      assert.expectDeprecation({ id: 'ember-data:model-save-promise', count: 4 });
     }
   });
 

packages/model/addon/-private/model.js

@@ -856,7 +856,7 @@ class Model extends EmberObject {
   save(options) {
     const promise = this._internalModel.save(options).then(() => this);
     if (DEPRECATE_SAVE_PROMISE_ACCESS) {
-      return deprecatedPromiseObject(PromiseObject.create({ promise }));
+      return deprecatedPromiseObject(promise);
     }
 
     return promise;

packages/store/addon/-private/system/promise-proxies.ts

@@ -105,7 +105,8 @@ export function promiseArray<I, T extends EmberArrayLike<I>>(promise: Promise<T>
 // constructor is accessed in some internals but not including it in the copyright for the deprecation
 const ALLOWABLE_METHODS = ['constructor', 'then', 'catch', 'finally'];
 
-export function deprecatedPromiseObject<T>(promise: PromiseObjectProxy<T>): PromiseObjectProxy<T> {
+export function deprecatedPromiseObject<T>(promise: Promise<T>): PromiseObjectProxy<T> {
+  const promiseObjectProxy: PromiseObjectProxy<T> = promiseObject(promise);
   const handler = {
     get(target: object, prop: string, receiver?: object): unknown {
       if (!ALLOWABLE_METHODS.includes(prop)) {
@@ -124,9 +125,14 @@ export function deprecatedPromiseObject<T>(promise: PromiseObjectProxy<T>): Prom
         );
       }
 
-      return (Reflect.get(target, prop, receiver) as Function).bind(target);
+      const value: unknown = Reflect.get(target, prop, receiver);
+      if (value && typeof value === 'function' && typeof value.bind === 'function') {
+        return value.bind(target);
+      }
+
+      return value;
     },
   };
 
-  return new Proxy(promise, handler) as PromiseObjectProxy<T>;
+  return new Proxy(promiseObjectProxy, handler) as PromiseObjectProxy<T>;
 }