Cleanup ValueReducer

This commit is contained in:
Gwendal Roué committed 2024-07-27 16:37:33 +02:00
1 parent 2ce8a6191d
commit 6c73b1c5c8
6 files changed
+29 -32

No files matched your search

@@ -313,6 +313,6 @@ When needed, you can help GRDB optimize observations and reduce database content
- ``handleEvents(willStart:willFetch:willTrackRegion:databaseDidChange:didReceiveValue:didFail:didCancel:)``
- ``print(_:to:)``
### Support
### Supporting Types
- ``ValueReducer``
+6 -8
View File
@@ -26,11 +26,11 @@ extension ValueObservation {
}
extension ValueReducers {
/// A `ValueReducer` whose values consist of those in a `Base` reduced
/// A `ValueReducer` whose values consist of those in a `Base` reducer
/// passed through a transform function.
///
/// See ``ValueObservation/map(_:)``.
public struct Map<Base: _ValueReducer, Value>: _ValueReducer {
public struct Map<Base: _ValueReducer, Value>: ValueReducer {
private var base: Base
private let transform: (Base.Value) throws -> Value
@@ -39,15 +39,13 @@ extension ValueReducers {
self.transform = transform
}
public func _fetch(_ db: Database) throws -> Base.Fetched {
try base._fetch(db)
}
public mutating func _value(_ fetched: Base.Fetched) throws -> Value? {
guard let value = try base._value(fetched) else { return nil }
return try transform(value)
}
}
}
extension ValueReducers.Map: ValueReducer where Base: ValueReducer {
public func _fetch(_ db: Database) throws -> Base.Fetched {
try base._fetch(db)
}
}
@@ -67,7 +67,7 @@ extension ValueReducers {
/// previously observed value.
///
/// See ``ValueObservation/removeDuplicates()``.
public struct RemoveDuplicates<Base: _ValueReducer>: _ValueReducer {
public struct RemoveDuplicates<Base: _ValueReducer>: ValueReducer {
private var base: Base
private var previousValue: Base.Value?
private var predicate: (Base.Value, Base.Value) -> Bool
@@ -77,6 +77,10 @@ extension ValueReducers {
self.predicate = predicate
}
public func _fetch(_ db: Database) throws -> Base.Fetched {
try base._fetch(db)
}
public mutating func _value(_ fetched: Base.Fetched) throws -> Base.Value? {
guard let value = try base._value(fetched) else {
return nil
@@ -90,9 +94,3 @@ extension ValueReducers {
}
}
}
extension ValueReducers.RemoveDuplicates: ValueReducer where Base: ValueReducer {
public func _fetch(_ db: Database) throws -> Base.Fetched {
try base._fetch(db)
}
}
+6 -8
View File
@@ -4,11 +4,16 @@ extension ValueReducers {
///
/// See ``ValueObservation/handleEvents(willStart:willFetch:willTrackRegion:databaseDidChange:didReceiveValue:didFail:didCancel:)``
/// and ``ValueObservation/print(_:to:)``.
public struct Trace<Base: _ValueReducer>: _ValueReducer {
public struct Trace<Base: _ValueReducer>: ValueReducer {
var base: Base
let willFetch: () -> Void
let didReceiveValue: (Base.Value) -> Void
public func _fetch(_ db: Database) throws -> Base.Fetched {
willFetch()
return try base._fetch(db)
}
public mutating func _value(_ fetched: Base.Fetched) throws -> Base.Value? {
guard let value = try base._value(fetched) else {
return nil
@@ -19,10 +24,3 @@ extension ValueReducers {
}
// swiftlint:enable line_length
}
extension ValueReducers.Trace: ValueReducer where Base: ValueReducer {
public func _fetch(_ db: Database) throws -> Base.Fetched {
willFetch()
return try base._fetch(db)
}
}
@@ -6,6 +6,11 @@ public protocol _ValueReducer {
/// The type of observed values
associatedtype Value
/// Fetches database values upon changes in an observed database region.
///
/// This method must does not depend on the state of the reducer.
func _fetch(_ db: Database) throws -> Fetched
/// Transforms a fetched value into an eventual observed value. Returns nil
/// when observer should not be notified.
///
@@ -26,17 +31,15 @@ public protocol _ValueReducer {
/// A `ValueReducer` fetches and transforms the database values
/// observed by a ``ValueObservation``.
///
/// Do not declare new conformances to `ValueReducer`. Only the built-in
/// conforming types are valid.
///
/// ## Topics
///
/// ### Support
/// ### Supporting Types
///
/// - ``ValueReducers``
public protocol ValueReducer: _ValueReducer {
/// Fetches database values upon changes in an observed database region.
///
/// This method must does not depend on the state of the reducer.
func _fetch(_ db: Database) throws -> Fetched
}
public protocol ValueReducer: _ValueReducer { }
/// A namespace for concrete types that adopt the ``ValueReducer`` protocol.
public enum ValueReducers { }
+1 -1
View File
@@ -97,7 +97,7 @@
- [X] GRDB7: All writes should be immediate, right? https://github.com/groue/GRDB.swift/pull/1485#issuecomment-1953793553
- [X] GRDB7: Remove concurrenRead and DatabaseFuture
- [ ] GRDB7: Change ValueObservation callback argument so that it could expose snapshots? https://github.com/groue/GRDB.swift/discussions/1523#discussioncomment-9092500
- [ ] GRDB7: Merge `_ValueReducer` into `ValueReducer`
- [X] GRDB7: Cleanup `ValueReducer`
- [ ] GRDB7: Sendable conformances
- [X] SerializedDatabase Sendable async closure
- [X] OnDemandFuture Sendable async closure