From 1e0a8c6700657af803a97413c1eb0ef07c5c16ed Mon Sep 17 00:00:00 2001
From: Eduardo Speroni <edusperoni@gmail.com>
Date: Wed, 10 Apr 2024 14:45:20 -0300
Subject: [PATCH 1/2] feat: add protocol information to native types

---
 .../src/TypeScript/DefinitionWriter.cpp       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/metadata-generator/src/TypeScript/DefinitionWriter.cpp b/metadata-generator/src/TypeScript/DefinitionWriter.cpp
index 6d20d891..2fe08a1e 100644
--- a/metadata-generator/src/TypeScript/DefinitionWriter.cpp
+++ b/metadata-generator/src/TypeScript/DefinitionWriter.cpp
@@ -976,7 +976,26 @@ std::string DefinitionWriter::tsifyType(const Type& type, const bool isFuncParam
             }
         }
         
-        if (interface.name == "NSArray" && isFuncParam) {
+        std::vector<std::string> protocols;
+        if (type.is(TypeType::TypeInterface) && type.as<InterfaceType>().protocols.size() > 0) {
+            for (auto & protocol : type.as<InterfaceType>().protocols) {
+                if (protocol->jsName != "NSCopying") {
+                    protocols.push_back(protocol->jsName);
+                }
+            }
+        }
+        
+        if (protocols.size() > 0) {
+            // Example: -(NSObject<Option> *) getOption;
+            // Expected: getOption(): NSObject & Option;
+            for (auto & protocol : protocols) {
+                output << " & " << protocol;
+            }
+        } else if (interface.name == "NSArray" && isFuncParam) {
+            // In this case, NSArray<string> maps into NSArray<string> | string[]
+            // We only do this if there are no protocols, though
+            // for the very rare case where someone would do NSArray with a protocol
+            // as we can't marshal a JS array into NSArray + protocol
             if (hasClosedGenerics) {
                 std::string arrayType = firstElementType;
                 output << " | " << arrayType << "[]";

From 73af937d11e8d16d4ae87da40508143d3ab2a59e Mon Sep 17 00:00:00 2001
From: Eduardo Speroni <edusperoni@gmail.com>
Date: Thu, 23 May 2024 12:21:19 -0300
Subject: [PATCH 2/2] fix: correct typing for C String return type

---
 metadata-generator/src/TypeScript/DefinitionWriter.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/metadata-generator/src/TypeScript/DefinitionWriter.cpp b/metadata-generator/src/TypeScript/DefinitionWriter.cpp
index 2fe08a1e..3d8b86ab 100644
--- a/metadata-generator/src/TypeScript/DefinitionWriter.cpp
+++ b/metadata-generator/src/TypeScript/DefinitionWriter.cpp
@@ -883,11 +883,9 @@ std::string DefinitionWriter::tsifyType(const Type& type, const bool isFuncParam
     case TypeSelector:
         return "string";
     case TypeCString: {
-        std::string res = "string";
-        if (isFuncParam) {
-            Type typeVoid(TypeVoid);
-            res += " | " + tsifyType(::Meta::PointerType(&typeVoid), isFuncParam);
-        }
+        std::string res = isFuncParam ? "string | " : "";
+        Type typeVoid(TypeVoid);
+        res += tsifyType(::Meta::PointerType(&typeVoid), isFuncParam);
         return res;
     }
     case TypeProtocol: