Remove Array<Self> from parsers (#1189)

* Remove self-referential parsers, xrOS -> visionOS

* Make StringLiteral parser public

* Fix macro tests running on iOS

Author: carson-katri

Package.resolved

@@ -1,7 +1,8 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
+import CompilerPluginSupport
 
 let package = Package(
     name: "LiveViewNative",
@@ -26,6 +27,10 @@ let package = Package(
 
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.2"),
         .package(url: "https://github.com/apple/swift-markdown.git", from: "0.2.0"),
+        
+        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.2"),
+        
+        .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.13.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -36,7 +41,9 @@ let package = Package(
                 "SwiftSoup",
                 "SwiftPhoenixClient",
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
-                .product(name: "LiveViewNativeCore", package: "liveview-native-core-swift")
+                .product(name: "LiveViewNativeCore", package: "liveview-native-core-swift"),
+                "LiveViewNativeMacros",
+                "LiveViewNativeStylesheet"
             ],
             plugins: [
                 .plugin(name: "BuiltinRegistryGeneratorPlugin")
@@ -51,6 +58,16 @@ let package = Package(
             dependencies: ["LiveViewNative"]
         ),
 
+        .executableTarget(
+            name: "ModifierGenerator",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                .product(name: "SwiftSyntax", package: "swift-syntax"),
+                .product(name: "SwiftParser", package: "swift-syntax"),
+                .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
+            ]
+        ),
+
         .executableTarget(
             name: "BuiltinRegistryGenerator",
             dependencies: [
@@ -98,15 +115,47 @@ let package = Package(
                 .product(name: "Markdown", package: "swift-markdown"),
             ]
         ),
-        // .plugin(
-        //     name: "TutorialRepoGeneratorPlugin",
-        //     capability: .command(
-        //         intent: .custom(verb: "generate-tutorial-repo", description: ""),
-        //         permissions: [
-        //             .writeToPackageDirectory(reason: "This command generates a repo for the tutorial that has a commit for each step")
-        //         ]
-        //     ),
-        //     dependencies: [.target(name: "TutorialRepoGenerator")]
-        // )
+        
+        .macro(
+            name: "LiveViewNativeMacros",
+            dependencies: [
+                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+                .product(name: "SwiftCompilerPlugin", package: "swift-syntax")
+            ]
+        ),
+        .testTarget(
+            name: "LiveViewNativeMacrosTests",
+            dependencies: [
+                "LiveViewNativeMacros",
+                .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
+            ]
+        ),
+        
+        .macro(
+            name: "LiveViewNativeStylesheetMacros",
+            dependencies: [
+                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+                .product(name: "SwiftCompilerPlugin", package: "swift-syntax")
+            ]
+        ),
+        .target(
+            name: "LiveViewNativeStylesheet",
+            dependencies: [
+                "LiveViewNativeStylesheetMacros",
+                .product(name: "LiveViewNativeCore", package: "liveview-native-core-swift"),
+                .product(name: "Parsing", package: "swift-parsing"),
+            ]
+        ),
+        .testTarget(
+            name: "LiveViewNativeStylesheetTests",
+            dependencies: ["LiveViewNativeStylesheet"]
+        ),
+        .testTarget(
+            name: "LiveViewNativeStylesheetMacrosTests",
+            dependencies: [
+                "LiveViewNativeStylesheetMacros",
+                .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
+            ]
+        ),
     ]
 )

Package.swift

@@ -16,13 +16,13 @@ struct _SearchCompletionModifier: ViewModifier {
 
     enum Completion {
         case completion(String)
-        #if os(iOS) || os(macOS) || os(xrOS)
+        #if os(iOS) || os(macOS) || os(visionOS)
         case token(Token)
         #endif
     }
     let completion: Completion
 
-    #if os(iOS) || os(macOS) || os(xrOS)
+    #if os(iOS) || os(macOS) || os(visionOS)
     init(_ token: AtomString) {
         self.completion = .token(.init(id: token.value))
     }
@@ -36,7 +36,7 @@ struct _SearchCompletionModifier: ViewModifier {
         switch completion {
         case .completion(let string):
             content.searchCompletion(string)
-        #if os(iOS) || os(macOS) || os(xrOS)
+        #if os(iOS) || os(macOS) || os(visionOS)
         case .token(let token):
             content.searchCompletion(token)
         #endif

[email protected]

@@ -22,7 +22,7 @@ struct _SearchScopesModifier<R: RootRegistry>: ViewModifier {
     @ObservedElement private var element
     @LiveContext<R> private var context
 
-    #if os(iOS) || os(macOS) || os(tvOS) || os(xrOS)
+    #if os(iOS) || os(macOS) || os(tvOS) || os(visionOS)
     @available(iOS 16.4, macOS 13.3, tvOS 16.4, *)
     init(_ scope: ChangeTracked<String>, activation: SearchScopeActivation, scopes: ViewReference) {
         self._scope = scope
@@ -38,7 +38,7 @@ struct _SearchScopesModifier<R: RootRegistry>: ViewModifier {
     #endif
 
     func body(content: Content) -> some View {
-        #if os(iOS) || os(macOS) || os(tvOS) || os(xrOS)
+        #if os(iOS) || os(macOS) || os(tvOS) || os(visionOS)
         if #available(iOS 16.4, macOS 13.3, tvOS 16.4, *) {
             if let activation = activation as? SearchScopeActivation {
                 content.searchScopes($scope, activation: activation, { scopes.resolve(on: element, in: context) })

Sources/LiveViewNative/Stylesheets/Modifiers/Overrides/SearchCompletionModifier.swift

@@ -144,7 +144,7 @@ extension AnyGesture: ParseableModifierValue where Value == Any {
         #endif
     }
 
-    #if os(iOS) || os(macOS) || os(xrOS)
+    #if os(iOS) || os(macOS) || os(visionOS)
     @ParseableExpression
     struct Magnify {
         static let name = "MagnifyGesture"

Sources/LiveViewNative/Stylesheets/Modifiers/Overrides/SearchScopesModifier.swift

@@ -16,7 +16,7 @@ enum AnyTextSelectability: String, CaseIterable, ParseableModifierValue {
 }
 
 extension View {
-#if os(iOS) || os(macOS) || os(xrOS)
+#if os(iOS) || os(macOS) || os(visionOS)
     @_disfavoredOverload
     @ViewBuilder
     func textSelection(_ selectability: AnyTextSelectability) -> some View {

Sources/LiveViewNative/Stylesheets/ParseableTypes/AnyGesture+ParseableModifierValue.swift

@@ -15,7 +15,16 @@ extension Axis.Set: ParseableModifierValue {
                 "horizontal": Axis.Set.horizontal,
                 "vertical": Axis.Set.vertical,
             ])
-            Array<Self>.parser(in: context).map(Self.init(_:))
+            Array<Axis>.parser(in: context).map({
+                Self.init($0.map({
+                    switch $0 {
+                    case .horizontal:
+                        return .horizontal
+                    case .vertical:
+                        return .vertical
+                    }
+                }))
+            })
         }
     }
 }

Sources/LiveViewNative/Stylesheets/ParseableTypes/AnyTextSelectability.swift

@@ -64,7 +64,7 @@ extension HorizontalEdge.Set: ParseableModifierValue {
                 "trailing": .trailing,
                 "all": .all,
             ])
-            Array<Self>.parser(in: context).map({ Self.init($0) })
+            Array<HorizontalEdge>.parser(in: context).map({ Self.init($0.map(Self.init)) })
         }
     }
 }
@@ -77,7 +77,7 @@ extension VerticalEdge.Set: ParseableModifierValue {
                 "bottom": bottom,
                 "all": all,
             ])
-            Array<Self>.parser(in: context).map({ Self.init($0) })
+            Array<VerticalEdge>.parser(in: context).map({ Self.init($0.map(Self.init)) })
         }
     }
 }

Sources/LiveViewNative/Stylesheets/ParseableTypes/Axis+Set+ParseableModifierValue.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 import LiveViewNativeStylesheet
 
-#if os(iOS) || os(macOS) || os(xrOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 extension KeyEquivalent: ParseableModifierValue {
     public static func parser(in context: ParseableModifierContext) -> some Parser<Substring.UTF8View, Self> {
         OneOf {