Merge pull request #42 from delegateas/dev

Release

Author: thygesteffensen

ExpressionEngine/ExpressionEngineException.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace ExpressionEngine
+{
+    internal class ExpressionEngineException : Exception
+    {
+        public ExpressionEngineException(string message) : base(message)
+        {
+        }
+    }
+}

ExpressionEngine/ExpressionGrammar.cs

@@ -11,7 +11,7 @@ namespace ExpressionEngine
     public class ExpressionGrammar
     {
         private readonly Parser<IRule> _method;
-        private readonly Parser<ValueTask<ValueContainer>> _input;
+        private readonly Parser<Task<ValueContainer>> _input;
 
         public ExpressionGrammar(IEnumerable<IFunction> functions)
         {
@@ -66,14 +66,7 @@ from index in _method.Or(stringLiteral).Or(integer).Contained(lBracket, rBracket
                 from nll in nullConditional
                 from dot in Parse.Char('.')
                 from index in Parse.AnyChar.Except(
-                    lBracket
-                        .Or(rBracket)
-                        .Or(lParenthesis)
-                        .Or(rParenthesis)
-                        .Or(Parse.Char('@'))
-                        .Or(Parse.Char(','))
-                        .Or(Parse.Char('.'))
-                        .Or(Parse.Char('?'))
+                    Parse.Chars('[', ']', '{', '}', '(', ')', '@', ',', '.', '?')
                 ).Many().Text()
                 select new IndexRule(new StringLiteralRule(new ValueContainer(index)), nll);
 
@@ -106,29 +99,22 @@ from indexes in bracketIndices.Or(dotIndices).Many()
                         Parse.Char('}'))
                     .Select(x => x.Evaluate());
 
-            Parser<ValueTask<ValueContainer>> expression =
-                from at in Parse.Char('@')
-                from method in _method
-                select method.Evaluate();
+            Parser<Task<ValueContainer>> expression =
+                Parse.Char('@').SelectMany(at => _method, async (at, method) => await method.Evaluate());
 
             Parser<string> allowedString =
                 from t in simpleString.Or(allowedCharacters).Many()
                 select string.Concat(t);
 
-            Parser<ValueTask<ValueContainer>> joinedString =
+            Parser<Task<ValueContainer>> joinedString =
                 from e in (
                         from preFix in allowedString
                         from exp in enclosedExpression.Optional()
                         select exp.IsEmpty ? preFix : preFix + exp.Get())
                     .Many()
-                select new ValueTask<ValueContainer>(new ValueContainer(string.Concat(e)));
+                select Task.FromResult(new ValueContainer(string.Concat(e)));
 
-            Parser<ValueTask<ValueContainer>> charPrefixedString =
-                from at in Parse.Char('@')
-                from str in Parse.LetterOrDigit.Many().Text().Except(Parse.Chars('{', '@'))
-                select new ValueTask<ValueContainer>(new ValueContainer(str));
-
-            _input = expression.Or(charPrefixedString).Or(joinedString);
+            _input = expression.Or(joinedString);
         }
 
         public async ValueTask<string> EvaluateToString(string input)

ExpressionEngine/Functions/Implementations/CollectionFunctions/ContainsFunction.cs

@@ -44,7 +44,7 @@ public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[
                     var substring = value.GetValue<string>();
                     return new ValueTask<ValueContainer>(new ValueContainer(text.Contains(substring)));
                 default:
-                    throw new PowerAutomateMockUpException($"Cannot perform contains on {collection.Type()}.");
+                    throw new ExpressionEngineException($"Cannot perform contains on {collection.Type()}.");
             }
         }
     }

ExpressionEngine/Functions/Implementations/CollectionFunctions/EmptyFunction.cs

@@ -24,7 +24,7 @@ public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[
                 ValueContainer.ValueType.Object => new ValueTask<ValueContainer>(new ValueContainer(
                     value.GetValue<Dictionary<string, ValueContainer>>().Count == 0)),
                 ValueContainer.ValueType.Null => new ValueTask<ValueContainer>(new ValueContainer(true)),
-                _ => throw new PowerAutomateMockUpException(
+                _ => throw new ExpressionEngineException(
                     $"Empty expression can only operate on String, Array or Object types, not {value.Type()}.")
             };
         }

ExpressionEngine/Functions/Implementations/CollectionFunctions/FirstFunction.cs

@@ -21,7 +21,7 @@ public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[
                     value.GetValue<string>().Substring(0, 1))),
                 ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
                     value.GetValue<IEnumerable<ValueContainer>>().First())),
-                _ => throw new PowerAutomateMockUpException(
+                _ => throw new ExpressionEngineException(
                     $"Empty expression can only operate on String or Array types, not {value.Type()}.")
             };
         }

ExpressionEngine/Functions/Implementations/CollectionFunctions/IntersectionFunction.cs

@@ -17,7 +17,7 @@ public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[
             {
                 ValueContainer.ValueType.Array => IntersectList(parameters),
                 ValueContainer.ValueType.Object => IntersectDict(parameters),
-                _ => throw new PowerAutomateMockUpException(
+                _ => throw new ExpressionEngineException(
                     $"Can only intersect Array and Object, not {parameters[0].Type()}.")
             };
         }

ExpressionEngine/Functions/Implementations/CollectionFunctions/LastFunction.cs

@@ -21,7 +21,7 @@ public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[
                     value.GetValue<string>().ToCharArray().Last().ToString())),
                 ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
                     value.GetValue<IEnumerable<ValueContainer>>().Last())),
-                _ => throw new PowerAutomateMockUpException(
+                _ => throw new ExpressionEngineException(
                     $"Empty expression can only operate on String or Array types, not {value.Type()}.")
             };
         }

ExpressionEngine/Functions/Implementations/CollectionFunctions/SkipFunction.cs

@@ -20,7 +20,7 @@ public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[
             {
                 ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
                     value.GetValue<IEnumerable<ValueContainer>>().Skip(count))),
-                _ => throw new PowerAutomateMockUpException(
+                _ => throw new ExpressionEngineException(
                     $"Empty expression can only operate on String or Array types, not {value.Type()}.")
             };
         }

ExpressionEngine/Functions/Implementations/CollectionFunctions/TakeFunction.cs

@@ -20,7 +20,7 @@ public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[
             {
                 ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
                     value.GetValue<IEnumerable<ValueContainer>>().Take(count))),
-                _ => throw new PowerAutomateMockUpException(
+                _ => throw new ExpressionEngineException(
                     $"Empty expression can only operate on String or Array types, not {value.Type()}.")
             };
         }

ExpressionEngine/Functions/Implementations/CollectionFunctions/UnionFunction.cs

@@ -17,7 +17,7 @@ public override async ValueTask<ValueContainer> ExecuteFunction(params ValueCont
             {
                 ValueContainer.ValueType.Array => UnionList(parameters),
                 ValueContainer.ValueType.Object => UnionDict(parameters),
-                _ => throw new PowerAutomateMockUpException(
+                _ => throw new ExpressionEngineException(
                     $"Can only union Array and Object, not {parameters[0].Type()}.")
             };
         }