Support record with ctor

Author: NikolayPianikov

Immutype.Tests/Integration/Tests.cs

@@ -4,6 +4,7 @@
 
 namespace Immutype.Tests.Integration
 {
+    using System.Security.Cryptography.X509Certificates;
     using Microsoft.CodeAnalysis;
 
     public class Tests
@@ -47,6 +48,34 @@ public record Rec(int val);
             // Then
             output.ShouldBe(new [] { "Rec { val = 99 }" }, generatedCode);
         }
+        
+        [Fact]
+        public void ShouldCreateRecordWithCtor()
+        {
+            // Given
+            const string statements = "System.Console.WriteLine(new Rec(33).WithVal(99).Val);";
+
+            // When
+            var output = @"
+            namespace Sample
+            {
+                using System;
+                
+                [Immutype.TargetAttribute()]
+                public record Rec
+                {
+                    public Rec(int val)
+                    {
+                        Val = val;
+                    }
+
+                    public int Val { get; }
+                }
+            }".Run(out var generatedCode, new RunOptions { Statements = statements });
+
+            // Then
+            output.ShouldBe(new [] { "99" }, generatedCode);
+        }
 
         [Fact]
         public void ShouldCreateRecordWithTwoValues()

Immutype.UsageScenarios.Tests/README_TEMPLATE.md

@@ -9,6 +9,7 @@
   - [Removing](#removing)
   - [Nullable collection](#nullable-collection)
   - [Set](#set)
+  - [Record with constructor](#record-with-constructor)
 
 ### Sample scenario
 
@@ -228,3 +229,55 @@ public class Set
 
 
 
+### Record with constructor
+
+
+
+``` CSharp
+[Immutype.Target]
+internal record Person
+{
+    public Person(
+        string name,
+        int? age = default,
+        ICollection<Person>? friends = default)
+    {
+        Name = name;
+        Age = age;
+        Friends = friends;
+    }
+
+    public string Name { get; }
+
+    public int? Age { get; }
+
+    public ICollection<Person>? Friends { get; }
+
+    public void Deconstruct(
+        out string name,
+        out int? age,
+        out ICollection<Person>? friends)
+    {
+        name = Name;
+        age = Age;
+        friends = Friends;
+    }
+}
+
+public class RecordWithConstructor
+{
+    public void Run()
+    {
+        var john = new Person("John",15)
+            .WithFriends(
+                new Person("David").WithAge(16),
+                new Person("James").WithAge(17)
+                    .WithFriends(new Person("Tyler").WithAge(16)));
+        
+        john.Friends?.Count.ShouldBe(2);
+    }
+}
+```
+
+
+

Immutype.UsageScenarios.Tests/RecordWithConstructor.cs

@@ -0,0 +1,65 @@
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable UnusedMember.Global
+// ReSharper disable RedundantNameQualifier
+// ReSharper disable CheckNamespace
+// ReSharper disable ConvertToPrimaryConstructor
+namespace Immutype.UsageScenarios.Tests.RecordWithConstructor
+{
+    using System.Collections.Generic;
+    using Shouldly;
+    using Xunit;
+
+    // $visible=true
+    // $tag=1 Basics
+    // $priority=05
+    // $description=Record with constructor
+    // {
+    [Immutype.Target]
+    internal record Person
+    {
+        public Person(
+            string name,
+            int? age = default,
+            ICollection<Person>? friends = default)
+        {
+            Name = name;
+            Age = age;
+            Friends = friends;
+        }
+
+        public string Name { get; }
+
+        public int? Age { get; }
+
+        public ICollection<Person>? Friends { get; }
+
+        public void Deconstruct(
+            out string name,
+            out int? age,
+            out ICollection<Person>? friends)
+        {
+            name = Name;
+            age = Age;
+            friends = Friends;
+        }
+    }
+
+    public class RecordWithConstructor
+    {
+    // }
+        [Fact]
+    // {
+        public void Run()
+        {
+            var john = new Person("John",15)
+                .WithFriends(
+                    new Person("David").WithAge(16),
+                    new Person("James").WithAge(17)
+                        .WithFriends(new Person("Tyler").WithAge(16)));
+            
+            john.Friends?.Count.ShouldBe(2);
+        }
+    }
+    // }
+}

Immutype/Core/SourceBuilder.cs

@@ -36,20 +36,22 @@ from source in Build(typeDeclarationSyntax, cancellationToken)
 
         public IEnumerable<Source> Build(TypeDeclarationSyntax typeDeclarationSyntax, CancellationToken cancellationToken)
         {
-            IReadOnlyList<ParameterSyntax>? parameters = typeDeclarationSyntax switch
+            IReadOnlyList<ParameterSyntax>? parameters = default;
+            if (typeDeclarationSyntax is RecordDeclarationSyntax recordDeclarationSyntax && recordDeclarationSyntax.ParameterList?.Parameters.Count != 0)
             {
-                RecordDeclarationSyntax recordDeclarationSyntax => recordDeclarationSyntax.ParameterList?.Parameters,
-                _ => (
-                        from ctor in typeDeclarationSyntax.Members.OfType<ConstructorDeclarationSyntax>()
-                        where !cancellationToken.IsCancellationRequested
-                        where ctor.Modifiers.Any(i => i.IsKind(SyntaxKind.PublicKeyword) || i.IsKind(SyntaxKind.InternalKeyword)) || !ctor.Modifiers.Any()
-                        orderby ctor.ParameterList.Parameters.Count descending
-                        select ctor)
-                    .FirstOrDefault()
-                    ?.ParameterList
-                    .Parameters
-            };
+                parameters = recordDeclarationSyntax.ParameterList?.Parameters;
+            }
 
+            parameters ??= (
+                    from ctor in typeDeclarationSyntax.Members.OfType<ConstructorDeclarationSyntax>()
+                    where !cancellationToken.IsCancellationRequested
+                    where ctor.ParameterList.Parameters.Count > 0 && ctor.Modifiers.Any(i => i.IsKind(SyntaxKind.PublicKeyword) || i.IsKind(SyntaxKind.InternalKeyword)) || !ctor.Modifiers.Any()
+                    orderby ctor.ParameterList.Parameters.Count descending
+                    select ctor)
+                .FirstOrDefault()
+                ?.ParameterList
+                .Parameters;
+            
             return parameters != default
                 ? _unitFactory.Create(typeDeclarationSyntax, parameters, cancellationToken)
                 : Enumerable.Empty<Source>();

Immutype/Core/TypeSyntaxFilter.cs

@@ -2,6 +2,8 @@
 namespace Immutype.Core
 {
     using System.Linq;
+    using Microsoft.CodeAnalysis;
+    using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
 
     internal class TypeSyntaxFilter : ITypeSyntaxFilter
@@ -33,11 +35,14 @@ public bool IsAccepted(TypeDeclarationSyntax typeDeclarationSyntax)
                 return false;
             }
 
-            return typeDeclarationSyntax switch
+            if (typeDeclarationSyntax is RecordDeclarationSyntax { ParameterList.Parameters.Count: > 0 })
             {
-                RecordDeclarationSyntax recordDeclarationSyntax => recordDeclarationSyntax.ParameterList is { Parameters.Count: > 0 },
-                _ => typeDeclarationSyntax.Members.OfType<ConstructorDeclarationSyntax>().Any(i => i.ParameterList.Parameters.Count > 0)
-            };
+                return true;
+            }
+
+            return typeDeclarationSyntax.Members
+                .OfType<ConstructorDeclarationSyntax>()
+                .Any(ctor => ctor.ParameterList.Parameters.Count > 0 && ctor.Modifiers.Any(i => i.IsKind(SyntaxKind.PublicKeyword) || i.IsKind(SyntaxKind.InternalKeyword)) || !ctor.Modifiers.Any());
         }
     }
 }

README.md

@@ -95,6 +95,7 @@ _Immutype_ supports [IIncrementalGenerator](https://docs.microsoft.com/en-us/dot
   - [Removing](#removing)
   - [Nullable collection](#nullable-collection)
   - [Set](#set)
+  - [Record with constructor](#record-with-constructor)
 
 ### Sample scenario
 
@@ -314,3 +315,55 @@ public class Set
 
 
 
+### Record with constructor
+
+
+
+``` CSharp
+[Immutype.Target]
+internal record Person
+{
+    public Person(
+        string name,
+        int? age = default,
+        ICollection<Person>? friends = default)
+    {
+        Name = name;
+        Age = age;
+        Friends = friends;
+    }
+
+    public string Name { get; }
+
+    public int? Age { get; }
+
+    public ICollection<Person>? Friends { get; }
+
+    public void Deconstruct(
+        out string name,
+        out int? age,
+        out ICollection<Person>? friends)
+    {
+        name = Name;
+        age = Age;
+        friends = Friends;
+    }
+}
+
+public class RecordWithConstructor
+{
+    public void Run()
+    {
+        var john = new Person("John",15)
+            .WithFriends(
+                new Person("David").WithAge(16),
+                new Person("James").WithAge(17)
+                    .WithFriends(new Person("Tyler").WithAge(16)));
+        
+        john.Friends?.Count.ShouldBe(2);
+    }
+}
+```
+
+
+