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

Jump to bottom

SwiftDataStore #4

Open
wants to merge 15 commits into
base: work/swift-data-repo-tim
Choose a base branch
from
Open

SwiftDataStore #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b8a616c
SwiftDataStore
cfoughty7 Oct 2, 2024
2dc4d3f
Better merge strategy
cfoughty7 Oct 2, 2024
1d66bf8
Merge branch 'work/swift-data-repo-tim' into work/swiftdata-store
cfoughty7 Oct 2, 2024
9ba679e
Merge branch 'work/swift-data-repo-tim' into work/swiftdata-store
cfoughty7 Oct 3, 2024
6719ae2
Fix timestamps
cfoughty7 Oct 3, 2024
ee064a3
Equatable errors
cfoughty7 Oct 3, 2024
524ffba
Update SwiftDataStore actor
cfoughty7 Oct 3, 2024
3892761
Fix Timestamp store bug
cfoughty7 Oct 3, 2024
c071ace
MainActor get
cfoughty7 Oct 3, 2024
096a28b
Merge branch 'work/swift-data-repo-tim' into work/swiftdata-store
cfoughty7 Oct 3, 2024
ba16ccc
Updated persistent store
cfoughty7 Oct 3, 2024
4d44ae8
Make public
cfoughty7 Oct 3, 2024
7a12f5d
Cleanup
cfoughty7 Oct 3, 2024
f8cb398
Unused codable
cfoughty7 Oct 3, 2024
2ca2857
End to end test
cfoughty7 Oct 3, 2024
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
2 changes: 1 addition & 1 deletion Sources/Core/Error/AppError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import Foundation

public protocol AppError: Error {
public protocol AppError: Error, Equatable {
associatedtype UIErrorType = UIError

/// Optional error data to present to the user
Expand Down
5 changes: 3 additions & 2 deletions Sources/Core/Error/DefaultError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public struct DefaultError<UIErrorType: UIError>: AppError {
intent: ErrorIntent = .indispensable
) {
self.uiError = uiError
self.error = error
self.error = error as? NSError
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're going to do this, the initializer should specify NSError rather than Error so that other error types don't slip through the cracks. But ideally this would work with any Error. Remind me why we need Equatable?

self.isNotable = isNotable
self.isRetryable = isRetryable
self.intent = intent
Expand All @@ -35,7 +35,8 @@ public struct DefaultError<UIErrorType: UIError>: AppError {

public var intent: ErrorIntent

public let error: Error?
// Using `NSError` allows us to be `Equatable`
public let error: NSError?

public var localizedDescription: String {
if let error {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Core/Error/UIError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import SwiftUI
///
/// Use `DefaultUIError` or implement your own to have more rich
/// data types including images, titles, etc.
public protocol UIError: Error, Identifiable {
public protocol UIError: Error, Identifiable, Hashable {
var message: String { get }
var isRetryable: Bool { get }
}
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftRepo/Repository/Protocols/Repository/ConstantQueryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public protocol ConstantQueryRepository<Variables, Value>: HasValueResult {
/// - willGet: a callback that is invoked if the query is performed.
///
/// When using a loading controller, the function `loadingController.loading` should be passed to the `willGet` parameter.
@MainActor
func get(errorIntent: ErrorIntent, queryStrategy: QueryStrategy?, willGet: @escaping Query.WillGet) async

/// Publishes results. The publisher's first element will be the currently stored value, if any, at the time of the `publisher()` call.
Expand All @@ -43,6 +44,7 @@ public protocol ConstantQueryRepository<Variables, Value>: HasValueResult {

public extension ConstantQueryRepository {

@MainActor
func get(
errorIntent: ErrorIntent,
queryStrategy: QueryStrategy? = nil,
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftRepo/Repository/Protocols/Repository/QueryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public protocol QueryRepository<QueryId, Variables, Key, Value>: HasValueResult
/// - willGet: a callback that is invoked if the query is performed.
///
/// When using a loading controller, the function `loadingController.loading` should be passed to the `willGet` parameter.
@MainActor
func get(
queryId: QueryId,
variables: Variables,
Expand Down Expand Up @@ -63,6 +64,7 @@ public protocol QueryRepository<QueryId, Variables, Key, Value>: HasValueResult

public extension QueryRepository {

@MainActor
func get(
queryId: QueryId,
variables: Variables,
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftRepo/Repository/Protocols/Repository/VariableQueryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public protocol VariableQueryRepository<Variables, Value>: HasValueResult {
/// - willGet: a callback that is invoked if the query is performed.
///
/// When using a loading controller, the function `loadingController.loading` should be passed to the `willGet` parameter.
@MainActor
func get(
variables: Variables,
errorIntent: ErrorIntent,
Expand All @@ -49,6 +50,7 @@ public protocol VariableQueryRepository<Variables, Value>: HasValueResult {

public extension VariableQueryRepository {

@MainActor
func get(
variables: Variables,
errorIntent: ErrorIntent,
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRepo/Repository/Repository/DefaultConstantQueryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public final class DefaultConstantQueryRepository<Variables, Value>: ConstantQue

// MARK: - ConstantQueryRepository

@MainActor
public func get(
errorIntent: ErrorIntent,
queryStrategy: QueryStrategy?,
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRepo/Repository/Repository/DefaultQueryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ where QueryId: Hashable, Variables: Hashable, Key: Hashable {

// MARK: - QueryRepository

@MainActor
public func get(
queryId: QueryId,
variables: Variables,
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRepo/Repository/Repository/DefaultVariableQueryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public final class DefaultVariableQueryRepository<Variables, Value>: VariableQue

// MARK: - VariableQueryRepository

@MainActor
public func get(
variables: Variables,
errorIntent: ErrorIntent,
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRepo/Repository/Repository/PagedQueryRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public final class PagedQueryRepository<QueryId, Variables, Key, Value>: QueryRe

public typealias ValueVariablesFactory = (_ queryId: QueryId, _ variables: Variables, _ value: Value) -> Variables

@MainActor
public func get(
queryId: QueryId,
variables: Variables,
Expand Down
Loading