refactor(core): 重构协程扩展和函数式编程相关代码

- 优化 CommandCoroutineExtensions 中的代码格式和异常处理逻辑
- 简化 WaitForEvent 和 WaitForEventWithTimeout 中的EventData属性实现
- 调整 EventListenerScope 中的EventData属性访问器
- 重构 ControlExtensions 中 TakeIf 和 TakeUnless 方法的实现
- 优化 FunctionExtensions 中 Repeat 和 Partial 方法的代码结构
- 调整 PipeExtensions 和其他扩展类的文档注释格式
- 修改测试代码中的协程迭代和事件注册相关实现
- 优化 DataRepository 中的异步操作实现方式
= [release ci]

GFramework.Core.Tests/coroutine/CommandCoroutineExtensionsTests.cs

@@ -25,8 +25,16 @@ public class CommandCoroutineExtensionsTests
     private class TestCommand : IAsyncCommand
     {
         private IArchitectureContext? _context;
-        public void SetContext(IArchitectureContext context) => _context = context;
+
-        public IArchitectureContext GetContext() => _context!;
+        public void SetContext(IArchitectureContext context)
+        {
+            _context = context;
+        }
+
+        public IArchitectureContext GetContext()
+        {
+            return _context!;
+        }
 
         public Task ExecuteAsync()
         {
@@ -47,7 +55,7 @@ public class CommandCoroutineExtensionsTests
     /// </summary>
     private class TestContextAware : IContextAware
     {
-        public Mock<IArchitectureContext> _mockContext = new();
+        public readonly Mock<IArchitectureContext> _mockContext = new();
 
         public IArchitectureContext GetContext()
         {
@@ -78,13 +86,9 @@ public class CommandCoroutineExtensionsTests
 
         // 迭代协程直到完成
         while (coroutine.MoveNext())
-        {
             if (coroutine.Current is WaitForTask)
-            {
                 // 等待任务完成
                 await Task.Delay(10);
-            }
-        }
 
         Assert.That(capturedException, Is.Null);
     }
@@ -109,13 +113,9 @@ public class CommandCoroutineExtensionsTests
 
         // 迭代协程直到完成
         while (coroutine.MoveNext())
-        {
             if (coroutine.Current is WaitForTask)
-            {
                 // 等待任务完成
                 await Task.Delay(10);
-            }
-        }
 
         Assert.That(capturedException, Is.Not.Null);
         // 异常被包装为 AggregateException
@@ -140,17 +140,13 @@ public class CommandCoroutineExtensionsTests
             .Returns(Task.FromException(expectedException));
 
         // 使用null作为错误处理程序
-        var coroutine = contextAware.SendCommandCoroutineWithErrorHandler(command, null);
+        var coroutine = contextAware.SendCommandCoroutineWithErrorHandler(command);
 
         // 迭代协程直到完成
         while (coroutine.MoveNext())
-        {
             if (coroutine.Current is WaitForTask)
-            {
                 // 等待任务完成
                 await Task.Delay(10);
-            }
-        }
 
         // 应该不会抛出异常
         Assert.Pass();
@@ -172,7 +168,7 @@ public class CommandCoroutineExtensionsTests
         var unRegisterMock = new Mock<IUnRegister>();
 
         Action<TestEvent>? eventCallback = null;
-        eventBusMock.Setup(bus => bus.Register<TestEvent>(It.IsAny<Action<TestEvent>>()))
+        eventBusMock.Setup(bus => bus.Register(It.IsAny<Action<TestEvent>>()))
             .Returns(unRegisterMock.Object)
             .Callback<Action<TestEvent>>(callback => eventCallback = callback);
 
@@ -196,10 +192,7 @@ public class CommandCoroutineExtensionsTests
 
         // 启动协程并等待命令执行完成
         coroutine.MoveNext(); // 进入命令发送阶段
-        if (coroutine.Current is WaitForTask)
+        if (coroutine.Current is WaitForTask) await Task.Delay(10); // 等待命令任务完成
-        {
-            await Task.Delay(10); // 等待命令任务完成
-        }
 
         // 此时协程应该在等待事件
         Assert.That(coroutine.MoveNext(), Is.True); // 等待事件阶段
@@ -252,13 +245,9 @@ public class CommandCoroutineExtensionsTests
 
             // 运行协程直到完成
             while (coroutine.MoveNext())
-            {
                 if (coroutine.Current is WaitForEventWithTimeout<TestEvent> timeoutWait)
-                {
                     // 模拟超时
                     timeoutWait.Update(0.2); // 更新时间超过超时限制
-                }
-            }
         });
     }
 
@@ -292,15 +281,11 @@ public class CommandCoroutineExtensionsTests
 
         // 使用null作为事件回调
         var coroutine = contextAware.SendCommandAndWaitEventCoroutine<TestCommand, TestEvent>(
-            command,
+            command); // null回调
-            null); // null回调
 
         // 启动协程
         coroutine.MoveNext(); // 进入命令发送阶段
-        if (coroutine.Current is WaitForTask)
+        if (coroutine.Current is WaitForTask) await Task.Delay(10); // 等待命令任务完成
-        {
-            await Task.Delay(10); // 等待命令任务完成
-        }
 
         // 触发事件
         var testEvent = new TestEvent { Data = "TestData" };
@@ -343,10 +328,7 @@ public class CommandCoroutineExtensionsTests
 
         // 启动协程 - 命令失败时协程仍然继续
         coroutine.MoveNext(); // 进入命令发送阶段
-        if (coroutine.Current is WaitForTask)
+        if (coroutine.Current is WaitForTask) await Task.Delay(10); // 等待命令任务完成
-        {
-            await Task.Delay(10); // 等待命令任务完成
-        }
 
         // 命令执行失败后，协程继续执行
         Assert.Pass();
@@ -384,7 +366,7 @@ public class CommandCoroutineExtensionsTests
         var eventBusMock = new Mock<IEventBus>();
         var unRegisterMock = new Mock<IUnRegister>();
 
-        eventBusMock.Setup(bus => bus.Register<TestEvent>(It.IsAny<Action<TestEvent>>()))
+        eventBusMock.Setup(bus => bus.Register(It.IsAny<Action<TestEvent>>()))
             .Returns(unRegisterMock.Object);
 
         // 设置上下文服务以返回事件总线

GFramework.Core.Tests/coroutine/CoroutineComposeExtensionsTests.cs

@@ -50,10 +50,7 @@ public class CoroutineComposeExtensionsTests
         var combined = first.Then(() => executionOrder.Add("action"));
 
         // 执行组合协程
-        while (combined.MoveNext())
+        while (combined.MoveNext()) combined.Current.Update(0.016);
-        {
-            combined.Current.Update(0.016);
-        }
 
         Assert.That(executionOrder.Count, Is.EqualTo(3));
         Assert.That(executionOrder[0], Is.EqualTo("coroutine"));
@@ -112,10 +109,7 @@ public class CoroutineComposeExtensionsTests
             .Then(() => executionOrder.Add(2))
             .Then(() => executionOrder.Add(3));
 
-        while (combined.MoveNext())
+        while (combined.MoveNext()) combined.Current.Update(0.016);
-        {
-            combined.Current.Update(0.016);
-        }
 
         Assert.That(executionOrder, Is.EqualTo([1, 2, 3]));
     }
@@ -162,10 +156,7 @@ public class CoroutineComposeExtensionsTests
         var second = CreateTestCoroutine(2, () => executionOrder.Add("second"));
         var combined = first.Then(second);
 
-        while (combined.MoveNext())
+        while (combined.MoveNext()) combined.Current.Update(0.016);
-        {
-            combined.Current.Update(0.016);
-        }
 
         Assert.That(executionOrder.Count, Is.EqualTo(4));
         Assert.That(executionOrder[0], Is.EqualTo("first"));
@@ -206,10 +197,7 @@ public class CoroutineComposeExtensionsTests
         var second = CreateTestCoroutine(0);
         var combined = first.Then(second);
 
-        while (combined.MoveNext())
+        while (combined.MoveNext()) combined.Current.Update(0.016);
-        {
-            combined.Current.Update(0.016);
-        }
 
         Assert.That(firstExecuteCount, Is.EqualTo(2));
     }
@@ -262,10 +250,7 @@ public class CoroutineComposeExtensionsTests
 
         var combined = first.Then(second).Then(third);
 
-        while (combined.MoveNext())
+        while (combined.MoveNext()) combined.Current.Update(0.016);
-        {
-            combined.Current.Update(0.016);
-        }
 
         Assert.That(executionOrder, Is.EqualTo(new[] { 1, 2, 3 }));
     }
@@ -286,10 +271,7 @@ public class CoroutineComposeExtensionsTests
             .Then(second)
             .Then(() => executionOrder.Add("action2"));
 
-        while (combined.MoveNext())
+        while (combined.MoveNext()) combined.Current.Update(0.016);
-        {
-            combined.Current.Update(0.016);
-        }
 
         Assert.That(executionOrder, Is.EqualTo(new[] { "coroutine1", "action1", "coroutine2", "action2" }));
     }
@@ -339,10 +321,7 @@ public class CoroutineComposeExtensionsTests
             coroutine = coroutine.Then(nextCoroutine);
         }
 
-        while (coroutine.MoveNext())
+        while (coroutine.MoveNext()) coroutine.Current.Update(0.016);
-        {
-            coroutine.Current.Update(0.016);
-        }
 
         Assert.That(count, Is.EqualTo(11));
     }

GFramework.Core.Tests/coroutine/CoroutineHelperTests.cs

@@ -443,7 +443,7 @@ public class CoroutineHelperTests
     public void RepeatCallForever_Should_Execute_Forever_When_ShouldContinue_Is_Null()
     {
         var callCount = 0;
-        var coroutine = CoroutineHelper.RepeatCallForever(0.1, () => callCount++, (Func<bool>?)null);
+        var coroutine = CoroutineHelper.RepeatCallForever(0.1, () => callCount++);
 
         for (var i = 0; i < 5; i++)
         {

GFramework.Core.Tests/coroutine/QueryCoroutineExtensionsTests.cs

@@ -23,9 +23,21 @@ public class QueryCoroutineExtensionsTests
     {
         private IArchitectureContext? _context;
         public string QueryData { get; set; } = string.Empty;
-        public void SetContext(IArchitectureContext context) => _context = context;
+
-        public IArchitectureContext GetContext() => _context!;
+        public void SetContext(IArchitectureContext context)
-        public string Do() => QueryData;
+        {
+            _context = context;
+        }
+
+        public IArchitectureContext GetContext()
+        {
+            return _context!;
+        }
+
+        public string Do()
+        {
+            return QueryData;
+        }
     }
 
     /// <summary>
@@ -33,7 +45,7 @@ public class QueryCoroutineExtensionsTests
     /// </summary>
     private class TestContextAware : IContextAware
     {
-        public Mock<IArchitectureContext> _mockContext = new Mock<IArchitectureContext>();
+        public readonly Mock<IArchitectureContext> _mockContext = new();
 
         public IArchitectureContext GetContext()
         {
@@ -58,7 +70,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Returns("TestResult");
 
         var coroutine = contextAware.SendQueryCoroutine<TestQuery, string>(query, result =>
@@ -90,7 +102,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<bool>(It.IsAny<IntQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<IntQuery>()))
             .Returns(true);
 
         var coroutine = contextAware.SendQueryCoroutine<IntQuery, bool>(query, result =>
@@ -118,7 +130,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Returns("TestResult");
 
         // 使用null作为结果回调，应该抛出NullReferenceException
@@ -141,7 +153,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Returns("ProcessedResult");
 
         var coroutine = contextAware.SendQueryCoroutine<TestQuery, string>(query, result =>
@@ -168,7 +180,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Returns("TestResult");
 
         var coroutine = contextAware.SendQueryCoroutine<TestQuery, string>(query, result => { });
@@ -189,7 +201,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为，让它抛出异常
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Throws(expectedException);
 
         // 由于SendQueryCoroutine会直接执行查询，这可能导致异常
@@ -216,7 +228,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为，并捕获传入的查询参数
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Returns((IQuery<string> q) =>
             {
                 capturedQuery = (TestQuery)q;
@@ -258,7 +270,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<ComplexResult>(It.IsAny<ComplexQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<ComplexQuery>()))
             .Returns(expectedResult);
 
         var coroutine =
@@ -284,7 +296,7 @@ public class QueryCoroutineExtensionsTests
 
         // 设置上下文发送查询的模拟行为，返回空字符串
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Returns(string.Empty);
 
         var coroutine =
@@ -302,12 +314,12 @@ public class QueryCoroutineExtensionsTests
     public void SendQueryCoroutine_Should_Handle_Null_Result()
     {
         var query = new TestQuery { QueryData = "TestQueryData" };
-        string? receivedResult = "initial";
+        var receivedResult = "initial";
         var contextAware = new TestContextAware();
 
         // 设置上下文发送查询的模拟行为，返回null
         contextAware._mockContext
-            .Setup(ctx => ctx.SendQuery<string>(It.IsAny<TestQuery>()))
+            .Setup(ctx => ctx.SendQuery(It.IsAny<TestQuery>()))
             .Returns((string)null!);
 
         var coroutine =
@@ -326,9 +338,21 @@ internal class IntQuery : IQuery<bool>
 {
     private IArchitectureContext? _context;
     public int Value { get; set; }
-    public void SetContext(IArchitectureContext context) => _context = context;
+
-    public IArchitectureContext GetContext() => _context!;
+    public void SetContext(IArchitectureContext context)
-    public bool Do() => Value > 0;
+    {
+        _context = context;
+    }
+
+    public IArchitectureContext GetContext()
+    {
+        return _context!;
+    }
+
+    public bool Do()
+    {
+        return Value > 0;
+    }
 }
 
 /// <summary>
@@ -338,11 +362,23 @@ internal class ComplexQuery : IQuery<ComplexResult>
 {
     private IArchitectureContext? _context;
     public string Name { get; set; } = string.Empty;
-    public List<int> Values { get; set; } = new List<int>();
+    public List<int> Values { get; set; } = new();
-    public Dictionary<string, object> Metadata { get; set; } = new Dictionary<string, object>();
+    public Dictionary<string, object> Metadata { get; set; } = new();
-    public void SetContext(IArchitectureContext context) => _context = context;
+
-    public IArchitectureContext GetContext() => _context!;
+    public void SetContext(IArchitectureContext context)
-    public ComplexResult Do() => new ComplexResult { ProcessedName = Name, Sum = Values.Sum(), Count = Values.Count };
+    {
+        _context = context;
+    }
+
+    public IArchitectureContext GetContext()
+    {
+        return _context!;
+    }
+
+    public ComplexResult Do()
+    {
+        return new ComplexResult { ProcessedName = Name, Sum = Values.Sum(), Count = Values.Count };
+    }
 }
 
 /// <summary>

GFramework.Core.Tests/events/EventListenerScopeTests.cs

@@ -217,7 +217,7 @@ public class EventListenerScopeTests
         var eventBusMock = new Mock<IEventBus>();
         var unRegisterMock = new Mock<IUnRegister>();
 
-        eventBusMock.Setup(x => x.Register<int>(It.IsAny<Action<int>>()))
+        eventBusMock.Setup(x => x.Register(It.IsAny<Action<int>>()))
             .Returns(unRegisterMock.Object)
             .Callback<Action<int>>(action => registeredAction = action);
 
@@ -242,7 +242,7 @@ public class EventListenerScopeTests
         var eventBusMock = new Mock<IEventBus>();
         var unRegisterMock = new Mock<IUnRegister>();
 
-        eventBusMock.Setup(x => x.Register<StructEvent>(It.IsAny<Action<StructEvent>>()))
+        eventBusMock.Setup(x => x.Register(It.IsAny<Action<StructEvent>>()))
             .Returns(unRegisterMock.Object)
             .Callback<Action<StructEvent>>(action => registeredAction = action);
 
@@ -268,7 +268,7 @@ public class EventListenerScopeTests
         var eventBusMock = new Mock<IEventBus>();
         var unRegisterMock = new Mock<IUnRegister>();
 
-        eventBusMock.Setup(x => x.Register<TestEvent>(It.IsAny<Action<TestEvent>>()))
+        eventBusMock.Setup(x => x.Register(It.IsAny<Action<TestEvent>>()))
             .Returns(unRegisterMock.Object)
             .Callback<Action<TestEvent>>(action => registeredAction = action);
 
@@ -290,7 +290,7 @@ public class EventListenerScopeTests
     {
         var eventBusMock = new Mock<IEventBus>();
         var unRegisterMock = new Mock<IUnRegister>();
-        eventBusMock.Setup(x => x.Register<TestEvent>(It.IsAny<Action<TestEvent>>()))
+        eventBusMock.Setup(x => x.Register(It.IsAny<Action<TestEvent>>()))
             .Returns(unRegisterMock.Object);
 
         var scope = new EventListenerScope<TestEvent>(eventBusMock.Object);

GFramework.Core.Tests/functional/control/ControlExtensionsTests.cs

@@ -16,7 +16,7 @@ public class ControlExtensionsTests
     public void TakeIf_Should_Return_Value_When_Condition_Is_True()
     {
         // Arrange
-        string str = "Hello";
+        var str = "Hello";
 
         // Act
         var result = str.TakeIf(s => s.Length > 3);
@@ -32,7 +32,7 @@ public class ControlExtensionsTests
     public void TakeIf_Should_Return_Null_When_Condition_Is_False()
     {
         // Arrange
-        string str = "Hi";
+        var str = "Hi";
 
         // Act
         var result = str.TakeIf(s => s.Length > 3);
@@ -48,7 +48,7 @@ public class ControlExtensionsTests
     public void TakeUnless_Should_Return_Value_When_Condition_Is_False()
     {
         // Arrange
-        string str = "Hi";
+        var str = "Hi";
 
         // Act
         var result = str.TakeUnless(s => s.Length > 3);
@@ -64,7 +64,7 @@ public class ControlExtensionsTests
     public void TakeUnless_Should_Return_Null_When_Condition_Is_True()
     {
         // Arrange
-        string str = "Hello";
+        var str = "Hello";
 
         // Act
         var result = str.TakeUnless(s => s.Length > 3);

GFramework.Core/coroutine/extensions/CommandCoroutineExtensions.cs

@@ -43,10 +43,7 @@ public static class CommandCoroutineExtensions
 
         yield return task.AsCoroutineInstruction();
 
-        if (task.IsFaulted)
+        if (task.IsFaulted) onError?.Invoke(task.Exception!);
-        {
-            onError?.Invoke(task.Exception!);
-        }
     }
 
     /// <summary>
@@ -89,11 +86,9 @@ public static class CommandCoroutineExtensions
 
                 // 检查是否超时
                 if (timeoutWait.IsTimeout)
-                {
                     // 超时处理
                     throw new TimeoutException($"wait for the event ${typeof(TEvent).Name} timeout.");
             }
-            }
             else
             {
                 // 等待事件触发（无超时）
@@ -101,10 +96,7 @@ public static class CommandCoroutineExtensions
             }
 
             // 调用事件回调
-            if (onEvent != null && wait.EventData != null)
+            if (onEvent != null && wait.EventData != null) onEvent.Invoke(wait.EventData);
-            {
-                onEvent.Invoke(wait.EventData);
-            }
         }
         finally
         {

GFramework.Core/coroutine/instructions/WaitForEvent.cs

@@ -20,7 +20,6 @@ public sealed class WaitForEvent<TEvent> : IYieldInstruction, IDisposable
 {
     private bool _disposed;
     private volatile bool _done;
-    private TEvent? _eventData;
     private IUnRegister? _unRegister;
 
     /// <summary>
@@ -38,7 +37,7 @@ public sealed class WaitForEvent<TEvent> : IYieldInstruction, IDisposable
     /// <summary>
     ///     获取接收到的事件数据
     /// </summary>
-    public TEvent? EventData => _eventData;
+    public TEvent? EventData { get; private set; }
 
     /// <summary>
     ///     释放资源
@@ -77,7 +76,7 @@ public sealed class WaitForEvent<TEvent> : IYieldInstruction, IDisposable
     /// <param name="eventData">事件数据</param>
     private void OnEventTriggered(TEvent eventData)
     {
-        _eventData = eventData;
+        EventData = eventData;
         _done = true;
     }
 }

GFramework.Core/coroutine/instructions/WaitForEventWithTimeout.cs

@@ -51,10 +51,7 @@ public sealed class WaitForEventWithTimeout<TEvent>(WaitForEvent<TEvent> waitFor
     public void Update(double deltaTime)
     {
         // 只有在事件未完成时才累加经过的时间
-        if (!_waitForEvent.IsDone)
+        if (!_waitForEvent.IsDone) _elapsedTime += (float)deltaTime;
-        {
-            _elapsedTime += (float)deltaTime;
-        }
 
         _waitForEvent.Update(deltaTime);
     }

GFramework.Core/events/EventListenerScope.cs

@@ -22,7 +22,6 @@ namespace GFramework.Core.events;
 public sealed class EventListenerScope<TEvent> : IDisposable
 {
     private readonly IUnRegister? _unRegister;
-    private TEvent? _eventData;
     private volatile bool _triggered;
 
     /// <summary>
@@ -37,7 +36,7 @@ public sealed class EventListenerScope<TEvent> : IDisposable
     /// <summary>
     ///     获取接收到的事件数据
     /// </summary>
-    public TEvent? EventData => _eventData;
+    public TEvent? EventData { get; private set; }
 
     /// <summary>
     ///     获取事件是否已被触发
@@ -58,7 +57,7 @@ public sealed class EventListenerScope<TEvent> : IDisposable
     /// <param name="eventData">接收到的事件数据</param>
     private void OnEventTriggered(TEvent eventData)
     {
-        _eventData = eventData;
+        EventData = eventData;
         _triggered = true;
     }
 }

GFramework.Core/functional/control/ControlExtensions.cs

@@ -29,7 +29,9 @@ public static class ControlExtensions
         this TSource value,
         Func<TSource, bool> predicate)
         where TSource : class
-        => predicate(value) ? value : null;
+    {
+        return predicate(value) ? value : null;
+    }
 
     /// <summary>
     ///     TakeUnless：条件相反的TakeIf
@@ -42,5 +44,7 @@ public static class ControlExtensions
         this TSource value,
         Func<TSource, bool> predicate)
         where TSource : class
-        => !predicate(value) ? value : null;
+    {
+        return !predicate(value) ? value : null;
+    }
 }

GFramework.Core/functional/functions/FunctionExtensions.cs

@@ -36,10 +36,7 @@ public static class FunctionExtensions
         ArgumentOutOfRangeException.ThrowIfNegative(times);
 
         var result = value;
-        for (var i = 0; i < times; i++)
+        for (var i = 0; i < times; i++) result = func(result);
-        {
-            result = func(result);
-        }
 
         return result;
     }
@@ -72,7 +69,6 @@ public static class FunctionExtensions
     /// <summary>
     ///     MemoizeUnbounded：
     ///     对函数结果进行无界缓存（线程安全）
-    ///
     ///     ⚠ 注意：
     ///     - 缓存永不释放
     ///     - TSource 必须具有稳定的 Equals / GetHashCode
@@ -92,13 +88,14 @@ public static class FunctionExtensions
 
     /// <summary>
     ///     Partial：部分应用（二参数函数固定第一个参数）
-    ///
     ///     ⚠ 偏函数应用属于高级用法，不建议在业务代码滥用
     /// </summary>
     public static Func<T2, TResult> Partial<T1, T2, TResult>(
         this Func<T1, T2, TResult> func,
         T1 firstArg)
-        => second => func(firstArg, second);
+    {
+        return second => func(firstArg, second);
+    }
 
     #endregion
 }

GFramework.Core/functional/pipe/PipeExtensions.cs

@@ -21,7 +21,6 @@ public static class PipeExtensions
     /// <summary>
     ///     Also：
     ///     对值执行副作用操作并返回原值
-    ///
     ///     适用于日志、调试、状态同步等场景
     /// </summary>
     public static T Also<T>(

GFramework.Game.Abstractions/data/IDataLocation.cs

@@ -28,7 +28,7 @@ public interface IDataLocation
     /// <summary>
     ///     存储类型（Local / Remote / Database / Memory）
     /// </summary>
-    StorageKind Kind { get; }
+    StorageKinds Kinds { get; }
 
     /// <summary>
     ///     命名空间/分区

GFramework.Game.Abstractions/data/IVersionedData.cs

@@ -10,6 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace GFramework.Game.Abstractions.data;
 
 /// <summary>

GFramework.Game.Abstractions/data/events/DataDeletedEvent.cs

@@ -18,4 +18,3 @@ namespace GFramework.Game.Abstractions.data.events;
 /// </summary>
 /// <param name="Location">数据位置信息，标识被删除数据的位置</param>
 public sealed record DataDeletedEvent(IDataLocation Location);
-

GFramework.Game.Abstractions/enums/StorageKinds.cs

@@ -18,7 +18,7 @@ namespace GFramework.Game.Abstractions.enums;
 ///     此枚举使用 Flags 特性，支持位运算组合多个存储类型
 /// </summary>
 [Flags]
-public enum StorageKind
+public enum StorageKinds
 {
     /// <summary>
     ///     无存储类型
@@ -43,5 +43,5 @@ public enum StorageKind
     /// <summary>
     ///     数据库存储
     /// </summary>
-    Database = 1 << 3,
+    Database = 1 << 3
 }

GFramework.Game.Abstractions/setting/data/AudioSettings.cs

@@ -48,10 +48,7 @@ public class AudioSettings : ISettingsData
     public void LoadFrom(ISettingsData source)
     {
         // 检查数据源是否为音频设置类型
-        if (source is not AudioSettings audioSettings)
+        if (source is not AudioSettings audioSettings) return;
-        {
-            return;
-        }
 
         // 将源数据中的各个音量设置复制到当前对象
         MasterVolume = audioSettings.MasterVolume;

GFramework.Game.Abstractions/setting/data/GraphicsSettings.cs

@@ -47,10 +47,7 @@ public class GraphicsSettings : ISettingsData
     public void LoadFrom(ISettingsData source)
     {
         // 检查源数据是否为GraphicsSettings类型，如果不是则直接返回
-        if (source is not GraphicsSettings settings)
+        if (source is not GraphicsSettings settings) return;
-        {
-            return;
-        }
 
         // 将源设置中的属性值复制到当前对象
         Fullscreen = settings.Fullscreen;

GFramework.Game.Abstractions/setting/data/LocalizationSettings.cs

@@ -54,10 +54,7 @@ public class LocalizationSettings : ISettingsData
     /// </remarks>
     public void LoadFrom(ISettingsData source)
     {
-        if (source is not LocalizationSettings settings)
+        if (source is not LocalizationSettings settings) return;
-        {
-            return;
-        }
 
         Language = settings.Language;
         Version = settings.Version;

GFramework.Game/data/DataRepository.cs

@@ -35,11 +35,6 @@ public class DataRepository(IStorage? storage, DataRepositoryOptions? options =
                                 throw new InvalidOperationException(
                                     "Failed to initialize storage. No IStorage utility found in context.");
 
-    protected override void OnInit()
-    {
-        _storage ??= this.GetUtility<IStorage>()!;
-    }
-
     /// <summary>
     ///     异步加载指定位置的数据
     /// </summary>
@@ -96,7 +91,9 @@ public class DataRepository(IStorage? storage, DataRepositoryOptions? options =
     /// <param name="location">数据位置信息</param>
     /// <returns>如果数据存在返回true，否则返回false</returns>
     public Task<bool> ExistsAsync(IDataLocation location)
-        => Storage.ExistsAsync(location.ToStorageKey());
+    {
+        return Storage.ExistsAsync(location.ToStorageKey());
+    }
 
     /// <summary>
     ///     异步删除指定位置的数据
@@ -117,12 +114,14 @@ public class DataRepository(IStorage? storage, DataRepositoryOptions? options =
     public async Task SaveAllAsync(IEnumerable<(IDataLocation location, IData data)> dataList)
     {
         var valueTuples = dataList.ToList();
-        foreach (var (location, data) in valueTuples)
+        foreach (var (location, data) in valueTuples) await SaveAsync(location, data);
-        {
-            await SaveAsync(location, data);
-        }
 
         if (_options.EnableEvents)
             this.SendEvent(new DataBatchSavedEvent(valueTuples));
     }
+
+    protected override void OnInit()
+    {
+        _storage ??= this.GetUtility<IStorage>()!;
+    }
 }

GFramework.Game/data/UnifiedSettingsDataRepository.cs

@@ -209,13 +209,9 @@ public class UnifiedSettingsDataRepository(
             var key = UnifiedKey;
 
             if (await Storage.ExistsAsync(key))
-            {
                 _file = await Storage.ReadAsync<UnifiedSettingsFile>(key);
-            }
             else
-            {
                 _file = new UnifiedSettingsFile { Version = 1 };
-            }
 
             _loaded = true;
         }

GFramework.Game/setting/SettingsModel.cs

@@ -114,7 +114,6 @@ public class SettingsModel<TRepository>(IDataLocationProvider? locationProvider,
         }
 
         foreach (var data in _data.Values)
-        {
             try
             {
                 var type = data.GetType();
@@ -135,7 +134,6 @@ public class SettingsModel<TRepository>(IDataLocationProvider? locationProvider,
             {
                 Log.Error($"Failed to initialize settings data: {data.GetType().Name}", ex);
             }
-        }
 
         this.SendEvent(new SettingsInitializedEvent());
     }
@@ -147,7 +145,6 @@ public class SettingsModel<TRepository>(IDataLocationProvider? locationProvider,
     public async Task SaveAllAsync()
     {
         foreach (var data in _data.Values)
-        {
             try
             {
                 var location = LocationProvider.GetLocation(data.GetType());
@@ -157,7 +154,6 @@ public class SettingsModel<TRepository>(IDataLocationProvider? locationProvider,
             {
                 Log.Error($"Failed to save settings data: {data.GetType().Name}", ex);
             }
-        }
 
         this.SendEvent(new SettingsSavedAllEvent());
     }
@@ -168,7 +164,6 @@ public class SettingsModel<TRepository>(IDataLocationProvider? locationProvider,
     public async Task ApplyAllAsync()
     {
         foreach (var applicator in _applicators)
-        {
             try
             {
                 await applicator.Value.Apply();
@@ -177,7 +172,6 @@ public class SettingsModel<TRepository>(IDataLocationProvider? locationProvider,
             {
                 Log.Error($"Failed to apply settings: {applicator.GetType().Name}", ex);
             }
-        }
 
         this.SendEvent(new SettingsAppliedAllEvent());
     }

GFramework.Game/storage/FileStorage.cs

@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
+using System.IO;
-using System.IO;
 using System.Text;
 using GFramework.Core.Abstractions.serializer;
 using GFramework.Game.Abstractions.storage;