Merge pull request #147 from xodial/xodial/fix-unstable-diagram-gen

xodial · web-flow · commit e00ec3f19ba0 · 2025-04-07T16:38:48.000-05:00
chore: stabilize puml generation
diff --git a/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/CallOrderExample.g.puml b/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/CallOrderExample.g.puml
@@ -1,8 +1,8 @@
 @startuml CallOrderExample
 state "CallOrderExample State" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_CallOrderExample_State {
   state "Active" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_CallOrderExample_Active {
-    state "Walking" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_CallOrderExample_Walking
     state "Running" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_CallOrderExample_Running
+    state "Walking" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_CallOrderExample_Walking
   }
   state "Inactive" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_CallOrderExample_Inactive {
     state "Standing" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_CallOrderExample_Standing
diff --git a/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/Heater.g.puml b/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/Heater.g.puml
@@ -1,10 +1,10 @@
 @startuml Heater
 state "Heater State" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State {
+  state "Off" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Off
   state "Powered" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Powered {
-    state "Idle" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Idle
     state "Heating" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Heating
+    state "Idle" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Idle
   }
-  state "Off" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Off
 }
 
 Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State --> Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State : TargetTempChanged
diff --git a/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/Patterns.g.puml b/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/Patterns.g.puml
@@ -1,8 +1,8 @@
 @startuml Patterns
 state "Patterns State" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State {
   state "One" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_One
-  state "Two" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_Two
   state "Three" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_Three
+  state "Two" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_Two
 }
 
 Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State --> Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_One : SetMode
diff --git a/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/ToasterOven.g.puml b/Chickensoft.LogicBlocks.DiagramGenerator.Tests/test_cases/ToasterOven.g.puml
@@ -1,10 +1,10 @@
 @startuml ToasterOven
 state "ToasterOven State" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State {
+  state "DoorOpen" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_DoorOpen
   state "Heating" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Heating {
-    state "Toasting" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Toasting
     state "Baking" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Baking
+    state "Toasting" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Toasting
   }
-  state "DoorOpen" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_DoorOpen
 }
 
 Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Baking --> Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Toasting : StartToasting
diff --git a/Chickensoft.LogicBlocks.DiagramGenerator/src/Diagrammer.cs b/Chickensoft.LogicBlocks.DiagramGenerator/src/Diagrammer.cs
@@ -458,7 +458,7 @@ int t
       lines.Add($"{Tab(t)}state \"{graph.Name}\" as {graph.UmlId}");
     }
 
-    foreach (var child in graph.Children) {
+    foreach (var child in graph.Children.OrderBy(child => child.Name)) {
       lines.AddRange(
         WriteGraph(child, impl, stateDescriptions, t + 1)
       );
diff --git a/Chickensoft.LogicBlocks.Tests/test/fixtures/FakeLogicBlock.g.puml b/Chickensoft.LogicBlocks.Tests/test/fixtures/FakeLogicBlock.g.puml
@@ -1,14 +1,14 @@
 @startuml FakeLogicBlock
 state "FakeLogicBlock State" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State {
+  state "AddErrorOnEnterState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_AddErrorOnEnterState
+  state "NothingState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_NothingState
+  state "OnEnterState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_OnEnterState
+  state "OnExitState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_OnExitState
   state "StartState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_StartState
   state "StateA" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_StateA
   state "StateB" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_StateB
   state "StateC" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_StateC
   state "StateD" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_StateD
-  state "NothingState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_NothingState
-  state "OnEnterState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_OnEnterState
-  state "OnExitState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_OnExitState
-  state "AddErrorOnEnterState" as Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State_AddErrorOnEnterState
 }
 
 Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State --> Chickensoft_LogicBlocks_Tests_Fixtures_FakeLogicBlock_State : NoNewState
diff --git a/Chickensoft.LogicBlocks.Tests/test/fixtures/MyLogicBlock.g.puml b/Chickensoft.LogicBlocks.Tests/test/fixtures/MyLogicBlock.g.puml
@@ -1,7 +1,7 @@
 @startuml MyLogicBlock
 state "MyLogicBlock State" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State {
-  state "SomeState" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeState
   state "SomeOtherState" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeOtherState
+  state "SomeState" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeState
 }
 
 Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeOtherState --> Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeState : SomeOtherInput
diff --git a/Chickensoft.LogicBlocks.Tests/test/src/LightSwitchMeta.g.puml b/Chickensoft.LogicBlocks.Tests/test/src/LightSwitchMeta.g.puml
@@ -1,7 +1,7 @@
 @startuml LightSwitch
 state "LightSwitch State" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State {
-  state "PoweredOn" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOn
   state "PoweredOff" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOff
+  state "PoweredOn" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOn
 }
 
 Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOff --> Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOn : Toggle
diff --git a/Chickensoft.LogicBlocks.Tests/test/src/examples/LightSwitchStandard.g.puml b/Chickensoft.LogicBlocks.Tests/test/src/examples/LightSwitchStandard.g.puml
@@ -1,7 +1,7 @@
 @startuml LightSwitch
 state "LightSwitch State" as Chickensoft_LogicBlocks_Tests_Examples_Misc_LightSwitch_State {
-  state "PoweredOn" as Chickensoft_LogicBlocks_Tests_Examples_Misc_LightSwitch_State_PoweredOn
   state "PoweredOff" as Chickensoft_LogicBlocks_Tests_Examples_Misc_LightSwitch_State_PoweredOff
+  state "PoweredOn" as Chickensoft_LogicBlocks_Tests_Examples_Misc_LightSwitch_State_PoweredOn
 }
 
 Chickensoft_LogicBlocks_Tests_Examples_Misc_LightSwitch_State_PoweredOff --> Chickensoft_LogicBlocks_Tests_Examples_Misc_LightSwitch_State_PoweredOn : Toggle

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`@startuml Heater`
`2`	`2`	`state "Heater State" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State {`
	`3`	`+ state "Off" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Off`
`3`	`4`	`state "Powered" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Powered {`
`4`		`- state "Idle" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Idle`
`5`	`5`	`state "Heating" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Heating`
	`6`	`+ state "Idle" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Idle`
`6`	`7`	`}`
`7`		`- state "Off" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State_Off`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State --> Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Heater_State : TargetTempChanged`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`@startuml Patterns`
`2`	`2`	`state "Patterns State" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State {`
`3`	`3`	`state "One" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_One`
`4`		`- state "Two" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_Two`
`5`	`4`	`state "Three" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_Three`
	`5`	`+ state "Two" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_Two`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State --> Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_Patterns_State_One : SetMode`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`@startuml ToasterOven`
`2`	`2`	`state "ToasterOven State" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State {`
	`3`	`+ state "DoorOpen" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_DoorOpen`
`3`	`4`	`state "Heating" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Heating {`
`4`		`- state "Toasting" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Toasting`
`5`	`5`	`state "Baking" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Baking`
	`6`	`+ state "Toasting" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Toasting`
`6`	`7`	`}`
`7`		`- state "DoorOpen" as Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_DoorOpen`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Baking --> Chickensoft_LogicBlocks_DiagramGenerator_Tests_TestCases_ToasterOven_State_Toasting : StartToasting`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ int t`
`458`	`458`	`lines.Add($"{Tab(t)}state \"{graph.Name}\" as {graph.UmlId}");`
`459`	`459`	`}`
`460`	`460`
`461`		`- foreach (var child in graph.Children) {`
	`461`	`+ foreach (var child in graph.Children.OrderBy(child => child.Name)) {`
`462`	`462`	`lines.AddRange(`
`463`	`463`	`WriteGraph(child, impl, stateDescriptions, t + 1)`
`464`	`464`	`);`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`@startuml MyLogicBlock`
`2`	`2`	`state "MyLogicBlock State" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State {`
`3`		`- state "SomeState" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeState`
`4`	`3`	`state "SomeOtherState" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeOtherState`
	`4`	`+ state "SomeState" as Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeState`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeOtherState --> Chickensoft_LogicBlocks_Tests_Fixtures_MyLogicBlock_State_SomeState : SomeOtherInput`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`@startuml LightSwitch`
`2`	`2`	`state "LightSwitch State" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State {`
`3`		`- state "PoweredOn" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOn`
`4`	`3`	`state "PoweredOff" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOff`
	`4`	`+ state "PoweredOn" as Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOn`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOff --> Chickensoft_LogicBlocks_Tests_Examples_LightSwitch_State_PoweredOn : Toggle`