Merge pull request #1105 from liveview-native/macro-deprecation-updates

Update macros for swift-syntax deprecations

Author: bcardarella

Sources/LiveViewNativeMacros/LiveViewMacro.swift

@@ -31,32 +31,37 @@ extension LiveViewMacro: ExpressionMacro {
         case 1:
             registries = "typealias Registries = \(addons.first!)"
         default:
-            func multiRegistry(_ addons: some RandomAccessCollection<SimpleTypeIdentifierSyntax>) -> SimpleTypeIdentifierSyntax {
+            func multiRegistry(_ addons: some RandomAccessCollection<IdentifierTypeSyntax>) -> IdentifierTypeSyntax {
                 switch addons.count {
                 case 2:
-                    return SimpleTypeIdentifierSyntax(
+                    return IdentifierTypeSyntax(
                         name: "_MultiRegistry",
                         genericArgumentClause: .init(arguments: .init([
-                            .init(argumentType: addons.first!, trailingComma: .commaToken()),
-                            .init(argumentType: addons.last!)
+                            .init(argument: addons.first!, trailingComma: .commaToken()),
+                            .init(argument: addons.last!)
                         ]))
                     )
                 default:
-                    return SimpleTypeIdentifierSyntax(
+                    return IdentifierTypeSyntax(
                         name: "_MultiRegistry",
                         genericArgumentClause: .init(arguments: .init([
-                            .init(argumentType: addons.first!, trailingComma: .commaToken()),
-                            .init(argumentType: multiRegistry(addons.dropFirst()))
+                            .init(argument: addons.first!, trailingComma: .commaToken()),
+                            .init(argument: multiRegistry(addons.dropFirst()))
                         ]))
                     )
                 }
             }
             registries = "typealias Registries = \(multiRegistry(addons))"
         }
 
-        let liveViewArguments = node.argumentList
-            .removingLast()
-            .replacing(childAt: node.argumentList.count - 2, with: node.argumentList.removingLast().last!.with(\.trailingComma, nil))
+        var liveViewArguments = LabeledExprListSyntax(
+            node.argumentList
+                .dropLast()
+        )
+        liveViewArguments = liveViewArguments.with(
+            \.[liveViewArguments.index(liveViewArguments.startIndex, offsetBy: node.argumentList.count - 2)],
+            node.argumentList.dropLast().last!.with(\.trailingComma, nil)
+        )
 
         return """
         { () -> AnyView in
@@ -69,13 +74,13 @@ extension LiveViewMacro: ExpressionMacro {
         """
     }
 
-    private static func transformAddon(_ element: ArrayElementSyntax) throws -> SimpleTypeIdentifierSyntax {
-        guard let registry = element.expression.as(MemberAccessExprSyntax.self)?.base?.as(SpecializeExprSyntax.self),
-              let name = registry.expression.as(IdentifierExprSyntax.self)
+    private static func transformAddon(_ element: ArrayElementSyntax) throws -> IdentifierTypeSyntax {
+        guard let registry = element.expression.as(MemberAccessExprSyntax.self)?.base?.as(GenericSpecializationExprSyntax.self),
+              let name = registry.expression.as(DeclReferenceExprSyntax.self)
         else { throw LiveViewMacroError.invalidAddonElement }
-        return SimpleTypeIdentifierSyntax(
-            name: name.identifier,
-            genericArgumentClause: .init(.init(arguments: .init([.init(argumentType: SimpleTypeIdentifierSyntax(name: .identifier("Self")))])))
+        return IdentifierTypeSyntax(
+            name: name.baseName,
+            genericArgumentClause: .init(.init(arguments: .init([.init(argument: IdentifierTypeSyntax(name: .identifier("Self")))])))
         )
     }
 }

Sources/LiveViewNativeMacros/RegistriesMacro.swift

@@ -38,7 +38,7 @@ extension RegistriesMacro: DeclarationMacro {
     ) throws -> [DeclSyntax]
         where Node: FreestandingMacroExpansionSyntax, Context: MacroExpansionContext
     {
-        guard let registries = node.genericArguments?.arguments
+        guard let registries = node.genericArgumentClause?.arguments
         else { throw RegistriesMacroError.missingArguments }
 
         switch registries.count {
@@ -47,19 +47,19 @@ extension RegistriesMacro: DeclarationMacro {
         case 1:
             return ["typealias Registries = \(registries.first!)"]
         default:
-            func multiRegistry(_ registries: GenericArgumentListSyntax) -> SimpleTypeIdentifierSyntax {
+            func multiRegistry(_ registries: GenericArgumentListSyntax) -> IdentifierTypeSyntax {
                 switch registries.count {
                 case 2:
-                    return SimpleTypeIdentifierSyntax(
+                    return IdentifierTypeSyntax(
                         name: "_MultiRegistry",
                         genericArgumentClause: .init(arguments: registries)
                     )
                 default:
-                    return SimpleTypeIdentifierSyntax(
+                    return IdentifierTypeSyntax(
                         name: "_MultiRegistry",
                         genericArgumentClause: .init(arguments: .init([
                             registries.first!,
-                            .init(argumentType: multiRegistry(registries.removingFirst()))
+                            .init(argument: multiRegistry(.init(registries.dropFirst())))
                         ]))
                     )
                 }