@@ -32,22 +32,24 @@ public protocol RxControllerEventRouter: class {
3232 var disposeBag : DisposeBag { get }
3333}
3434
35- struct RxControllerEventForworder {
35+ struct RxControllerEventForwarder {
3636 let input : PublishRelay < RxControllerEvent >
3737 let inputIdentifier : RxControllerEvent . Identifier
3838 let output : PublishRelay < RxControllerEvent >
3939 let outputIdentifier : RxControllerEvent . Identifier
4040
41- func forword ( ) -> Disposable {
41+ func forward ( ) -> Disposable {
4242 return input. value ( of: inputIdentifier) . subscribe ( onNext: {
4343 self . output. accept ( self . outputIdentifier. event ( $0) )
4444 } )
4545 }
4646
47- func forword< T, O: ObservableConvertibleType > ( flatMapLatest: @escaping ( ( T ? ) -> O ) ) -> Disposable {
48- return input. value ( of: inputIdentifier, type: T . self) . flatMapLatest ( flatMapLatest) . subscribe ( onNext: {
49- self . output. accept ( self . outputIdentifier. event ( $0) )
50- } )
47+ func forward< T, O: ObservableConvertibleType > ( flatMapLatest: @escaping ( ( T ? ) -> O ) ) -> Disposable {
48+ return input. value ( of: inputIdentifier, type: T . self)
49+ . flatMapLatest ( flatMapLatest)
50+ . subscribe ( onNext: {
51+ self . output. accept ( self . outputIdentifier. event ( $0) )
52+ } )
5153 }
5254}
5355
@@ -57,46 +59,46 @@ extension RxControllerEventRouter {
5759 parentEvent parentEventIdentifier: RxControllerEvent . Identifier ,
5860 toEvent eventIdentifier: RxControllerEvent . Identifier
5961 ) {
60- let forworder = RxControllerEventForworder (
62+ let forwarder = RxControllerEventForwarder (
6163 input: parentEvents, inputIdentifier: parentEventIdentifier,
6264 output: events, outputIdentifier: eventIdentifier
6365 )
64- return forworder . forword ( ) . disposed ( by: disposeBag)
66+ return forwarder . forward ( ) . disposed ( by: disposeBag)
6567 }
6668
6769 public func forward< T, O: ObservableConvertibleType > (
6870 parentEvent parentEventIdentifier: RxControllerEvent . Identifier ,
6971 toEvent eventIdentifier: RxControllerEvent . Identifier ,
7072 flatMapLatest: @escaping ( T ? ) -> O
7173 ) {
72- let forworder = RxControllerEventForworder (
74+ let forwarder = RxControllerEventForwarder (
7375 input: parentEvents, inputIdentifier: parentEventIdentifier,
7476 output: events, outputIdentifier: eventIdentifier
7577 )
76- forworder . forword ( flatMapLatest: flatMapLatest) . disposed ( by: disposeBag)
78+ forwarder . forward ( flatMapLatest: flatMapLatest) . disposed ( by: disposeBag)
7779 }
7880
7981 public func forward(
8082 event eventIdentifier: RxControllerEvent . Identifier ,
8183 toParentEvent parentEventIdentifier: RxControllerEvent . Identifier
8284 ) {
83- let forworder = RxControllerEventForworder (
85+ let forwarder = RxControllerEventForwarder (
8486 input: events, inputIdentifier: eventIdentifier,
8587 output: parentEvents, outputIdentifier: parentEventIdentifier
8688 )
87- forworder . forword ( ) . disposed ( by: disposeBag)
89+ forwarder . forward ( ) . disposed ( by: disposeBag)
8890 }
8991
9092 public func forward< T, O: ObservableConvertibleType > (
9193 event eventIdentifier: RxControllerEvent . Identifier ,
9294 toParentEvent parentEventIdentifier: RxControllerEvent . Identifier ,
9395 flatMapLatest: @escaping ( T ? ) -> O
9496 ) {
95- let forworder = RxControllerEventForworder (
97+ let forwarder = RxControllerEventForwarder (
9698 input: events, inputIdentifier: eventIdentifier,
9799 output: parentEvents, outputIdentifier: parentEventIdentifier
98100 )
99- forworder . forword ( flatMapLatest: flatMapLatest) . disposed ( by: disposeBag)
101+ forwarder . forward ( flatMapLatest: flatMapLatest) . disposed ( by: disposeBag)
100102 }
101103
102104}
0 commit comments