Merge branch 'dev' into output-encoding

Author: nblumhardt

src/Serilog.Expressions/Expressions/Compilation/Linq/LinqExpressionCompiler.cs

@@ -186,9 +186,8 @@ static ExpressionBody CompileLogical(Func<ExpressionBody, ExpressionBody, Expres
     protected override ExpressionBody Transform(AccessorExpression spx)
     {
         var receiver = Transform(spx.Receiver);
-        return LX.Call(TryGetStructurePropertyValueMethod, LX.Constant(StringComparison.OrdinalIgnoreCase), receiver, LX.Constant(spx.MemberName, typeof(string)));
+        return LX.Call(TryGetStructurePropertyValueMethod, LX.Constant(StringComparison.Ordinal), receiver, LX.Constant(spx.MemberName, typeof(string)));
     }
-
     protected override ExpressionBody Transform(ConstantExpression cx)
     {
         return LX.Constant(cx.Constant);

src/Serilog.Expressions/Templates/Compilation/CompiledRepetition.cs

@@ -22,22 +22,22 @@ class CompiledRepetition : CompiledTemplate
 {
     readonly Evaluatable _enumerable;
     readonly string? _keyOrElementName;
-    readonly string? _valueName;
+    readonly string? _valueOrIndexName;
     readonly CompiledTemplate _body;
     readonly CompiledTemplate? _delimiter;
     readonly CompiledTemplate? _alternative;
 
     public CompiledRepetition(
         Evaluatable enumerable,
         string? keyOrElementName,
-        string? valueName,
+        string? valueOrIndexName,
         CompiledTemplate body,
         CompiledTemplate? delimiter,
         CompiledTemplate? alternative)
     {
         _enumerable = enumerable;
         _keyOrElementName = keyOrElementName;
-        _valueName = valueName;
+        _valueOrIndexName = valueOrIndexName;
         _body = body;
         _delimiter = delimiter;
         _alternative = alternative;
@@ -52,29 +52,32 @@ public override void Evaluate(EvaluationContext ctx, TextWriter output)
             return;
         }
 
-        if (enumerable is SequenceValue sv)
+        if (enumerable is SequenceValue sequence)
         {
-            if (sv.Elements.Count == 0)
+            if (sequence.Elements.Count == 0)
             {
                 _alternative?.Evaluate(ctx, output);
                 return;
             }
 
-            var first = true;
-            foreach (var element in sv.Elements)
+            for (var i = 0; i < sequence.Elements.Count; ++i)
             {
-                if (element == null)
-                    continue; // Should have been invalid but Serilog didn't check and so this does occur in the wild.
+                // Null elements should have been invalid but Serilog didn't check, and so this does occur in the wild.
+                var element = sequence.Elements[i] ?? new ScalarValue(null);
 
-                if (first)
-                    first = false;
-                else
+                if (i != 0)
+                {
                     _delimiter?.Evaluate(ctx, output);
+                }
 
                 var local = _keyOrElementName != null
-                    ? new(ctx.LogEvent, Locals.Set(ctx.Locals, _keyOrElementName, element))
+                    ? new EvaluationContext(ctx.LogEvent, Locals.Set(ctx.Locals, _keyOrElementName, element))
                     : ctx;
 
+                local = _valueOrIndexName != null
+                    ? new EvaluationContext(local.LogEvent, Locals.Set(local.Locals, _valueOrIndexName, new ScalarValue(i)))
+                    : local;
+
                 _body.Evaluate(local, output);
             }
 
@@ -101,8 +104,8 @@ public override void Evaluate(EvaluationContext ctx, TextWriter output)
                     ? new(ctx.LogEvent, Locals.Set(ctx.Locals, _keyOrElementName, new ScalarValue(member.Name)))
                     : ctx;
 
-                local = _valueName != null
-                    ? new(local.LogEvent, Locals.Set(local.Locals, _valueName, member.Value))
+                local = _valueOrIndexName != null
+                    ? new(local.LogEvent, Locals.Set(local.Locals, _valueOrIndexName, member.Value))
                     : local;
 
                 _body.Evaluate(local, output);
@@ -129,8 +132,8 @@ public override void Evaluate(EvaluationContext ctx, TextWriter output)
                     ? new(ctx.LogEvent, Locals.Set(ctx.Locals, _keyOrElementName, element.Key))
                     : ctx;
 
-                local = _valueName != null
-                    ? new(local.LogEvent, Locals.Set(local.Locals, _valueName, element.Value))
+                local = _valueOrIndexName != null
+                    ? new(local.LogEvent, Locals.Set(local.Locals, _valueOrIndexName, element.Value))
                     : local;
 
                 _body.Evaluate(local, output);

src/Serilog.Expressions/Templates/Compilation/NameResolution/TemplateLocalNameResolver.cs renamed to src/Serilog.Expressions/Templates/Compilation/NameResolution/TemplateLocalNameBinder.cs

@@ -76,7 +76,7 @@ Template Transform(Repetition rep, Stack<string> locals)
             locals.Pop();
 
         return new Repetition(
-            rep.Enumerable,
+            ExpressionLocalNameBinder.BindLocalValueNames(rep.Enumerable, locals),
             rep.BindingNames,
             body,
             rep.Delimiter != null ? Transform(rep.Delimiter, locals) : null,

test/Serilog.Expressions.Tests/Cases/expression-evaluation-cases.asv

@@ -24,6 +24,12 @@ false                                ⇶ false
 {a: 1, ..{b: 2}, b: undefined()}     ⇶ {a: 1}
 {a: 1, ..{a: undefined()}}           ⇶ {a: 1}
 {..{a: 1}, ..{b: 2, c: 3}}           ⇶ {a: 1, b: 2, c: 3}
+{a: 1}['a']                          ⇶ 1
+{a: 1}['A']                          ⇶ undefined()
+{a: 1}.a                             ⇶ 1
+{a: 1}.A                             ⇶ undefined()
+ElementAt({a: 1}, 'A')               ⇶ undefined()
+ElementAt({a: 1}, 'A') ci            ⇶ 1
 
 // Strings
 ''                                   ⇶ ''

test/Serilog.Expressions.Tests/Cases/template-evaluation-cases.asv

@@ -23,8 +23,10 @@ A{#if false}B{#else if false}C{#else if true}D{#else}E{#end} ⇶ AD
 A{#if false}B{#else if true}C{#end}                  ⇶ AC
 {#if true}A{#if false}B{#else}C{#end}D{#end}         ⇶ ACD
 {#each a in [1,2,3]}<{a}>{#delimit},{#end}           ⇶ <1>,<2>,<3>
+{#each a, i in [1,2,3]}<{a}>({i}){#delimit},{#end}   ⇶ <1>(0),<2>(1),<3>(2)
 {#each a in {x: 1, y: 2}}{a}{#end}                   ⇶ xy
 {#each a, b in {x: 1, y: 2}}{a}.{b}{#end}            ⇶ x.1y.2
+{#each a, b in {x: {y: 'z'}}}{#each c, d in b}A: {a}, C: {c}, D: {d}{#end}{#end} ⇶ A: x, C: y, D: z
 {#if true}A{#each a in [1]}B{a}{#end}C{#end}D        ⇶ AB1CD
 {#each a in []}{a}!{#else}none{#end}                 ⇶ none
 Culture-specific {42.34}                             ⇶ Culture-specific 42,34