Adding overload for custom constructors to take the context; closes A…

…utoMapper#151
JakeGinnivan · Dec 17, 2011 · f648512 · f648512
1 parent e6ec194
commit f648512
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/AutoMapper/IMappingExpression.cs b/src/AutoMapper/IMappingExpression.cs
@@ -28,6 +28,7 @@ IMappingExpression<TSource, TDestination> Include<TOtherSource, TOtherDestinatio
         IMappingExpression<TSource, TDestination> AfterMap(Action<TSource, TDestination> afterFunction);
         IMappingExpression<TSource, TDestination> AfterMap<TMappingAction>() where TMappingAction : IMappingAction<TSource, TDestination>;
         IMappingExpression<TSource, TDestination> ConstructUsing(Func<TSource, TDestination> ctor);
+        IMappingExpression<TSource, TDestination> ConstructUsing(Func<ResolutionContext, TDestination> ctor);
         void As<T>();
         IMappingExpression<TSource, TDestination> MaxDepth(int depth);
         IMappingExpression<TSource, TDestination> ConstructUsingServiceLocator();

diff --git a/src/AutoMapper/Internal/MappingExpression.cs b/src/AutoMapper/Internal/MappingExpression.cs
@@ -380,7 +380,12 @@ public IMappingExpression<TSource, TDestination> AfterMap<TMappingAction>() wher
 
         public IMappingExpression<TSource, TDestination> ConstructUsing(Func<TSource, TDestination> ctor)
         {
-            _typeMap.DestinationCtor = src => ctor((TSource)src);
+            return ConstructUsing(ctxt => ctor((TSource) ctxt.SourceValue));
+        }
+
+        public IMappingExpression<TSource, TDestination> ConstructUsing(Func<ResolutionContext, TDestination> ctor)
+        {
+            _typeMap.DestinationCtor = ctxt => ctor(ctxt);
 
             return this;
         }

diff --git a/src/AutoMapper/MappingEngine.cs b/src/AutoMapper/MappingEngine.cs
@@ -370,7 +370,7 @@ object IMappingEngineRunner.CreateObject(ResolutionContext context)
 
             if (typeMap != null)
                 if (typeMap.DestinationCtor != null)
-                    return typeMap.DestinationCtor(context.SourceValue);
+                    return typeMap.DestinationCtor(context);
                 else if (typeMap.ConstructDestinationUsingServiceLocator && context.Options.ServiceCtor != null)
                     return context.Options.ServiceCtor(destinationType);
                 else if (typeMap.ConstructDestinationUsingServiceLocator)

diff --git a/src/AutoMapper/TypeMap.cs b/src/AutoMapper/TypeMap.cs
@@ -71,7 +71,7 @@ public Action<object, object> AfterMap
             }
         }
 
-        public Func<object, object> DestinationCtor { get; set; }
+        public Func<ResolutionContext, object> DestinationCtor { get; set; }
 
         public List<string> IgnorePropertiesStartingWith { get; set; }