Adds templateOpts access via strings (#2)

* Allow basic templateOpts access

* Added a test for arrays

* Added in better support for templateOpts and Arrays

* removed the skip

* Added in more tests for objects

* handle

lib/jyson.js

@@ -16,9 +16,22 @@ const getKeyFromArrayIndexes = (key, arrayIndexes) => {
   return keyFromArrayIndexes;
 };
 
-const getKey = (object, key, undefinedValue, arrayIndexes) => {
-  const jysonValuePath = JysonValue.getPath(key);
+const getKey = (object, key, templateOpts, undefinedValue, arrayIndexes) => {
+  let jysonValuePath = JysonValue.getPath(key);
   const jysonValueUndefinedValue = JysonValue.getUndefinedValue(key, undefinedValue);
+
+  if(jysonValuePath[0] === '#') {
+    const indexRegex = /\[([^)]+)\]/;
+
+    jysonValuePath = jysonValuePath.substring(1);
+    const match = indexRegex.exec(jysonValuePath);
+    if (match) {
+      const indexValue = getKey(object, match[1], templateOpts, undefinedValue, arrayIndexes);
+      jysonValuePath = jysonValuePath.replace(indexRegex, `.${indexValue}`);
+    }
+
+    return get(templateOpts, getKeyFromArrayIndexes(jysonValuePath, arrayIndexes), jysonValueUndefinedValue);
+  }
   return get(object, getKeyFromArrayIndexes(jysonValuePath, arrayIndexes), jysonValueUndefinedValue);
 };
 
@@ -30,26 +43,26 @@ const setValue = (json, key, value) => {
   return json[key] = value;
 };
 
-const getArrayValueLength = (object, json, arrayIndexes, arrayKey) => {
+const getArrayValueLength = (object, json, arrayIndexes, arrayKey, templateOpts) => {
   if(JysonValue.isAPath(json)) {
     const jysonValuePath = JysonValue.getPath(json);
 
     const arrayLocation = getKeyFromArrayIndexes(jysonValuePath, arrayIndexes).split('.$').shift();
 
-    return get(object, `${arrayLocation}.length`, -1);
+    return getKey(object, `${arrayLocation}.length`, templateOpts, -1, arrayIndexes);
   }
 
   if(typeof json === 'object') {
     return Object.keys(json).reduce((maxLength, key) => {
-      return Math.max(maxLength, getArrayValueLength(object, json[key], arrayIndexes, arrayKey));
+      return Math.max(maxLength, getArrayValueLength(object, json[key], arrayIndexes, arrayKey, templateOpts));
     }, -1);
   }
 
   throw new Error(`jyson encountered an invalid array at: ${arrayKey}`);
 };
 
 const getKeyAndSetValue = (jsonResult, key, path, object, templateOpts, opts) => {
-  const value = getKey(object, path, opts.undefinedValue, opts.arrayIndexes);
+  const value = getKey(object, path, templateOpts, opts.undefinedValue, opts.arrayIndexes);
 
   // If we encounter an array without a $ in jyson, we consider that an error
   assert.ok(!Array.isArray(value) || path.indexOf('$') !== -1, `jyson encountered an array when it was not expecting one: ${path}`);
@@ -72,7 +85,7 @@ const fillKeys = (json, object, templateOpts, opts) => {
       assert.ok(json[key].length === 1, `jyson template arrays must be of length one at key: ${key}`);
 
       const jysonArrayValue = JysonArray.getValue(json[key]);
-      const arrayValueLength = getArrayValueLength(object, jysonArrayValue, opts.arrayIndexes, key);
+      const arrayValueLength = getArrayValueLength(object, jysonArrayValue, opts.arrayIndexes, key, templateOpts);
       const arrayIndexesIndex = opts.arrayIndexes.length;
       const arrayValue = [];
 
@@ -89,7 +102,7 @@ const fillKeys = (json, object, templateOpts, opts) => {
 
         let result;
         if(JysonValue.isAPath(jysonArrayValue)) {
-          result = setValue(jsonResult, key, getKey(object, jysonArrayValue, opts.undefinedValue, opts.arrayIndexes));
+          result = setValue(jsonResult, key, getKey(object, jysonArrayValue, templateOpts, opts.undefinedValue, opts.arrayIndexes));
         } else {
           result = fillKeys(jysonArrayValue, object, templateOpts, opts);
         }