Skip to content

Add extension to dispatch attributed actions from publishers #11

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

Merged
merged 13 commits into from
Mar 27, 2023
Merged

Add extension to dispatch attributed actions from publishers #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9355cf0
Add extension to dispatch attributed actions from publishers
sebastianvarela Mar 24, 2023
365ed77
Try
sebastianvarela Mar 24, 2023
5154913
Ignore output files
sebastianvarela Mar 24, 2023
04184f4
Another try
sebastianvarela Mar 24, 2023
67a6187
another try
sebastianvarela Mar 24, 2023
1fe9e28
iOS try
sebastianvarela Mar 24, 2023
210d4e9
final try
sebastianvarela Mar 24, 2023
83d1329
Another try
sebastianvarela Mar 24, 2023
8991be5
Merge branch 'master' into dispatch_attributed_actions
sebastianvarela Mar 24, 2023
36ef7d8
update ignore
sebastianvarela Mar 24, 2023
353926f
Merge branch 'master' into dispatch_attributed_actions
sebastianvarela Mar 24, 2023
a297b79
restore ignore
sebastianvarela Mar 24, 2023
66b15ed
Merge branch 'master' into dispatch_attributed_actions
sebastianvarela Mar 24, 2023
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
30 changes: 20 additions & 10 deletions Mini.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,18 @@
F227FD8229CDB3F800F1E801 /* AttributedAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = F227FD8029CDB3F800F1E801 /* AttributedAction.swift */; };
F227FD8329CDB3F800F1E801 /* AttributedAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = F227FD8029CDB3F800F1E801 /* AttributedAction.swift */; };
F227FD8429CDB3F800F1E801 /* AttributedAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = F227FD8029CDB3F800F1E801 /* AttributedAction.swift */; };
F227FD8729CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F227FD8629CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift */; };
F227FD8829CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F227FD8629CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift */; };
F227FD8929CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F227FD8629CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift */; };
F227FD8A29CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F227FD8629CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift */; };
F26C3AF822537A4600189D28 /* Mini.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C3AF722537A4600189D28 /* Mini.swift */; };
F26C3AF922537A4600189D28 /* Mini.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C3AF722537A4600189D28 /* Mini.swift */; };
F26C3AFA22537A4600189D28 /* Mini.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C3AF722537A4600189D28 /* Mini.swift */; };
F26C3AFB22537A4600189D28 /* Mini.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C3AF722537A4600189D28 /* Mini.swift */; };
F288761028649AFE0069790E /* PublisherExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions.swift */; };
F288761128649AFE0069790E /* PublisherExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions.swift */; };
F288761228649AFE0069790E /* PublisherExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions.swift */; };
F288761328649AFE0069790E /* PublisherExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions.swift */; };
F288761028649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions+CompletableActions.swift */; };
F288761128649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions+CompletableActions.swift */; };
F288761228649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions+CompletableActions.swift */; };
F288761328649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288760F28649AFE0069790E /* PublisherExtensions+CompletableActions.swift */; };
F288761528649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288761428649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift */; };
F288761628649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288761428649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift */; };
F288761728649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288761428649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift */; };
Expand Down Expand Up @@ -228,8 +232,9 @@
F222D7692525361700672E7B /* KeyedTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyedTask.swift; sourceTree = "<group>"; };
F222D7752525373B00672E7B /* KeyedTaskTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyedTaskTests.swift; sourceTree = "<group>"; };
F227FD8029CDB3F800F1E801 /* AttributedAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedAction.swift; sourceTree = "<group>"; };
F227FD8629CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PublisherExtensions+EmptyActions.swift"; sourceTree = "<group>"; };
F26C3AF722537A4600189D28 /* Mini.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mini.swift; sourceTree = "<group>"; };
F288760F28649AFE0069790E /* PublisherExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublisherExtensions.swift; sourceTree = "<group>"; };
F288760F28649AFE0069790E /* PublisherExtensions+CompletableActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PublisherExtensions+CompletableActions.swift"; sourceTree = "<group>"; };
F288761428649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Publishers.CombineMiniTasksTuple2.swift; sourceTree = "<group>"; };
F288DCC829BA8BF600FBFED1 /* None.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = None.swift; sourceTree = "<group>"; };
F288DCCE29BB922700FBFED1 /* Publishers.CombineMiniTasksTuple4.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Publishers.CombineMiniTasksTuple4.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -417,7 +422,8 @@
isa = PBXGroup;
children = (
F297D27D286A0C6900323F24 /* Dispatcher+Combine.swift */,
F288760F28649AFE0069790E /* PublisherExtensions.swift */,
F288760F28649AFE0069790E /* PublisherExtensions+CompletableActions.swift */,
F227FD8629CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift */,
F288DCD829BB942100FBFED1 /* Publishers.CombineMiniTasksArray.swift */,
F288761428649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift */,
F288DCD329BB922F00FBFED1 /* Publishers.CombineMiniTasksTuple3.swift */,
Expand Down Expand Up @@ -772,8 +778,9 @@
F297D27E286A0C6900323F24 /* Dispatcher+Combine.swift in Sources */,
F288761528649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift in Sources */,
F297D269286A02E200323F24 /* KeyedAction.swift in Sources */,
F227FD8729CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */,
F222D4B325249B7E00672E7B /* Task.swift in Sources */,
F288761028649AFE0069790E /* PublisherExtensions.swift in Sources */,
F288761028649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */,
F288DCC929BA8BF600FBFED1 /* None.swift in Sources */,
F222D4CF25249B7E00672E7B /* Store.swift in Sources */,
F288DCCF29BB922700FBFED1 /* Publishers.CombineMiniTasksTuple4.swift in Sources */,
Expand Down Expand Up @@ -828,8 +835,9 @@
F297D27F286A0C6900323F24 /* Dispatcher+Combine.swift in Sources */,
F288761628649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift in Sources */,
F297D26A286A02E200323F24 /* KeyedAction.swift in Sources */,
F227FD8829CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */,
F222D4B425249B7E00672E7B /* Task.swift in Sources */,
F288761128649AFE0069790E /* PublisherExtensions.swift in Sources */,
F288761128649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */,
F288DCCA29BA8BF600FBFED1 /* None.swift in Sources */,
F222D4D025249B7E00672E7B /* Store.swift in Sources */,
F288DCD029BB922700FBFED1 /* Publishers.CombineMiniTasksTuple4.swift in Sources */,
Expand Down Expand Up @@ -884,8 +892,9 @@
F297D280286A0C6900323F24 /* Dispatcher+Combine.swift in Sources */,
F288761728649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift in Sources */,
F297D26B286A02E200323F24 /* KeyedAction.swift in Sources */,
F227FD8929CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */,
F222D4B525249B7E00672E7B /* Task.swift in Sources */,
F288761228649AFE0069790E /* PublisherExtensions.swift in Sources */,
F288761228649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */,
F288DCCB29BA8BF600FBFED1 /* None.swift in Sources */,
F222D4D125249B7E00672E7B /* Store.swift in Sources */,
F288DCD129BB922700FBFED1 /* Publishers.CombineMiniTasksTuple4.swift in Sources */,
Expand Down Expand Up @@ -940,8 +949,9 @@
F297D281286A0C6900323F24 /* Dispatcher+Combine.swift in Sources */,
F288761828649B1C0069790E /* Publishers.CombineMiniTasksTuple2.swift in Sources */,
F297D26C286A02E200323F24 /* KeyedAction.swift in Sources */,
F227FD8A29CDEBAE00F1E801 /* PublisherExtensions+EmptyActions.swift in Sources */,
F222D4B625249B7E00672E7B /* Task.swift in Sources */,
F288761328649AFE0069790E /* PublisherExtensions.swift in Sources */,
F288761328649AFE0069790E /* PublisherExtensions+CompletableActions.swift in Sources */,
F288DCCC29BA8BF600FBFED1 /* None.swift in Sources */,
F222D4D225249B7E00672E7B /* Store.swift in Sources */,
F288DCD229BB922700FBFED1 /* Publishers.CombineMiniTasksTuple4.swift in Sources */,
Expand Down
63 changes: 63 additions & 0 deletions Sources/Publishers/PublisherExtensions+CompletableActions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import Combine
import Foundation

public extension Publisher {
func dispatch<A: CompletableAction>(action: A.Type,
expiration: TaskExpiration = .immediately,
on dispatcher: Dispatcher)
-> Cancellable where A.TaskPayload == Output, A.TaskError == Failure {
sink { completion in
switch completion {
case .failure(let error):
let action = A(task: .requestFailure(error))
dispatcher.dispatch(action)

case .finished:
break
}
} receiveValue: { payload in
let action = A(task: .requestSuccess(payload, expiration: expiration))
dispatcher.dispatch(action)
}
}

func dispatch<A: KeyedCompletableAction>(action: A.Type,
expiration: TaskExpiration = .immediately,
key: A.Key,
on dispatcher: Dispatcher)
-> Cancellable where A.TaskPayload == Output, A.TaskError == Failure {
sink { completion in
switch completion {
case .failure(let error):
let action = A(task: .requestFailure(error, tag: "\(key)"), key: key)
dispatcher.dispatch(action)

case .finished:
break
}
} receiveValue: { payload in
let action = A(task: .requestSuccess(payload, tag: "\(key)"), key: key)
dispatcher.dispatch(action)
}
}

func dispatch<A: AttributedCompletableAction>(action: A.Type,
attribute: A.Attribute,
expiration: TaskExpiration = .immediately,
on dispatcher: Dispatcher)
-> Cancellable where A.TaskPayload == Output, A.TaskError == Failure {
sink { completion in
switch completion {
case .failure(let error):
let action = A(task: .requestFailure(error), attribute: attribute)
dispatcher.dispatch(action)

case .finished:
break
}
} receiveValue: { payload in
let action = A(task: .requestSuccess(payload, expiration: expiration), attribute: attribute)
dispatcher.dispatch(action)
}
}
}
77 changes: 38 additions & 39 deletions Sources/Publishers/PublisherExtensions.swift → ...rs/PublisherExtensions+EmptyActions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,6 @@ import Combine
import Foundation

public extension Publisher {
func dispatch<A: CompletableAction>(action: A.Type,
expiration: TaskExpiration = .immediately,
on dispatcher: Dispatcher)
-> Cancellable where A.TaskPayload == Output, A.TaskError == Failure {
sink { completion in
switch completion {
case .failure(let error):
let action = A(task: .requestFailure(error))
dispatcher.dispatch(action)

case .finished:
break
}
} receiveValue: { payload in
let action = A(task: .requestSuccess(payload, expiration: expiration))
dispatcher.dispatch(action)
}
}

func dispatch<A: KeyedCompletableAction>(action: A.Type,
expiration: TaskExpiration = .immediately,
key: A.Key,
on dispatcher: Dispatcher)
-> Cancellable where A.TaskPayload == Output, A.TaskError == Failure {
sink { completion in
switch completion {
case .failure(let error):
let action = A(task: .requestFailure(error, tag: "\(key)"), key: key)
dispatcher.dispatch(action)

case .finished:
break
}
} receiveValue: { payload in
let action = A(task: .requestSuccess(payload, tag: "\(key)"), key: key)
dispatcher.dispatch(action)
}
}

func dispatch<A: KeyedEmptyAction>(action: A.Type,
expiration: TaskExpiration = .immediately,
key: A.Key,
Expand Down Expand Up @@ -114,4 +75,42 @@ public extension Publisher {
} receiveValue: { _ in
}
}

func dispatch<A: AttributedEmptyAction>(action: A.Type,
attribute: A.Attribute,
expiration: TaskExpiration = .immediately,
on dispatcher: Dispatcher)
-> Cancellable where A.TaskPayload == Output, A.TaskError == Failure, Output == None {
sink { completion in
switch completion {
case .failure(let error):
let action = A(task: .requestFailure(error), attribute: attribute)
dispatcher.dispatch(action)

case .finished:
let action = A(task: .requestSuccess(expiration: expiration), attribute: attribute)
dispatcher.dispatch(action)
}
} receiveValue: { _ in
}
}

func dispatch<A: AttributedEmptyAction>(action: A.Type,
attribute: A.Attribute,
expiration: TaskExpiration = .immediately,
on dispatcher: Dispatcher)
-> Cancellable where A.TaskPayload == None, A.TaskError == Failure, Output == Void {
sink { completion in
switch completion {
case .failure(let error):
let action = A(task: .requestFailure(error), attribute: attribute)
dispatcher.dispatch(action)

case .finished:
let action = A(task: .requestSuccess(expiration: expiration), attribute: attribute)
dispatcher.dispatch(action)
}
} receiveValue: { _ in
}
}
}
Loading