bind on fields, not properties

Author: DerekGooding

README.md

@@ -16,7 +16,7 @@ A lightweight WPF ViewModel framework with automatic source generation that elim
 ### Installation
 
 ```xml
-<PackageReference Include="SimpleViewModel" Version="0.9.0" />
+<PackageReference Include="SimpleViewModel" Version="0.9.3" />
 ```
 
 ### Basic Usage

SimpleViewModel/BindAttribute.cs

@@ -1,4 +1,4 @@
 namespace SimpleViewModel;
 
-[AttributeUsage(AttributeTargets.Property)]
+[AttributeUsage(AttributeTargets.Field)]
 public sealed class BindAttribute : Attribute;

SimpleViewModel/SimpleViewModel.csproj

@@ -9,7 +9,7 @@
 
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	  <PackageId>SimpleViewModel</PackageId>
-	  <Version>0.9.2</Version>
+	  <Version>0.9.3</Version>
 	  <Authors>Derek Gooding</Authors>
 	  <Company>Derek Gooding</Company>
 	  <Description>
@@ -31,20 +31,20 @@
 
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>
 	  <PackageReadmeFile>README.md</PackageReadmeFile>
-	  <PackageProjectUrl>https://github.com/DerekGooding/SimpleMVVM</PackageProjectUrl>
-	  <RepositoryUrl>https://github.com/DerekGooding/SimpleMVVM</RepositoryUrl>
-	  <PackageBugTrackerUrl>https://github.com/DerekGooding/SimpleMVVM/issues</PackageBugTrackerUrl>
+	  <PackageProjectUrl>https://github.com/DerekGooding/SimpleViewModel</PackageProjectUrl>
+	  <RepositoryUrl>https://github.com/DerekGooding/SimpleViewModel</RepositoryUrl>
+	  <PackageBugTrackerUrl>https://github.com/DerekGooding/SimpleViewModel/issues</PackageBugTrackerUrl>
 	  <RepositoryType>git</RepositoryType>
 	  <RepositoryBranch>main</RepositoryBranch>
 	  <RepositoryCommit>$(GitCommitId)</RepositoryCommit>
 
 	  <PackageIcon>Icon.png</PackageIcon>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	  <DocumentationFile>bin\SimpleMVVM.xml</DocumentationFile>
+	  <DocumentationFile>bin\SimpleViewModel.xml</DocumentationFile>
 
 	  <Copyright>Copyright © Derek Gooding 2025</Copyright>
-	  <Product>SimpleMVVM</Product>
-	  <AssemblyTitle>SimpleMVVM - Lightweight windows only WPF MVVM with Source Generation</AssemblyTitle>
+	  <Product>SimpleViewModel</Product>
+	  <AssemblyTitle>SimpleViewModel - Lightweight windows only WPF MVVM with Source Generation</AssemblyTitle>
 	  <AssemblyDescription>$(Description)</AssemblyDescription>
 	  <NeutralLanguage>en-US</NeutralLanguage>
 

ViewModelGenerator/ViewModelGenerator.cs

@@ -30,56 +30,64 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
         context.RegisterSourceOutput(compilationAndClasses, static (spc, source) =>
         {
-            var (compilation, classNodes) = source;
+        var (compilation, classNodes) = source;
 
-            foreach (var classNode in classNodes)
-            {
-                var model = compilation.GetSemanticModel(classNode.SyntaxTree);
-                if (model.GetDeclaredSymbol(classNode) is not INamedTypeSymbol symbol) continue;
+        foreach (var classNode in classNodes)
+        {
+            var model = compilation.GetSemanticModel(classNode.SyntaxTree);
+            if (model.GetDeclaredSymbol(classNode) is not INamedTypeSymbol symbol) continue;
 
-                if (!symbol.GetAttributes().Any(attr => attr.AttributeClass?.Name == "ViewModelAttribute")) continue;
+            if (!symbol.GetAttributes().Any(attr => attr.AttributeClass?.Name == "ViewModelAttribute")) continue;
 
-                var className = symbol.Name;
-                var generatedName = $"{className}";
-                var namespaceName = symbol.ContainingNamespace.ToDisplayString();
+            var className = symbol.Name;
+            var generatedName = $"{className}";
+            var namespaceName = symbol.ContainingNamespace.ToDisplayString();
 
-                var bindFields = symbol.GetMembers()
-                    .OfType<IFieldSymbol>()
-                    .Where(f => f.GetAttributes().Any(attr => attr.AttributeClass?.Name == "BindAttribute"))
-                    .ToList();
+            var bindFields = symbol.GetMembers()
+                .OfType<IFieldSymbol>()
+                .Where(f => f.GetAttributes().Any(attr => attr.AttributeClass?.Name == "BindAttribute"))
+                .ToList();
 
-                var commandMethods = symbol.GetMembers()
-                    .OfType<IMethodSymbol>()
-                    .Where(m => m.MethodKind == MethodKind.Ordinary &&
-                                m.GetAttributes().Any(attr => attr.AttributeClass?.Name == "CommandAttribute"))
-                    .ToList();
+            var commandMethods = symbol.GetMembers()
+                .OfType<IMethodSymbol>()
+                .Where(m => m.MethodKind == MethodKind.Ordinary &&
+                            m.GetAttributes().Any(attr => attr.AttributeClass?.Name == "CommandAttribute"))
+                .ToList();
 
-                // Generate ViewModel partial class
-                var viewModelBuilder = new StringBuilder($@"
-using SimpleViewModel.BaseClasses;
+            // Generate ViewModel partial class
+            var viewModelBuilder = new StringBuilder(
+$@"using SimpleViewModel.BaseClasses;
 
 namespace {namespaceName}
 {{
     public partial class {className} : BaseViewModel
-    {{
-");
+    {{");
 
-                foreach (var field in bindFields)
-                {
-                    viewModelBuilder.AppendLine($"        public {field.Type} {ToPascal(field.Name)} {{ get; set; }}");
-                }
+            foreach (var field in bindFields)
+            {
+                viewModelBuilder.AppendLine($"        public {field.Type} {ToPascal(field.Name)} {{ get; set; }}");
+            }
+
+            viewModelBuilder.AppendLine();
+
+            foreach (var field in bindFields)
+            {
+                var fieldType = field.Type.ToDisplayString();
+                var fieldName = ToPascal(field.Name);
 
-                viewModelBuilder.AppendLine();
+                viewModelBuilder.AppendLine($"        public {fieldType} {fieldName} {{ get => {field.Name}; set => SetProperty(ref {field.Name}, value); }}");
+            }
 
-                foreach (var method in commandMethods)
-                {
-                    var commandClassName = $"Command_{method.Name}";
-                    var commandFieldName = $"{ToPascal(method.Name)}Command";
-                    viewModelBuilder.AppendLine($"        public {commandClassName} {commandFieldName} {{ get; }} = new {commandClassName}(this);");
+            foreach (var method in commandMethods)
+            {
+                var commandClassName = $"Command_{method.Name}";
+                var commandFieldName = $"{ToPascal(method.Name)}Command";
+                viewModelBuilder.AppendLine($"        private {commandClassName} _{commandFieldName} {{ get; }} = new {commandClassName}(this);");
+                viewModelBuilder.AppendLine($"        public {commandClassName} {commandFieldName} => _{commandFieldName} ??= new(this);");
 
                     // Generate command class per method
-                    var commandBuilder = new StringBuilder($@"
-using SimpleViewModel.BaseClasses;
+                    var commandBuilder = new StringBuilder(
+$@"using SimpleViewModel.BaseClasses;
 
 namespace {namespaceName}
 {{