update to support typed-throw

uber · Jun 30, 2024 · 4ca5407 · 4ca5407
1 parent 41de219
commit 4ca5407
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 6 deletions.
diff --git a/Sources/MockoloFramework/Parsers/SwiftSyntaxExtensions.swift b/Sources/MockoloFramework/Parsers/SwiftSyntaxExtensions.swift
@@ -432,7 +432,7 @@ extension FunctionDeclSyntax {
                                     genericTypeParams: genericTypeParams,
                                     genericWhereClause: genericWhereClause,
                                     params: params,
-									throwsOrRethrows: self.signature.effectSpecifiers?.throwsClause?.throwsSpecifier.text,
+									throwsOrRethrows: self.signature.effectSpecifiers?.throwsClause?.text,
                                     asyncOrReasync: self.signature.effectSpecifiers?.asyncSpecifier?.text,
                                     isStatic: isStatic,
                                     offset: self.offset,
@@ -473,7 +473,7 @@ extension InitializerDeclSyntax {
                            genericTypeParams: genericTypeParams,
                            genericWhereClause: genericWhereClause,
                            params: params,
-						   throwsOrRethrows: self.signature.effectSpecifiers?.throwsClause?.throwsSpecifier.text,
+						   throwsOrRethrows: self.signature.effectSpecifiers?.throwsClause?.text,
                            asyncOrReasync: self.signature.effectSpecifiers?.asyncSpecifier?.text,
                            isStatic: false,
                            offset: self.offset,
@@ -796,3 +796,14 @@ extension Trivia {
         return nil
     }
 }
+
+extension ThrowsClauseSyntax {
+
+	var text: String {
+		if let type {
+			"\(throwsSpecifier.text)(\(type.description))"
+		} else {
+			throwsSpecifier.text
+		}
+	}
+}
diff --git a/Sources/MockoloFramework/Utils/StringExtensions.swift b/Sources/MockoloFramework/Utils/StringExtensions.swift
@@ -108,13 +108,34 @@ extension String {
     ///
     """
 
-
     var hasThrowsOrRethrows: Bool {
         return components(separatedBy: .whitespaces).contains { component in
-            return component == .throws || component == .rethrows
-        }
+			let hasTypedThrow = hasPrefix(String.throws.withLeftParen)
+			return component == .throws || hasTypedThrow || component == .rethrows
+		}
     }
 
+	/// Extract Error type in typed-throw.
+	///
+	/// - Note: Because any keyword can appear, it was hard to split by whitespace.
+	/// 
+	/// - ex
+	/// 	```
+	/// 	throws(any LocalizedError)
+	/// 	↓ should extract
+	/// 	any LocalizedError
+	/// 	```
+	var typedThrowTypeName: String {
+		let pattern = #"throws\((?<thrownType>.+)\)"#
+		guard let regex = try? Regex(pattern, as: (Substring, thrownType: Substring).self) else {
+			return ""
+		}
+		guard let match = firstMatch(of: regex) else {
+			return ""
+		}
+		return String(match.output.thrownType)
+	}
+
     var hasAsync: Bool {
         return components(separatedBy: .whitespaces).contains { component in
             return component == .async

diff --git a/Sources/MockoloFramework/Utils/TypeParser.swift b/Sources/MockoloFramework/Utils/TypeParser.swift
@@ -558,9 +558,18 @@ public final class `Type` {
             displayableReturnType = "(\(displayableReturnType))"
         }
 
+		let hasThrowsOrRethrows = suffix.hasThrowsOrRethrows
+		let typedThrowTypeName = suffix.typedThrowTypeName
+
+		let thrownSuffix: String = if typedThrowTypeName.isNotEmpty {
+			"\(String.throws)(\(typedThrowTypeName))"
+		} else {
+			String.throws
+		}
+
         let suffixStr = [
             suffix.hasAsync ? String.async + " " : nil,
-            suffix.hasThrowsOrRethrows ? String.throws + " " : nil,
+			hasThrowsOrRethrows ? thrownSuffix + " " : nil,
         ].compactMap { $0 }.joined()
 
         let typeStr = "((\(displayableParamStr)) \(suffixStr)-> \(displayableReturnType))?"