Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combine signals #78

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Combine signals #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34d6450
Introduce MergeSignals.swift with merge & combineLatest
AndrewSB Apr 24, 2019
52a920d
Add option with 3 signals to merge & combineLatest
AndrewSB Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Signals.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@

/* Begin PBXBuildFile section */
158A3F152052EE8E00174952 /* UIBarButtonItem+Signals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 158A3F142052EE8E00174952 /* UIBarButtonItem+Signals.swift */; };
46874B202270D79000162049 /* MergeSignal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B1F2270D79000162049 /* MergeSignal.swift */; };
46874B212270D79000162049 /* MergeSignal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B1F2270D79000162049 /* MergeSignal.swift */; };
46874B222270D79000162049 /* MergeSignal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B1F2270D79000162049 /* MergeSignal.swift */; };
46874B232270D79000162049 /* MergeSignal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B1F2270D79000162049 /* MergeSignal.swift */; };
46874B252270D9BF00162049 /* MergeSignals+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B242270D9BF00162049 /* MergeSignals+arity.swift */; };
46874B262270D9BF00162049 /* MergeSignals+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B242270D9BF00162049 /* MergeSignals+arity.swift */; };
46874B272270D9BF00162049 /* MergeSignals+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B242270D9BF00162049 /* MergeSignals+arity.swift */; };
46874B282270D9BF00162049 /* MergeSignals+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46874B242270D9BF00162049 /* MergeSignals+arity.swift */; };
720D11781A085315003C4361 /* Signals.h in Headers */ = {isa = PBXBuildFile; fileRef = 720D11771A085315003C4361 /* Signals.h */; settings = {ATTRIBUTES = (Public, ); }; };
720D117E1A085315003C4361 /* Signals.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 720D11721A085314003C4361 /* Signals.framework */; };
720D11851A085315003C4361 /* SignalsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 720D11841A085315003C4361 /* SignalsTests.swift */; };
Expand Down Expand Up @@ -65,6 +73,8 @@

/* Begin PBXFileReference section */
158A3F142052EE8E00174952 /* UIBarButtonItem+Signals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "UIBarButtonItem+Signals.swift"; path = "ios/UIBarButtonItem+Signals.swift"; sourceTree = "<group>"; };
46874B1F2270D79000162049 /* MergeSignal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeSignal.swift; sourceTree = "<group>"; };
46874B242270D9BF00162049 /* MergeSignals+arity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MergeSignals+arity.swift"; sourceTree = "<group>"; };
720D11721A085314003C4361 /* Signals.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Signals.framework; sourceTree = BUILT_PRODUCTS_DIR; };
720D11761A085315003C4361 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
720D11771A085315003C4361 /* Signals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Signals.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -171,6 +181,8 @@
children = (
720D11771A085315003C4361 /* Signals.h */,
720D11941A08537E003C4361 /* Signal.swift */,
46874B1F2270D79000162049 /* MergeSignal.swift */,
46874B242270D9BF00162049 /* MergeSignals+arity.swift */,
724993511C435569006653CB /* iOS */,
720D11751A085315003C4361 /* Supporting Files */,
);
Expand Down Expand Up @@ -502,8 +514,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
46874B252270D9BF00162049 /* MergeSignals+arity.swift in Sources */,
72321EFC1DB74CA300E79E9D /* AssociatedObject.swift in Sources */,
72321EFF1DB74CBF00E79E9D /* UIControl+Signals.swift in Sources */,
46874B202270D79000162049 /* MergeSignal.swift in Sources */,
158A3F152052EE8E00174952 /* UIBarButtonItem+Signals.swift in Sources */,
720D11951A08537E003C4361 /* Signal.swift in Sources */,
);
Expand All @@ -525,6 +539,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
46874B282270D9BF00162049 /* MergeSignals+arity.swift in Sources */,
46874B232270D79000162049 /* MergeSignal.swift in Sources */,
721E12A91C1E8E1D00CD0CBA /* Signal.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -534,7 +550,9 @@
buildActionMask = 2147483647;
files = (
72321EFD1DB74CA400E79E9D /* AssociatedObject.swift in Sources */,
46874B272270D9BF00162049 /* MergeSignals+arity.swift in Sources */,
72321F001DB74CC000E79E9D /* UIControl+Signals.swift in Sources */,
46874B222270D79000162049 /* MergeSignal.swift in Sources */,
725B76CD1C26572E001D04CC /* Signal.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -555,6 +573,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
46874B262270D9BF00162049 /* MergeSignals+arity.swift in Sources */,
46874B212270D79000162049 /* MergeSignal.swift in Sources */,
72665B4E1C212BEC0067DF26 /* Signal.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
72 changes: 72 additions & 0 deletions Signals/MergeSignal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import Foundation
#if os(Linux)
import Dispatch
#endif

public extension Signal {
/// http://rxmarbles.com/#merge
static func merge<T, U>(_ signalOne: Signal<T>, _ signalTwo: Signal<U>, retainLastData: Bool = true) -> Signal<(T?, U?)> {
return MergeSignals(signalOne, signalTwo)
}

/// http://rxmarbles.com/#combineLatest
static func combineLatest<T, U>(_ signalOne: Signal<T>, _ signalTwo: Signal<U>, retainLatestData: Bool = true) -> Signal<(T, U)> {
return CombineLatestSignals(signalOne, signalTwo)
}
}

private class CombineLatestSignals<A, B>: Signal<(A, B)> {
private var oneLastData: A? = .none
private var twoLastData: B? = .none

let signalOne: Signal<A>
let signalTwo: Signal<B>

init(_ signalOne: Signal<A>, _ signalTwo: Signal<B>, retainLastData: Bool = true) {
self.signalOne = signalOne
self.signalTwo = signalTwo
super.init(retainLastData: retainLastData)

signalOne.subscribePast(with: self) { a in
self.oneLastData = a
self.forwardToCombinedIfAppropriate()
}
signalTwo.subscribePast(with: self) { b in
self.twoLastData = b
self.forwardToCombinedIfAppropriate()
}
}

internal func forwardToCombinedIfAppropriate() {
guard let oneData = oneLastData, let twoData = twoLastData else { return }

self.fire((oneData, twoData))
}
}

private class MergeSignals<A, B>: Signal<(A?, B?)> {
private var oneLastData: A? = .none
private var twoLastData: B? = .none

let signalOne: Signal<A>
let signalTwo: Signal<B>

init(_ signalOne: Signal<A>, _ signalTwo: Signal<B>, retainLastData: Bool = true) {
self.signalOne = signalOne
self.signalTwo = signalTwo
super.init(retainLastData: retainLastData)

signalOne.subscribePast(with: self) { a in
self.oneLastData = a
self.forwardSignal()
}
signalTwo.subscribePast(with: self) { b in
self.twoLastData = b
self.forwardSignal()
}
}

private func forwardSignal() {
self.fire((oneLastData, twoLastData))
}
}
88 changes: 88 additions & 0 deletions Signals/MergeSignals+arity.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import Foundation
#if os(Linux)
import Dispatch
#endif

public extension Signal {
/// http://rxmarbles.com/#merge
static func merge<T, U, V>(_ signalOne: Signal<T>, _ signalTwo: Signal<U>, _ signalThree: Signal<V>, retainLastData: Bool = true) -> Signal<(T?, U?, V?)> {
return MergeSignals3(signalOne, signalTwo, signalThree)
}

/// http://rxmarbles.com/#combineLatest
static func combineLatest<T, U, V>(_ signalOne: Signal<T>, _ signalTwo: Signal<U>, _ signalThree: Signal<V>, retainLatestData: Bool = true) -> Signal<(T, U, V)> {
return CombineLatestSignals3(signalOne, signalTwo, signalThree)
}
}

private class MergeSignals3<A, B, C>: Signal<(A?, B?, C?)> {
private var oneLastData: A?
private var twoLastData: B?
private var threeLastData: C?

let signalOne: Signal<A>
let signalTwo: Signal<B>
let signalThree: Signal<C>

init(_ signalOne: Signal<A>, _ signalTwo: Signal<B>, _ signalThree: Signal<C>, retainLastData: Bool = true) {
self.signalOne = signalOne
self.signalTwo = signalTwo
self.signalThree = signalThree
super.init(retainLastData: retainLastData)

signalOne.subscribePast(with: self) { a in
self.oneLastData = a
self.forwardSignal()
}
signalTwo.subscribePast(with: self) { b in
self.twoLastData = b
self.forwardSignal()
}
signalThree.subscribe(with: self) { c in
self.threeLastData = c
self.forwardSignal()
}
}

private func forwardSignal() {
self.fire((oneLastData, twoLastData, threeLastData))
}
}

private class CombineLatestSignals3<A, B, C>: Signal<(A, B, C)> {
private var oneLastData: A?
private var twoLastData: B?
private var threeLastData: C?

let signalOne: Signal<A>
let signalTwo: Signal<B>
let signalThree: Signal<C>

init(_ signalOne: Signal<A>, _ signalTwo: Signal<B>, _ signalThree: Signal<C>, retainLastData: Bool = true) {
self.signalOne = signalOne
self.signalTwo = signalTwo
self.signalThree = signalThree
super.init(retainLastData: retainLastData)

signalOne.subscribePast(with: self) { a in
self.oneLastData = a
self.forwardToCombinedIfAppropriate()
}
signalTwo.subscribePast(with: self) { b in
self.twoLastData = b
self.forwardToCombinedIfAppropriate()
}
signalThree.subscribe(with: self) { c in
self.threeLastData = c
self.forwardToCombinedIfAppropriate()
}
}

internal func forwardToCombinedIfAppropriate() {
guard let oneData = oneLastData,
let twoData = twoLastData,
let threeData = threeLastData else { return }

self.fire((oneData, twoData, threeData))
}
}
2 changes: 1 addition & 1 deletion Signals/Signal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Dispatch

/// Create instances of `Signal` and assign them to public constants on your class for each event type that your
/// class fires.
final public class Signal<T> {
public class Signal<T> {

public typealias SignalCallback = (T) -> Void

Expand Down