Stop exposing mapper in MapperContext

src/Umbraco.Core/Mapping/MapperContext.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Umbraco.Core.Mapping
 {
@@ -7,6 +8,7 @@ namespace Umbraco.Core.Mapping
     /// </summary>
     public class MapperContext
     {
+        private readonly UmbracoMapper _mapper;
         private IDictionary<string, object> _items;
 
         /// <summary>
@@ -14,14 +16,9 @@ namespace Umbraco.Core.Mapping
         /// </summary>
         public MapperContext(UmbracoMapper mapper)
         {
-            Mapper = mapper;
+            _mapper = mapper;
         }
 
-        /// <summary>
-        /// Gets the mapper.
-        /// </summary>
-        public UmbracoMapper Mapper { get;}
-
         /// <summary>
         /// Gets a value indicating whether the context has items.
         /// </summary>
@@ -31,5 +28,81 @@ namespace Umbraco.Core.Mapping
         /// Gets the context items.
         /// </summary>
         public IDictionary<string, object> Items => _items ?? (_items = new Dictionary<string, object>());
+
+        #region Map
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TTarget>(object source)
+            => _mapper.Map<TTarget>(source, this);
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TTarget>(object source, Action<MapperContext> f)
+        {
+            f(this);
+            return _mapper.Map<TTarget>(source, this);
+        }
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source)
+            => _mapper.Map<TSource, TTarget>(source, this);
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, Action<MapperContext> f)
+        {
+            f(this);
+            return _mapper.Map<TSource, TTarget>(source, this);
+        }
+
+        /// <summary>
+        /// Maps a source object to an existing target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="target">The target object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, TTarget target)
+            => _mapper.Map(source, target, this);
+
+        /// <summary>
+        /// Maps a source object to an existing target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="target">The target object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, TTarget target, Action<MapperContext> f)
+        {
+            f(this);
+            return _mapper.Map(source, target, this);
+        }
+
+        #endregion
     }
 }