From ba79f4e1340c924cb2c9174c673cc7ac30714c6e Mon Sep 17 00:00:00 2001
From: Dmitry Baltin <baltin.dmitry@gmail.com>
Date: Fri, 5 Sep 2025 22:18:07 +0200
Subject: [PATCH 1/3] feat: removed CancellationToken from all the arguments to
 make the BT syntax more compact

---
 Runtime/UnitaskFbtNodes.cs | 118 ++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 61 deletions(-)

diff --git a/Runtime/UnitaskFbtNodes.cs b/Runtime/UnitaskFbtNodes.cs
index 820d140..e6a4e2b 100644
--- a/Runtime/UnitaskFbtNodes.cs
+++ b/Runtime/UnitaskFbtNodes.cs
@@ -24,9 +24,8 @@ public static class UnitaskFbtNodes
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static async UniTask<bool> Inverter<T>(
             this T board, 
-            CancellationToken ct, 
-            Func<T, CancellationToken, UniTask<bool>> func)
-            => !await func.Invoke(board, ct);
+            Func<T, UniTask<bool>> func)
+            => !await func.Invoke(board);
 
         /// <summary>
         /// Execute the given func delegate if the given condition is true 
@@ -39,10 +38,9 @@ public static async UniTask<bool> Inverter<T>(
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static async UniTask<bool> If<T>(
             this T board, 
-            CancellationToken ct, 
             Func<T, bool> condition, 
-            Func<T, CancellationToken, UniTask<bool>> func) 
-            => condition.Invoke(board) && await func.Invoke(board, ct);
+            Func<T, UniTask<bool>> func) 
+            => condition.Invoke(board) && await func.Invoke(board);
 
         /// <summary>
         /// Classic selector node
@@ -59,24 +57,24 @@ public static async UniTask<bool> If<T>(
         /// <param name="token"></param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static async UniTask<bool> Selector<T>(this T board, CancellationToken token,
-            Func<T, CancellationToken, UniTask<bool>> f1,
-            Func<T, CancellationToken, UniTask<bool>> f2,
-            Func<T, CancellationToken, UniTask<bool>> f3 = null,
-            Func<T, CancellationToken, UniTask<bool>> f4 = null,
-            Func<T, CancellationToken, UniTask<bool>> f5 = null,
-            Func<T, CancellationToken, UniTask<bool>> f6 = null,
-            Func<T, CancellationToken, UniTask<bool>> f7 = null,
-            Func<T, CancellationToken, UniTask<bool>> f8 = null)
+        public static async UniTask<bool> Selector<T>(this T board, 
+            Func<T, UniTask<bool>> f1,
+            Func<T, UniTask<bool>> f2,
+            Func<T, UniTask<bool>> f3 = null,
+            Func<T, UniTask<bool>> f4 = null,
+            Func<T, UniTask<bool>> f5 = null,
+            Func<T, UniTask<bool>> f6 = null,
+            Func<T, UniTask<bool>> f7 = null,
+            Func<T, UniTask<bool>> f8 = null)
         {
-            var s = f1 is not null && await f1.Invoke(board, token); if(s) return true;
-            s = f2 is not null && await f2.Invoke(board, token); if(s) return true;
-            s = f3 is not null && await f3.Invoke(board, token); if(s) return true;
-            s = f4 is not null && await f4.Invoke(board, token); if(s) return true;
-            s = f5 is not null && await f5.Invoke(board, token); if(s) return true;
-            s = f6 is not null && await f6.Invoke(board, token); if(s) return true;
-            s = f7 is not null && await f7.Invoke(board, token); if(s) return true;
-            s = f8 is not null && await f8.Invoke(board, token); if(s) return true;
+            var s = f1 is not null && await f1.Invoke(board); if(s) return true;
+            s = f2 is not null && await f2.Invoke(board); if(s) return true;
+            s = f3 is not null && await f3.Invoke(board); if(s) return true;
+            s = f4 is not null && await f4.Invoke(board); if(s) return true;
+            s = f5 is not null && await f5.Invoke(board); if(s) return true;
+            s = f6 is not null && await f6.Invoke(board); if(s) return true;
+            s = f7 is not null && await f7.Invoke(board); if(s) return true;
+            s = f8 is not null && await f8.Invoke(board); if(s) return true;
 
             return false;
         }
@@ -95,24 +93,24 @@ public static async UniTask<bool> Selector<T>(this T board, CancellationToken to
         /// <param name="f8">Optional delegate receiving T and returning Status</param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static async UniTask<bool> Sequencer<T>(this T board, CancellationToken token,
-            Func<T, CancellationToken, UniTask<bool>> f1,
-            Func<T, CancellationToken, UniTask<bool>> f2,
-            Func<T, CancellationToken, UniTask<bool>> f3 = null,
-            Func<T, CancellationToken, UniTask<bool>> f4 = null,
-            Func<T, CancellationToken, UniTask<bool>> f5 = null,
-            Func<T, CancellationToken, UniTask<bool>> f6 = null,
-            Func<T, CancellationToken, UniTask<bool>> f7 = null,
-            Func<T, CancellationToken, UniTask<bool>> f8 = null)
+        public static async UniTask<bool> Sequencer<T>(this T board,
+            Func<T, UniTask<bool>> f1,
+            Func<T, UniTask<bool>> f2,
+            Func<T, UniTask<bool>> f3 = null,
+            Func<T, UniTask<bool>> f4 = null,
+            Func<T, UniTask<bool>> f5 = null,
+            Func<T, UniTask<bool>> f6 = null,
+            Func<T, UniTask<bool>> f7 = null,
+            Func<T, UniTask<bool>> f8 = null)
         {
-            var s = f1 is not null && await f1.Invoke(board, token); if(!s) return false;
-            s = f2 is not null && await f2.Invoke(board, token); if(!s) return false;
-            s = f3 is not null && await f3.Invoke(board, token); if(!s) return false;
-            s = f4 is not null && await f4.Invoke(board, token); if(!s) return false;
-            s = f5 is not null && await f5.Invoke(board, token); if(!s) return false;
-            s = f6 is not null && await f6.Invoke(board, token); if(!s) return false;
-            s = f7 is not null && await f7.Invoke(board, token); if(!s) return false;
-            s = f8 is not null && await f8.Invoke(board, token); if(!s) return false;
+            var s = f1 is not null && await f1.Invoke(board); if(!s) return false;
+            s = f2 is not null && await f2.Invoke(board); if(!s) return false;
+            s = f3 is not null && await f3.Invoke(board); if(!s) return false;
+            s = f4 is not null && await f4.Invoke(board); if(!s) return false;
+            s = f5 is not null && await f5.Invoke(board); if(!s) return false;
+            s = f6 is not null && await f6.Invoke(board); if(!s) return false;
+            s = f7 is not null && await f7.Invoke(board); if(!s) return false;
+            s = f8 is not null && await f8.Invoke(board); if(!s) return false;
             
             return true;
         }
@@ -132,13 +130,12 @@ public static async UniTask<bool> Sequencer<T>(this T board, CancellationToken t
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static async UniTask<bool> ConditionalInverter<T>(
             this T board,
-            CancellationToken token,
             Func<T, bool> condition,
-            Func<T, CancellationToken, UniTask<bool>> func,
-            Func<T, CancellationToken, UniTask<bool>> elseFunc = null)
+            Func<T, UniTask<bool>> func,
+            Func<T, UniTask<bool>> elseFunc = null)
             => condition.Invoke(board)
-                ? await board.Inverter(token, func)
-                : elseFunc != null && await board.Inverter(token, elseFunc);
+                ? await board.Inverter(func)
+                : elseFunc != null && await board.Inverter(elseFunc);
 
         /// <summary>
         /// Check condition before Selector
@@ -156,15 +153,14 @@ public static async UniTask<bool> ConditionalInverter<T>(
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static async UniTask<bool> ConditionalSelector<T>(
                 this T board,
-                CancellationToken token,
                 Func<T, bool> condition,
-                Func<T, CancellationToken, UniTask<bool>> f1,
-                Func<T, CancellationToken, UniTask<bool>> f2,
-                Func<T, CancellationToken, UniTask<bool>> f3 = null,
-                Func<T, CancellationToken, UniTask<bool>> f4 = null,
-                Func<T, CancellationToken, UniTask<bool>> f5 = null,
-                Func<T, CancellationToken, UniTask<bool>> f6 = null)
-            => condition.Invoke(board) && await board.Selector(token, f1, f2, f3, f4, f5, f6);
+                Func<T, UniTask<bool>> f1,
+                Func<T, UniTask<bool>> f2,
+                Func<T, UniTask<bool>> f3 = null,
+                Func<T, UniTask<bool>> f4 = null,
+                Func<T, UniTask<bool>> f5 = null,
+                Func<T, UniTask<bool>> f6 = null)
+            => condition.Invoke(board) && await board.Selector(f1, f2, f3, f4, f5, f6);
 
         /// <summary>
         /// Check condition before Sequencer
@@ -179,14 +175,14 @@ public static async UniTask<bool> ConditionalSelector<T>(
         /// <param name="f6">Optional delegate receiving T and returning Status</param>
         /// <returns>If the condition is false return Failure. Else return the result of Sequencer</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static async UniTask<bool> ConditionalSequencer<T>(this T board, CancellationToken token,
+        public static async UniTask<bool> IfSequencer<T>(this T board,
                 Func<T, bool> condition,
-                Func<T, CancellationToken, UniTask<bool>> f1,
-                Func<T, CancellationToken, UniTask<bool>> f2,
-                Func<T, CancellationToken, UniTask<bool>> f3 = null,
-                Func<T, CancellationToken, UniTask<bool>> f4 = null,
-                Func<T, CancellationToken, UniTask<bool>> f5 = null,
-                Func<T, CancellationToken, UniTask<bool>> f6 = null)
-            => condition.Invoke(board) && await board.Sequencer(token, f1, f2, f3, f4, f5, f6);
+                Func<T, UniTask<bool>> f1,
+                Func<T, UniTask<bool>> f2,
+                Func<T, UniTask<bool>> f3 = null,
+                Func<T, UniTask<bool>> f4 = null,
+                Func<T, UniTask<bool>> f5 = null,
+                Func<T, UniTask<bool>> f6 = null)
+            => condition.Invoke(board) && await board.Sequencer(f1, f2, f3, f4, f5, f6);
     }
 }
\ No newline at end of file

From 5164bb54ed9dde1c314f3e19118e24a43385fe82 Mon Sep 17 00:00:00 2001
From: Dmitry Baltin <baltin.dmitry@gmail.com>
Date: Sat, 6 Sep 2025 10:46:50 +0200
Subject: [PATCH 2/3] feat: uFBT definition is simplified

- namespace renamed UnitaskFBT -> UFBT
- removed extra Inverter node
- names of conditional nodes ar shortened
---
 Runtime/UnitaskFbtNodes.cs | 73 ++++++++++++--------------------------
 1 file changed, 22 insertions(+), 51 deletions(-)

diff --git a/Runtime/UnitaskFbtNodes.cs b/Runtime/UnitaskFbtNodes.cs
index e6a4e2b..0edf00d 100644
--- a/Runtime/UnitaskFbtNodes.cs
+++ b/Runtime/UnitaskFbtNodes.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using Cysharp.Threading.Tasks;
 
-namespace Baltin.UnitaskFBT
+namespace Baltin.UFBT
 {
     /// <summary>
     /// Async Functional Behavior Tree pattern
@@ -15,18 +15,6 @@ namespace Baltin.UnitaskFBT
     /// <typeparam name="T">Type of 'blackboard' that represents the controlled object.</typeparam>
     public static class UnitaskFbtNodes
     {
-        /// <summary>
-        /// Classic inverter node
-        /// </summary>
-        /// <param name="board">Blackboard object</param>
-        /// <param name="func">Delegate receiving T and returning Status</param>
-        /// <returns></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static async UniTask<bool> Inverter<T>(
-            this T board, 
-            Func<T, UniTask<bool>> func)
-            => !await func.Invoke(board);
-
         /// <summary>
         /// Execute the given func delegate if the given condition is true 
         /// </summary>
@@ -40,7 +28,7 @@ public static async UniTask<bool> If<T>(
             this T board, 
             Func<T, bool> condition, 
             Func<T, UniTask<bool>> func) 
-            => condition.Invoke(board) && await func.Invoke(board);
+            => condition(board) && await func(board);
 
         /// <summary>
         /// Classic selector node
@@ -67,18 +55,19 @@ public static async UniTask<bool> Selector<T>(this T board,
             Func<T, UniTask<bool>> f7 = null,
             Func<T, UniTask<bool>> f8 = null)
         {
-            var s = f1 is not null && await f1.Invoke(board); if(s) return true;
-            s = f2 is not null && await f2.Invoke(board); if(s) return true;
-            s = f3 is not null && await f3.Invoke(board); if(s) return true;
-            s = f4 is not null && await f4.Invoke(board); if(s) return true;
-            s = f5 is not null && await f5.Invoke(board); if(s) return true;
-            s = f6 is not null && await f6.Invoke(board); if(s) return true;
-            s = f7 is not null && await f7.Invoke(board); if(s) return true;
-            s = f8 is not null && await f8.Invoke(board); if(s) return true;
+            var s = await f1(board); if(s) return true;
+            s = await f2(board); if(s) return true;
+            s = f3 is not null && await f3(board); if(s) return true;
+            s = f4 is not null && await f4(board); if(s) return true;
+            s = f5 is not null && await f5(board); if(s) return true;
+            s = f6 is not null && await f6(board); if(s) return true;
+            s = f7 is not null && await f7(board); if(s) return true;
+            s = f8 is not null && await f8(board); if(s) return true;
 
             return false;
         }
         
+        // ReSharper disable Unity.PerformanceAnalysis
         /// <summary>
         /// Classic sequencer node
         /// </summary>
@@ -103,14 +92,14 @@ public static async UniTask<bool> Sequencer<T>(this T board,
             Func<T, UniTask<bool>> f7 = null,
             Func<T, UniTask<bool>> f8 = null)
         {
-            var s = f1 is not null && await f1.Invoke(board); if(!s) return false;
-            s = f2 is not null && await f2.Invoke(board); if(!s) return false;
-            s = f3 is not null && await f3.Invoke(board); if(!s) return false;
-            s = f4 is not null && await f4.Invoke(board); if(!s) return false;
-            s = f5 is not null && await f5.Invoke(board); if(!s) return false;
-            s = f6 is not null && await f6.Invoke(board); if(!s) return false;
-            s = f7 is not null && await f7.Invoke(board); if(!s) return false;
-            s = f8 is not null && await f8.Invoke(board); if(!s) return false;
+            var s = await f1(board); if(!s) return false;
+            s = await f2(board); if(!s) return false;
+            s = f3 is not null && await f3(board); if(!s) return false;
+            s = f4 is not null && await f4(board); if(!s) return false;
+            s = f5 is not null && await f5(board); if(!s) return false;
+            s = f6 is not null && await f6(board); if(!s) return false;
+            s = f7 is not null && await f7(board); if(!s) return false;
+            s = f8 is not null && await f8(board); if(!s) return false;
             
             return true;
         }
@@ -119,24 +108,6 @@ public static async UniTask<bool> Sequencer<T>(this T board,
         //Every conditional node can be replaced by two nodes the first of them is an Action node containing the condition and wrapping the second mains node 
         //But usually is more convenient to use one conditional node instead
 
-        /// <summary>
-        /// Check condition, execute given action and then return its inverted result 
-        /// </summary>
-        /// <param name="board">Blackboard object</param>
-        /// <param name="condition">Condition given as a delegate returning bool</param>
-        /// <param name="func">Action returning Status</param>
-        /// <param name="elseFunc"></param>
-        /// <returns>If the condition is false return Failure. Else return inverted value of the func</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static async UniTask<bool> ConditionalInverter<T>(
-            this T board,
-            Func<T, bool> condition,
-            Func<T, UniTask<bool>> func,
-            Func<T, UniTask<bool>> elseFunc = null)
-            => condition.Invoke(board)
-                ? await board.Inverter(func)
-                : elseFunc != null && await board.Inverter(elseFunc);
-
         /// <summary>
         /// Check condition before Selector
         /// Returns Failure if the condition is false
@@ -151,7 +122,7 @@ public static async UniTask<bool> ConditionalInverter<T>(
         /// <param name="f6">Optional delegate receiving T and returning Status</param>
         /// <returns>If the condition is false return Failure. Else return the result of Selector</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static async UniTask<bool> ConditionalSelector<T>(
+        public static async UniTask<bool> IfSelector<T>(
                 this T board,
                 Func<T, bool> condition,
                 Func<T, UniTask<bool>> f1,
@@ -160,7 +131,7 @@ public static async UniTask<bool> ConditionalSelector<T>(
                 Func<T, UniTask<bool>> f4 = null,
                 Func<T, UniTask<bool>> f5 = null,
                 Func<T, UniTask<bool>> f6 = null)
-            => condition.Invoke(board) && await board.Selector(f1, f2, f3, f4, f5, f6);
+            => condition(board) && await board.Selector(f1, f2, f3, f4, f5, f6);
 
         /// <summary>
         /// Check condition before Sequencer
@@ -183,6 +154,6 @@ public static async UniTask<bool> IfSequencer<T>(this T board,
                 Func<T, UniTask<bool>> f4 = null,
                 Func<T, UniTask<bool>> f5 = null,
                 Func<T, UniTask<bool>> f6 = null)
-            => condition.Invoke(board) && await board.Sequencer(f1, f2, f3, f4, f5, f6);
+            => condition(board) && await board.Sequencer(f1, f2, f3, f4, f5, f6);
     }
 }
\ No newline at end of file

From c0477a82718d2c9484f01fad21f0f34ef58ccb7c Mon Sep 17 00:00:00 2001
From: Dmitry Baltin <baltin.dmitry@gmail.com>
Date: Sat, 6 Sep 2025 10:48:37 +0200
Subject: [PATCH 3/3] chore: version incremented (incompatible with previous
 version)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9c27ed7..f5798dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.baltin.ufbt",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "displayName": "UniTaskFBT",
   "description": "Async Functional Behavior Tree implementation based on UniTask",
   "unity": "2021.2",