fix include code gen

MapsterMapper · Aug 2, 2020 · 86d845c · 86d845c
1 parent 7a73d50
commit 86d845c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/Mapster.Tests/Mapster.Tests.csproj b/src/Mapster.Tests/Mapster.Tests.csproj
@@ -20,6 +20,10 @@
     <ItemGroup>
         <ProjectReference Include="..\Mapster\Mapster.csproj" />
     </ItemGroup>
+    <Target Name="mapster" AfterTargets="AfterBuild">
+        <Exec WorkingDirectory="$(ProjectDir)" Command="dotnet tool restore" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="dotnet mapster -a $(TargetDir)$(ProjectName).dll" />
+    </Target>
     <ItemGroup>
       <None Remove="packages.config" />
       <None Remove="mock.keys" />

diff --git a/src/Mapster/Adapters/BaseAdapter.cs b/src/Mapster/Adapters/BaseAdapter.cs
@@ -188,7 +188,11 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
                 set = Expression.Coalesce(destination, set);
             }
 
-            if (set.NodeType != ExpressionType.Throw)
+            if (set.NodeType == ExpressionType.Throw)
+            {
+                blocks.Add(set);
+            }
+            else
             {
                 //TDestination result;
                 //if (source == null)

diff --git a/src/Mapster/TypeAdapterSetter.cs b/src/Mapster/TypeAdapterSetter.cs
@@ -366,6 +366,17 @@ public TypeAdapterSetter<TDestination> MapToConstructor(ConstructorInfo ctor)
             this.Settings.MapToConstructor = ctor;
             return this;
         }
+
+        public TypeAdapterSetter<TDestination> AfterMappingInline(Expression<Action<TDestination>> action)
+        {
+            this.CheckCompiled();
+
+            var lambda = Expression.Lambda(action.Body, 
+                Expression.Parameter(typeof(object), "src"),
+                action.Parameters[0]);
+            Settings.AfterMappingFactories.Add(arg => lambda);
+            return this;
+        }
     }
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S4136:Method overloads should be grouped together", Justification = "<Pending>")]
@@ -416,6 +427,11 @@ internal TypeAdapterSetter(TypeAdapterSettings settings, TypeAdapterConfig paren
             return (TypeAdapterSetter<TSource, TDestination>) base.MapToConstructor(ctor);
         }
 
+        public new TypeAdapterSetter<TSource, TDestination> AfterMappingInline(Expression<Action<TDestination>> action)
+        {
+            return (TypeAdapterSetter<TSource, TDestination>) base.AfterMappingInline(action);
+        }
+
         #endregion
 
         public TypeAdapterSetter<TSource, TDestination> IgnoreIf(
@@ -570,15 +586,15 @@ public TypeAdapterSetter<TSource, TDestination> BeforeMappingInline(Expression<A
             Settings.BeforeMappingFactories.Add(arg => action);
             return this;
         }
-
+        
         public TypeAdapterSetter<TSource, TDestination> AfterMappingInline(Expression<Action<TSource, TDestination>> action)
         {
             this.CheckCompiled();
 
             Settings.AfterMappingFactories.Add(arg => action);
             return this;
         }
-
+        
         public TypeAdapterSetter<TSource, TDestination> Include<TDerivedSource, TDerivedDestination>()
             where TDerivedSource: class, TSource
             where TDerivedDestination: class, TDestination