Skip to content

Adopt CasePath protocol #373

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
stephencelis merged 7 commits into from
Aug 31, 2026
Merged

Adopt CasePath protocol #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bdc479
2.0 support
stephencelis Aug 27, 2026
d613317
Adopt `CasePath` protocol
stephencelis Aug 27, 2026
5568189
wip
stephencelis Aug 27, 2026
a60b6e1
wip
stephencelis Aug 27, 2026
d31b0ba
Merge remote-tracking branch 'origin/main' into case-path-protocol
stephencelis Aug 27, 2026
9e1b0be
wip
stephencelis Aug 31, 2026
ffcf06e
wip
stephencelis Aug 31, 2026
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
126 changes: 63 additions & 63 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.8.0"),
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.10.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
.package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.1.0"),
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.6.0"),
.package(url: "https://github.com/pointfreeco/swift-perception", "1.3.4"..<"3.0.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.8.0"),
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.7.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.10.1"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"605.0.0"),
],
Expand Down
4 changes: 2 additions & 2 deletions Package@swift-6.0.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.8.0"),
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.10.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.6.0"),
.package(url: "https://github.com/pointfreeco/swift-perception", "1.3.4"..<"3.0.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.8.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.10.1"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.13.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"605.0.0"),
Expand Down
4 changes: 2 additions & 2 deletions Package@swift-6.1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.8.0"),
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.10.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.6.0"),
.package(url: "https://github.com/pointfreeco/swift-perception", "1.3.4"..<"3.0.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.8.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.10.1"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.13.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"605.0.0"),
Expand Down
4 changes: 2 additions & 2 deletions Package@swift-6.2.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.8.0"),
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.10.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.6.0"),
.package(url: "https://github.com/pointfreeco/swift-perception", "1.3.4"..<"3.0.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.8.0"),
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.10.1"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.13.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"605.0.0"),
Expand Down
7 changes: 4 additions & 3 deletions Sources/SwiftNavigation/CaseBindable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
member,
names: named(AllCasePaths),
named(allCasePaths),
named(caseName),
named(_$Element),
named(UIBindingEnumeration),
named(BindingEnumeration),
Expand Down Expand Up @@ -123,7 +124,7 @@

extension UIBinding where Value: CasePathable {
public func _$case<Member>(
_ keyPath: KeyPath<Value.AllCasePaths, AnyCasePath<Value, Member>>
_ keyPath: KeyPath<Value.AllCasePaths, some CasePath<Value, Member>>
) -> UIBinding<Member> {
self[dynamicMember: keyPath]!
}
Expand Down Expand Up @@ -241,7 +242,7 @@

extension SwiftUI.Binding where Value: CasePathable {
public func _$case<Member>(
_ keyPath: KeyPath<Value.AllCasePaths, AnyCasePath<Value, Member>>
_ keyPath: KeyPath<Value.AllCasePaths, some CasePath<Value, Member>>
) -> SwiftUI.Binding<Member> {
SwiftUI.Binding<Member>(_unwrapping: self[_case: keyPath])!
}
Expand All @@ -256,7 +257,7 @@

extension CasePathable {
fileprivate subscript<Member>(
_case keyPath: KeyPath<AllCasePaths, AnyCasePath<Self, Member>>
_case keyPath: KeyPath<AllCasePaths, some CasePath<Self, Member>>
) -> Member? {
get { Self.allCasePaths[keyPath: keyPath].extract(from: self) }
set {
Expand Down
34 changes: 16 additions & 18 deletions Sources/SwiftNavigation/Traits/CasePaths.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/// - Returns: A new binding.
@_disfavoredOverload
public subscript<Member>(
dynamicMember keyPath: KeyPath<Value.AllCasePaths, AnyCasePath<Value, Member>>
dynamicMember keyPath: KeyPath<Value.AllCasePaths, some CasePath<Value, Member>>
) -> UIBinding<Member>?
where Value: CasePathable {
func open(_ location: some _UIBinding<Value>) -> UIBinding<Member?> {
Expand All @@ -25,7 +25,7 @@
/// - Parameter keyPath: A case key path to a specific associated value.
/// - Returns: A new binding.
public subscript<V: CasePathable, Member>(
dynamicMember keyPath: KeyPath<V.AllCasePaths, AnyCasePath<V, Member>>
dynamicMember keyPath: KeyPath<V.AllCasePaths, some CasePath<V, Member>>
) -> UIBinding<Member?>
where Value == V? {
func open(_ location: some _UIBinding<Value>) -> UIBinding<Member?> {
Expand All @@ -42,26 +42,24 @@
/// - Parameter keyPath: A case key path to a case with no associated value.
/// - Returns: A new binding.
public subscript<V: CasePathable>(
dynamicMember keyPath: KeyPath<V.AllCasePaths, AnyCasePath<V, Void>>
dynamicMember keyPath: KeyPath<V.AllCasePaths, some CasePath<V, Void>>
) -> UIBinding<Bool>
where Value == V? {
UIBinding<Bool>(self[dynamicMember: keyPath])
}
}

private final class _UIBindingEnumToOptionalCase<Base: _UIBinding, Case>: _UIBinding
where Base.Value: CasePathable {
private final class _UIBindingEnumToOptionalCase<Base: _UIBinding, Path: CasePath>: _UIBinding
where Base.Value: CasePathable, Path.Root == Base.Value {
let base: Base
let keyPath: _SendableKeyPath<Base.Value.AllCasePaths, AnyCasePath<Base.Value, Case>>
let casePath: AnyCasePath<Base.Value, Case>
init(
base: Base, keyPath: _SendableKeyPath<Base.Value.AllCasePaths, AnyCasePath<Base.Value, Case>>
) {
let keyPath: _SendableKeyPath<Base.Value.AllCasePaths, Path>
nonisolated(unsafe) let casePath: Path

@stephencelis stephencelis Aug 27, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This unsafe is just till we get a handle on #321. AnyCasePath is sendable in 1.0, and case path conformances are sendable in 2.0.

init(base: Base, keyPath: _SendableKeyPath<Base.Value.AllCasePaths, Path>) {
self.base = base
self.keyPath = keyPath
self.casePath = Base.Value.allCasePaths[keyPath: keyPath]
}
var wrappedValue: Case? {
var wrappedValue: Path.Value? {
get {
casePath.extract(from: base.wrappedValue)
}
Expand All @@ -81,17 +79,17 @@
}

private final class _UIBindingOptionalEnumToCase<
Base: _UIBinding<Enum?>, Enum: CasePathable, Case
>: _UIBinding {
Base: _UIBinding<Path.Root?>, Path: CasePath
>: _UIBinding where Path.Root: CasePathable {
let base: Base
let keyPath: _SendableKeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Case>>
let casePath: AnyCasePath<Enum, Case>
init(base: Base, keyPath: _SendableKeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Case>>) {
let keyPath: _SendableKeyPath<Path.Root.AllCasePaths, Path>
nonisolated(unsafe) let casePath: Path
init(base: Base, keyPath: _SendableKeyPath<Path.Root.AllCasePaths, Path>) {
self.base = base
self.keyPath = keyPath
self.casePath = Enum.allCasePaths[keyPath: keyPath]
self.casePath = Path.Root.allCasePaths[keyPath: keyPath]
}
var wrappedValue: Case? {
var wrappedValue: Path.Value? {
get {
base.wrappedValue.flatMap(casePath.extract(from:))
}
Expand Down
5 changes: 5 additions & 0 deletions Sources/SwiftNavigationMacros/CaseBindableMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
enumDecl.inheritanceClause?.inheritedTypes.contains {
["CaseBindable", "\(moduleName).CaseBindable"].contains($0.type.trimmedDescription)
} ?? false
|| extensions.contains {
$0.inheritanceClause?.inheritedTypes.contains {
$0.type.trimmedDescription.hasSuffix("CaseBindable")
} ?? false
}
if !conformsToCaseBindable {
let caseBindableExtension: DeclSyntax = """
\(declaration.attributes.availability)extension \(type.trimmed): \
Expand Down
10 changes: 5 additions & 5 deletions Sources/SwiftUINavigation/Traits/CasePaths.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/// - Parameter keyPath: A case key path to a specific associated value.
/// - Returns: A new binding.
public subscript<Member>(
dynamicMember keyPath: KeyPath<Value.AllCasePaths, AnyCasePath<Value, Member>>
dynamicMember keyPath: KeyPath<Value.AllCasePaths, some CasePath<Value, Member>>
) -> Binding<Member>?
where Value: CasePathable {
Binding<Member>(unwrapping: self[keyPath])
Expand All @@ -24,7 +24,7 @@
/// - Parameter keyPath: A case key path to a specific associated value.
/// - Returns: A new binding.
public subscript<Enum: CasePathable, Member>(
dynamicMember keyPath: KeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Member>>
dynamicMember keyPath: KeyPath<Enum.AllCasePaths, some CasePath<Enum, Member>>
) -> Binding<Member?>
where Value == Enum? {
self[keyPath]
Expand All @@ -39,7 +39,7 @@
/// - Parameter keyPath: A case key path to a specific associated value.
/// - Returns: A new binding.
public subscript<Enum: CasePathable>(
dynamicMember keyPath: KeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Void>>
dynamicMember keyPath: KeyPath<Enum.AllCasePaths, some CasePath<Enum, Void>>
) -> Binding<Bool>
where Value == Enum? {
Binding<Bool>(self[keyPath])
Expand All @@ -48,7 +48,7 @@

extension CasePathable {
fileprivate subscript<Member>(
keyPath: KeyPath<Self.AllCasePaths, AnyCasePath<Self, Member>>
keyPath: KeyPath<AllCasePaths, some CasePath<Self, Member>>
) -> Member? {
get {
Self.allCasePaths[keyPath: keyPath].extract(from: self)
Expand All @@ -62,7 +62,7 @@

extension Optional where Wrapped: CasePathable {
fileprivate subscript<Member>(
keyPath: KeyPath<Wrapped.AllCasePaths, AnyCasePath<Wrapped, Member>>
keyPath: KeyPath<Wrapped.AllCasePaths, some CasePath<Wrapped, Member>>
) -> Member? {
get {
self.flatMap(Wrapped.allCasePaths[keyPath: keyPath].extract(from:))
Expand Down
Loading