d

Modules/BusX/Bus/src/Bus.Processor.swift

@@ -7,19 +7,17 @@ public extension Bus {
     public init(
       _ handler: @escaping ((Src) -> Dst?),
       _ keyIn: String,
-      _ keyOut: String,
+      _ keyOut: String
-      opt: [Option] = []
     ) {
-      Bus.process([keyIn], keyOut, handler, opt: opt, sub: &subscriptions)
+      Bus.processSync([keyIn], keyOut, handler, &subscriptions)
     }
 
     public init(
       _ handler: @escaping ((Src) -> Dst?),
       _ keysIn: Set<String>,
-      _ keyOut: String,
+      _ keyOut: String
-      opt: [Option] = []
     ) {
-      Bus.process(keysIn, keyOut, handler, opt: opt, sub: &subscriptions)
+      Bus.processSync(keysIn, keyOut, handler, &subscriptions)
     }
   }
 }

Modules/BusX/Bus/src/Bus.swift

@@ -10,92 +10,83 @@ public enum Bus {
 }
 
 public extension Bus {
-  enum Option {
+  /// Асинхронно обрабатывать входящие события из шины.
-    case async
+  static func receiveAsync<T>(
-  }
-}
-
-public extension Bus {
-  static func receive<T>(
     _ keys: Set<String>,
     _ handler: @escaping ((String, T) -> Void),
-    opt: [Option] = [],
+    _ subscriptions: inout [AnyCancellable]
-    sub subscriptions: inout [AnyCancellable]
   ) {
-    let isAsync = opt.contains(.async)
+    Self.events
-
+      .compactMap { convertKeyValue(keys, $0) }
-    // Async.
+      .receive(on: DispatchQueue.main)
-    if isAsync {
+      .sink { v in handler(v.0, v.1) }
-      Self.events
+      .store(in: &subscriptions)
-        .compactMap { convertKeyValue(keys, $0) }
-        .receive(on: DispatchQueue.main)
-        .sink { v in handler(v.0, v.1) }
-        .store(in: &subscriptions)
-    }
-
-    // Async.
-    if !isAsync {
-      Self.events
-        .compactMap { convertKeyValue(keys, $0) }
-        .sink { v in handler(v.0, v.1) }
-        .store(in: &subscriptions)
-    }
   }
     
-  static func send<T>(
+  /// Синхронно обрабатывать входящие события из шины.
+  static func receiveSync<T>(
+    _ keys: Set<String>,
+    _ handler: @escaping ((String, T) -> Void),
+    _ subscriptions: inout [AnyCancellable]
+  ) {
+    Self.events
+      .compactMap { convertKeyValue(keys, $0) }
+      .sink { v in handler(v.0, v.1) }
+      .store(in: &subscriptions)
+  }
+
+  /// Асинхронно отправлять события из узла в шину.
+  static func sendAsync<T>(
     _ key: String,
     _ node: AnyPublisher<T, Never>,
-    opt: [Option] = [],
+    _ subscriptions: inout [AnyCancellable]
-    sub subscriptions: inout [AnyCancellable]
   ) {
-    let isAsync = opt.contains(.async)
+    node
-
+      .receive(on: DispatchQueue.main)
-    // Async.
+      .sink { v in Self.e.send((key, v)) }
-    if isAsync {
+      .store(in: &subscriptions)
-      node
-        .receive(on: DispatchQueue.main)
-        .sink { v in Self.e.send((key, v)) }
-        .store(in: &subscriptions)
-    }
-
-    // Sync.
-    if !isAsync {
-      node
-        .sink { v in Self.e.send((key, v)) }
-        .store(in: &subscriptions)
-    }
   }
     
+  /// Синхронно отправлять события из узла в шину.
+  static func sendSync<T>(
+    _ key: String,
+    _ node: AnyPublisher<T, Never>,
+    _ subscriptions: inout [AnyCancellable]
+  ) {
+    node
+      .sink { v in Self.e.send((key, v)) }
+      .store(in: &subscriptions)
+  }
+  
+  /// Синхронно отправить событие в шину один раз.
   static func send(_ key: String, _ value: Any) {
     Self.e.send((key, value))
   }
 }
 
 public extension Bus {
-  static func process<Src, Dst>(
+  static func processAsync<Src, Dst>(
     _ keysIn: Set<String>,
     _ keyOut: String,
     _ handler: @escaping ((Src) -> Dst?),
-    opt: [Option] = [],
+    _ subscriptions: inout [AnyCancellable]
-    sub subscriptions: inout [AnyCancellable]
   ) {
-    let isAsync = opt.contains(.async)
+    Self.events
+    .compactMap { processKeysValue($0, keysIn, handler) }
+    .receive(on: DispatchQueue.main)
+    .sink { vOut in Self.e.send((keyOut, vOut)) }
+    .store(in: &subscriptions)
+  }
 
-    // Async.
+  static func processSync<Src, Dst>(
-    if isAsync {
+    _ keysIn: Set<String>,
-      Self.events
+    _ keyOut: String,
-      .compactMap { processKeysValue($0, keysIn, handler) }
+    _ handler: @escaping ((Src) -> Dst?),
-      .receive(on: DispatchQueue.main)
+    _ subscriptions: inout [AnyCancellable]
-      .sink { vOut in Self.e.send((keyOut, vOut)) }
+  ) {
-      .store(in: &subscriptions)
+    Self.events
-    }
+    .compactMap { processKeysValue($0, keysIn, handler) }
-
+    .sink { vOut in Self.e.send((keyOut, vOut)) }
-    // Sync.
+    .store(in: &subscriptions)
-    if !isAsync {
-      Self.events
-      .compactMap { processKeysValue($0, keysIn, handler) }
-      .sink { vOut in Self.e.send((keyOut, vOut)) }
-      .store(in: &subscriptions)
-    }
   }
 }

Modules/BusX/BusUI/src/BusUI.Button.swift

@@ -6,10 +6,10 @@ extension BusUI {
     var subscriptions = [AnyCancellable]()
    
     public init(_ key: String) {
-      Bus.send(
+      Bus.sendSync(
         key,
         v.map { true }.eraseToAnyPublisher(),
-        sub: &subscriptions
+        &subscriptions
       )
     }
   }

Modules/BusX/BusUI/src/BusUI.TextField.swift

@@ -10,19 +10,19 @@ extension BusUI {
       _ textApp: String,
       _ textUI: String
     ) {
-      Bus.send(
+      Bus.sendSync(
         textUI,
         $v
           .removeDuplicates()
           .compactMap(onlyUIText)
           .eraseToAnyPublisher(),
-        sub: &subscriptions
+        &subscriptions
       )
    
-      Bus.receive(
+      Bus.receiveSync(
         [textApp],
         { [weak self] (_, v: String) in self?.v = "a:\(v)" },
-        sub: &subscriptions
+        &subscriptions
       )
     }
   }

Modules/BusX/BusUI/src/BusUI.Value.swift

@@ -10,10 +10,10 @@ extension BusUI {
       _ defaultValue: T
     ) {
       v = defaultValue
-      Bus.receive(
+      Bus.receiveSync(
         [key],
         { [weak self] (_, v: T) in self?.v = v },
-        sub: &subscriptions
+        &subscriptions
       )
     }
   }

Modules/MeetupIdX/src/MeetupId.Debounce.swift

@@ -12,19 +12,19 @@ extension MeetupId {
       _ src: String,
       _ dst: String
     ) {
-      Bus.receive(
+      Bus.receiveSync(
         [src],
         { [weak self] _, v in self?.v.send(v) },
-        sub: &subscriptions
+        &subscriptions
       )
 
-      Bus.send(
+      Bus.sendSync(
         dst,
         v
           .debounce(for: .seconds(sec), scheduler: DispatchQueue.main)
           .compactMap { (v: Src) in handler(v) }
           .eraseToAnyPublisher(),
-        sub: &subscriptions
+        &subscriptions
       )
     }
   }

Modules/MeetupIdX/src/MeetupId.Delay.swift

@@ -12,19 +12,19 @@ extension MeetupId {
       _ src: String,
       _ dst: String
     ) {
-      Bus.receive(
+      Bus.receiveSync(
         [src],
         { [weak self] _, v in self?.v.send(v) },
-        sub: &subscriptions
+        &subscriptions
       )
 
-      Bus.send(
+      Bus.sendSync(
         dst,
         v
           .delay(for: .seconds(sec), scheduler: DispatchQueue.main)
           .compactMap { (v: Src) in handler(v) }
           .eraseToAnyPublisher(),
-        sub: &subscriptions
+        &subscriptions
       )
     }
   }