fix: expand target type new when inlining in queryable projection map…

…pings (#1238)
riok · Apr 15, 2024 · 840b6e1 · 840b6e1
1 parent b3f79e8
commit 840b6e1
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 7 deletions.
diff --git a/src/Riok.Mapperly/Descriptors/InlineExpressionRewriter.cs b/src/Riok.Mapperly/Descriptors/InlineExpressionRewriter.cs
@@ -60,13 +60,33 @@ public override SyntaxNode VisitTypeArgumentList(TypeArgumentListSyntax node)
         if (semanticModel.GetSymbolInfo(node.Expression).Symbol is ITypeSymbol namedTypeSymbol)
         {
             var expression = FullyQualifiedIdentifier(namedTypeSymbol).WithTriviaFrom(node.Expression);
-
             return node.WithExpression(expression);
         }
 
         return base.VisitMemberAccessExpression(node);
     }
 
+    public override SyntaxNode VisitImplicitObjectCreationExpression(ImplicitObjectCreationExpressionSyntax node)
+    {
+        if (
+            semanticModel.GetSymbolInfo(node).Symbol is IMethodSymbol
+            {
+                MethodKind: MethodKind.Constructor,
+                ReceiverType: not null
+            } ctorSymbol
+        )
+        {
+            return ObjectCreationExpression(
+                TrailingSpacedToken(SyntaxKind.NewKeyword),
+                FullyQualifiedIdentifier(ctorSymbol.ReceiverType),
+                (ArgumentListSyntax?)base.VisitArgumentList(node.ArgumentList),
+                node.Initializer == null ? null : (InitializerExpressionSyntax?)base.VisitInitializerExpression(node.Initializer)
+            );
+        }
+
+        return node;
+    }
+
     public override SyntaxNode VisitArrayType(ArrayTypeSyntax node)
     {
         var fullyQualifiedElementType = FullyQualifiedType(node.ElementType);

diff --git a/...erly.IntegrationTests/_snapshots/ProjectionMapperTest.SnapshotGeneratedSource.verified.cs b/...erly.IntegrationTests/_snapshots/ProjectionMapperTest.SnapshotGeneratedSource.verified.cs
@@ -44,7 +44,7 @@ public static partial class ProjectionMapper
                 } : default,
                 DateTimeValueTargetDateOnly = global::System.DateOnly.FromDateTime(x.DateTimeValueTargetDateOnly),
                 DateTimeValueTargetTimeOnly = global::System.TimeOnly.FromDateTime(x.DateTimeValueTargetTimeOnly),
-                ManuallyMapped = new(100) { StringValue = x.ManuallyMapped },
+                ManuallyMapped = new global::Riok.Mapperly.IntegrationTests.Dto.TestObjectDtoManuallyMappedProjection(100) { StringValue = x.ManuallyMapped },
                 ManuallyMappedModified = x.ManuallyMappedModified + 10,
                 ManuallyMappedList = global::System.Linq.Enumerable.ToList(global::System.Linq.Enumerable.Select(x.ManuallyMappedList, x1 => x1.Value)),
                 IntegerValues = global::System.Linq.Enumerable.ToList(global::System.Linq.Enumerable.OrderBy(x.IntegerValues, x => x.Value)),

diff --git a/...tegrationTests/_snapshots/ProjectionMapperTest.SnapshotGeneratedSource_NET6_0.verified.cs b/...tegrationTests/_snapshots/ProjectionMapperTest.SnapshotGeneratedSource_NET6_0.verified.cs
@@ -44,7 +44,7 @@ public static partial class ProjectionMapper
                 } : default,
                 DateTimeValueTargetDateOnly = global::System.DateOnly.FromDateTime(x.DateTimeValueTargetDateOnly),
                 DateTimeValueTargetTimeOnly = global::System.TimeOnly.FromDateTime(x.DateTimeValueTargetTimeOnly),
-                ManuallyMapped = new(100) { StringValue = x.ManuallyMapped },
+                ManuallyMapped = new global::Riok.Mapperly.IntegrationTests.Dto.TestObjectDtoManuallyMappedProjection(100) { StringValue = x.ManuallyMapped },
                 ManuallyMappedModified = x.ManuallyMappedModified + 10,
                 ManuallyMappedList = global::System.Linq.Enumerable.ToList(global::System.Linq.Enumerable.Select(x.ManuallyMappedList, x1 => x1.Value)),
                 IntegerValues = global::System.Linq.Enumerable.ToList(global::System.Linq.Enumerable.OrderBy(x.IntegerValues, x => x.Value)),

diff --git a/test/Riok.Mapperly.Tests/Mapping/QueryableProjectionUserImplementedTest.cs b/test/Riok.Mapperly.Tests/Mapping/QueryableProjectionUserImplementedTest.cs
@@ -127,14 +127,48 @@ public Task ClassToClassUserImplementedWithUsingMappings()
             """
             private partial System.Linq.IQueryable<B> Map(System.Linq.IQueryable<A> source);
 
-            private static DateTimeOffset MapToDateTimeOffset(
-                DateTime dateTime
-            ) => new(dateTime, TimeSpan.Zero);
+            private static DateTimeOffset MapToDateTimeOffset(DateTime dateTime)
+                => new DateTimeOffset(dateTime, TimeSpan.Zero);
             """,
             "class A { public DateTime Value { get; set; } }",
             "class B { public DateTimeOffset Value { get; set; } }"
         );
 
         return TestHelper.VerifyGenerator(source);
     }
+
+    [Fact]
+    public Task ClassToClassUserImplementedWithTargetTypeNew()
+    {
+        var source = TestSourceBuilder.MapperWithBodyAndTypes(
+            """
+            private partial System.Linq.IQueryable<B> Map(System.Linq.IQueryable<A> source);
+
+            private static DateTimeOffset MapToDateTimeOffset(DateTime dateTime)
+                => new(dateTime, TimeSpan.Zero);
+            """,
+            "class A { public DateTime Value { get; set; } }",
+            "class B { public DateTimeOffset Value { get; set; } }"
+        );
+
+        return TestHelper.VerifyGenerator(source);
+    }
+
+    [Fact]
+    public Task ClassToClassUserImplementedWithTargetTypeNewInitializer()
+    {
+        var source = TestSourceBuilder.MapperWithBodyAndTypes(
+            """
+            private partial System.Linq.IQueryable<B> Map(System.Linq.IQueryable<A> source);
+
+            private static C MapIt(DateTime dateTime)
+                => new(1) { Value2 = 10 };
+            """,
+            "class A { public DateTime Value { get; set; } }",
+            "class B { public C Value { get; set; } }",
+            "class C(int value1) { public int Value2 { set; } }"
+        );
+
+        return TestHelper.VerifyGenerator(source);
+    }
 }
diff --git a/...tionUserImplementedTest.ClassToClassUserImplementedWithTargetTypeNew#Mapper.g.verified.cs b/...tionUserImplementedTest.ClassToClassUserImplementedWithTargetTypeNew#Mapper.g.verified.cs
@@ -0,0 +1,16 @@
+//HintName: Mapper.g.cs
+// <auto-generated />
+#nullable enable
+public partial class Mapper
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Riok.Mapperly", "0.0.1.0")]
+    private partial global::System.Linq.IQueryable<global::B> Map(global::System.Linq.IQueryable<global::A> source)
+    {
+#nullable disable
+        return System.Linq.Queryable.Select(source, x => new global::B()
+        {
+            Value = new global::System.DateTimeOffset(x.Value, global::System.TimeSpan.Zero),
+        });
+#nullable enable
+    }
+}
diff --git a/...lementedTest.ClassToClassUserImplementedWithTargetTypeNewInitializer#Mapper.g.verified.cs b/...lementedTest.ClassToClassUserImplementedWithTargetTypeNewInitializer#Mapper.g.verified.cs
@@ -0,0 +1,16 @@
+//HintName: Mapper.g.cs
+// <auto-generated />
+#nullable enable
+public partial class Mapper
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Riok.Mapperly", "0.0.1.0")]
+    private partial global::System.Linq.IQueryable<global::B> Map(global::System.Linq.IQueryable<global::A> source)
+    {
+#nullable disable
+        return System.Linq.Queryable.Select(source, x => new global::B()
+        {
+            Value = new global::C(1) { Value2 = 10 },
+        });
+#nullable enable
+    }
+}
diff --git a/...tionUserImplementedTest.ClassToClassUserImplementedWithUsingMappings#Mapper.g.verified.cs b/...tionUserImplementedTest.ClassToClassUserImplementedWithUsingMappings#Mapper.g.verified.cs
@@ -9,7 +9,7 @@ public partial class Mapper
 #nullable disable
         return System.Linq.Queryable.Select(source, x => new global::B()
         {
-            Value = new(x.Value, global::System.TimeSpan.Zero),
+            Value = new global::System.DateTimeOffset(x.Value, global::System.TimeSpan.Zero),
         });
 #nullable enable
     }