Aspid.MVVM 1.1.0

.gitignore

@@ -26,9 +26,6 @@
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/
 
-# Debug artifacts
-launchSettings.json
-
 # Prevent accidental re-checkin of NuGet.exe
 NuGet.exe
 

Aspid.MVVM.Generators.sln

@@ -17,9 +17,7 @@ Global
 		{8396B53C-70A1-422E-9E40-9AEBB223F6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8396B53C-70A1-422E-9E40-9AEBB223F6B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A1DE8BA3-CAEC-4823-99D1-720059565792}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1DE8BA3-CAEC-4823-99D1-720059565792}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A1DE8BA3-CAEC-4823-99D1-720059565792}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1DE8BA3-CAEC-4823-99D1-720059565792}.Release|Any CPU.Build.0 = Release|Any CPU
 		{837E3102-786A-44C6-9490-1C77BE8D26C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{837E3102-786A-44C6-9490-1C77BE8D26C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{837E3102-786A-44C6-9490-1C77BE8D26C3}.Release|Any CPU.ActiveCfg = Release|Any CPU

Aspid.MVVM.Generators/Aspid.MVVM.Generators.Sample/Aspid.MVVM.Generators.Sample.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
@@ -14,4 +14,15 @@
         <None Remove="DDD.UbiquitousLanguageRegistry.txt"/>
     </ItemGroup>
 
+    <!--
+        Compile the entire Unity-independent core (Assets/Aspid/MVVM/Source) so the
+        source generator runs over it. A recursive glob is used instead of an explicit
+        file list so the project stays in sync as Source files are added/removed/renamed.
+    -->
+    <ItemGroup>
+        <Compile Include="..\..\..\Aspid.MVVM\Assets\Aspid\MVVM\Source\**\*.cs">
+            <Link>Source\%(RecursiveDir)%(Filename)%(Extension)</Link>
+        </Compile>
+    </ItemGroup>
+
 </Project>

Aspid.MVVM.Generators/Aspid.MVVM.Generators.Sample/ExProperty1Vm.cs

@@ -0,0 +1,36 @@
+namespace Aspid.MVVM.Generators.Sample;
+
+[ViewModel]
+public partial class ExProperty1Vm
+{
+    private string _firstName = string.Empty;
+    private string _lastName = string.Empty;
+
+    [Bind]
+    public string FirstName
+    {
+        get => _firstName;
+        private set
+        {
+            if (SetFirstNameField(ref _firstName, value))
+                OnFullNamePropertyChanged();
+        }
+    }
+
+    [Bind]
+    [BindAlso(nameof(FullName))]
+    public string LastName
+    {
+        get => _lastName;
+        private set
+        {
+            if (_lastName == value) return;
+
+            _lastName = value;
+            OnLastNamePropertyChanged();
+        }
+    }
+
+    [Bind]
+    public string FullName => $"{FirstName} {LastName}";
+}

Aspid.MVVM.Generators/Aspid.MVVM.Generators.Sample/ExProperty2Vm.cs

@@ -0,0 +1,36 @@
+namespace Aspid.MVVM.Generators.Sample;
+
+[ViewModel]
+public partial class ExProperty2Vm
+{
+    private string _firstName = string.Empty;
+    private string _lastName = string.Empty;
+
+    [Bind]
+    public string FirstName
+    {
+        get => _firstName;
+        private set
+        {
+            if (SetField(ref _firstName, value))
+                OnPropertyChanged(nameof(FullName));
+        }
+    }
+
+    [Bind]
+    [BindAlso(nameof(FullName))]
+    public string LastName
+    {
+        get => _lastName;
+        private set
+        {
+            if (_lastName == value) return;
+
+            _lastName = value;
+            OnPropertyChanged();
+        }
+    }
+
+    [Bind]
+    public string FullName => $"{_firstName} {_lastName}";
+}

Aspid.MVVM.Generators/Aspid.MVVM.Generators/Aspid.MVVM.Generators.csproj

@@ -4,20 +4,23 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
-        <LangVersion>13</LangVersion>
+        <LangVersion>14</LangVersion>
 
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
         <IsRoslynComponent>true</IsRoslynComponent>
         <PackageId>Aspid.MVVM.Generators</PackageId>
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Aspid.Generators.Helper" Version="0.1.0" />
+        <PackageReference Include="Aspid.Generators.Helper.Unity" Version="0.1.0" />
         <PackageReference ExcludeAssets="runtime" Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference ExcludeAssets="runtime" Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0"/>
         <PackageReference ExcludeAssets="runtime" Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0"/>
+        <PackageReference Include="SourceGenerator.Foundations" Version="2.0.13" />
     </ItemGroup>
 
 </Project>

Aspid.MVVM.Generators/Aspid.MVVM.Generators/Generators/Binders/BinderGenerator.Find.cs

@@ -2,27 +2,27 @@
 using System.Threading;
 using System.Diagnostics;
 using Microsoft.CodeAnalysis;
-using Aspid.Generator.Helpers;
+using Aspid.Generators.Helper;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis.CSharp;
 using System.Runtime.CompilerServices;
-using Aspid.MVVM.Generators.Binders.Data;
-using Aspid.MVVM.Generators.Descriptions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Aspid.MVVM.Generators.Generators.Binders.Data;
+using Classes = Aspid.MVVM.Generators.Generators.Descriptions.Classes;
 
-namespace Aspid.MVVM.Generators.Binders;
+namespace Aspid.MVVM.Generators.Generators.Binders;
 
 public partial class BinderGenerator
 {
-    private static FoundForGenerator<BinderData> FindBinders(GeneratorSyntaxContext context,
+    private static BinderData? FindBinders(GeneratorSyntaxContext context,
         CancellationToken cancellationToken)
     {
         Debug.Assert(context.Node is TypeDeclarationSyntax);
         var candidate = Unsafe.As<TypeDeclarationSyntax>(context.Node);
         var symbol = context.SemanticModel.GetDeclaredSymbol(candidate, cancellationToken);
 
-        if (symbol is null) return default;
-        if (!symbol.HasInterfaceInSelfOrBases(Classes.IBinder, out var binderInterface)) return default;
+        if (symbol is null) return null;
+        if (!symbol.TryGetAnyInterfaceInSelfAndBases(out var binderInterface, Classes.IBinder)) return null;
 
         var hasBinderLogInBaseType = false;
         const string setValueName = "SetValue";
@@ -35,16 +35,22 @@ private static FoundForGenerator<BinderData> FindBinders(GeneratorSyntaxContext
                     .Any(binderMethod =>
                     {
                         if (binderMethod.Name is not setValueName) return false;
-                        
+
                         return binderMethod.EqualsSignature(method) &&
                             method.ExplicitInterfaceImplementations.Length != 0;
                     });
-
-                if (methodsExplicitImplemented) return default;
 
-                if (!hasBinderLogInBaseType 
+                if (methodsExplicitImplemented) return null;
+
+                // Check if IAnyBinder.SetValue<T> is already explicitly implemented
+                if (method.IsGenericMethod && method.Name == setValueName
+                    && method.ExplicitInterfaceImplementations.Any(m =>
+                        m.ContainingType.Name is "IAnyBinder"))
+                    return null;
+
+                if (!hasBinderLogInBaseType
                     && !SymbolEqualityComparer.Default.Equals(type, symbol)
-                    && method.HasAnyAttribute(Classes.BinderLogAttribute))
+                    && method.HasAnyAttributeInSelf(Classes.BinderLogAttribute))
                 {
                     hasBinderLogInBaseType = true;
                 }
@@ -55,17 +61,25 @@ private static FoundForGenerator<BinderData> FindBinders(GeneratorSyntaxContext
 
         foreach (var method in symbol.GetMembers().OfType<IMethodSymbol>())
         {
-            if (method.Parameters.Length != 1) continue;
+            if (method.Parameters.Length is not 1) continue;
             if (method.NameFromExplicitImplementation() != setValueName) continue;
-            if (!symbol.HasInterfaceInSelfOrBases($"{Classes.IBinder.FullName}<{method.Parameters[0].Type.ToDisplayString()}>")) continue;
-
-            if (method.HasAnyAttribute(Classes.BinderLogAttribute) &&
+
+            var isIBinderMethod = !method.IsGenericMethod
+                && symbol.HasAnyInterfaceInSelfAndBases(
+                    $"{Classes.IBinder.FullName}<{method.Parameters[0].Type.ToDisplayString()}>");
+
+            var isIAnyBinderMethod = method is { IsGenericMethod: true, TypeParameters.Length: 1 }
+                && symbol.HasAnyInterfaceInSelfAndBases(Classes.IAnyBinder.FullName);
+
+            if (!isIBinderMethod && !isIAnyBinderMethod) continue;
+
+            if (method.HasAnyAttributeInSelf(Classes.BinderLogAttribute) &&
                 !method.ExplicitInterfaceImplementations.Any())
                 binderLogMethods.Add(method);
         }
-        
-        if (binderLogMethods.Count == 0) return default;
-
-        return new FoundForGenerator<BinderData>(new BinderData(symbol, candidate, hasBinderLogInBaseType, binderLogMethods));
+
+        return binderLogMethods.Count is 0
+            ? null
+            : new BinderData(symbol, candidate, hasBinderLogInBaseType, binderLogMethods);
     }
 }

Aspid.MVVM.Generators/Aspid.MVVM.Generators/Generators/Binders/BinderGenerator.Generate.cs

@@ -1,10 +1,10 @@
 using Microsoft.CodeAnalysis;
-using Aspid.Generator.Helpers;
-using Aspid.MVVM.Generators.Binders.Body;
-using Aspid.MVVM.Generators.Binders.Data;
-using Aspid.MVVM.Generators.Descriptions;
+using Aspid.Generators.Helper;
+using Aspid.MVVM.Generators.Generators.Binders.Body;
+using Aspid.MVVM.Generators.Generators.Binders.Data;
+using Aspid.MVVM.Generators.Generators.Descriptions;
 
-namespace Aspid.MVVM.Generators.Binders;
+namespace Aspid.MVVM.Generators.Generators.Binders;
 
 public partial class BinderGenerator
 {
@@ -14,7 +14,7 @@ private static void GenerateCode(SourceProductionContext context, BinderData bin
     {
         var declaration = binderData.Declaration;
         var @namespace = declaration.GetNamespaceName();
-        var declarationText = declaration.GetDeclarationText();
+        var declarationText = new DeclarationText(declaration);
 
         GenerateBinderLog(@namespace, new BinderDataSpan(binderData), context, declarationText);
     }
@@ -31,15 +31,15 @@ private static void GenerateBinderLog(
 
 #if DEBUG
         code.AppendLine($"#if !{Defines.ASPID_MVVM_BINDER_LOG_DISABLED}")
-            .AppendClassBegin(@namespace, declarationText)
+            .BeginClass(@namespace, declarationText)
             .AppendBinderLogBody(data)
-            .AppendClassEnd(@namespace)
+            .EndClass(@namespace)
             .AppendLine("#endif");
 #else
-        code.AppendLine($"#if {Defines.UNITY_EDITOR} && !{Defines.ASPID_MVVM_BINDER_LOG_DISABLED}")
-            .AppendClassBegin(@namespace, declarationText)
+        code.AppendLine($"#if {Aspid.Generators.Helper.Unity.Defines.UNITY_EDITOR} && !{Defines.ASPID_MVVM_BINDER_LOG_DISABLED}")
+            .BeginClass(@namespace, declarationText)
             .AppendBinderLogBody(data)
-            .AppendClassEnd(@namespace)
+            .EndClass(@namespace)
             .Append("#endif");
 #endif
 

Aspid.MVVM.Generators/Aspid.MVVM.Generators/Generators/Binders/BinderGenerator.cs

@@ -3,16 +3,17 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace Aspid.MVVM.Generators.Binders;
+namespace Aspid.MVVM.Generators.Generators.Binders;
 
 [Generator]
 public partial class BinderGenerator : IIncrementalGenerator
 {
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
+        // ReSharper disable once NullableWarningSuppressionIsUsed
         var provider = context.SyntaxProvider.CreateSyntaxProvider(SyntacticPredicate, FindBinders)
-            .Where(foundForSourceGenerator => foundForSourceGenerator.IsNeed)
-            .Select((foundForSourceGenerator, _) => foundForSourceGenerator.Container);
+            .Where(data => data.HasValue)
+            .Select((data, _) => data!.Value);
 
         context.RegisterSourceOutput(
             source: provider,