remove autoclosure from extracted tuple

griotspeak · Dec 25, 2024 · 224d63e · 224d63e
1 parent e7f4920
commit 224d63e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/Sources/DiscriminatedUnionMacros/DiscriminatedUnionMacro.swift b/Sources/DiscriminatedUnionMacros/DiscriminatedUnionMacro.swift
@@ -135,9 +135,17 @@ extension DiscriminatedUnionMacro: MemberMacro {
                     output = "(\(rawOut.joined(separator: ", ")))"
                 }
 
+                let strippedParams = if parameterClause.parameters.count == 1 {
+                    String(describing: parameterClause.parameters.first!.type)
+                } else {
+                    "(\(parameterClause.parameters.description))"
+                }
+
+
+                Swift.print("usiyan::: strippedParams: \(String(describing: strippedParams))")
                 return (
                     String(describing: singleCase.name),
-                    parameterClause.parameters.count == 1 ? String(describing: parameterClause.parameters.first!.type) : "(\(parameterClause.parameters.description))",
+                    strippedParams.replacingOccurrences(of: "@autoclosure ", with: ""),
                     bindings.joined(separator: ", "),
                     output
                 )

diff --git a/Tests/DiscriminatedUnionTests/DiscriminatedUnionTests.swift b/Tests/DiscriminatedUnionTests/DiscriminatedUnionTests.swift
@@ -24,6 +24,7 @@ final class DiscriminatedUnionTests: XCTestCase {
                 case parrot
                 case snake
                 case bird(name: String, Int)
+                case hydra(@autoclosure () -> String, String)
             }
             """,
 
@@ -35,13 +36,15 @@ enum Pet {
     case parrot
     case snake
     case bird(name: String, Int)
+    case hydra(@autoclosure () -> String, String)
 
     public enum Discriminant: DiscriminantType {
         case dog
         case cat
         case parrot
         case snake
         case bird
+        case hydra
 
         public var hasAssociatedType: Bool {
             return switch self {
@@ -55,6 +58,8 @@ enum Pet {
                 false // nil
             case .bird:
                 true // Optional("name: String, Int")
+            case .hydra:
+                true // Optional("@autoclosure () -> String, String")
             }
         }
     }
@@ -71,6 +76,8 @@ enum Pet {
             return .snake
         case .bird:
             return .bird
+        case .hydra:
+            return .hydra
         }
     }
 
@@ -93,6 +100,14 @@ enum Pet {
             .failure(.invalidExtraction(expected: .bird, actual: self.discriminant))
         }
     }
+
+    public func tupleFromHydra() -> Swift.Result<(() -> String, String), PayloadExtractionError> {
+        if case .hydra(let index0, let index1) = self {
+            .success((index0, index1))
+        } else {
+            .failure(.invalidExtraction(expected: .hydra, actual: self.discriminant))
+        }
+    }
 }
 
 """,