Property generated by Source Generator now chooses its Accessibility from the highest access from getter or setter

Author: ShawnLaMountain

README.md

@@ -1,4 +1,4 @@
-# ThunderDesign.Net-PCL.Threading
+# ThunderDesign.Net-PCL.Threading
 [![CI](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Threading/actions/workflows/CI.yml/badge.svg)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Threading/actions/workflows/CI.yml)
 [![CD](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Threading/actions/workflows/CD.yml/badge.svg)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Threading/actions/workflows/CD.yml)
 [![Nuget](https://img.shields.io/nuget/v/ThunderDesign.Net-PCL.Threading)](https://www.nuget.org/packages/ThunderDesign.Net-PCL.Threading)
@@ -107,9 +107,10 @@ With the source generator, you only need to annotate your fields:
 
 ```csharp
 using ThunderDesign.Net.Threading.Attributes;
+
 public partial class Person 
-{ 
-    [BindableProperty] 
+{
+    [BindableProperty]
     private string _name;
 
     [Property]
@@ -128,7 +129,6 @@ using ThunderDesign.Net.Threading.Interfaces;
 public partial class Person : IBindableObject, INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler PropertyChanged;
-
     protected readonly object _Locker = new object();
 
     public string Name
@@ -140,58 +140,70 @@ public partial class Person : IBindableObject, INotifyPropertyChanged
     public int Age
     {
         get { return this.GetProperty(ref _age, _Locker); }
-        set { this.SetProperty(ref _age, value, _Locker, true); }
+        set { this.SetProperty(ref _age, value, _Locker); }
     }
 }
 ```
 
 You can now use your `Person` class like this:
 
 ```csharp
-var person = new Person(); 
-person.Name = "Alice"; 
-person.Age = 30; // PropertyChanged event will be raised for Name changes if you subscribe to it.
+var person = new Person();
+person.Name = "Alice";
+person.Age = 30;
+// PropertyChanged event will be raised for Name changes if you subscribe to it.
 ```
 
 **No need to manually implement** property notification, thread safety, or boilerplate code—the generator does it for you!
 
-> For more advanced scenarios, you can use attribute parameters to control property behavior (e.g., read-only, also notify other properties, or control accessor visibility).
+> For more advanced scenarios, you can use attribute parameters to control property behavior (e.g., read-only, also notify other properties, or control accessor/property visibility).
+
+---
 
-### Advanced: Customizing Property Accessors
+### Advanced: Customizing Getter and Setter Accessors
 
-You can now control the visibility of generated property getters and setters using the `AccessorAccessibility` enum.  
-This allows you to generate properties with `private`, `protected`, `internal`, or other C# accessibilities for the `get` and `set` accessors.
+You can control the visibility of the generated property's getter and setter using the `AccessorAccessibility` enum.  
+The property itself will use the most accessible (widest) of the getter or setter's accessibilities.
 
 #### Example
 
 ```csharp
-using ThunderDesign.Net.Threading.Attributes; 
-using ThunderDesign.Net_PCL.Threading.Shared.Enums;
+using ThunderDesign.Net.Threading.Attributes;
+using ThunderDesign.Net.Threading.Enums;
 
 public partial class Person
 {
-    // Public getter, private setter [BindableProperty(getter: AccessorAccessibility.Public, setter: AccessorAccessibility.Private)] private string _name;
-    // Internal getter, protected setter
+    // Public getter, private setter (property will be public)
+    [BindableProperty(getter: AccessorAccessibility.Public, setter: AccessorAccessibility.Private)]
+    private string _name;
+
+    // Internal getter, protected setter (property will be internal)
     [Property(getter: AccessorAccessibility.Internal, setter: AccessorAccessibility.Protected)]
     private int _age;
 }
 ```
 
 **What gets generated:**
-
 ```csharp
 public partial class Person
 {
-    public string Name { get { return this.GetProperty(ref _name, _Locker); } private set { this.SetProperty(ref _name, value, _Locker, true); } }
+    public string Name
+    {
+        get { return this.GetProperty(ref _name, _Locker); }
+        private set { this.SetProperty(ref _name, value, _Locker, true); }
+    }
+
     internal int Age
     {
-        get { return this.GetProperty(ref _age, _Locker); }
+        internal get { return this.GetProperty(ref _age, _Locker); }
         protected set { this.SetProperty(ref _age, value, _Locker); }
     }
 }
+
 ```
 
-> The default for both getter and setter is `public` if not specified.
+> The property will be as accessible as its most accessible accessor (getter or setter).
+> The default for `getter`, and `setter` is `public` if not specified.
 
 **Available options for `AccessorAccessibility`:**
 - `Public`
@@ -201,12 +213,13 @@ public partial class Person
 - `ProtectedInternal`
 - `PrivateProtected`
 
+---
+
 ### Advanced: Notify Other Properties
 
-You can now notify other properties when a specific property changes by using the `alsoNotify` parameter in the `[BindableProperty]` attribute.
+You can notify other properties when a specific property changes by using the `alsoNotify` parameter in the `[BindableProperty]` attribute.
 
 #### Example
-
 ```csharp
 using ThunderDesign.Net.Threading.Attributes;
 
@@ -228,7 +241,6 @@ public partial class Person
 public partial class Person : IBindableObject, INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler PropertyChanged;
-
     protected readonly object _Locker = new object();
 
     public string FirstName
@@ -248,23 +260,20 @@ public partial class Person : IBindableObject, INotifyPropertyChanged
         get { return this.GetProperty(ref _lastName, _Locker); }
         set
         {
-            this.SetProperty(ref _lastName, value, _Locker, true);
-            OnPropertyChanged(nameof(DisplayName));
+            if (this.SetProperty(ref _lastName, value, _Locker, true))
+            {
+                this.OnPropertyChanged(nameof(DisplayName));
+            }
         }
     }
 
     public string DisplayName => $"{FirstName} {LastName}";
-
-    protected void OnPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
 }
 ```
 
 > This feature is particularly useful for computed properties like `DisplayName` that depend on other properties.
 
-----
+---
 
 ## Installation
 
@@ -302,4 +311,6 @@ This can be overwritten durring creation or by setting Property `WaitOnNotifyCol
 Observable Objects Property `WaitOnNotifyPropertyChanged` has been renamed to Property `WaitOnNotifying`.
 
 Observable Collections Property `WaitOnNotifyCollectionChanged` has been removed and now uses Property `WaitOnNotifying`.
-----
+----
+
+

src/ThunderDesign.Net-PCL.SourceGenerators/Helpers/PropertyGeneratorHelpers.cs

@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Linq;
 
-namespace ThunderDesign.Net_PCL.SourceGenerators.Helpers
+namespace ThunderDesign.Net.SourceGenerators.Helpers
 {
     internal static class PropertyGeneratorHelpers
     {

src/ThunderDesign.Net-PCL.SourceGenerators/ThunderDesign.Net-PCL.SourceGenerators.csproj

@@ -4,7 +4,7 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-		<RootNamespace>ThunderDesign.Net_PCL.SourceGenerators</RootNamespace>
+		<RootNamespace>ThunderDesign.Net.SourceGenerators</RootNamespace>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<IncludeAnalyzer>true</IncludeAnalyzer>
 		<!-- NuGet package metadata -->

src/ThunderDesign.Net-PCL.SourceGenerators/UnifiedPropertyGenerator.cs

@@ -6,9 +6,9 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using ThunderDesign.Net_PCL.SourceGenerators.Helpers;
+using ThunderDesign.Net.SourceGenerators.Helpers;
 
-namespace ThunderDesign.Net_PCL.SourceGenerators
+namespace ThunderDesign.Net.SourceGenerators
 {
     [Generator]
     public class UnifiedPropertyGenerator : IIncrementalGenerator
@@ -201,7 +201,7 @@ public virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMem
     }");
             }
 
-            // Helper to convert AccessorAccessibility to C# keyword
+            // Helper to convert AccessorAccessibility to C# keyword (empty string means public)
             static string ToAccessorString(object accessor)
             {
                 var value = accessor?.ToString() ?? "Public";
@@ -217,6 +217,29 @@ static string ToAccessorString(object accessor)
                 };
             }
 
+            // Helper to rank accessibilities for comparison
+            static int GetAccessibilityRank(string access)
+            {
+                return access switch
+                {
+                    "Public" => 6,
+                    "ProtectedInternal" => 5,
+                    "Internal" => 4,
+                    "Protected" => 3,
+                    "PrivateProtected" => 2,
+                    "Private" => 1,
+                    _ => 0
+                };
+            }
+
+            // Helper to get the widest (most accessible) accessibility
+            static string GetWidestAccessibility(object getter, object setter)
+            {
+                string getterStr = getter?.ToString() ?? "Public";
+                string setterStr = setter?.ToString() ?? "Public";
+                return GetAccessibilityRank(getterStr) >= GetAccessibilityRank(setterStr) ? getterStr : setterStr;
+            }
+
             // Generate all bindable properties
             foreach (var info in bindableFields)
             {
@@ -251,19 +274,19 @@ static string ToAccessorString(object accessor)
                 if (alsoNotify == null)
                     alsoNotify = new string[0];
 
-                // Default to Public if not present
                 var getter = args.Length > 4 ? args[4].Value : null;
                 var setter = args.Length > 5 ? args[5].Value : null;
 
                 var getterStr = ToAccessorString(getter);
                 var setterStr = ToAccessorString(setter);
+                var propertyAccessibilityStr = ToAccessorString(GetWidestAccessibility(getter, setter));
 
                 var lockerArg = threadSafe ? "_Locker" : "null";
                 var notifyArg = notify ? "true" : "false";
                 if (readOnly)
                 {
                     source.AppendLine($@"
-    public {typeName} {propertyName}
+    {propertyAccessibilityStr}{typeName} {propertyName}
     {{
         {getterStr}get {{ return this.GetProperty(ref {fieldName}, {lockerArg}); }}
     }}");
@@ -294,7 +317,7 @@ static string ToAccessorString(object accessor)
                     }
 
                     source.AppendLine($@"
-    public {typeName} {propertyName}
+    {propertyAccessibilityStr}{typeName} {propertyName}
     {{
         {getterStr}get {{ return this.GetProperty(ref {fieldName}, {lockerArg}); }}
         {setAccessor}
@@ -305,7 +328,6 @@ static string ToAccessorString(object accessor)
             // Generate all regular properties
             foreach (var info in propertyFields)
             {
-                // Skip if any rule failed (diagnostic already reported)
                 var propertyName = PropertyGeneratorHelpers.ToPropertyName(info.FieldSymbol.Name);
                 if (!PropertyGeneratorHelpers.IsPartial(classSymbol) ||
                     !PropertyGeneratorHelpers.IsValidFieldName(info.FieldSymbol.Name) ||
@@ -326,20 +348,21 @@ static string ToAccessorString(object accessor)
 
                 var getterStr = ToAccessorString(getter);
                 var setterStr = ToAccessorString(setter);
+                var propertyAccessibilityStr = ToAccessorString(GetWidestAccessibility(getter, setter));
 
                 var lockerArg = threadSafe ? "_Locker" : "null";
                 if (readOnly)
                 {
                     source.AppendLine($@"
-    public {typeName} {propertyName}
+    {propertyAccessibilityStr}{typeName} {propertyName}
     {{
         {getterStr}get {{ return this.GetProperty(ref {fieldName}, {lockerArg}); }}
     }}");
                 }
                 else
                 {
                     source.AppendLine($@"
-    public {typeName} {propertyName}
+    {propertyAccessibilityStr}{typeName} {propertyName}
     {{
         {getterStr}get {{ return this.GetProperty(ref {fieldName}, {lockerArg}); }}
         {setterStr}set {{ this.SetProperty(ref {fieldName}, value, {lockerArg}); }}

src/ThunderDesign.Net-PCL.Threading.Shared/Attributes/BindablePropertyAttribute.cs

@@ -1,7 +1,7 @@
 using System;
 using ThunderDesign.Net.Threading.Enums;
 
-namespace ThunderDesign.Net_PCL.Threading.Attributes
+namespace ThunderDesign.Net.Threading.Attributes
 {
     [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
     public sealed class BindablePropertyAttribute : Attribute

src/ThunderDesign.Net-PCL.Threading.Shared/Attributes/PropertyAttribute.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using ThunderDesign.Net.Threading.Enums;
 
-namespace ThunderDesign.Net_PCL.Threading.Attributes
+namespace ThunderDesign.Net.Threading.Attributes
 {
     [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
     public sealed class PropertyAttribute : Attribute

src/ThunderDesign.Net-PCL.Threading.Shared/ThunderDesign.Net-PCL.Threading.Shared.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net6.0;net8.0</TargetFrameworks>
-    <RootNamespace>ThunderDesign.Net_PCL.Threading.Shared</RootNamespace>
+    <RootNamespace>ThunderDesign.Net.Threading.Shared</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IncludeBuildOutput>true</IncludeBuildOutput>
     <IncludeContentInPack>true</IncludeContentInPack>

src/ThunderDesign.Net-PCL.Threading/Collections/HashSetThreadSafe.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using ThunderDesign.Net_PCL.Threading.Interfaces;
+using ThunderDesign.Net.Threading.Interfaces;
 
-namespace ThunderDesign.Net_PCL.Threading.Collections
+namespace ThunderDesign.Net.Threading.Collections
 {
 #if NETSTANDARD1_3_OR_GREATER || NET6_0_OR_GREATER
     public class HashSetThreadSafe<T> : HashSet<T>, IHashSetThreadSafe<T>

src/ThunderDesign.Net-PCL.Threading/Collections/LinkedListThreadSafe.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Threading;
-using ThunderDesign.Net_PCL.Threading.Interfaces;
+using ThunderDesign.Net.Threading.Interfaces;
 
-namespace ThunderDesign.Net_PCL.Threading.Collections
+namespace ThunderDesign.Net.Threading.Collections
 {
 #if NETSTANDARD1_3_OR_GREATER || NET6_0_OR_GREATER
     public class LinkedListThreadSafe<T> : LinkedList<T>, ILinkedListThreadSafe<T>

src/ThunderDesign.Net-PCL.Threading/Collections/ListThreadSafe.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading;
-using ThunderDesign.Net_PCL.Threading.Interfaces;
+using ThunderDesign.Net.Threading.Interfaces;
 
-namespace ThunderDesign.Net_PCL.Threading.Collections
+namespace ThunderDesign.Net.Threading.Collections
 {
     public class ListThreadSafe<T> : List<T>, IListThreadSafe<T>
     {