fix: handle internal visibility correctly

riok · Jul 27, 2023 · e82e858 · e82e858
1 parent 2650df5
commit e82e858
Show file tree

Hide file tree

Showing 36 changed files with 544 additions and 170 deletions.
diff --git a/src/Riok.Mapperly/Descriptors/Enumerables/CollectionInfoBuilder.cs b/src/Riok.Mapperly/Descriptors/Enumerables/CollectionInfoBuilder.cs
@@ -163,6 +163,7 @@ or CollectionType.SortedSet
         {
             return true;
         }
+
         // has valid add if type implements ISet and has implicit Add method
         if (
             implementedTypes.HasFlag(CollectionType.ISet)

diff --git a/...Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersContainerBuilderContext.cs b/...Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersContainerBuilderContext.cs
@@ -1,6 +1,5 @@
 using Riok.Mapperly.Descriptors.Mappings.MemberMappings;
 using Riok.Mapperly.Diagnostics;
-using Riok.Mapperly.Helpers;
 using Riok.Mapperly.Symbols;
 
 namespace Riok.Mapperly.Descriptors.MappingBodyBuilders.BuilderContext;
@@ -39,7 +38,7 @@ private void AddNullMemberInitializers(IMemberAssignmentMappingContainer contain
         {
             var nullablePath = new MemberPath(nullableTrailPath);
             var type = nullablePath.Member.Type;
-            if (!type.HasAccessibleParameterlessConstructor())
+            if (!BuilderContext.SymbolAccessor.HasAccessibleParameterlessConstructor(type))
             {
                 BuilderContext.ReportDiagnostic(DiagnosticDescriptors.NoParameterlessConstructorFound, type);
                 continue;

diff --git a/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs b/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs
@@ -189,7 +189,7 @@ private static void BuildConstructorMapping(INewInstanceBuilderContext<IMapping>
         // then by descending parameter count
         // ctors annotated with [Obsolete] are considered last unless they have a MapperConstructor attribute set
         var ctorCandidates = namedTargetType.InstanceConstructors
-            .Where(ctor => ctor.IsAccessible())
+            .Where(ctor => ctx.BuilderContext.SymbolAccessor.IsAccessible(ctor))
             .OrderByDescending(x => ctx.BuilderContext.SymbolAccessor.HasAttribute<MapperConstructorAttribute>(x))
             .ThenBy(x => ctx.BuilderContext.SymbolAccessor.HasAttribute<MapperConstructorAttribute>(x))
             .ThenByDescending(x => x.Parameters.Length == 0)

diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs
@@ -196,23 +196,17 @@ out sourcePath
         if (!ctx.Mapping.SourceType.IsTupleType || ctx.Mapping.SourceType is not INamedTypeSymbol namedType)
             return false;
 
-        var mappableMember = namedType.TupleElements
-            .Where(
-                x =>
-                    x.CorrespondingTupleField != default
-                    && !ctx.IgnoredSourceMemberNames.Contains(x.Name)
-                    && string.Equals(field.CorrespondingTupleField!.Name, x.CorrespondingTupleField!.Name)
-            )
-            .Select(MappableMember.Create)
-            .WhereNotNull()
-            .FirstOrDefault();
+        var mappableField = namedType.TupleElements.FirstOrDefault(
+            x =>
+                x.CorrespondingTupleField != default
+                && !ctx.IgnoredSourceMemberNames.Contains(x.Name)
+                && string.Equals(field.CorrespondingTupleField!.Name, x.CorrespondingTupleField!.Name)
+        );
 
-        if (mappableMember != default)
-        {
-            sourcePath = new MemberPath(new[] { mappableMember });
-            return true;
-        }
+        if (mappableField == default)
+            return false;
 
-        return false;
+        sourcePath = new MemberPath(new[] { new FieldMember(mappableField) });
+        return true;
     }
 }
diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/RuntimeTargetTypeMappingBodyBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/RuntimeTargetTypeMappingBodyBuilder.cs
@@ -14,7 +14,14 @@ public static void BuildMappingBody(MappingBuilderContext ctx, UserDefinedNewIns
         // therefore set source type always to nun-nullable
         // as non-nullables are also assignable to nullables.
         var mappings = GetUserMappingCandidates(ctx)
-            .Where(x => mapping.TypeParameters.CanConsumeTypes(ctx.Compilation, x.SourceType.NonNullable(), x.TargetType));
+            .Where(
+                x =>
+                    mapping.TypeParameters.DoesTypesSatisfyTypeParameterConstraints(
+                        ctx.SymbolAccessor,
+                        x.SourceType.NonNullable(),
+                        x.TargetType
+                    )
+            );
 
         BuildMappingBody(ctx, mapping, mappings);
     }
@@ -27,8 +34,8 @@ public static void BuildMappingBody(MappingBuilderContext ctx, UserDefinedNewIns
         var mappings = GetUserMappingCandidates(ctx)
             .Where(
                 x =>
-                    x.SourceType.NonNullable().IsAssignableTo(ctx.Compilation, mapping.SourceType)
-                    && x.TargetType.IsAssignableTo(ctx.Compilation, mapping.TargetType)
+                    ctx.SymbolAccessor.HasImplicitConversion(x.SourceType.NonNullable(), mapping.SourceType)
+                    && ctx.SymbolAccessor.HasImplicitConversion(x.TargetType, mapping.TargetType)
             );
 
         BuildMappingBody(ctx, mapping, mappings);
@@ -74,7 +81,7 @@ IEnumerable<ITypeMapping> childMappings
             .ThenBy(x => x.TargetType.IsNullable())
             .GroupBy(x => new TypeMappingKey(x, false))
             .Select(x => x.First())
-            .Select(x => new RuntimeTargetTypeMapping(x, x.TargetType.IsAssignableTo(ctx.Compilation, ctx.Target)));
+            .Select(x => new RuntimeTargetTypeMapping(x, ctx.Compilation.HasImplicitConversion(x.TargetType, ctx.Target)));
         mapping.AddMappings(runtimeTargetTypeMappings);
     }
 }
diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilderContext.cs b/src/Riok.Mapperly/Descriptors/MappingBuilderContext.cs
@@ -176,7 +176,7 @@ protected virtual NullFallbackValue GetNullFallbackValue(ITypeSymbol targetType,
         if (targetType.SpecialType == SpecialType.System_String)
             return NullFallbackValue.EmptyString;
 
-        if (targetType.HasAccessibleParameterlessConstructor())
+        if (SymbolAccessor.HasAccessibleParameterlessConstructor(targetType))
             return NullFallbackValue.CreateInstance;
 
         ReportDiagnostic(DiagnosticDescriptors.NoParameterlessConstructorFound, targetType);

diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/CtorMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/CtorMappingBuilder.cs
@@ -17,7 +17,7 @@ public static class CtorMappingBuilder
 
         // resolve ctors which have the source as single argument
         var ctorMethod = namedTarget.InstanceConstructors
-            .Where(x => x.IsAccessible())
+            .Where(ctx.SymbolAccessor.IsAccessible)
             .FirstOrDefault(
                 m =>
                     m.Parameters.Length == 1

diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/DerivedTypeMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/DerivedTypeMappingBuilder.cs
@@ -38,11 +38,11 @@ bool duplicatedSourceTypesAllowed
         var derivedTypeMappingSourceTypes = new HashSet<ITypeSymbol>(SymbolEqualityComparer.Default);
         var derivedTypeMappings = new List<ITypeMapping>(configs.Count);
         Func<ITypeSymbol, bool> isAssignableToSource = ctx.Source is ITypeParameterSymbol sourceTypeParameter
-            ? t => sourceTypeParameter.CanConsumeType(ctx.Compilation, ctx.Source.NullableAnnotation, t)
-            : t => t.IsAssignableTo(ctx.Compilation, ctx.Source);
+            ? t => ctx.SymbolAccessor.DoesTypeSatisfyTypeParameterConstraints(sourceTypeParameter, t, ctx.Source.NullableAnnotation)
+            : t => ctx.SymbolAccessor.HasImplicitConversion(t, ctx.Source);
         Func<ITypeSymbol, bool> isAssignableToTarget = ctx.Target is ITypeParameterSymbol targetTypeParameter
-            ? t => targetTypeParameter.CanConsumeType(ctx.Compilation, ctx.Target.NullableAnnotation, t)
-            : t => t.IsAssignableTo(ctx.Compilation, ctx.Target);
+            ? t => ctx.SymbolAccessor.DoesTypeSatisfyTypeParameterConstraints(targetTypeParameter, t, ctx.Target.NullableAnnotation)
+            : t => ctx.SymbolAccessor.HasImplicitConversion(t, ctx.Target);
 
         foreach (var config in configs)
         {

diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/DictionaryMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/DictionaryMappingBuilder.cs
@@ -64,7 +64,7 @@ or CollectionType.IReadOnlyDictionary
         // it should have a an object factory or a parameterless public ctor
         if (
             !ctx.ObjectFactories.TryFindObjectFactory(ctx.Source, ctx.Target, out var objectFactory)
-            && !ctx.Target.HasAccessibleParameterlessConstructor()
+            && !ctx.SymbolAccessor.HasAccessibleParameterlessConstructor(ctx.Target)
         )
         {
             ctx.ReportDiagnostic(DiagnosticDescriptors.NoParameterlessConstructorFound, ctx.Target);

diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumerableMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumerableMappingBuilder.cs
@@ -165,7 +165,7 @@ ITypeMapping elementMapping
     {
         if (
             !ctx.ObjectFactories.TryFindObjectFactory(ctx.Source, ctx.Target, out var objectFactory)
-            && !ctx.Target.HasAccessibleParameterlessConstructor()
+            && !ctx.SymbolAccessor.HasAccessibleParameterlessConstructor(ctx.Target)
         )
         {
             ctx.ReportDiagnostic(DiagnosticDescriptors.NoParameterlessConstructorFound, ctx.Target);

diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/NewInstanceObjectPropertyMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/NewInstanceObjectPropertyMappingBuilder.cs
@@ -21,7 +21,7 @@ public static class NewInstanceObjectPropertyMappingBuilder
                 ctx.MapperConfiguration.UseReferenceHandling
             );
 
-        if (ctx.Target is not INamedTypeSymbol namedTarget || namedTarget.Constructors.All(x => !x.IsAccessible()))
+        if (ctx.Target is not INamedTypeSymbol namedTarget || namedTarget.Constructors.All(x => !ctx.SymbolAccessor.IsAccessible(x)))
             return null;
 
         if (ctx.Source.IsEnum() || ctx.Target.IsEnum())

diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/SpanMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/SpanMappingBuilder.cs
@@ -130,7 +130,7 @@ ForEachAddEnumerableExistingTargetMapping CreateForEach(string methodName)
 
         if (
             !ctx.ObjectFactories.TryFindObjectFactory(ctx.Source, ctx.Target, out var objectFactory)
-            && !ctx.Target.HasAccessibleParameterlessConstructor()
+            && !ctx.SymbolAccessor.HasAccessibleParameterlessConstructor(ctx.Target)
         )
         {
             return MapSpanArrayToEnumerableMethod(ctx);

diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericSourceObjectFactory.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericSourceObjectFactory.cs
@@ -1,6 +1,5 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Riok.Mapperly.Helpers;
 using static Riok.Mapperly.Emit.SyntaxFactoryHelper;
 
 namespace Riok.Mapperly.Descriptors.ObjectFactories;
@@ -12,17 +11,16 @@ namespace Riok.Mapperly.Descriptors.ObjectFactories;
 /// </summary>
 public class GenericSourceObjectFactory : ObjectFactory
 {
-    private readonly Compilation _compilation;
-
-    public GenericSourceObjectFactory(IMethodSymbol method, Compilation compilation)
-        : base(method)
-    {
-        _compilation = compilation;
-    }
+    public GenericSourceObjectFactory(SymbolAccessor symbolAccessor, IMethodSymbol method)
+        : base(symbolAccessor, method) { }
 
     public override bool CanCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate) =>
         SymbolEqualityComparer.Default.Equals(Method.ReturnType, targetTypeToCreate)
-        && Method.TypeParameters[0].CanConsumeType(_compilation, Method.Parameters[0].Type.NullableAnnotation, sourceType);
+        && SymbolAccessor.DoesTypeSatisfyTypeParameterConstraints(
+            Method.TypeParameters[0],
+            sourceType,
+            Method.Parameters[0].Type.NullableAnnotation
+        );
 
     protected override ExpressionSyntax BuildCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate, ExpressionSyntax source) =>
         GenericInvocation(Method.Name, new[] { NonNullableIdentifier(sourceType) }, source);

diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericSourceTargetObjectFactory.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericSourceTargetObjectFactory.cs
@@ -1,34 +1,31 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Riok.Mapperly.Helpers;
 using static Riok.Mapperly.Emit.SyntaxFactoryHelper;
 
 namespace Riok.Mapperly.Descriptors.ObjectFactories;
 
 public class GenericSourceTargetObjectFactory : ObjectFactory
 {
-    private readonly Compilation _compilation;
     private readonly int _sourceTypeParameterIndex;
     private readonly int _targetTypeParameterIndex;
 
-    public GenericSourceTargetObjectFactory(IMethodSymbol method, Compilation compilation, int sourceTypeParameterIndex)
-        : base(method)
+    public GenericSourceTargetObjectFactory(SymbolAccessor symbolAccessor, IMethodSymbol method, int sourceTypeParameterIndex)
+        : base(symbolAccessor, method)
     {
-        _compilation = compilation;
         _sourceTypeParameterIndex = sourceTypeParameterIndex;
         _targetTypeParameterIndex = (sourceTypeParameterIndex + 1) % 2;
     }
 
     public override bool CanCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate) =>
-        Method.TypeParameters[_sourceTypeParameterIndex].CanConsumeType(
-            _compilation,
-            Method.Parameters[0].Type.NullableAnnotation,
-            sourceType
+        SymbolAccessor.DoesTypeSatisfyTypeParameterConstraints(
+            Method.TypeParameters[_sourceTypeParameterIndex],
+            sourceType,
+            Method.Parameters[0].Type.NullableAnnotation
         )
-        && Method.TypeParameters[_targetTypeParameterIndex].CanConsumeType(
-            _compilation,
-            Method.ReturnType.NullableAnnotation,
-            targetTypeToCreate
+        && SymbolAccessor.DoesTypeSatisfyTypeParameterConstraints(
+            Method.TypeParameters[_targetTypeParameterIndex],
+            targetTypeToCreate,
+            Method.ReturnType.NullableAnnotation
         );
 
     protected override ExpressionSyntax BuildCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate, ExpressionSyntax source)

diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericTargetObjectFactory.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericTargetObjectFactory.cs
@@ -1,6 +1,5 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Riok.Mapperly.Helpers;
 using static Riok.Mapperly.Emit.SyntaxFactoryHelper;
 
 namespace Riok.Mapperly.Descriptors.ObjectFactories;
@@ -12,16 +11,15 @@ namespace Riok.Mapperly.Descriptors.ObjectFactories;
 /// </summary>
 public class GenericTargetObjectFactory : ObjectFactory
 {
-    private readonly Compilation _compilation;
-
-    public GenericTargetObjectFactory(IMethodSymbol method, Compilation compilation)
-        : base(method)
-    {
-        _compilation = compilation;
-    }
+    public GenericTargetObjectFactory(SymbolAccessor symbolAccessor, IMethodSymbol method)
+        : base(symbolAccessor, method) { }
 
     public override bool CanCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate) =>
-        Method.TypeParameters[0].CanConsumeType(_compilation, Method.ReturnType.NullableAnnotation, targetTypeToCreate);
+        SymbolAccessor.DoesTypeSatisfyTypeParameterConstraints(
+            Method.TypeParameters[0],
+            targetTypeToCreate,
+            Method.ReturnType.NullableAnnotation
+        );
 
     protected override ExpressionSyntax BuildCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate, ExpressionSyntax source) =>
         GenericInvocation(Method.Name, new[] { NonNullableIdentifier(targetTypeToCreate) });

diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericTargetObjectFactoryWithSource.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/GenericTargetObjectFactoryWithSource.cs
@@ -11,8 +11,8 @@ namespace Riok.Mapperly.Descriptors.ObjectFactories;
 /// </summary>
 public class GenericTargetObjectFactoryWithSource : GenericTargetObjectFactory
 {
-    public GenericTargetObjectFactoryWithSource(IMethodSymbol method, Compilation compilation)
-        : base(method, compilation) { }
+    public GenericTargetObjectFactoryWithSource(SymbolAccessor symbolAccessor, IMethodSymbol method)
+        : base(symbolAccessor, method) { }
 
     public override bool CanCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate) =>
         base.CanCreateType(sourceType, targetTypeToCreate) && SymbolEqualityComparer.Default.Equals(Method.Parameters[0].Type, sourceType);

diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/ObjectFactory.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/ObjectFactory.cs
@@ -10,11 +10,14 @@ namespace Riok.Mapperly.Descriptors.ObjectFactories;
 /// </summary>
 public abstract class ObjectFactory
 {
-    protected ObjectFactory(IMethodSymbol method)
+    protected ObjectFactory(SymbolAccessor symbolAccessor, IMethodSymbol method)
     {
         Method = method;
+        SymbolAccessor = symbolAccessor;
     }
 
+    protected SymbolAccessor SymbolAccessor { get; }
+
     protected IMethodSymbol Method { get; }
 
     public ExpressionSyntax CreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate, ExpressionSyntax source) =>
@@ -38,7 +41,7 @@ private ExpressionSyntax HandleNull(ExpressionSyntax expression, ITypeSymbol typ
         if (!Method.ReturnType.UpgradeNullable().IsNullable())
             return expression;
 
-        ExpressionSyntax nullFallback = typeToCreate.HasAccessibleParameterlessConstructor()
+        ExpressionSyntax nullFallback = SymbolAccessor.HasAccessibleParameterlessConstructor(typeToCreate)
             ? CreateInstance(typeToCreate)
             : ThrowNullReferenceException($"The object factory {Method.Name} returned null");
 

diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/ObjectFactoryBuilder.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/ObjectFactoryBuilder.cs
@@ -37,8 +37,8 @@ public static ObjectFactoryCollection ExtractObjectFactories(SimpleMappingBuilde
         if (!methodSymbol.IsGenericMethod)
         {
             return methodSymbol.Parameters.Length == 1
-                ? new SimpleObjectFactoryWithSource(methodSymbol)
-                : new SimpleObjectFactory(methodSymbol);
+                ? new SimpleObjectFactoryWithSource(ctx.SymbolAccessor, methodSymbol)
+                : new SimpleObjectFactory(ctx.SymbolAccessor, methodSymbol);
         }
 
         switch (methodSymbol.TypeParameters.Length)
@@ -76,12 +76,12 @@ public static ObjectFactoryCollection ExtractObjectFactories(SimpleMappingBuilde
         if (returnTypeIsGeneric)
         {
             return hasSourceParameter
-                ? new GenericTargetObjectFactoryWithSource(methodSymbol, ctx.Compilation)
-                : new GenericTargetObjectFactory(methodSymbol, ctx.Compilation);
+                ? new GenericTargetObjectFactoryWithSource(ctx.SymbolAccessor, methodSymbol)
+                : new GenericTargetObjectFactory(ctx.SymbolAccessor, methodSymbol);
         }
 
         if (hasSourceParameter)
-            return new GenericSourceObjectFactory(methodSymbol, ctx.Compilation);
+            return new GenericSourceObjectFactory(ctx.SymbolAccessor, methodSymbol);
 
         ctx.ReportDiagnostic(DiagnosticDescriptors.InvalidObjectFactorySignature, methodSymbol, methodSymbol.Name);
         return null;
@@ -109,6 +109,6 @@ public static ObjectFactoryCollection ExtractObjectFactories(SimpleMappingBuilde
             return null;
         }
 
-        return new GenericSourceTargetObjectFactory(methodSymbol, ctx.Compilation, sourceParameterIndex);
+        return new GenericSourceTargetObjectFactory(ctx.SymbolAccessor, methodSymbol, sourceParameterIndex);
     }
 }
diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/SimpleObjectFactory.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/SimpleObjectFactory.cs
@@ -10,8 +10,8 @@ namespace Riok.Mapperly.Descriptors.ObjectFactories;
 /// </summary>
 public class SimpleObjectFactory : ObjectFactory
 {
-    public SimpleObjectFactory(IMethodSymbol method)
-        : base(method) { }
+    public SimpleObjectFactory(SymbolAccessor symbolAccessor, IMethodSymbol method)
+        : base(symbolAccessor, method) { }
 
     public override bool CanCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate) =>
         SymbolEqualityComparer.Default.Equals(Method.ReturnType, targetTypeToCreate);

diff --git a/src/Riok.Mapperly/Descriptors/ObjectFactories/SimpleObjectFactoryWithSource.cs b/src/Riok.Mapperly/Descriptors/ObjectFactories/SimpleObjectFactoryWithSource.cs
@@ -11,8 +11,8 @@ namespace Riok.Mapperly.Descriptors.ObjectFactories;
 /// </summary>
 public class SimpleObjectFactoryWithSource : SimpleObjectFactory
 {
-    public SimpleObjectFactoryWithSource(IMethodSymbol method)
-        : base(method) { }
+    public SimpleObjectFactoryWithSource(SymbolAccessor symbolAccessor, IMethodSymbol method)
+        : base(symbolAccessor, method) { }
 
     public override bool CanCreateType(ITypeSymbol sourceType, ITypeSymbol targetTypeToCreate) =>
         base.CanCreateType(sourceType, targetTypeToCreate) && SymbolEqualityComparer.Default.Equals(sourceType, Method.Parameters[0].Type);

diff --git a/src/Riok.Mapperly/Descriptors/SimpleMappingBuilderContext.cs b/src/Riok.Mapperly/Descriptors/SimpleMappingBuilderContext.cs
@@ -52,6 +52,7 @@ protected SimpleMappingBuilderContext(SimpleMappingBuilderContext ctx)
     public MapperAttribute MapperConfiguration => _configuration.Mapper;
 
     public WellKnownTypes Types { get; }
+
     public SymbolAccessor SymbolAccessor { get; }
 
     protected MappingBuilder MappingBuilder { get; }