Skip to content

Commit 048098f

Browse files
thygesteffensenthygesteffensen
authored
Merge pull request #39 from delegateas/dev
Release
2 parents 9fccc2f + 148543d commit 048098f

61 files changed

Lines changed: 928 additions & 651 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ExpressionEngine/ExpressionEngine.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
namespace ExpressionEngine
1+
using System.Threading.Tasks;
2+
3+
namespace ExpressionEngine
24
{
35
public interface IExpressionEngine
46
{
5-
string Parse(string input);
6-
ValueContainer ParseToValueContainer(string input);
7+
ValueTask<string> Parse(string input);
8+
ValueTask<ValueContainer> ParseToValueContainer(string input);
79
}
810

911
public class ExpressionEngine : IExpressionEngine
@@ -15,14 +17,14 @@ public ExpressionEngine(ExpressionGrammar grammar)
1517
_expressionGrammar = grammar;
1618
}
1719

18-
public string Parse(string input)
20+
public async ValueTask<string> Parse(string input)
1921
{
20-
return _expressionGrammar.EvaluateToString(input);
22+
return await _expressionGrammar.EvaluateToString(input);
2123
}
2224

23-
public ValueContainer ParseToValueContainer(string input)
25+
public async ValueTask<ValueContainer> ParseToValueContainer(string input)
2426
{
25-
return _expressionGrammar.EvaluateToValueContainer(input);
27+
return await _expressionGrammar.EvaluateToValueContainer(input);
2628
}
2729
}
2830
}

‎ExpressionEngine/ExpressionGrammar.cs‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
35
using ExpressionEngine.Functions.Base;
46
using ExpressionEngine.Rules;
57
using Sprache;
@@ -9,7 +11,7 @@ namespace ExpressionEngine
911
public class ExpressionGrammar
1012
{
1113
private readonly Parser<IRule> _method;
12-
private readonly Parser<ValueContainer> _input;
14+
private readonly Parser<ValueTask<ValueContainer>> _input;
1315

1416
public ExpressionGrammar(IEnumerable<IFunction> functions)
1517
{
@@ -59,7 +61,7 @@ from content in Parse.CharExcept('\'').Or(escapedCharacters).Many().Text()
5961
from nll in nullConditional
6062
from index in _method.Or(stringLiteral).Or(integer).Contained(lBracket, rBracket)
6163
select new IndexRule(index, nll);
62-
64+
6365
Parser<IRule> dotIndices =
6466
from nll in nullConditional
6567
from dot in Parse.Char('.')
@@ -69,7 +71,10 @@ from index in Parse.AnyChar.Except(
6971
.Or(lParenthesis)
7072
.Or(rParenthesis)
7173
.Or(Parse.Char('@'))
72-
).Many().Text()
74+
.Or(Parse.Char(','))
75+
.Or(Parse.Char('.'))
76+
.Or(Parse.Char('?'))
77+
).Many().Text()
7378
select new IndexRule(new StringLiteralRule(new ValueContainer(index)), nll);
7479

7580
Parser<IRule> argument =
@@ -93,49 +98,49 @@ from args in arguments.Contained(lParenthesis, rParenthesis)
9398
Parse.Ref(() =>
9499
from func in function
95100
from indexes in bracketIndices.Or(dotIndices).Many()
96-
select (IRule) new AccessValueRule(func, indexes));
101+
select indexes.Aggregate(func, (acc, next) => new AccessValueRule(acc, next)));
97102

98-
Parser<ValueContainer> enclosedExpression =
103+
Parser<ValueTask<ValueContainer>> enclosedExpression =
99104
_method.Contained(
100105
Parse.String("@{"),
101106
Parse.Char('}'))
102107
.Select(x => x.Evaluate());
103108

104-
Parser<ValueContainer> expression =
109+
Parser<ValueTask<ValueContainer>> expression =
105110
from at in Parse.Char('@')
106111
from method in _method
107112
select method.Evaluate();
108-
113+
109114
Parser<string> allowedString =
110115
from t in simpleString.Or(allowedCharacters).Many()
111116
select string.Concat(t);
112117

113-
Parser<ValueContainer> joinedString =
118+
Parser<ValueTask<ValueContainer>> joinedString =
114119
from e in (
115120
from preFix in allowedString
116121
from exp in enclosedExpression.Optional()
117122
select exp.IsEmpty ? preFix : preFix + exp.Get())
118123
.Many()
119-
select new ValueContainer(string.Concat(e));
124+
select new ValueTask<ValueContainer>(new ValueContainer(string.Concat(e)));
120125

121-
Parser<ValueContainer> charPrefixedString =
126+
Parser<ValueTask<ValueContainer>> charPrefixedString =
122127
from at in Parse.Char('@')
123128
from str in Parse.LetterOrDigit.Many().Text().Except(Parse.Chars('{', '@'))
124-
select new ValueContainer(str);
129+
select new ValueTask<ValueContainer>(new ValueContainer(str));
125130

126131
_input = expression.Or(charPrefixedString).Or(joinedString);
127132
}
128133

129-
public string EvaluateToString(string input)
134+
public async ValueTask<string> EvaluateToString(string input)
130135
{
131-
var output = _input.Parse(input);
136+
var output = await _input.Parse(input);
132137

133138
return output.GetValue<string>();
134139
}
135140

136-
public ValueContainer EvaluateToValueContainer(string input)
141+
public async ValueTask<ValueContainer> EvaluateToValueContainer(string input)
137142
{
138-
return _input.Parse(input);
143+
return await _input.Parse(input);
139144
}
140145
}
141146
}

‎ExpressionEngine/Functions/Base/IFunction.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using System;
2+
using System.Threading.Tasks;
23

34
namespace ExpressionEngine.Functions.Base
45
{
56
public interface IFunction
67
{
78
string FunctionName { get; }
8-
ValueContainer ExecuteFunction(ValueContainer[] strings);
9+
ValueTask<ValueContainer> ExecuteFunction(ValueContainer[] strings);
910
}
1011

1112
public abstract class Function : IFunction
@@ -17,6 +18,6 @@ protected Function(string functionName)
1718
FunctionName = functionName ?? throw new ArgumentNullException(nameof(functionName));
1819
}
1920

20-
public abstract ValueContainer ExecuteFunction(params ValueContainer[] parameters);
21+
public abstract ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters);
2122
}
2223
}

‎ExpressionEngine/Functions/Implementations/CollectionFunctions/ContainsFunction.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Threading.Tasks;
45
using ExpressionEngine.Functions.Base;
56

67
namespace ExpressionEngine.Functions.Implementations.CollectionFunctions
@@ -11,7 +12,7 @@ public ContainsFunction() : base("contains")
1112
{
1213
}
1314

14-
public override ValueContainer ExecuteFunction(params ValueContainer[] parameters)
15+
public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters)
1516
{
1617
var collection = parameters[0];
1718
var value = parameters[1];
@@ -28,20 +29,20 @@ public override ValueContainer ExecuteFunction(params ValueContainer[] parameter
2829
case ValueContainer.ValueType.String:
2930
case ValueContainer.ValueType.Boolean:
3031
case ValueContainer.ValueType.Null:
31-
return new ValueContainer(array.Contains(value));
32+
return new ValueTask<ValueContainer>(new ValueContainer(array.Contains(value)));
3233
case ValueContainer.ValueType.Array:
3334
case ValueContainer.ValueType.Object:
34-
return new ValueContainer(false);
35+
return new ValueTask<ValueContainer>(new ValueContainer(false));
3536
default:
3637
throw new ArgumentOutOfRangeException();
3738
}
3839
case ValueContainer.ValueType.Object:
3940
var key = value.GetValue<string>();
40-
return new ValueContainer(collection.AsDict().ContainsKey(key));
41+
return new ValueTask<ValueContainer>(new ValueContainer(collection.AsDict().ContainsKey(key)));
4142
case ValueContainer.ValueType.String:
4243
var text = collection.GetValue<string>();
4344
var substring = value.GetValue<string>();
44-
return new ValueContainer(text.Contains(substring));
45+
return new ValueTask<ValueContainer>(new ValueContainer(text.Contains(substring)));
4546
default:
4647
throw new PowerAutomateMockUpException($"Cannot perform contains on {collection.Type()}.");
4748
}

‎ExpressionEngine/Functions/Implementations/CollectionFunctions/EmptyFunction.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Threading.Tasks;
34
using ExpressionEngine.Functions.Base;
45

56
namespace ExpressionEngine.Functions.Implementations.CollectionFunctions
@@ -10,18 +11,19 @@ public EmptyFunction() : base("empty")
1011
{
1112
}
1213

13-
public override ValueContainer ExecuteFunction(params ValueContainer[] parameters)
14+
public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters)
1415
{
1516
var value = parameters[0];
1617

1718
return value.Type() switch
1819
{
19-
ValueContainer.ValueType.String => new ValueContainer(string.IsNullOrEmpty(value.GetValue<string>())),
20-
ValueContainer.ValueType.Array => new ValueContainer(
21-
!value.GetValue<IEnumerable<ValueContainer>>().Any()),
22-
ValueContainer.ValueType.Object => new ValueContainer(
23-
value.GetValue<Dictionary<string, ValueContainer>>().Count == 0),
24-
ValueContainer.ValueType.Null => new ValueContainer(true),
20+
ValueContainer.ValueType.String => new ValueTask<ValueContainer>(
21+
new ValueContainer(string.IsNullOrEmpty(value.GetValue<string>()))),
22+
ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
23+
!value.GetValue<IEnumerable<ValueContainer>>().Any())),
24+
ValueContainer.ValueType.Object => new ValueTask<ValueContainer>(new ValueContainer(
25+
value.GetValue<Dictionary<string, ValueContainer>>().Count == 0)),
26+
ValueContainer.ValueType.Null => new ValueTask<ValueContainer>(new ValueContainer(true)),
2527
_ => throw new PowerAutomateMockUpException(
2628
$"Empty expression can only operate on String, Array or Object types, not {value.Type()}.")
2729
};

‎ExpressionEngine/Functions/Implementations/CollectionFunctions/FirstFunction.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Threading.Tasks;
34
using ExpressionEngine.Functions.Base;
45

56
namespace ExpressionEngine.Functions.Implementations.CollectionFunctions
@@ -10,16 +11,16 @@ public FirstFunction() : base("first")
1011
{
1112
}
1213

13-
public override ValueContainer ExecuteFunction(params ValueContainer[] parameters)
14+
public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters)
1415
{
1516
var value = parameters[0];
1617

1718
return value.Type() switch
1819
{
19-
ValueContainer.ValueType.String => new ValueContainer(
20-
value.GetValue<string>().Substring(0, 1)),
21-
ValueContainer.ValueType.Array => new ValueContainer(
22-
value.GetValue<IEnumerable<ValueContainer>>().First()),
20+
ValueContainer.ValueType.String => new ValueTask<ValueContainer>(new ValueContainer(
21+
value.GetValue<string>().Substring(0, 1))),
22+
ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
23+
value.GetValue<IEnumerable<ValueContainer>>().First())),
2324
_ => throw new PowerAutomateMockUpException(
2425
$"Empty expression can only operate on String or Array types, not {value.Type()}.")
2526
};

‎ExpressionEngine/Functions/Implementations/CollectionFunctions/IntersectionFunction.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Threading.Tasks;
34
using ExpressionEngine.Functions.Base;
45

56
namespace ExpressionEngine.Functions.Implementations.CollectionFunctions
@@ -10,7 +11,7 @@ public InterSectionFunction() : base("intersection")
1011
{
1112
}
1213

13-
public override ValueContainer ExecuteFunction(params ValueContainer[] parameters)
14+
public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters)
1415
{
1516
return parameters[0].Type() switch
1617
{
@@ -21,11 +22,11 @@ public override ValueContainer ExecuteFunction(params ValueContainer[] parameter
2122
};
2223
}
2324

24-
private ValueContainer IntersectDict(IReadOnlyList<ValueContainer> parameters)
25+
private ValueTask<ValueContainer> IntersectDict(IReadOnlyList<ValueContainer> parameters)
2526
{
2627
var first = parameters[0].GetValue<Dictionary<string, ValueContainer>>();
2728

28-
return new ValueContainer(parameters.Skip(1).Aggregate(first, ToDictionary));
29+
return new ValueTask<ValueContainer>(new ValueContainer(parameters.Skip(1).Aggregate(first, ToDictionary)));
2930
}
3031

3132
private Dictionary<string, ValueContainer> ToDictionary(Dictionary<string, ValueContainer> first,
@@ -37,15 +38,15 @@ private Dictionary<string, ValueContainer> ToDictionary(Dictionary<string, Value
3738
.ToDictionary(x => x.Key, x => second[x.Key]);
3839
}
3940

40-
private ValueContainer IntersectList(IReadOnlyList<ValueContainer> parameters)
41+
private ValueTask<ValueContainer> IntersectList(IReadOnlyList<ValueContainer> parameters)
4142
{
4243
var first = parameters[0].GetValue<IEnumerable<ValueContainer>>();
4344

4445
var intersection = parameters.Skip(1)
4546
.Select(valueContainer => valueContainer.GetValue<IEnumerable<ValueContainer>>())
4647
.Aggregate(first, (current, collection) => current.Intersect(collection));
4748

48-
return new ValueContainer(intersection);
49+
return new ValueTask<ValueContainer>(new ValueContainer(intersection));
4950
}
5051
}
5152
}

‎ExpressionEngine/Functions/Implementations/CollectionFunctions/JoinFunction.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Threading.Tasks;
34
using ExpressionEngine.Functions.Base;
45

56
namespace ExpressionEngine.Functions.Implementations.CollectionFunctions
@@ -10,13 +11,13 @@ public JoinFunction() : base("join")
1011
{
1112
}
1213

13-
public override ValueContainer ExecuteFunction(params ValueContainer[] parameters)
14+
public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters)
1415
{
1516
var collection = parameters[0].GetValue<IEnumerable<ValueContainer>>();
1617
var delimiter = parameters[1].GetValue<string>();
1718

18-
return new ValueContainer(collection.Skip(1)
19-
.Aggregate(collection.First().ToString(), (s, currentVc) => s + delimiter + currentVc));
19+
return new ValueTask<ValueContainer>(new ValueContainer(collection.Skip(1)
20+
.Aggregate(collection.First().ToString(), (s, currentVc) => s + delimiter + currentVc)));
2021
}
2122
}
2223
}

‎ExpressionEngine/Functions/Implementations/CollectionFunctions/LastFunction.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Threading.Tasks;
34
using ExpressionEngine.Functions.Base;
45

56
namespace ExpressionEngine.Functions.Implementations.CollectionFunctions
@@ -10,16 +11,16 @@ public LastFunction() : base("last")
1011
{
1112
}
1213

13-
public override ValueContainer ExecuteFunction(params ValueContainer[] parameters)
14+
public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters)
1415
{
1516
var value = parameters[0];
1617

1718
return value.Type() switch
1819
{
19-
ValueContainer.ValueType.String => new ValueContainer(
20-
value.GetValue<string>().ToCharArray().Last().ToString()),
21-
ValueContainer.ValueType.Array => new ValueContainer(
22-
value.GetValue<IEnumerable<ValueContainer>>().Last()),
20+
ValueContainer.ValueType.String => new ValueTask<ValueContainer>(new ValueContainer(
21+
value.GetValue<string>().ToCharArray().Last().ToString())),
22+
ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
23+
value.GetValue<IEnumerable<ValueContainer>>().Last())),
2324
_ => throw new PowerAutomateMockUpException(
2425
$"Empty expression can only operate on String or Array types, not {value.Type()}.")
2526
};

‎ExpressionEngine/Functions/Implementations/CollectionFunctions/SkipFunction.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Threading.Tasks;
34
using ExpressionEngine.Functions.Base;
45

56
namespace ExpressionEngine.Functions.Implementations.CollectionFunctions
@@ -10,15 +11,15 @@ public SkipFunction() : base("skip")
1011
{
1112
}
1213

13-
public override ValueContainer ExecuteFunction(params ValueContainer[] parameters)
14+
public override ValueTask<ValueContainer> ExecuteFunction(params ValueContainer[] parameters)
1415
{
1516
var value = parameters[0];
1617
var count = parameters[1].GetValue<int>();
1718

1819
return value.Type() switch
1920
{
20-
ValueContainer.ValueType.Array => new ValueContainer(
21-
value.GetValue<IEnumerable<ValueContainer>>().Skip(count)),
21+
ValueContainer.ValueType.Array => new ValueTask<ValueContainer>(new ValueContainer(
22+
value.GetValue<IEnumerable<ValueContainer>>().Skip(count))),
2223
_ => throw new PowerAutomateMockUpException(
2324
$"Empty expression can only operate on String or Array types, not {value.Type()}.")
2425
};

0 commit comments

Comments
 (0)