Improve compatibility with Ember.ArrayProxy. Fixes #109 (#110)

addon/collapse-key.js

@@ -5,11 +5,15 @@ export default function(property) {
     return [property];
   }
 
-  let atEachIndex = property.indexOf('.@each');
-  if (atEachIndex !== -1) {
-    return [property.slice(0, atEachIndex)];
-  } else if (property.slice(-2) === '[]') {
-    return [property.slice(0, -3)];
+  let atEachIndex = property.indexOf('@each.');
+  if (atEachIndex === -1) {
+    atEachIndex = property.indexOf('[]');
+  }
+
+  if (atEachIndex === 0) {
+    return [''];
+  } else if (atEachIndex > 0) {
+    return [property.slice(0, atEachIndex - 1)];
   }
 
   return expandProperty(property);

addon/create-class-computed.js

@@ -72,7 +72,7 @@ export default function(observerBools, macroGenerator) {
     function getOriginalArrayDecorator(key, i) {
       if (typeof key === 'string') {
         let originalKey = keys[keyMap[i]];
-        if (originalKey.indexOf('.[]') !== -1 || originalKey.indexOf('.@each') !== -1) {
+        if (originalKey.indexOf('[]') !== -1 || originalKey.indexOf('@each.') !== -1) {
           return originalKey;
         }
       }

addon/get-value.js

@@ -1,4 +1,5 @@
 import { get } from '@ember/object';
+import { isBlank } from '@ember/utils';
 import isComputed from './is-computed';
 
 export default function({ context, macro, key } = {}) {
@@ -10,5 +11,11 @@ export default function({ context, macro, key } = {}) {
     return macro;
   }
 
+  if (isBlank(macro)) {
+    // the macro was `[]' or `@each.key', which has been trimmed, leaving a
+    // blank string, so return the context (which is likely an ArrayProxy)
+    return context;
+  }
+
   return get(context, macro);
 }

addon/normalize-array-key.js

@@ -1,3 +1,5 @@
+import { isBlank } from '@ember/utils';
+
 export default function(array, keys = []) {
   // this macro support should be extracted out
   // we should only deal with string keys in here
@@ -7,7 +9,7 @@ export default function(array, keys = []) {
 
   let props;
 
-  let i = array.indexOf('.@each');
+  let i = array.indexOf('@each.');
   if (i !== -1) {
     let chain = array.split('.');
     let end = chain[chain.length - 1];
@@ -17,12 +19,14 @@ export default function(array, keys = []) {
       props = [end];
     }
   } else {
-    i = array.indexOf('.[]');
+    i = array.indexOf('[]');
     props = [];
   }
 
-  if (i !== -1) {
-    array = array.substr(0, i);
+  if (i === 0) {
+    array = ''
+  } else if (i > 0) {
+    array = array.slice(0, i - 1);
   }
 
   keys.forEach(key => {
@@ -48,5 +52,5 @@ export default function(array, keys = []) {
     }
   }
 
-  return `${array}.${suffix}`;
+  return isBlank(array) ? suffix : `${array}.${suffix}`;
 }

package.json

@@ -36,7 +36,7 @@
     "ember-cli-shims": "^1.1.0",
     "ember-data": "^2.13.2",
     "ember-disable-prototype-extensions": "^1.1.2",
-    "ember-macro-test-helpers": "^3.0.0",
+    "ember-macro-test-helpers": "^3.1.0",
     "ember-resolver": "^4.0.0",
     "ember-sinon": "0.7.0",
     "ember-source": "~2.14.0",

tests/integration/computed-test.js

@@ -4,6 +4,8 @@ import { module } from 'qunit';
 import sinon from 'sinon';
 import compute from 'ember-macro-test-helpers/compute';
 import namedTest from '../helpers/named-test';
+import ArrayProxy from '@ember/array/proxy';
+import { A as emberA } from '@ember/array';
 
 const getReturnValue = 'get return value test';
 const setReturnValue = 'set return value test';
@@ -186,6 +188,18 @@ namedTest('computed', 'function syntax: resolves array [] keys', function(assert
   assert.deepEqual(getCallback.args[1], ['123']);
 });
 
+namedTest('computed', 'function syntax: resolves ArrayProxy []', function(assert) {
+  compute({
+    baseClass: ArrayProxy,
+    computed: computed('[]', getCallback),
+    properties: {
+      content: emberA(['123'])
+    }
+  });
+
+  assert.deepEqual(getCallback.args[1][0].toArray(), ['123']);
+});
+
 namedTest('computed', 'function syntax: resolves array @each keys', function(assert) {
   compute({
     computed: computed('[email protected]', getCallback),
@@ -197,6 +211,18 @@ namedTest('computed', 'function syntax: resolves array @each keys', function(ass
   assert.deepEqual(getCallback.args[1], ['123']);
 });
 
+namedTest('computed', 'function syntax: resolves ArrayProxy @each', function(assert) {
+  compute({
+    baseClass: ArrayProxy,
+    computed: computed('@each.key1', getCallback),
+    properties: {
+      content: emberA([{ key1: '123' }])
+    }
+  });
+
+  assert.deepEqual(getCallback.args[1][0].toArray(), [{ key1: '123' }]);
+});
+
 namedTest('computed', 'function syntax: expands properties', function(assert) {
   compute({
     computed: computed('{key1,key2}', getCallback),

tests/unit/collapse-key-test.js

@@ -17,20 +17,41 @@ test('it collapses array.[]', function(assert) {
   );
 });
 
+test('it collapses []', function(assert) {
+  assert.deepEqual(
+    collapseKey('[]'),
+    ['']
+  );
+});
+
 test('it collapses array.@each', function(assert) {
   assert.deepEqual(
     collapseKey('[email protected]'),
     ['foo']
   );
 });
 
+test('it collapses @each', function(assert) {
+  assert.deepEqual(
+    collapseKey('@each.bar'),
+    ['']
+  );
+});
+
 test('it collapses array.@each with brace expansion', function(assert) {
   assert.deepEqual(
     collapseKey('foo.@each.{bar,baz}'),
     ['foo']
   );
 });
 
+test('it collapses @each with brace expansion', function(assert) {
+  assert.deepEqual(
+    collapseKey('@each.{bar,baz}'),
+    ['']
+  );
+});
+
 test('it ignores string without brace expansion', function(assert) {
   assert.deepEqual(
     collapseKey('foo'),

tests/unit/get-value-test.js

@@ -71,6 +71,16 @@ module('Unit | get value');
 
     assert.strictEqual(value, false);
   });
+
+  test('returns the context if the macro is blank', function(assert) {
+    let context = {
+      testKey: 'test value'
+    };
+
+    let value = getValue({ context, macro: '' });
+
+    assert.strictEqual(value, context);
+  });
 });
 
 namedTest('getValue', 'returns undefined if property doesn\'t exist', function(assert) {

tests/unit/normalize-array-key-test.js

@@ -57,6 +57,18 @@ test('it does not alter array.[] with empty keys', function(assert) {
   assert.strictEqual(result, 'foo.bar.[]');
 });
 
+test('it does not alter []', function(assert) {
+  let result = normalizeArrayKey('[]');
+
+  assert.strictEqual(result, '[]');
+});
+
+test('it does not alter [] with empty keys', function(assert) {
+  let result = normalizeArrayKey('[]', []);
+
+  assert.strictEqual(result, '[]');
+});
+
 test('it does not alter [email protected]', function(assert) {
   let result = normalizeArrayKey('[email protected]');
 
@@ -69,6 +81,18 @@ test('it does not alter [email protected] with empty keys', function(assert) {
   assert.strictEqual(result, '[email protected]');
 });
 
+test('it does not alter @each.prop', function(assert) {
+  let result = normalizeArrayKey('@each.prop');
+
+  assert.strictEqual(result, '@each.prop');
+});
+
+test('it does not alter @each.prop with empty keys', function(assert) {
+  let result = normalizeArrayKey('@each.prop', []);
+
+  assert.strictEqual(result, '@each.prop');
+});
+
 test('it watches array prop when raw array', function(assert) {
   let result = normalizeArrayKey('foo.bar', ['prop']);