create constants file for special array strings (#124)

kellyselden · Jul 7, 2017 · 7c19767 · 7c19767
1 parent ee4b9ae
commit 7c19767
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/addon/-constants.js b/addon/-constants.js
@@ -0,0 +1,2 @@
+export const ARRAY_EACH = '@each.';
+export const ARRAY_LENGTH = '[]';
diff --git a/addon/collapse-key.js b/addon/collapse-key.js
@@ -1,13 +1,17 @@
 import expandProperty from './expand-property';
+import {
+  ARRAY_EACH,
+  ARRAY_LENGTH
+} from './-constants';
 
 export default function(property) {
   if (typeof property !== 'string') {
     return [property];
   }
 
-  let arrayIndex = property.indexOf('@each.');
+  let arrayIndex = property.indexOf(ARRAY_EACH);
   if (arrayIndex === -1) {
-    arrayIndex = property.indexOf('[]');
+    arrayIndex = property.indexOf(ARRAY_LENGTH);
   }
 
   if (arrayIndex === 0) {

diff --git a/addon/create-class-computed.js b/addon/create-class-computed.js
@@ -7,6 +7,10 @@ import WeakMap from 'ember-weakmap';
 import getValue from './get-value';
 import { collapseKeysWithMap } from './collapse-keys';
 import flattenKeys from './flatten-keys';
+import {
+  ARRAY_EACH,
+  ARRAY_LENGTH
+} from './-constants';
 
 const { defineProperty } = Ember;
 
@@ -72,7 +76,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(ARRAY_EACH) !== -1 || originalKey.indexOf(ARRAY_LENGTH) !== -1) {
           return originalKey;
         }
       }

diff --git a/addon/normalize-array-key.js b/addon/normalize-array-key.js
@@ -1,4 +1,8 @@
 import { isBlank } from '@ember/utils';
+import {
+  ARRAY_EACH,
+  ARRAY_LENGTH
+} from './-constants';
 
 export default function(array, keys = []) {
   // this macro support should be extracted out
@@ -9,7 +13,7 @@ export default function(array, keys = []) {
 
   let props;
 
-  let i = array.indexOf('@each.');
+  let i = array.indexOf(ARRAY_EACH);
   if (i !== -1) {
     let chain = array.split('.');
     let end = chain[chain.length - 1];
@@ -19,7 +23,7 @@ export default function(array, keys = []) {
       props = [end];
     }
   } else {
-    i = array.indexOf('[]');
+    i = array.indexOf(ARRAY_LENGTH);
     props = [];
   }
 
@@ -44,9 +48,9 @@ export default function(array, keys = []) {
 
   let suffix;
   if (props.length === 0) {
-    suffix = '[]';
+    suffix = ARRAY_LENGTH;
   } else {
-    suffix = '@each.';
+    suffix = ARRAY_EACH;
     if (props.length === 1) {
       suffix += props[0];
     } else {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const ARRAY_EACH = '@each.';
		export const ARRAY_LENGTH = '[]';