Skip to content

Store internals: Refactor RootStore/ToState to "Core" protocol composition #3460

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 37 commits into from
Mar 27, 2025
Merged

Store internals: Refactor RootStore/ToState to "Core" protocol composition #3460

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8a03e6a
wip
stephencelis Sep 13, 2024
3fe6fb0
wip
stephencelis Sep 13, 2024
9122a3a
wip
stephencelis Sep 13, 2024
f80cb3b
wip
stephencelis Sep 13, 2024
f67562a
wip
stephencelis Sep 13, 2024
2bd4f44
wip
stephencelis Sep 13, 2024
00ad75e
wip
stephencelis Sep 13, 2024
65c42e1
wip
stephencelis Sep 13, 2024
e79668e
wip
stephencelis Sep 13, 2024
0665585
wip
stephencelis Sep 13, 2024
a5e7734
wip
stephencelis Sep 13, 2024
0d630e2
wip
stephencelis Sep 13, 2024
edbf4e6
wip
stephencelis Sep 13, 2024
0ae2e54
Merge remote-tracking branch 'origin/main' into core
stephencelis Sep 13, 2024
26e41f9
wip
stephencelis Sep 13, 2024
f4da4c6
wip
stephencelis Sep 13, 2024
33cc53e
wip
stephencelis Sep 13, 2024
052841e
wip
stephencelis Sep 13, 2024
e34e628
wip
stephencelis Sep 13, 2024
712fa8d
wip
stephencelis Sep 14, 2024
d9eb1f6
wip
stephencelis Sep 14, 2024
603d725
Merge remote-tracking branch 'origin/main' into core
stephencelis Sep 19, 2024
62a61c3
get rid of originating action
mbrandonw Sep 27, 2024
c70426f
wip
stephencelis Oct 2, 2024
bef3861
Merge remote-tracking branch 'origin/main' into core
stephencelis Oct 8, 2024
e58cba5
Merge remote-tracking branch 'origin/main' into core
stephencelis Oct 16, 2024
c3338b5
Merge remote-tracking branch 'origin/main' into core
stephencelis Oct 21, 2024
413c24c
Merge branch 'main' into core
stephencelis Nov 12, 2024
bbe33b7
Merge remote-tracking branch 'origin/main' into core
stephencelis Feb 6, 2025
47d606b
Merge remote-tracking branch 'origin/main' into core
stephencelis Feb 27, 2025
58fddea
Merge remote-tracking branch 'origin/main' into core
stephencelis Feb 27, 2025
1b7f72c
wip
stephencelis Feb 28, 2025
5714403
Merge remote-tracking branch 'origin/main' into core
stephencelis Mar 13, 2025
95570eb
Deprecate non-writable scopes
stephencelis Mar 13, 2025
31b0755
Revert "Deprecate non-writable scopes"
stephencelis Mar 13, 2025
f05ac83
Merge branch 'main' into core
stephencelis Mar 26, 2025
725189d
wip
stephencelis Mar 26, 2025
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into core
  • Loading branch information
@stephencelis
stephencelis committed Sep 19, 2024
commit 603d725c31cd5e6422df307739ff90d04f6b6c70
2 changes: 1 addition & 1 deletion Sources/ComposableArchitecture/Observation/IdentifiedArray+Observation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public struct _StoreCollection<ID: Hashable & Sendable, State, Action>: RandomAc
return Store()
}
let elementID = self.data.ids[position]
let scopeID = self.store.id(state: \.[id:elementID], action: \.[id:elementID])
let scopeID = self.store.id(state: \.[id: elementID], action: \.[id: elementID])
guard let child = self.store.children[scopeID] as? Store<State, Action>
else {
@MainActor
Expand Down
4 changes: 2 additions & 2 deletions Sources/ComposableArchitecture/SwiftUI/ForEachStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public struct ForEachStore<
let id = element[keyPath: viewStore.state.id]
content(
store.scope(
id: store.id(state: \.[id:id]!, action: \.[id:id]),
id: store.id(state: \.[id: id]!, action: \.[id: id]),
childCore: open(store.core, element: element, id: id)
)
)
Expand Down Expand Up @@ -228,7 +228,7 @@ public struct ForEachStore<
let id = element[keyPath: viewStore.state.id]
content(
store.scope(
id: store.id(state: \.[id:id]!, action: \.[id:id]),
id: store.id(state: \.[id: id]!, action: \.[id: id]),
childCore: open(store.core, element: element, id: id)
)
)
Expand Down
48 changes: 24 additions & 24 deletions Sources/ComposableArchitecture/SwiftUI/NavigationStackStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ public struct NavigationStackStore<State, Action, Root: View, Destination: View>
let id = store.id(
state:
\.[
id:component.id,
fileID:_HashableStaticString(rawValue: fileID),
filePath:_HashableStaticString(rawValue: filePath),
line:line,
column:column
id :component.id,
fileID: _HashableStaticString(rawValue: fileID),
filePath: _HashableStaticString(rawValue: filePath),
line: line,
column: column
],
action: \.[id:component.id]
action: \.[id: component.id]
)
@MainActor
func open(
Expand All @@ -73,13 +73,13 @@ public struct NavigationStackStore<State, Action, Root: View, Destination: View>
base: core,
cachedState: component.element,
stateKeyPath: \.[
id:component.id,
fileID:_HashableStaticString(rawValue: fileID),
filePath:_HashableStaticString(rawValue: filePath),
line:line,
column:column
id: component.id,
fileID: _HashableStaticString(rawValue: fileID),
filePath: _HashableStaticString(rawValue: filePath),
line: line,
column: column
],
actionKeyPath: \.[id:component.id]
actionKeyPath: \.[id: component.id]
)
}
return destination(store.scope(id: id, childCore: open(store.core)))
Expand Down Expand Up @@ -119,13 +119,13 @@ public struct NavigationStackStore<State, Action, Root: View, Destination: View>
let id = store.id(
state:
\.[
id:component.id,
fileID:_HashableStaticString(rawValue: fileID),
filePath:_HashableStaticString(rawValue: filePath),
line:line,
column:column
id: component.id,
fileID: _HashableStaticString(rawValue: fileID),
filePath: _HashableStaticString(rawValue: filePath),
line: line,
column: column
],
action: \.[id:component.id]
action: \.[id: component.id]
)
if let child = store.children[id] as? Store<State, Action> {
return SwitchStore(child, content: destination)
Expand All @@ -138,13 +138,13 @@ public struct NavigationStackStore<State, Action, Root: View, Destination: View>
base: core,
cachedState: component.element,
stateKeyPath: \.[
id:component.id,
fileID:_HashableStaticString(rawValue: fileID),
filePath:_HashableStaticString(rawValue: filePath),
line:line,
column:column
id: component.id,
fileID: _HashableStaticString(rawValue: fileID),
filePath: _HashableStaticString(rawValue: filePath),
line: line,
column: column
],
actionKeyPath: \.[id:component.id]
actionKeyPath: \.[id: component.id]
)
}
return SwitchStore(store.scope(id: id, childCore: open(store.core)), content: destination)
Expand Down
24 changes: 12 additions & 12 deletions Sources/ComposableArchitecture/UIKit/NavigationStackControllerUIKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
let id = path.wrappedValue.id(
state:
\.[
id:component.id,
fileID:_HashableStaticString(rawValue: fileID),
filePath:_HashableStaticString(rawValue: filePath),
line:line,
column:column
id: component.id,
fileID: _HashableStaticString(rawValue: fileID),
filePath: _HashableStaticString(rawValue: filePath),
line: line,
column: column
],
action: \.[id:component.id]
action: \.[id: component.id]
)
@MainActor
func open(
Expand All @@ -63,13 +63,13 @@
base: core,
cachedState: component.element,
stateKeyPath: \.[
id:component.id,
fileID:_HashableStaticString(rawValue: fileID),
filePath:_HashableStaticString(rawValue: filePath),
line:line,
column:column
id: component.id,
fileID: _HashableStaticString(rawValue: fileID),
filePath: _HashableStaticString(rawValue: filePath),
line: line,
column: column
],
actionKeyPath: \.[id:component.id]
actionKeyPath: \.[id: component.id]
)
}
return destination(path.wrappedValue.scope(id: id, childCore: open(path.wrappedValue.core)))
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.