getValue refactor breaking change for people explicitly using it

kellyselden · Apr 25, 2017 · 922fe7c · 922fe7c
1 parent 426827a
commit 922fe7c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/addon/-build-computed.js b/addon/-build-computed.js
@@ -7,15 +7,12 @@ function parseComputedArgs(args) {
   };
 }
 
-function mapKeysToValues(keys, getValue, context) {
-  return keys.map(key => getValue(context, key));
-}
-
 function buildCallback(collapsedKeys, incomingCallback, getValue) {
   let newCallback;
 
   function createArgs(context) {
-    return mapKeysToValues(collapsedKeys, getValue, context);
+    let bundledKeys = collapsedKeys.map(key => ({ context, key }));
+    return bundledKeys.map(getValue);
   }
 
   if (typeof incomingCallback === 'function') {

diff --git a/addon/create-class-computed.js b/addon/create-class-computed.js
@@ -82,7 +82,7 @@ export default function(observerBools, macroGenerator) {
       let mappedWithResolvedOberverKeys = mappedKeys.map((key, i) => {
         let shouldObserve = observerBools[i];
         if (shouldObserve) {
-          key = getValue(this, key);
+          key = getValue({ context: this, key });
         }
         return key;
       });
@@ -116,7 +116,7 @@ export default function(observerBools, macroGenerator) {
 
       let properties = collapsedKeys.reduce((properties, key, i) => {
         if (typeof key !== 'string') {
-          properties[i.toString()] = getValue(this, key);
+          properties[i.toString()] = getValue({ context: this, key });
         }
         return properties;
       }, {});

diff --git a/addon/get-value-unsafe.js b/addon/get-value-unsafe.js
@@ -1,7 +1,7 @@
 import getValue from './get-value';
 
-export default function(context, key) {
-  let value = getValue(context, key);
+export default function({ context, key }) {
+  let value = getValue({ context, key });
   if (value !== undefined) {
     return value;
   }

diff --git a/addon/get-value.js b/addon/get-value.js
@@ -1,7 +1,7 @@
 import get from 'ember-metal/get';
 import isComputed from './is-computed';
 
-export default function(context, key) {
+export default function({ context, key }) {
   if (isComputed(key)) {
     return key._getter.call(context);
   }

diff --git a/tests/unit/get-value-test.js b/tests/unit/get-value-test.js
@@ -26,7 +26,7 @@ module('Unit | get value');
       testKey: 'test value'
     };
 
-    let value = getValue(context, 'testKey');
+    let value = getValue({ context, key: 'testKey' });
 
     assert.strictEqual(value, 'test value');
   });
@@ -36,7 +36,7 @@ module('Unit | get value');
     let callback = sinon.stub().returns('test value');
     let key = computed(callback);
 
-    let value = getValue(context, key);
+    let value = getValue({ context, key });
 
     assert.strictEqual(callback.thisValues[0], context);
     assert.strictEqual(value, 'test value');
@@ -47,7 +47,7 @@ module('Unit | get value');
       testKey: false
     };
 
-    let value = getValue(context, 'testKey');
+    let value = getValue({ context, key: 'testKey' });
 
     assert.strictEqual(value, false);
   });
@@ -56,15 +56,15 @@ module('Unit | get value');
 namedTest('getValue', 'returns undefined if property doesn\'t exist', function(assert) {
   let context = {};
 
-  let value = getValue(context, 'testKey');
+  let value = getValue({ context, key: 'testKey' });
 
   assert.strictEqual(value, undefined);
 });
 
 namedTest('getValueUnsafe', 'returns literal if property doesn\'t exist', function(assert) {
   let context = {};
 
-  let value = getValueUnsafe(context, 'testKey');
+  let value = getValueUnsafe({ context, key: 'testKey' });
 
   assert.strictEqual(value, 'testKey');
 });