wip

Author: stephencelis

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-LoadThenNavigate.swift

@@ -10,7 +10,7 @@ private let readMe = """
   """
 
 struct LoadThenNavigateListState: Equatable {
-  var rows: IdentifiedArray<Row> = [
+  var rows: IdentifiedArrayOf<Row> = [
     .init(count: 1, id: UUID()),
     .init(count: 42, id: UUID()),
     .init(count: 100, id: UUID()),

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-NavigateAndLoad.swift

@@ -9,7 +9,7 @@ private let readMe = """
   """
 
 struct NavigateAndLoadListState: Equatable {
-  var rows: IdentifiedArray<Row> = [
+  var rows: IdentifiedArrayOf<Row> = [
     .init(count: 1, id: UUID()),
     .init(count: 42, id: UUID()),
     .init(count: 100, id: UUID()),

Examples/Todos/Todos/Todos.swift

@@ -72,7 +72,7 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment>.combine(
         .eraseToEffect()
 
     case .sortCompletedTodos:
-      state.todos.sortCompleted()
+      state.todos.sort { $1.isComplete && !$0.isComplete }
       return .none
 
     case .todo(id: _, action: .checkBoxToggled):
@@ -152,20 +152,7 @@ struct AppView: View {
   }
 }
 
-extension IdentifiedArray where ID == UUID, Element == Todo {
-  fileprivate mutating func sortCompleted() {
-    // Simulate stable sort
-    self = IdentifiedArray(
-      self.enumerated()
-        .sorted(by: { lhs, rhs in
-          (rhs.element.isComplete && !lhs.element.isComplete) || lhs.offset < rhs.offset
-        })
-        .map(\.element)
-    )
-  }
-}
-
-extension IdentifiedArray where ID == UUID, Element == Todo {
+extension IdentifiedArray where Element == Todo, ID == Element.ID {
   static let mock: Self = [
     Todo(
       description: "Check Mail",

Sources/ComposableArchitecture/Internal/Deprecations.swift

@@ -1,12 +1,6 @@
 import Combine
 import SwiftUI
 
-// NB: Deprecated after TODO:
-
-@available(*, unavailable, renamed: "IdentifiedArray")
-public typealias IdentifiedArrayOf<Element> = IdentifiedArray<Element>
-where Element: Identifiable
-
 // NB: Deprecated after 0.17.0:
 
 extension IfLetStore {

Sources/ComposableArchitecture/Reducer.swift

@@ -845,15 +845,14 @@ public struct Reducer<State, Action, Environment> {
   ///     generally considered a logic error, as a child reducer cannot process a child action
   ///     for unavailable child state.
   /// - Returns: A reducer that works on `GlobalState`, `GlobalAction`, `GlobalEnvironment`.
-  public func forEach<GlobalState, GlobalAction, GlobalEnvironment>(
-    state toLocalState: WritableKeyPath<GlobalState, IdentifiedArray<State>>,
-    action toLocalAction: CasePath<GlobalAction, (State.ID, Action)>,
+  public func forEach<GlobalState, GlobalAction, GlobalEnvironment, ID>(
+    state toLocalState: WritableKeyPath<GlobalState, IdentifiedArray<ID, State>>,
+    action toLocalAction: CasePath<GlobalAction, (ID, Action)>,
     environment toLocalEnvironment: @escaping (GlobalEnvironment) -> Environment,
     breakpointOnNil: Bool = true,
     _ file: StaticString = #file,
     _ line: UInt = #line
-  ) -> Reducer<GlobalState, GlobalAction, GlobalEnvironment>
-  where State: Identifiable {
+  ) -> Reducer<GlobalState, GlobalAction, GlobalEnvironment> {
     .init { globalState, globalAction, globalEnvironment in
       guard let (id, localAction) = toLocalAction.extract(from: globalAction) else { return .none }
       if globalState[keyPath: toLocalState][id: id] == nil {

Sources/ComposableArchitecture/SwiftUI/ForEachStore.swift

@@ -140,14 +140,12 @@ where Data: Collection, ID: Hashable, Content: View {
   ///   - store: A store on an identified array of data and an identified action.
   ///   - content: A function that can generate content given a store of an element.
   public init<EachContent: View>(
-    _ store: Store<IdentifiedArray<EachState>, (ID, EachAction)>,
+    _ store: Store<IdentifiedArray<ID, EachState>, (ID, EachAction)>,
     @ViewBuilder content: @escaping (Store<EachState, EachAction>) -> EachContent
   )
   where
-    EachState: Identifiable,
-  ID == EachState.ID,
     EachContent: View,
-    Data == IdentifiedArray<EachState>,
+    Data == IdentifiedArray<ID, EachState>,
     Content == WithViewStore<
       OrderedSet<ID>, (ID, EachAction), ForEach<OrderedSet<ID>, ID, EachContent>
     >