This is a better name than ExtractorError

griotspeak · Dec 24, 2024 · e7f4920 · e7f4920
1 parent 6442269
commit e7f4920
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Sources/DiscriminatedUnion/DiscriminatedUnion.swift b/Sources/DiscriminatedUnion/DiscriminatedUnion.swift
@@ -9,7 +9,7 @@
 //    prefixed(tupleFrom),
 //    named(Discriminant),
 //    named(discriminant),
-//    named(ExtractorError)
+//    named(PayloadExtractionError)
 )
 public macro discriminatedUnion() = #externalMacro(
     module: "DiscriminatedUnionMacros",

diff --git a/Sources/DiscriminatedUnionMacros/DiscriminatedUnionMacro.swift b/Sources/DiscriminatedUnionMacros/DiscriminatedUnionMacro.swift
@@ -58,12 +58,12 @@ extension DiscriminatedUnionMacro: MemberMacro {
             try DeclSyntax(validating: $0)
         }
 
-        let validatedExtractorError = try DeclSyntax(validating: extractorErrorDecl())
+        let validatedPayloadExtractionError = try DeclSyntax(validating: extractorErrorDecl())
 
         return try [
             DeclSyntax(validating: "\(raw: discriminantDecl)"),
             validatedPropertyDecl,
-            validatedExtractorError
+            validatedPayloadExtractionError
         ] + validatedExtractors
     }
 
@@ -73,7 +73,7 @@ extension DiscriminatedUnionMacro: MemberMacro {
 
     static func extractorErrorDecl() -> DeclSyntax {
         """
-        public enum ExtractorError: Swift.Error {
+        public enum PayloadExtractionError: Swift.Error {
             case invalidExtraction(expected: Discriminant, actual: Discriminant)
         }
         """
@@ -150,7 +150,7 @@ extension DiscriminatedUnionMacro: MemberMacro {
             let titleCasedName = "\(caseName.first!.uppercased())\(caseName.dropFirst())"
             return """
 
-            public func tupleFrom\(raw: titleCasedName)() -> Swift.Result<\(raw: tupleType), ExtractorError> {
+            public func tupleFrom\(raw: titleCasedName)() -> Swift.Result<\(raw: tupleType), PayloadExtractionError> {
                 if case .\(raw: caseName)(\(raw: pBindings)) = self {
                     .success(\(raw: returnValue))
                 } else {

diff --git a/Tests/DiscriminatedUnionTests/DiscriminatedUnionTests.swift b/Tests/DiscriminatedUnionTests/DiscriminatedUnionTests.swift
@@ -74,19 +74,19 @@ enum Pet {
         }
     }
 
-    public enum ExtractorError: Swift.Error {
+    public enum PayloadExtractionError: Swift.Error {
         case invalidExtraction(expected: Discriminant, actual: Discriminant)
     }
 
-    public func tupleFromCat() -> Swift.Result<Bool, ExtractorError> {
+    public func tupleFromCat() -> Swift.Result<Bool, PayloadExtractionError> {
         if case .cat(let curious) = self {
             .success(curious)
         } else {
             .failure(.invalidExtraction(expected: .cat, actual: self.discriminant))
         }
     }
 
-    public func tupleFromBird() -> Swift.Result<(name: String, Int), ExtractorError> {
+    public func tupleFromBird() -> Swift.Result<(name: String, Int), PayloadExtractionError> {
         if case .bird(let name, let index1) = self {
             .success((name, index1))
         } else {