Support swift-syntax from 600.0.0-latest (#3160)

* Support swift-syntax from 600.0.0-latest The Xcode 16 beta generates macro projects using these swift-syntax snapshots. Luckily things seem to be backwards compatible, so we can expand our supported range. * wip
pointfreeco · Jun 12, 2024 · 7ac630f · 7ac630f
1 parent 889c27b
commit 7ac630f
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 54 deletions.
diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
-        "version" : "1.3.0"
+        "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
+        "version" : "1.4.0"
       }
     },
     {
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-case-paths",
       "state" : {
-        "revision" : "e593aba2c6222daad7c4f2732a431eed2c09bb07",
-        "version" : "1.3.0"
+        "revision" : "b871e5ed11a23e52c2896a92ce2c829982ff8619",
+        "version" : "1.4.2"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
-        "version" : "1.1.0"
+        "revision" : "ee97538f5b81ae89698fd95938896dec5217b148",
+        "version" : "1.1.1"
       }
     },
     {
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-dependencies",
       "state" : {
-        "revision" : "d3a5af3038a09add4d7682f66555d6212058a3c0",
-        "version" : "1.2.2"
+        "revision" : "00bc30ca03f98881329fab7f1bebef8eba472596",
+        "version" : "1.3.1"
       }
     },
     {
@@ -113,35 +113,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-macro-testing",
       "state" : {
-        "revision" : "90e38eec4bf661ec0da1bbfd3ec507d0f0c05310",
-        "version" : "0.3.0"
+        "revision" : "851c8b6bde2000d8051dc9aca1efee04dcc37411",
+        "version" : "0.4.1"
       }
     },
     {
       "identity" : "swift-perception",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-perception",
       "state" : {
-        "revision" : "9b77fbd07b9529312f7e9adb10f5131acd9e2363",
-        "version" : "1.2.0"
+        "revision" : "d8340521e532cffdf75a64468ff9362de8bd2bb9",
+        "version" : "1.2.3"
       }
     },
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
       "state" : {
-        "revision" : "5b0c434778f2c1a4c9b5ebdb8682b28e84dd69bd",
-        "version" : "1.15.4"
+        "revision" : "8ddd519780452729c6634ad6bd0d2595938e9ea3",
+        "version" : "1.16.1"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-syntax",
       "state" : {
-        "revision" : "08a2f0a9a30e0f705f79c9cfaca1f68b71bdc775",
-        "version" : "510.0.0"
+        "revision" : "303e5c5c36d6a558407d364878df131c3546fad8",
+        "version" : "510.0.2"
       }
     },
     {
@@ -158,17 +158,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swiftui-navigation.git",
       "state" : {
-        "revision" : "d9e72f3083c08375794afa216fb2f89c0114f303",
-        "version" : "1.2.1"
+        "revision" : "7ab04c6e2e6a73d34d5a762970ef88bf0aedb084",
+        "version" : "1.4.0"
       }
     },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "b13b1d1a8e787a5ffc71ac19dcaf52183ab27ba2",
-        "version" : "1.1.1"
+        "revision" : "6f30bdba373bbd7fbfe241dddd732651f2fbd1e2",
+        "version" : "1.1.2"
       }
     }
   ],

diff --git a/Examples/SyncUps/SyncUps/RecordMeeting.swift b/Examples/SyncUps/SyncUps/RecordMeeting.swift
@@ -346,13 +346,13 @@ struct SpeakerArc: Shape {
     }
   }
 
-  private var degreesPerSpeaker: Double {
+  nonisolated private var degreesPerSpeaker: Double {
     360 / Double(totalSpeakers)
   }
-  private var startAngle: Angle {
+  nonisolated private var startAngle: Angle {
     Angle(degrees: degreesPerSpeaker * Double(speakerIndex) + 1)
   }
-  private var endAngle: Angle {
+  nonisolated private var endAngle: Angle {
     Angle(degrees: startAngle.degrees + degreesPerSpeaker - 1)
   }
 }

diff --git a/Examples/SyncUps/SyncUpsTests/AppFeatureTests.swift b/Examples/SyncUps/SyncUpsTests/AppFeatureTests.swift
@@ -19,19 +19,21 @@ final class AppFeatureTests: XCTestCase {
     }
 
     await store.send(\.path[id:0].detail.editButtonTapped) {
-      $0.path[id: 0]?.detail?.destination = .edit(
-        SyncUpForm.State(syncUp: syncUp)
-      )
+      $0.path[id: 0]?.modify(\.detail) { $0.destination = .edit(SyncUpForm.State(syncUp: syncUp)) }
     }
 
     syncUp.title = "Blob"
     await store.send(\.path[id:0].detail.destination.edit.binding.syncUp, syncUp) {
-      $0.path[id: 0]?.detail?.destination?.edit?.syncUp.title = "Blob"
+      $0.path[id: 0]?.modify(\.detail) {
+        $0.destination?.modify(\.edit) { $0.syncUp.title = "Blob" }
+      }
     }
 
     await store.send(\.path[id:0].detail.doneEditingButtonTapped) {
-      $0.path[id: 0]?.detail?.destination = nil
-      $0.path[id: 0]?.detail?.syncUp.title = "Blob"
+      $0.path[id: 0]?.modify(\.detail) {
+        $0.destination = nil
+        $0.syncUp.title = "Blob"
+      }
     }
     .finish()
   }
@@ -51,11 +53,11 @@ final class AppFeatureTests: XCTestCase {
     }
 
     await store.send(\.path[id:0].detail.deleteButtonTapped) {
-      $0.path[id: 0]?.detail?.destination = .alert(.deleteSyncUp)
+      $0.path[id: 0]?.modify(\.detail) { $0.destination = .alert(.deleteSyncUp) }
     }
 
     await store.send(\.path[id:0].detail.destination.alert.confirmDeletion) {
-      $0.path[id: 0, case: \.detail]?.destination = nil
+      $0.path[id: 0]?.modify(\.detail) { $0.destination = nil }
       $0.syncUpsList.syncUps = []
     }
 
@@ -109,13 +111,15 @@ final class AppFeatureTests: XCTestCase {
       XCTAssertEqual($0.path.count, 1)
     }
     store.assert {
-      $0.path[id: 0]?.detail?.syncUp.meetings = [
-        Meeting(
-          id: Meeting.ID(UUID(0)),
-          date: Date(timeIntervalSince1970: 1_234_567_890),
-          transcript: "I completed the project"
-        )
-      ]
+      $0.path[id: 0]?.modify(\.detail) {
+        $0.syncUp.meetings = [
+          Meeting(
+            id: Meeting.ID(UUID(0)),
+            date: Date(timeIntervalSince1970: 1_234_567_890),
+            transcript: "I completed the project"
+          )
+        ]
+      }
     }
   }
 }
diff --git a/Examples/SyncUps/SyncUpsTests/SyncUpDetailTests.swift b/Examples/SyncUps/SyncUpsTests/SyncUpDetailTests.swift
@@ -102,7 +102,7 @@ final class SyncUpDetailTests: XCTestCase {
 
     syncUp.title = "Blob's Meeting"
     await store.send(\.destination.edit.binding.syncUp, syncUp) {
-      $0.destination?.edit?.syncUp.title = "Blob's Meeting"
+      $0.destination?.modify(\.edit) { $0.syncUp.title = "Blob's Meeting" }
     }
 
     await store.send(.doneEditingButtonTapped) {

diff --git a/Examples/SyncUps/SyncUpsTests/SyncUpsListTests.swift b/Examples/SyncUps/SyncUpsTests/SyncUpsListTests.swift
@@ -24,7 +24,7 @@ final class SyncUpsListTests: XCTestCase {
 
     syncUp.title = "Engineering"
     await store.send(\.destination.add.binding.syncUp, syncUp) {
-      $0.destination?.add?.syncUp.title = "Engineering"
+      $0.destination?.modify(\.add) { $0.syncUp.title = "Engineering" }
     }
 
     await store.send(.confirmAddSyncUpButtonTapped) {

diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift
@@ -20,7 +20,7 @@ let package = Package(
   dependencies: [
     .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
-    .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"511.0.0"),
+    .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"601.0.0"),
     .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
     .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.0"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.3.0"),

diff --git a/Sources/ComposableArchitecture/Internal/NavigationID.swift b/Sources/ComposableArchitecture/Internal/NavigationID.swift
@@ -35,10 +35,10 @@ struct NavigationIDPath: Hashable, Sendable {
 
 struct NavigationID: Hashable, @unchecked Sendable {
   private let kind: Kind
-  private let identifier: AnyHashableSendable?
+  private let identifier: AnyHashable?
   private let tag: UInt32?
 
-  enum Kind: Hashable, @unchecked Sendable {
+  enum Kind: Hashable {
     case casePath(root: Any.Type, value: Any.Type)
     case keyPath(AnyKeyPath)
 
@@ -73,7 +73,7 @@ struct NavigationID: Hashable, @unchecked Sendable {
     self.kind = .keyPath(keyPath)
     self.tag = EnumMetadata(Value.self)?.tag(of: base)
     if let id = _identifiableID(base) ?? EnumMetadata.project(base).flatMap(_identifiableID) {
-      self.identifier = AnyHashableSendable(id)
+      self.identifier = id
     } else {
       self.identifier = nil
     }
@@ -105,7 +105,7 @@ struct NavigationID: Hashable, @unchecked Sendable {
     self.kind = .casePath(root: Root.self, value: Value.self)
     self.tag = EnumMetadata(Root.self)?.tag(of: root)
     if let id = _identifiableID(root) ?? _identifiableID(value) {
-      self.identifier = AnyHashableSendable(id)
+      self.identifier = id
     } else {
       self.identifier = nil
     }

diff --git a/Sources/ComposableArchitecture/Internal/PresentationID.swift b/Sources/ComposableArchitecture/Internal/PresentationID.swift
@@ -6,15 +6,15 @@ extension PresentationState {
   }
 }
 
-struct PresentationID: Hashable, Identifiable, Sendable {
-  private let identifier: AnyHashableSendable?
+struct PresentationID: Hashable, Identifiable {
+  private let identifier: AnyHashable?
   private let tag: UInt32?
   private let type: Any.Type
 
   init<Base>(base: Base) {
     self.tag = EnumMetadata(Base.self)?.tag(of: base)
     if let id = _identifiableID(base) ?? EnumMetadata.project(base).flatMap(_identifiableID) {
-      self.identifier = AnyHashableSendable(id)
+      self.identifier = id
     } else {
       self.identifier = nil
     }

diff --git a/Sources/ComposableArchitecture/Observation/ViewAction.swift b/Sources/ComposableArchitecture/Observation/ViewAction.swift
@@ -12,7 +12,11 @@ public protocol ViewAction<ViewAction> {
 public protocol ViewActionSending<StoreState, StoreAction> {
   associatedtype StoreState
   associatedtype StoreAction: ViewAction
-  @MainActor(unsafe) var store: Store<StoreState, StoreAction> { get }
+  #if swift(>=5.10)
+    @MainActor @preconcurrency var store: Store<StoreState, StoreAction> { get }
+  #else
+    @MainActor(unsafe) var store: Store<StoreState, StoreAction> { get }
+  #endif
 }
 
 extension ViewActionSending {

diff --git a/Sources/ComposableArchitectureMacros/Extensions.swift b/Sources/ComposableArchitectureMacros/Extensions.swift
@@ -284,3 +284,15 @@ extension DeclGroupSyntax {
     return self.is(StructDeclSyntax.self)
   }
 }
+
+extension AttributedTypeSyntax {
+  var isInout: Bool {
+    #if canImport(SwiftSyntax600)
+      self.specifiers.contains(
+        where: { $0.as(SimpleTypeSpecifierSyntax.self)?.specifier.tokenKind == .keyword(.inout) }
+      ) == true
+    #else
+      self.specifier?.tokenKind == .keyword(.inout)
+    #endif
+  }
+}
diff --git a/Sources/ComposableArchitectureMacros/ObservableStateMacro.swift b/Sources/ComposableArchitectureMacros/ObservableStateMacro.swift
@@ -13,9 +13,12 @@ import SwiftDiagnostics
 import SwiftOperators
 import SwiftSyntax
 import SwiftSyntaxBuilder
-import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 
+#if !canImport(SwiftSyntax600)
+  import SwiftSyntaxMacroExpansion
+#endif
+
 public struct ObservableStateMacro {
   static let moduleName = "ComposableArchitecture"
 

diff --git a/Sources/ComposableArchitectureMacros/ReducerMacro.swift b/Sources/ComposableArchitectureMacros/ReducerMacro.swift
@@ -2,9 +2,12 @@ import SwiftDiagnostics
 import SwiftOperators
 import SwiftSyntax
 import SwiftSyntaxBuilder
-import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 
+#if !canImport(SwiftSyntax600)
+  import SwiftSyntaxMacroExpansion
+#endif
+
 public enum ReducerMacro {
 }
 
@@ -93,7 +96,7 @@ extension ReducerMacro: MemberAttributeMacro {
           method.signature.parameterClause.parameters.count == 2,
           let state = method.signature.parameterClause.parameters.first,
           state.firstName.text == "into",
-          state.type.as(AttributedTypeSyntax.self)?.specifier?.text == "inout",
+          state.type.as(AttributedTypeSyntax.self)?.isInout == true,
           method.signature.parameterClause.parameters.last?.firstName.text == "action",
           method.signature.effectSpecifiers == nil,
           method.signature.returnClause?.type.as(IdentifierTypeSyntax.self) != nil
@@ -210,7 +213,7 @@ extension ReducerMacro: MemberMacro {
         method.signature.parameterClause.parameters.count == 2,
         let state = method.signature.parameterClause.parameters.first,
         state.firstName.text == "into",
-        state.type.as(AttributedTypeSyntax.self)?.specifier?.text == "inout",
+        state.type.as(AttributedTypeSyntax.self)?.isInout == true,
         method.signature.parameterClause.parameters.last?.firstName.text == "action",
         method.signature.effectSpecifiers == nil,
         method.signature.returnClause?.type.as(IdentifierTypeSyntax.self) != nil

diff --git a/Sources/ComposableArchitectureMacros/ViewActionMacro.swift b/Sources/ComposableArchitectureMacros/ViewActionMacro.swift
@@ -1,8 +1,11 @@
 import SwiftDiagnostics
 import SwiftSyntax
-import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 
+#if !canImport(SwiftSyntax600)
+  import SwiftSyntaxMacroExpansion
+#endif
+
 public struct ViewActionMacro: ExtensionMacro {
   public static func expansion<D: DeclGroupSyntax, T: TypeSyntaxProtocol, C: MacroExpansionContext>(
     of node: AttributeSyntax,