Add AccessModifier support to ReactiveCommand

README.md

@@ -37,12 +37,16 @@ ReactiveUI Source Generators automatically generate ReactiveUI objects to stream
 - `[ReactiveCommand(OutputScheduler = "RxApp.MainThreadScheduler")]` using a ReactiveUI Scheduler
 - `[ReactiveCommand(OutputScheduler = nameof(_isheduler))]` using a Scheduler defined in the class
 - `[ReactiveCommand][property: AttributeToAddToCommand]` with Attribute passthrough
+- `[ReactiveCommand(AccessModifier = PropertyAccessModifier.Internal)]` sets the access modifier of the generated command property
 - `[IViewFor(nameof(ViewModelName))]`
 - `[IViewFor<YourViewModelType>]`
 - `[IViewFor("YourNameSpace.YourGenericViewModel<int>")]` Generic
 - `[IViewFor<YourViewModelType>(RegistrationType = SplatRegistrationType.PerRequest)]` with Splat Registration Type for IViewFor registration.
 - `[IViewFor<YourViewModelType>(RegistrationType = SplatRegistrationType.LazySingleton)]` Generic with Splat Registration Type for IViewFor registration.
 - `[IViewFor<YourViewModelType>(RegistrationType = SplatRegistrationType.Constant)]` Generic with Splat Registration Type for IViewFor registration.
+- `[IViewFor<YourViewModelType>(ViewModelRegistrationType = SplatRegistrationType.PerRequest)]` Generic with Splat Registration Type for ViewModel registration.
+- `[IViewFor<YourViewModelType>(ViewModelRegistrationType = SplatRegistrationType.LazySingleton)]` Generic with Splat Registration Type for ViewModel registration.
+- `[IViewFor<YourViewModelType>(ViewModelRegistrationType = SplatRegistrationType.Constant)]` Generic with Splat Registration Type for ViewModel registration.
 - `[RoutedControlHost("YourNameSpace.CustomControl")]`
 - `[ViewModelControlHost("YourNameSpace.CustomControl")]`
 - `[BindableDerivedList]` Generates a derived list from a ReadOnlyObservableCollection backing field
@@ -544,6 +548,17 @@ public partial class MyReactiveClass
 }
 ```
 
+### Usage ReactiveCommand with AccessModifier
+```csharp
+using ReactiveUI.SourceGenerators;
+
+public partial class MyReactiveClass
+{
+    [ReactiveCommand(AccessModifier = PropertyAccessModifier.Internal)]
+    private void Execute() { }
+}
+```
+
 ## Usage IViewFor `[IViewFor(nameof(ViewModelName))]`
 
 ### IViewFor usage

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactivePartialProperties#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactiveProperiesWithAttributes#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactiveProperties#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactivePropertiesCalledValue#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactivePropertiesWithAccess#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactivePropertiesWithAttributesAccessAndInheritance#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactivePropertiesWithIdenticalClass#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactivePropertiesWithInit#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVE/ReactiveGeneratorTests.FromReactivePropertiesWithNestedClass#ReactiveUI.SourceGenerators.AccessModifier.g.verified.cs

@@ -23,6 +23,19 @@ internal enum AccessModifier
     Init,
 }
 
+/// <summary>
+/// Property Access Modifier.
+/// </summary>
+internal enum PropertyAccessModifier
+{
+    Public,
+    Protected,
+    Internal,
+    Private,
+    InternalProtected,
+    PrivateProtected,
+}
+
 /// <summary>
 /// InheritanceModifier.
 /// </summary>

src/ReactiveUI.SourceGenerator.Tests/REACTIVECMD/ReactiveCMDGeneratorTests.FromReactiveAsyncCommand#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs

@@ -31,6 +31,14 @@ internal sealed class ReactiveCommandAttribute : global::System.Attribute
     /// The output scheduler.
     /// </value>
     public string? OutputScheduler { get; init; }
+
+    /// <summary>
+    /// Gets the AccessModifier of the ReactiveCommand property.
+    /// </summary>
+    /// <value>
+    /// The AccessModifier of the property.
+    /// </value>
+    public PropertyAccessModifier AccessModifier { get; init; }
 }
 #nullable restore
 #pragma warning restore

src/ReactiveUI.SourceGenerator.Tests/REACTIVECMD/ReactiveCMDGeneratorTests.FromReactiveAsyncCommandWithParameter#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs

@@ -31,6 +31,14 @@ internal sealed class ReactiveCommandAttribute : global::System.Attribute
     /// The output scheduler.
     /// </value>
     public string? OutputScheduler { get; init; }
+
+    /// <summary>
+    /// Gets the AccessModifier of the ReactiveCommand property.
+    /// </summary>
+    /// <value>
+    /// The AccessModifier of the property.
+    /// </value>
+    public PropertyAccessModifier AccessModifier { get; init; }
 }
 #nullable restore
 #pragma warning restore

src/ReactiveUI.SourceGenerator.Tests/REACTIVECMD/ReactiveCMDGeneratorTests.FromReactiveCommand#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs

@@ -31,6 +31,14 @@ internal sealed class ReactiveCommandAttribute : global::System.Attribute
     /// The output scheduler.
     /// </value>
     public string? OutputScheduler { get; init; }
+
+    /// <summary>
+    /// Gets the AccessModifier of the ReactiveCommand property.
+    /// </summary>
+    /// <value>
+    /// The AccessModifier of the property.
+    /// </value>
+    public PropertyAccessModifier AccessModifier { get; init; }
 }
 #nullable restore
 #pragma warning restore

src/ReactiveUI.SourceGenerator.Tests/REACTIVECMD/ReactiveCMDGeneratorTests.FromReactiveCommandWithNestedClasses#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs

@@ -31,6 +31,14 @@ internal sealed class ReactiveCommandAttribute : global::System.Attribute
     /// The output scheduler.
     /// </value>
     public string? OutputScheduler { get; init; }
+
+    /// <summary>
+    /// Gets the AccessModifier of the ReactiveCommand property.
+    /// </summary>
+    /// <value>
+    /// The AccessModifier of the property.
+    /// </value>
+    public PropertyAccessModifier AccessModifier { get; init; }
 }
 #nullable restore
 #pragma warning restore

src/ReactiveUI.SourceGenerator.Tests/REACTIVECMD/ReactiveCMDGeneratorTests.FromReactiveCommandWithOutputScheduler#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs

@@ -31,6 +31,14 @@ internal sealed class ReactiveCommandAttribute : global::System.Attribute
     /// The output scheduler.
     /// </value>
     public string? OutputScheduler { get; init; }
+
+    /// <summary>
+    /// Gets the AccessModifier of the ReactiveCommand property.
+    /// </summary>
+    /// <value>
+    /// The AccessModifier of the property.
+    /// </value>
+    public PropertyAccessModifier AccessModifier { get; init; }
 }
 #nullable restore
 #pragma warning restore

src/ReactiveUI.SourceGenerator.Tests/REACTIVECMD/ReactiveCMDGeneratorTests.FromReactiveCommandWithParameter#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs

@@ -31,6 +31,14 @@ internal sealed class ReactiveCommandAttribute : global::System.Attribute
     /// The output scheduler.
     /// </value>
     public string? OutputScheduler { get; init; }
+
+    /// <summary>
+    /// Gets the AccessModifier of the ReactiveCommand property.
+    /// </summary>
+    /// <value>
+    /// The AccessModifier of the property.
+    /// </value>
+    public PropertyAccessModifier AccessModifier { get; init; }
 }
 #nullable restore
 #pragma warning restore

src/ReactiveUI.SourceGenerators.Execute/TestViewModel.cs

@@ -437,7 +437,7 @@ protected virtual void Dispose(bool disposing)
     /// </summary>
     /// <param name="i">The i.</param>
     /// <returns>An Observable of int.</returns>
-    [ReactiveCommand]
+    [ReactiveCommand(AccessModifier = PropertyAccessModifier.Internal)]
     private IObservable<double?> Test8Observable(int i) => Observable.Return<double?>(i + 10.0);
 
     [ReactiveCommand]

src/ReactiveUI.SourceGenerators.Roslyn/AttributeDefinitions.cs

@@ -42,6 +42,19 @@ internal enum AccessModifier
             Init,
         }
 
+        /// <summary>
+        /// Property Access Modifier.
+        /// </summary>
+        internal enum PropertyAccessModifier
+        {
+            Public,
+            Protected,
+            Internal,
+            Private,
+            InternalProtected,
+            PrivateProtected,
+        }
+
         /// <summary>
         /// InheritanceModifier.
         /// </summary>
@@ -128,6 +141,14 @@ internal sealed class ReactiveCommandAttribute : global::System.Attribute
     /// The output scheduler.
     /// </value>
     public string? OutputScheduler { get; init; }
+
+    /// <summary>
+    /// Gets the AccessModifier of the ReactiveCommand property.
+    /// </summary>
+    /// <value>
+    /// The AccessModifier of the property.
+    /// </value>
+    public PropertyAccessModifier AccessModifier { get; init; }
 }
 #nullable restore
 #pragma warning restore

src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/Models/CommandInfo.cs

@@ -19,7 +19,8 @@ internal record CommandInfo(
     string? CanExecuteObservableName,
     CanExecuteTypeInfo? CanExecuteTypeInfo,
     string? OutputScheduler,
-    EquatableArray<string> ForwardedPropertyAttributes)
+    EquatableArray<string> ForwardedPropertyAttributes,
+    string AccessModifier)
 {
     private const string UnitTypeName = "global::System.Reactive.Unit";