Even more fluent syntax

.editorconfig

@@ -0,0 +1,88 @@
+# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\Users\henning.torsteinsen\source\repos\stateless\HenningNTStateless codebase based on best match to current usage at 14.04.2020
+# You can modify the rules from these initially generated values to suit your own policies
+# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+[*.cs]
+
+#Core editorconfig formatting - indentation
+
+#use soft tabs (spaces) for indentation
+indent_style = space
+
+#Formatting - new line options
+
+#place else statements on a new line
+csharp_new_line_before_else = true
+#require braces to be on a new line for control_blocks, methods, properties, lambdas, types, and accessors (also known as "Allman" style)
+csharp_new_line_before_open_brace = control_blocks, methods, properties, lambdas, types, accessors
+
+#Formatting - organize using options
+
+#sort System.* using directives alphabetically, and place them before other usings
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+
+#require NO space between a cast and the value
+csharp_space_after_cast = false
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_after_colon_in_inheritance_clause = true
+#require a space after a keyword in a control flow statement such as a for loop
+csharp_space_after_keywords_in_control_flow_statements = true
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_before_colon_in_inheritance_clause = true
+#remove space within empty argument list parentheses
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+#remove space between method call name and opening parenthesis
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
+csharp_space_between_method_call_parameter_list_parentheses = false
+#remove space within empty parameter list parentheses for a method declaration
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+
+#leave code block on single line
+csharp_preserve_single_line_blocks = true
+#leave statements and member declarations on the same line
+csharp_preserve_single_line_statements = true
+
+#Style - expression bodied member options
+
+#prefer block bodies for accessors
+csharp_style_expression_bodied_accessors = false:suggestion
+#prefer block bodies for constructors
+csharp_style_expression_bodied_constructors = false:suggestion
+#prefer block bodies for methods
+csharp_style_expression_bodied_methods = false:suggestion
+#prefer block bodies for properties
+csharp_style_expression_bodied_properties = false:suggestion
+
+#Style - expression level options
+
+#prefer out variables to be declared inline in the argument list of a method call when possible
+csharp_style_inlined_variable_declaration = true:suggestion
+#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+#Style - implicit and explicit types
+
+#prefer var is used to declare variables with built-in system types such as int
+csharp_style_var_for_built_in_types = true:suggestion
+#prefer var when the type is already mentioned on the right-hand side of a declaration expression
+csharp_style_var_when_type_is_apparent = true:suggestion
+
+#Style - language keyword and framework type options
+
+#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+#Style - qualification options
+
+#prefer fields not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_field = false:suggestion
+#prefer methods not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_method = false:suggestion
+#prefer properties not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_property = false:suggestion

README.md

@@ -185,7 +185,7 @@ On platforms that provide `Task<T>`, the `StateMachine` supports `async` entry/e
 
 ```csharp
 stateMachine.Configure(State.Assigned)
-    .OnEntryAsync(async () => await SendEmailToAssignee());
+    .OnEntry(async () => await SendEmailToAssignee());
 ```
 
 Asynchronous handlers must be registered using the `*Async()` methods in these cases.

Stateless.sln

@@ -36,6 +36,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelephoneCallExample", "exa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonExample", "example\JsonExample\JsonExample.csproj", "{809A7873-DD78-4D5D-A432-9718C929BECA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B500BE05-347F-4BD8-8FB4-A24C08CFA610}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

example/BugTrackerExample/Bug.cs

@@ -34,21 +34,21 @@ public Bug(string title)
 
             // Configure the Open state
             _machine.Configure(State.Open)
-                .Permit(Trigger.Assign, State.Assigned);
+                .Transition(Trigger.Assign).To(State.Assigned);
 
             // Configure the Assigned state
             _machine.Configure(State.Assigned)
                 .SubstateOf(State.Open)
+                .OnExit(OnDeassigned)
                 .OnEntryFrom(_assignTrigger, OnAssigned)  // This is where the TriggerWithParameters is used. Note that the TriggerWithParameters object is used, not something from the enum
-                .PermitReentry(Trigger.Assign)
-                .Permit(Trigger.Close, State.Closed)
-                .Permit(Trigger.Defer, State.Deferred)
-                .OnExit(OnDeassigned);
+                .Transition(Trigger.Assign).Self()
+                .Transition(Trigger.Close).To(State.Closed)
+                .Transition(Trigger.Defer).To(State.Deferred);
 
             // Configure the Deferred state
             _machine.Configure(State.Deferred)
                 .OnEntry(() => _assignee = null)
-                .Permit(Trigger.Assign, State.Assigned);
+                .Transition(Trigger.Assign).To(State.Assigned);
         }
 
         public void Close()

example/BugTrackerExample/BugTrackerExample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
     <AssemblyName>BugTrackerExample</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>BugTrackerExample</PackageId>

example/JsonExample/JsonExample.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

example/JsonExample/Member.cs

@@ -33,7 +33,7 @@ public Member(string name)
         [JsonConstructor]
         private Member(string state, string name)
         {
-            var memberState = (MembershipState) Enum.Parse(typeof(MembershipState), state);
+            var memberState = (MembershipState)Enum.Parse(typeof(MembershipState), state);
             _stateMachine = new StateMachine<MembershipState, MemberTriggers>(memberState);
             Name = name;
 
@@ -43,15 +43,15 @@ private Member(string state, string name)
         private void ConfigureStateMachine()
         {
             _stateMachine.Configure(MembershipState.Active)
-                .Permit(MemberTriggers.Suspend, MembershipState.Inactive)
-                .Permit(MemberTriggers.Terminate, MembershipState.Terminated);
+                .Transition(MemberTriggers.Suspend).To(MembershipState.Inactive)
+                .Transition(MemberTriggers.Terminate).To(MembershipState.Terminated);
 
             _stateMachine.Configure(MembershipState.Inactive)
-                .Permit(MemberTriggers.Reactivate, MembershipState.Active)
-                .Permit(MemberTriggers.Terminate, MembershipState.Terminated);
+                .Transition(MemberTriggers.Reactivate).To(MembershipState.Active)
+                .Transition(MemberTriggers.Terminate).To(MembershipState.Terminated);
 
             _stateMachine.Configure(MembershipState.Terminated)
-                .Permit(MemberTriggers.Reactivate, MembershipState.Active);
+                .Transition(MemberTriggers.Reactivate).To(MembershipState.Active);
         }
 
         public void Terminate()
@@ -86,6 +86,6 @@ public bool Equals(Member anotherMember)
     }
 
 
-    
+
 
 }

example/OnOffExample/OnOffExample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
     <AssemblyName>OnOffExample</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>OnOffExample</PackageId>

example/OnOffExample/Program.cs

@@ -19,16 +19,16 @@ static void Main(string[] args)
             var onOffSwitch = new StateMachine<string, char>(off);
 
             // Configure state machine with the Configure method, supplying the state to be configured as a parameter
-            onOffSwitch.Configure(off).Permit(space, on);
-            onOffSwitch.Configure(on).Permit(space, off);
+            onOffSwitch.Configure(off).Transition(space).To(on);
+            onOffSwitch.Configure(on).Transition(space).To(off);
 
             Console.WriteLine("Press <space> to toggle the switch. Any other key will exit the program.");
 
             while (true)
             {
                 Console.WriteLine("Switch is in state: " + onOffSwitch.State);
                 var pressed = Console.ReadKey(true).KeyChar;
-                
+
                 // Check if user wants to exit
                 if (pressed != space) break;
 

example/TelephoneCallExample/PhoneCall.cs

@@ -48,25 +48,25 @@ public PhoneCall(string caller)
             _setCalleeTrigger = _machine.SetTriggerParameters<string>(Trigger.CallDialed);
 
             _machine.Configure(State.OffHook)
-	            .Permit(Trigger.CallDialed, State.Ringing);
+	            .Transition(Trigger.CallDialed).To(State.Ringing);
 
             _machine.Configure(State.Ringing)
                 .OnEntryFrom(_setCalleeTrigger, callee => OnDialed(callee), "Caller number to call")
-	            .Permit(Trigger.CallConnected, State.Connected);
+	            .Transition(Trigger.CallConnected).To(State.Connected);
 
             _machine.Configure(State.Connected)
                 .OnEntry(t => StartCallTimer())
                 .OnExit(t => StopCallTimer())
-                .InternalTransition(Trigger.MuteMicrophone, t => OnMute())
-                .InternalTransition(Trigger.UnmuteMicrophone, t => OnUnmute())
-                .InternalTransition<int>(_setVolumeTrigger, (volume, t) => OnSetVolume(volume))
-                .Permit(Trigger.LeftMessage, State.OffHook)
-	            .Permit(Trigger.PlacedOnHold, State.OnHold);
+                .Transition(Trigger.MuteMicrophone).Internal().Do(() => OnMute())
+                .Transition(Trigger.UnmuteMicrophone).Internal().Do( () => OnUnmute())
+                .Transition(Trigger.SetVolume).Internal().Do<int>( (volume, t) => OnSetVolume(volume))
+                .Transition(Trigger.LeftMessage).To(State.OffHook)
+	            .Transition(Trigger.PlacedOnHold).To(State.OnHold);
 
             _machine.Configure(State.OnHold)
                 .SubstateOf(State.Connected)
-                .Permit(Trigger.TakenOffHold, State.Connected)
-                .Permit(Trigger.PhoneHurledAgainstWall, State.PhoneDestroyed);
+                .Transition(Trigger.TakenOffHold).To(State.Connected)
+                .Transition(Trigger.PhoneHurledAgainstWall).To(State.PhoneDestroyed);
 
             _machine.OnTransitioned(t => Console.WriteLine($"OnTransitioned: {t.Source} -> {t.Destination} via {t.Trigger}({string.Join(", ",  t.Parameters)})"));
         }

example/TelephoneCallExample/TelephoneCallExample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
     <AssemblyName>TelephoneCallExample</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>TelephoneCallExample</PackageId>

src/Stateless/ActivateActionBehaviour.cs

@@ -7,14 +7,10 @@ public partial class StateMachine<TState, TTrigger>
     {
         internal abstract class ActivateActionBehaviour
         {
-            readonly TState _state;
-
-            protected ActivateActionBehaviour(TState state, Reflection.InvocationInfo actionDescription)
+            protected ActivateActionBehaviour(Reflection.InvocationInfo actionDescription)
             {
-                _state = state;
                 Description = actionDescription ?? throw new ArgumentNullException(nameof(actionDescription));
             }
-
             internal Reflection.InvocationInfo Description { get; }
 
             public abstract void Execute();
@@ -24,8 +20,8 @@ public class Sync : ActivateActionBehaviour
             {
                 readonly Action _action;
 
-                public Sync(TState state, Action action, Reflection.InvocationInfo actionDescription)
-                    : base(state, actionDescription)
+                public Sync(Action action, Reflection.InvocationInfo actionDescription)
+                    : base(actionDescription)
                 {
                     _action = action;
                 }
@@ -46,17 +42,15 @@ public class Async : ActivateActionBehaviour
             {
                 readonly Func<Task> _action;
 
-                public Async(TState state, Func<Task> action, Reflection.InvocationInfo actionDescription)
-                    : base(state, actionDescription)
+                public Async(Func<Task> action, Reflection.InvocationInfo actionDescription)
+                    : base(actionDescription)
                 {
                     _action = action;
                 }
 
                 public override void Execute()
                 {
-                    throw new InvalidOperationException(
-                        $"Cannot execute asynchronous action specified in OnActivateAsync for '{_state}' state. " +
-                         "Use asynchronous version of Activate [ActivateAsync]");
+                    _action().GetAwaiter().GetResult();
                 }
 
                 public override Task ExecuteAsync()

src/Stateless/DeactivateActionBehaviour.cs

@@ -7,11 +7,9 @@ public partial class StateMachine<TState, TTrigger>
     {
         internal abstract class DeactivateActionBehaviour
         {
-            readonly TState _state;
 
             protected DeactivateActionBehaviour(TState state, Reflection.InvocationInfo actionDescription)
             {
-                _state = state;
                 Description = actionDescription ?? throw new ArgumentNullException(nameof(actionDescription));
             }
 
@@ -54,9 +52,7 @@ public Async(TState state, Func<Task> action, Reflection.InvocationInfo actionDe
 
                 public override void Execute()
                 {
-                    throw new InvalidOperationException(
-                        $"Cannot execute asynchronous action specified in OnDeactivateAsync for '{_state}' state. " +
-                         "Use asynchronous version of Deactivate [DeactivateAsync]");
+                    _action().GetAwaiter().GetResult();
                 }
 
                 public override Task ExecuteAsync()