Handle type names prefixed with any

cashapp · Jan 15, 2025 · db2260f · db2260f
1 parent 6b852ec
commit db2260f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Sources/KnitCodeGen/TypeNamer.swift b/Sources/KnitCodeGen/TypeNamer.swift
@@ -30,8 +30,10 @@ enum TypeNamer {
             // The naming doesn't work for function types, just return closure
             return "closure"
         }
+        // Drop any annotation
+        var type = type.replacingOccurrences(of: "any ", with: "")
         let removedCharacters = CharacterSet(charactersIn: "?[]():&, ")
-        var type = type.components(separatedBy: removedCharacters).joined(separator: "")
+        type = type.components(separatedBy: removedCharacters).joined(separator: "")
         let regex = try! NSRegularExpression(pattern: "<.*>")
         let nsString = type as NSString
         if let match = regex.firstMatch(in: type, range: .init(location: 0, length: type.count)) {

diff --git a/Tests/KnitCodeGenTests/TypeNamerTests.swift b/Tests/KnitCodeGenTests/TypeNamerTests.swift
@@ -98,6 +98,18 @@ final class TypeNamerTests: XCTestCase {
         )
     }
 
+    func testAnyPrefix() {
+        assertComputedIdentifier(
+            type: "(any AppTransitionObservable)",
+            expectedIdentifier: "appTransitionObservable"
+        )
+
+        assertComputedIdentifier(
+            type: "any AppTransitionObservable",
+            expectedIdentifier: "appTransitionObservable"
+        )
+    }
+
 }
 
 private func assertComputedIdentifier(