fix: Fixed ValueContainer.cs and AccessValueRule.cs to support the new structure

Author: thygesteffensen

ExpressionEngine/Rules/AccessValueRule.cs

@@ -25,7 +25,6 @@ public ValueContainer Evaluate()
 
             if (currentValue.Type() == ValueContainer.ValueType.Array)
             {
-                var asArray = currentValue.GetValue<ValueContainer[]>();
                 if (index.Type() != ValueContainer.ValueType.Integer)
                 {
                     throw InvalidTemplateException.BuildInvalidTemplateExceptionArray(
@@ -34,47 +33,48 @@ public ValueContainer Evaluate()
                         index.GetValue<string>());
                 }
 
-                var i = index.GetValue<int>();
-                if (i > asArray.Length)
+                try
+                {
+                    return currentValue[index.GetValue<int>()];
+                }
+                catch (IndexOutOfRangeException)
                 {
                     if (nullConditional)
                     {
                         return new ValueContainer();
                     }
-                    throw new IndexOutOfRangeException();
-                }
 
-                currentValue = asArray[i];
+                    throw;
+                }
             }
 
-            else if (currentValue.Type() == ValueContainer.ValueType.Object)
+            if (currentValue.Type() == ValueContainer.ValueType.Object)
             {
-                var asObject = currentValue.GetValue<Dictionary<string, ValueContainer>>();
-                var key = index.GetValue<string>();
-
-                if (asObject.ContainsKey(key))
+                try
                 {
-                    return asObject[key];
+                    return currentValue[index.GetValue<string>()];
                 }
-
+                catch (KeyNotFoundException)
+                {
                     if (nullConditional)
                     {
                         return new ValueContainer();
                     }
 
-                throw InvalidTemplateException.BuildInvalidTemplateExceptionObject(
-                    (_func as ExpressionRule)?.FunctionName,
-                    _func.PrettyPrint() + _indexRule.PrettyPrint(),
-                    index.GetValue<string>(),
-                    asObject.Keys.ToArray());
+                    throw InvalidTemplateException.BuildInvalidTemplateExceptionObject(
+                        (_func as ExpressionRule)?.FunctionName,
+                        _func.PrettyPrint() + _indexRule.PrettyPrint(),
+                        index.GetValue<string>(),
+                        currentValue.GetValue<Dictionary<string, ValueContainer>>().Keys.ToArray());
+                }
             }
 
             return currentValue;
         }
 
         public string PrettyPrint()
         {
-            throw new NotImplementedException();
+            return $"{_func.PrettyPrint()}{_indexRule.PrettyPrint()}";
         }
     }
 }

ExpressionEngine/ValueContainer.cs

@@ -156,7 +156,7 @@ public ValueContainer this[int i]
                     throw new InvalidOperationException("Index operations can only be performed on arrays.");
                 }
 
-                return ((List<ValueContainer>) _value)[i];
+                return _value[i];
             }
             set
             {