[CLEANUP] Migrate to notifyPropertyChange internally and deprecate pr…

…opertyDidChange

packages/ember-glimmer/tests/integration/syntax/each-test.js

@@ -1,4 +1,4 @@
-import { get, set, propertyDidChange } from 'ember-metal';
+import { get, set, notifyPropertyChange } from 'ember-metal';
 import { applyMixins, strip } from '../../utils/abstract-test-case';
 import { moduleFor, RenderingTest } from '../../utils/test-case';
 import { A as emberA, ArrayProxy, RSVP } from 'ember-runtime';
@@ -83,8 +83,8 @@ class ArrayLike {
   }
 
   arrayContentDidChange() {
-    propertyDidChange(this, '[]');
-    propertyDidChange(this, 'length');
+    notifyPropertyChange(this, '[]');
+    notifyPropertyChange(this, 'length');
   }
 
 }

packages/ember-metal/lib/computed.js

@@ -8,7 +8,7 @@ import {
   defineProperty
 } from './properties';
 import {
-  propertyDidChange
+  notifyPropertyChange
 } from './property_events';
 import {
   addDependentKeys,
@@ -418,7 +418,7 @@ ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, valu
 
   cache[keyName] = ret === undefined ? UNDEFINED : ret;
 
-  propertyDidChange(obj, keyName, meta);
+  notifyPropertyChange(obj, keyName, meta);
 
   return ret;
 };

packages/ember-metal/lib/index.js

@@ -57,6 +57,7 @@ export {
   beginPropertyChanges,
   changeProperties,
   endPropertyChanges,
+  notifyPropertyChange,
   overrideChains,
   propertyDidChange,
   propertyWillChange,

packages/ember-metal/lib/property_events.js

@@ -48,6 +48,25 @@ function propertyWillChange() {
   );
 }
 
+/**
+  @method propertyDidChange
+  @for Ember
+  @private
+*/
+function propertyDidChange(obj, keyName, _meta) {
+  deprecate(
+    `'propertyDidChange' is deprecated in favor of 'notifyPropertyChange'. It is safe to change this call to 'notifyPropertyChange'.`,
+    false,
+    {
+      id: 'ember-metal.deprecate-propertyDidChange',
+      until: '3.5.0',
+      url: 'https://emberjs.com/deprecations/v3.x/#toc_ember-metal-deprecate-propertyWillChange-and-propertyDidChange'
+    }
+  );
+
+  notifyPropertyChange(obj, keyName, _meta);
+}
+
 /**
   This function is called just after an object property has changed.
   It will notify any observers and clear caches among other things.
@@ -56,15 +75,15 @@ function propertyWillChange() {
   reason you can't directly watch a property you can invoke this method
   manually.
 
-  @method propertyDidChange
+  @method notifyPropertyChange
   @for Ember
   @param {Object} obj The object with the property that will change
   @param {String} keyName The property key (or path) that will change.
   @param {Meta} meta The objects meta.
   @return {void}
   @private
 */
-function propertyDidChange(obj, keyName, _meta) {
+function notifyPropertyChange(obj, keyName, _meta) {
   let meta = _meta === undefined ? peekMeta(obj) : _meta;
   let hasMeta = meta !== undefined;
 
@@ -109,7 +128,7 @@ function dependentKeysDidChange(obj, depKey, meta) {
     seen = DID_SEEN = {};
   }
 
-  iterDeps(propertyDidChange, obj, depKey, seen, meta);
+  iterDeps(notifyPropertyChange, obj, depKey, seen, meta);
 
   if (top) {
     DID_SEEN = null;
@@ -147,7 +166,7 @@ function iterDeps(method, obj, depKey, seen, meta) {
 function chainsDidChange(obj, keyName, meta) {
   let chainWatchers = meta.readableChainWatchers();
   if (chainWatchers !== undefined) {
-    chainWatchers.notify(keyName, true, propertyDidChange);
+    chainWatchers.notify(keyName, true, notifyPropertyChange);
   }
 }
 
@@ -251,6 +270,7 @@ function notifyObservers(obj, keyName, meta) {
 export {
   propertyWillChange,
   propertyDidChange,
+  notifyPropertyChange,
   overrideChains,
   beginPropertyChanges,
   endPropertyChanges,

packages/ember-metal/lib/property_set.js

@@ -2,7 +2,7 @@ import { toString } from 'ember-utils';
 import { assert, Error as EmberError } from 'ember-debug';
 import { getPossibleMandatoryProxyValue, _getPath as getPath } from './property_get';
 import {
-  propertyDidChange
+  notifyPropertyChange
 } from './property_events';
 
 import {
@@ -82,7 +82,7 @@ export function set(obj, keyName, value, tolerant) {
       obj[keyName] = value;
     }
 
-    propertyDidChange(obj, keyName, meta);
+    notifyPropertyChange(obj, keyName, meta);
   }
 
   return value;

packages/ember-metal/tests/chains_test.js

@@ -5,7 +5,7 @@ import {
   finishChains,
   defineProperty,
   computed,
-  propertyDidChange,
+  notifyPropertyChange,
   peekMeta,
   meta
 } from '..';
@@ -65,7 +65,7 @@ QUnit.test('observer and CP chains', function(assert) {
   */
 
   // invalidate qux
-  propertyDidChange(obj, 'qux');
+  notifyPropertyChange(obj, 'qux');
 
   // CP chain is blown away
 

packages/ember-metal/tests/observer_test.js

@@ -3,7 +3,7 @@ import { testBoth } from 'internal-test-helpers';
 import {
   addObserver,
   removeObserver,
-  propertyDidChange,
+  notifyPropertyChange,
   defineProperty,
   computed,
   cacheFor,
@@ -76,7 +76,7 @@ testBoth('observer should continue to fire after dependent properties are access
   get(obj, 'anotherProp');
 
   for (let i = 0; i < 10; i++) {
-    propertyDidChange(obj, 'prop');
+    notifyPropertyChange(obj, 'prop');
   }
 
   assert.equal(observerCount, 10, 'should continue to fire indefinitely');

packages/ember-metal/tests/performance_test.js

@@ -3,7 +3,7 @@ import {
   get,
   computed,
   defineProperty,
-  propertyDidChange,
+  notifyPropertyChange,
   beginPropertyChanges,
   endPropertyChanges,
   addObserver
@@ -59,7 +59,7 @@ moduleFor('Computed Properties - Number of times evaluated', class extends Abstr
 
     addObserver(foo, 'bar.baz.bam', function() {});
 
-    propertyDidChange(get(foo, 'bar.baz'), 'bam');
+    notifyPropertyChange(get(foo, 'bar.baz'), 'bam');
 
     assert.equal(count, 0, 'should not have recomputed property');
   }

packages/ember-runtime/lib/mixins/-proxy.js

@@ -9,7 +9,7 @@ import {
   meta,
   addObserver,
   removeObserver,
-  propertyDidChange,
+  notifyPropertyChange,
   defineProperty,
   Mixin,
   tagFor,
@@ -22,7 +22,7 @@ import { bool } from '../computed/computed_macros';
 function contentPropertyDidChange(content, contentKey) {
   let key = contentKey.slice(8); // remove "content."
   if (key in this) { return; } // if shadowed in proxy
-  propertyDidChange(this, key);
+  notifyPropertyChange(this, key);
 }
 
 class ProxyTag extends CachedTag {

packages/ember-runtime/lib/mixins/array.js

@@ -10,7 +10,7 @@ import {
   isNone,
   aliasMethod,
   Mixin,
-  propertyDidChange,
+  notifyPropertyChange,
   addListener,
   removeListener,
   sendEvent,
@@ -44,7 +44,7 @@ function arrayObserversHelper(obj, target, opts, operation, notify) {
   operation(obj, '@array:change', target, didChange);
 
   if (hasObservers === notify) {
-    propertyDidChange(obj, 'hasArrayObservers');
+    notifyPropertyChange(obj, 'hasArrayObservers');
   }
 
   return obj;
@@ -102,10 +102,10 @@ export function arrayContentDidChange(array, startIdx, removeAmt, addAmt) {
   }
 
   if (addAmt < 0 || removeAmt < 0 || addAmt - removeAmt !== 0) {
-    propertyDidChange(array, 'length');
+    notifyPropertyChange(array, 'length');
   }
 
-  propertyDidChange(array, '[]');
+  notifyPropertyChange(array, '[]');
 
   if (array.__each) {
     array.__each.arrayDidChange(array, startIdx, removeAmt, addAmt);
@@ -124,14 +124,14 @@ export function arrayContentDidChange(array, startIdx, removeAmt, addAmt) {
 
     let normalStartIdx = startIdx < 0 ? previousLength + startIdx : startIdx;
     if (cache.firstObject !== undefined && normalStartIdx === 0) {
-      propertyDidChange(array, 'firstObject', meta);
+      notifyPropertyChange(array, 'firstObject', meta);
     }
 
     if (cache.lastObject !== undefined) {
       let previousLastIndex = previousLength - 1;
       let lastAffectedIndex = normalStartIdx + removedAmount;
       if (previousLastIndex < lastAffectedIndex) {
-        propertyDidChange(array, 'lastObject', meta);
+        notifyPropertyChange(array, 'lastObject', meta);
       }
    }
   }
@@ -1286,7 +1286,7 @@ EachProxy.prototype = {
       if (lim > 0) {
         addObserverForContentKey(content, key, this, idx, lim);
       }
-      propertyDidChange(this, key, meta);
+      notifyPropertyChange(this, key, meta);
     }
   },
 
@@ -1334,7 +1334,7 @@ EachProxy.prototype = {
   },
 
   contentKeyDidChange(obj, keyName) {
-    propertyDidChange(this, keyName);
+    notifyPropertyChange(this, keyName);
   }
 };
 

packages/ember-runtime/lib/mixins/observable.js

@@ -13,6 +13,7 @@ import {
   beginPropertyChanges,
   propertyWillChange,
   propertyDidChange,
+  notifyPropertyChange,
   endPropertyChanges,
   addObserver,
   removeObserver,
@@ -279,16 +280,7 @@ export default Mixin.create({
   },
 
   /**
-    Notify the observer system that a property has just changed.
-
-    Sometimes you need to change a value directly or indirectly without
-    actually calling `get()` or `set()` on it. In this case, you can use this
-    method instead. Calling this method will notify all observers that the
-    property has potentially changed value.
-
     @method propertyDidChange
-    @param {String} keyName The property key that has just changed.
-    @return {Observable}
     @private
   */
   propertyDidChange(keyName) {
@@ -297,15 +289,20 @@ export default Mixin.create({
   },
 
   /**
-    Convenience method to call `propertyDidChange`.
+    Notify the observer system that a property has just changed.
+
+    Sometimes you need to change a value directly or indirectly without
+    actually calling `get()` or `set()` on it. In this case, you can use this
+    method instead. Calling this method will notify all observers that the
+    property has potentially changed value.
 
     @method notifyPropertyChange
     @param {String} keyName The property key to be notified about.
     @return {Observable}
     @public
   */
   notifyPropertyChange(keyName) {
-    this.propertyDidChange(keyName);
+    notifyPropertyChange(this, keyName);
     return this;
   },
 

packages/ember-runtime/tests/legacy_1x/mixins/observable/observable_test.js

@@ -414,7 +414,7 @@ moduleFor('Computed properties', class extends AbstractTestCase {
     object.get('computedCached'); // should run func
     object.get('computedCached'); // should not run func
 
-    object.propertyDidChange('computedCached');
+    object.notifyPropertyChange('computedCached');
 
     object.get('computedCached'); // should run again
     assert.equal(object.computedCachedCalls.length, 2, 'should have invoked method 2x');

packages/ember-runtime/tests/legacy_1x/mixins/observable/propertyChanges_test.js

@@ -91,7 +91,7 @@ moduleFor('object.propertyChanges', class extends AbstractTestCase {
     ObjectA.set('foo', 'changeFooValue');
 
     // Indicate the subscribers of foo that the value has just changed
-    ObjectA.propertyDidChange('foo', null);
+    ObjectA.notifyPropertyChange('foo', null);
 
     // Values of prop has just changed
     assert.equal(ObjectA.prop, 'changedPropValue');

packages/ember-runtime/tests/mixins/observable_test.js

@@ -104,3 +104,11 @@ QUnit.test('propertyWillChange triggers a deprecation warning', function () {
     obj.propertyWillChange('foo');
   }, /'propertyWillChange' is deprecated and has no effect. It is safe to remove this call./);
 });
+
+QUnit.test('propertyDidChange triggers a deprecation warning', function () {
+  let obj = EmberObject.create();
+
+  expectDeprecation(() => {
+    obj.propertyDidChange('foo');
+  }, /'propertyDidChange' is deprecated in favor of 'notifyPropertyChange'. It is safe to change this call to 'notifyPropertyChange'./);
+});

packages/ember/lib/index.js

@@ -90,6 +90,7 @@ Ember.run = metal.run;
 Ember._ObserverSet = metal.ObserverSet;
 Ember.propertyWillChange = metal.propertyWillChange;
 Ember.propertyDidChange = metal.propertyDidChange;
+Ember.notifyPropertyChange = metal.notifyPropertyChange;
 Ember.overrideChains = metal.overrideChains;
 Ember.beginPropertyChanges = metal.beginPropertyChanges;
 Ember.endPropertyChanges = metal.endPropertyChanges;

packages/ember/tests/reexports_test.js

@@ -75,9 +75,9 @@ let allExports =[
   ['_ObserverSet', 'ember-metal', 'ObserverSet'],
   ['propertyWillChange', 'ember-metal'],
   ['propertyDidChange', 'ember-metal'],
+  ['notifyPropertyChange', 'ember-metal'],
   ['overrideChains', 'ember-metal'],
   ['beginPropertyChanges', 'ember-metal'],
-  ['beginPropertyChanges', 'ember-metal'],
   ['endPropertyChanges', 'ember-metal'],
   ['changeProperties', 'ember-metal'],
   ['defineProperty', 'ember-metal'],