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

Update sink method #113

Merged
merged 1 commit into from
May 10, 2020
Merged

Update sink method #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Sources/VergeStore/Store/Derived+Assign.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extension Derived {
on object: Object,
dropsOutput: @escaping (Changes<Value>) -> Bool = { _ in false }
) -> VergeAnyCancellable {
sinkChanges { [weak object] c in
sinkValue { [weak object] c in
guard !dropsOutput(c) else { return }
object?[keyPath: keyPath] = c.primitive
}
Expand Down Expand Up @@ -92,7 +92,7 @@ extension Derived {
public func assign(
to binder: @escaping (Changes<Value>) -> Void
) -> VergeAnyCancellable {
sinkChanges { c in
sinkValue { c in
binder(c)
}
}
Expand Down
44 changes: 35 additions & 9 deletions Sources/VergeStore/Store/Derived.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public class Derived<Value>: DerivedType {
/// Subscribe the state changes
///
/// - Returns: A subscriber that performs the provided closure upon receiving values.
public func sinkChanges(
public func sinkValue(
dropsFirst: Bool = false,
queue: TargetQueue? = nil,
receive: @escaping (Changes<Value>) -> Void
Expand All @@ -140,11 +140,23 @@ public class Derived<Value>: DerivedType {
}
.asAutoCancellable()
}

/// Subscribe the state changes
///
/// - Returns: A subscriber that performs the provided closure upon receiving values.
@available(*, deprecated, renamed: "sinkValue")
public func sinkChanges(
dropsFirst: Bool = false,
queue: TargetQueue? = nil,
receive: @escaping (Changes<Value>) -> Void
) -> VergeAnyCancellable {
sinkValue(dropsFirst: dropsFirst, queue: queue, receive: receive)
}

/// Subscribe the state changes
///
/// - Returns: A subscriber that performs the provided closure upon receiving values.
@available(*, deprecated, renamed: "sinkChanges")
@available(*, deprecated, renamed: "sinkState")
public func subscribeChanges(
dropsFirst: Bool = false,
queue: TargetQueue? = nil,
Expand Down Expand Up @@ -284,17 +296,31 @@ extension Derived where Value : Equatable {
/// Receives a value only changed
///
/// - Returns: A subscriber that performs the provided closure upon receiving values.
public func sinkChangedValue(
public func sinkChangedPrimitiveValue(
dropsFirst: Bool = false,
queue: TargetQueue? = nil,
receive: @escaping (Value) -> Void
) -> VergeAnyCancellable {
sinkChanges(dropsFirst: dropsFirst, queue: queue) { (changes) in
sinkValue(dropsFirst: dropsFirst, queue: queue) { (changes) in
changes.ifChanged { value in
receive(value)
}
}
}

/// Subscribe the state changes
///
/// Receives a value only changed
///
/// - Returns: A subscriber that performs the provided closure upon receiving values.
@available(*, deprecated, renamed: "sinkStatePrimitiveValue")
public func sinkChangedValue(
dropsFirst: Bool = false,
queue: TargetQueue? = nil,
receive: @escaping (Value) -> Void
) -> VergeAnyCancellable {
sinkChangedPrimitiveValue(dropsFirst: dropsFirst, queue: queue, receive: receive)
}
}

extension Derived where Value == Any {
Expand All @@ -321,14 +347,14 @@ extension Derived where Value == Any {
initialUpstreamState: initial,
subscribeUpstreamState: { callback in

let _s0 = s0.sinkChanges(dropsFirst: true, queue: nil) { (s0) in
let _s0 = s0.sinkValue(dropsFirst: true, queue: nil) { (s0) in
buffer.modify { value in
value.0 = s0.primitive
callback(value)
}
}

let _s1 = s1.sinkChanges(dropsFirst: true, queue: nil) { (s1) in
let _s1 = s1.sinkValue(dropsFirst: true, queue: nil) { (s1) in
buffer.modify { value in
value.1 = s1.primitive
callback(value)
Expand Down Expand Up @@ -369,21 +395,21 @@ extension Derived where Value == Any {
initialUpstreamState: initial,
subscribeUpstreamState: { callback in

let _s0 = s0.sinkChanges(dropsFirst: true, queue: nil) { (s0) in
let _s0 = s0.sinkValue(dropsFirst: true, queue: nil) { (s0) in
buffer.modify { value in
value.0 = s0.primitive
callback(value)
}
}

let _s1 = s1.sinkChanges(dropsFirst: true, queue: nil) { (s1) in
let _s1 = s1.sinkValue(dropsFirst: true, queue: nil) { (s1) in
buffer.modify { value in
value.1 = s1.primitive
callback(value)
}
}

let _s2 = s2.sinkChanges(dropsFirst: true, queue: nil) { (s2) in
let _s2 = s2.sinkValue(dropsFirst: true, queue: nil) { (s2) in
buffer.modify { value in
value.2 = s2.primitive
callback(value)
Expand Down
6 changes: 3 additions & 3 deletions Tests/VergeStoreTests/DerivedTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ final class DerivedTests: XCTestCase {
expectation.expectedFulfillmentCount = 1
expectation.assertForOverFulfill = true

let subscription = baseSlice.sinkChanges(dropsFirst: true) { (changes) in
let subscription = baseSlice.sinkValue(dropsFirst: true) { (changes) in
expectation.fulfill()
}

Expand Down Expand Up @@ -145,7 +145,7 @@ final class DerivedTests: XCTestCase {

XCTAssert(d.primitiveValue == (0, ""))

let sub = d.sinkChanges { (changes) in
let sub = d.sinkValue { (changes) in

updateCount.fulfill()

Expand Down Expand Up @@ -197,7 +197,7 @@ final class DerivedTests: XCTestCase {

XCTAssert(d.primitiveValue == (0, 0))

let sub = d.sinkChanges { (changes) in
let sub = d.sinkValue { (changes) in

updateCount.fulfill()

Expand Down