Merge pull request #16 from BlaiseD/master

Update to recreate the binary expression when the operands change.

Author: BlaiseD

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Authors>Jimmy Bogard</Authors>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>1.0.4</VersionPrefix>
+    <VersionPrefix>1.0.5-preview01</VersionPrefix>
     <WarningsAsErrors>true</WarningsAsErrors>
     <NoWarn>$(NoWarn);1701;1702;1591</NoWarn>
   </PropertyGroup>

src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs

@@ -105,6 +105,31 @@ protected override Expression VisitLambda<T>(Expression<T> node)
             return mapped;
         }
 
+        protected override Expression VisitBinary(BinaryExpression node)
+        {
+            return DoVisitBinary(this.Visit(node.Left), this.Visit(node.Right), this.Visit(node.Conversion));
+
+            Expression DoVisitBinary(Expression newLeft, Expression newRight, Expression conversion)
+            {
+                if (newLeft != node.Left || newRight != node.Right || conversion != node.Conversion)
+                {
+                    if (node.NodeType == ExpressionType.Coalesce && node.Conversion != null)
+                        return Expression.Coalesce(newLeft, newRight, conversion as LambdaExpression);
+                    else
+                        return Expression.MakeBinary
+                        (
+                            node.NodeType,
+                            newLeft,
+                            newRight,
+                            node.IsLiftedToNull,
+                            Expression.MakeBinary(node.NodeType, newLeft, newRight).Method
+                        );
+                }
+
+                return node;
+            }
+        }
+
         protected override Expression VisitUnary(UnaryExpression node)
         {
             switch (node.NodeType)

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.Structs.Tests.cs

@@ -62,6 +62,161 @@ public void Can_convert_return_type()
             output1.First().Year.ShouldBe(2000);
             output2.Year.ShouldBe(2000);
         }
+
+        [Fact]
+        public void Replace_operator_when_operands_change()
+        {
+            var config = new MapperConfiguration(cfg => {
+                cfg.AddExpressionMapping();
+                cfg.CreateMap<Source, Dest>().ReverseMap();
+            });
+
+            var mapper = config.CreateMapper();
+
+            Expression<Func<Source, bool>> expression = x => x == default(Source);
+
+            var mapped = mapper.MapExpression<Expression<Func<Dest, bool>>>(expression);
+        }
+    }
+
+    public struct Source
+    {
+        public Source(int i) { val = i; }
+        public int val;
+
+        public static implicit operator int(Source i)
+        {
+            return i.val;
+        }
+
+        public static implicit operator Source(int i)
+        {
+            return new Source(i);
+        }
+
+        public static bool operator <(Source a, Source b)
+        {
+            return a.val < b.val;
+        }
+
+        public static bool operator >(Source a, Source b)
+        {
+            return a.val > b.val;
+        }
+
+        public static bool operator ==(Source a, Source b)
+        {
+            return a.val == b.val;
+        }
+
+        public static bool operator ==(Source a, int b)
+        {
+            return a.val == b;
+        }
+
+        public static bool operator ==(int a, Source b)
+        {
+            return a == b.val;
+        }
+
+        public static bool operator !=(Source a, Source b)
+        {
+            return a.val != b.val;
+        }
+
+        public static bool operator !=(Source a, int b)
+        {
+            return a.val != b;
+        }
+
+        public static bool operator !=(int a, Source b)
+        {
+            return a != b.val;
+        }
+
+        public override int GetHashCode()
+        {
+            return this.val.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is Source)
+                return this == (Source)obj;
+            if (obj is int)
+                return this == (Source)((int)obj);
+            return false;
+        }
+    }
+
+    public struct Dest
+    {
+        public Dest(int i) { val = i; }
+        public int val;
+
+        public static implicit operator int(Dest i)
+        {
+            return i.val;
+        }
+
+        public static implicit operator Dest(int i)
+        {
+            return new Dest(i);
+        }
+
+        public static bool operator <(Dest a, Dest b)
+        {
+            return a.val < b.val;
+        }
+
+        public static bool operator >(Dest a, Dest b)
+        {
+            return a.val > b.val;
+        }
+
+        public static bool operator ==(Dest a, Dest b)
+        {
+            return a.val == b.val;
+        }
+
+        public static bool operator ==(Dest a, int b)
+        {
+            return a.val == b;
+        }
+
+        public static bool operator ==(int a, Dest b)
+        {
+            return a == b.val;
+        }
+
+        public static bool operator !=(Dest a, Dest b)
+        {
+            return a.val != b.val;
+        }
+
+        public static bool operator !=(Dest a, int b)
+        {
+            return a.val != b;
+        }
+
+        public static bool operator !=(int a, Dest b)
+        {
+            return a != b.val;
+        }
+
+        public override int GetHashCode()
+        {
+            return this.val.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is Dest)
+                return this == (Dest)obj;
+            if (obj is int)
+                return this == (Dest)((int)obj);
+            return false;
+        }
     }
 
     public struct Garage