Fixed result builder

Author: Dean151

Sources/RuleKit/Center.swift

@@ -118,7 +118,12 @@ extension RuleKit {
         RuleKit.internal.rules.append((rule, trigger))
     }
 
+    @available(*, deprecated, message: "Use setRule(_:, callback:, options:, rule:) instead")
     public static func setRule(triggering callback: @escaping @Sendable () -> Void, name: String, options: [any RuleKitOption] = [], _ rule: Rule) {
+        setRule(name, triggering: callback, options: options, rule)
+    }
+
+    public static func setRule(_ name: String, triggering callback: @escaping @Sendable () -> Void, options: [any RuleKitOption] = [], _ rule: Rule) {
         let trigger = CallbackTrigger(rawValue: name, callback: callback)
         let rule = options.isEmpty ? rule : RuleWithOptions(options: options, trigger: trigger, rule: rule)
         RuleKit.internal.rules.append((rule, trigger))

Sources/RuleKit/Rule.swift

@@ -37,10 +37,42 @@ extension Rule {
     }
 }
 
-@resultBuilder struct RuleBuilder {
-    static func buildBlock(_ components: Rule...) -> [any Rule] {
+@resultBuilder public struct RuleBuilder {
+    public static func buildBlock(_ components: Rule...) -> [any Rule] {
         components
     }
+
+    public static func buildBlock(_ components: [Rule]...) -> [Rule] {
+        components.flatMap { $0 }
+    }
+
+    public static func buildExpression(_ expression: Rule) -> [Rule] {
+        [expression]
+    }
+
+    public static func buildExpression(_ expression: [Rule]) -> [Rule] {
+        expression
+    }
+
+    public static func buildOptional(_ component: [Rule]?) -> [Rule] {
+        component ?? []
+    }
+
+    public static func buildEither(first component: [Rule]) -> [Rule] {
+        component
+    }
+
+    public static func buildEither(second component: [Rule]) -> [Rule] {
+        component
+    }
+
+    public static func buildArray(_ components: [[Rule]]) -> [Rule] {
+        components.flatMap { $0 }
+    }
+
+    public static func buildLimitedAvailability(_ component: [Rule]) -> [Rule] {
+        component
+    }
 }
 
 // MARK: Event rule
@@ -59,7 +91,7 @@ public struct EventRule: Rule {
         }
     }
 
-    init(event: RuleKit.Event, condition: @escaping (RuleKit.DonatedEvent) -> Bool) {
+    public init(event: RuleKit.Event, condition: @escaping (RuleKit.DonatedEvent) -> Bool) {
         self.event = event
         self.condition = condition
     }
@@ -84,11 +116,23 @@ public struct AnyOfRule: Rule {
             return false
         }
     }
+
+    public init(rules: [any Rule]) {
+        self.rules = rules
+    }
+
+    public init(@RuleBuilder rules: () -> [any Rule]) {
+        self.rules = rules()
+    }
 }
 
 extension Rule where Self == AnyOfRule {
+    public static func anyOf(_  rules: [any Rule]) -> Rule {
+        AnyOfRule(rules: rules)
+    }
+
     public static func anyOf(@RuleBuilder _  rules: () -> [any Rule]) -> Rule {
-        AnyOfRule(rules: rules())
+        AnyOfRule(rules: rules)
     }
 }
 
@@ -105,11 +149,23 @@ public struct AllOfRule: Rule {
             return true
         }
     }
+
+    public init(rules: [any Rule]) {
+        self.rules = rules
+    }
+
+    public init(@RuleBuilder rules: () -> [any Rule]) {
+        self.rules = rules()
+    }
 }
 
 extension Rule where Self == AllOfRule {
+    public static func allOf(_  rules: [any Rule]) -> Rule {
+        AllOfRule(rules: rules)
+    }
+
     public static func allOf(@RuleBuilder _  rules: () -> [any Rule]) -> Rule {
-        AllOfRule(rules: rules())
+        AllOfRule(rules: rules)
     }
 }
 

Tests/RuleKitTests/RuleKitTests.swift

@@ -26,7 +26,7 @@
 //
 
 import XCTest
-@testable import RuleKit
+import RuleKit
 
 extension RuleKit.Event {
     static let testEvent: Self = "test.event"
@@ -44,6 +44,20 @@ final class RuleKitTests: XCTestCase {
     }
 
     func testNotificationRuleTriggering() async throws {
+        await RuleKit.Event.testEvent.reset()
+        await RuleKit.setRule(triggering: Self.testNotification, .anyOf([
+            EventRule(event: .testEvent) {
+                $0.donations.count > 0
+            }
+        ]))
+        let expectation = expectation(forNotification: Self.testNotification, object: nil)
+        await RuleKit.Event.testEvent.donate()
+        await fulfillment(of: [expectation])
+        let count = await RuleKit.Event.testEvent.donations.count
+        XCTAssertEqual(1, count)
+    }
+
+    func testNotificationRuleTriggeringResultBuilder() async throws {
         await RuleKit.Event.testEvent.reset()
         await RuleKit.setRule(triggering: Self.testNotification, .anyOf {
             EventRule(event: .testEvent) {
@@ -60,9 +74,25 @@ final class RuleKitTests: XCTestCase {
     func testCallbackRuleTriggering() async throws {
         await RuleKit.Event.testEvent.reset()
         let expectation = XCTestExpectation()
-        await RuleKit.setRule(triggering: {
+        await RuleKit.setRule(Self.testCallback, triggering: {
+            expectation.fulfill()
+        }, .anyOf([
+            EventRule(event: .testEvent) {
+                $0.donations.count > 0
+            }
+        ]))
+        await RuleKit.Event.testEvent.donate()
+        await fulfillment(of: [expectation])
+        let count = await RuleKit.Event.testEvent.donations.count
+        XCTAssertEqual(1, count)
+    }
+
+    func testCallbackRuleTriggeringResultBuilder() async throws {
+        await RuleKit.Event.testEvent.reset()
+        let expectation = XCTestExpectation()
+        await RuleKit.setRule(Self.testCallback, triggering: {
             expectation.fulfill()
-        }, rawValue: Self.testCallback, .anyOf {
+        }, .anyOf {
             EventRule(event: .testEvent) {
                 $0.donations.count > 0
             }