From fba0b7fbbf8a548be3a472bbb1aa77e64c796e64 Mon Sep 17 00:00:00 2001
From: Marc Rousavy <me@mrousavy.com>
Date: Wed, 15 Jan 2025 18:54:16 +0100
Subject: [PATCH 1/3] fix: Replace `TypeInfo.hpp` with `NitroTypeInfo.hpp`

---
 packages/react-native-nitro-modules/cpp/core/HybridFunction.hpp | 2 +-
 packages/react-native-nitro-modules/cpp/core/Promise.hpp        | 2 +-
 .../cpp/jsi/JSIConverter+Exception.hpp                          | 2 +-
 .../cpp/jsi/JSIConverter+HostObject.hpp                         | 2 +-
 .../cpp/jsi/JSIConverter+HybridObject.hpp                       | 2 +-
 .../react-native-nitro-modules/cpp/jsi/JSIConverter+Tuple.hpp   | 2 +-
 .../react-native-nitro-modules/cpp/jsi/JSIConverter+Variant.hpp | 2 +-
 .../cpp/prototype/HybridObjectPrototype.cpp                     | 2 +-
 .../react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp | 2 +-
 .../cpp/utils/{TypeInfo.hpp => NitroTypeInfo.hpp}               | 2 +-
 packages/react-native-nitro-modules/ios/core/HybridContext.hpp  | 2 +-
 packages/react-native-nitro-modules/ios/utils/RuntimeError.hpp  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/react-native-nitro-modules/cpp/utils/{TypeInfo.hpp => NitroTypeInfo.hpp} (99%)

diff --git a/packages/react-native-nitro-modules/cpp/core/HybridFunction.hpp b/packages/react-native-nitro-modules/cpp/core/HybridFunction.hpp
index 29c6ef058..0c240d6ce 100644
--- a/packages/react-native-nitro-modules/cpp/core/HybridFunction.hpp
+++ b/packages/react-native-nitro-modules/cpp/core/HybridFunction.hpp
@@ -15,7 +15,7 @@ struct JSIConverter;
 #include "CountTrailingOptionals.hpp"
 #include "JSIConverter.hpp"
 #include "NitroDefines.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <exception>
 #include <functional>
 #include <jsi/jsi.h>
diff --git a/packages/react-native-nitro-modules/cpp/core/Promise.hpp b/packages/react-native-nitro-modules/cpp/core/Promise.hpp
index 48aba72f5..80a2e2ab5 100644
--- a/packages/react-native-nitro-modules/cpp/core/Promise.hpp
+++ b/packages/react-native-nitro-modules/cpp/core/Promise.hpp
@@ -7,7 +7,7 @@
 #include "AssertPromiseState.hpp"
 #include "NitroDefines.hpp"
 #include "ThreadPool.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <exception>
 #include <future>
 #include <jsi/jsi.h>
diff --git a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Exception.hpp b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Exception.hpp
index 7e3860db7..17dd28002 100644
--- a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Exception.hpp
+++ b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Exception.hpp
@@ -12,7 +12,7 @@ struct JSIConverter;
 
 #include "JSIConverter.hpp"
 
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <exception>
 #include <jsi/jsi.h>
 
diff --git a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HostObject.hpp b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HostObject.hpp
index db222b132..462e7c3dd 100644
--- a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HostObject.hpp
+++ b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HostObject.hpp
@@ -6,7 +6,7 @@
 
 #include "IsSharedPtrTo.hpp"
 #include "NitroDefines.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <jsi/jsi.h>
 #include <type_traits>
 
diff --git a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HybridObject.hpp b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HybridObject.hpp
index 2377b1ad5..b8f2e5c3c 100644
--- a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HybridObject.hpp
+++ b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+HybridObject.hpp
@@ -11,7 +11,7 @@ class HybridObject;
 
 #include "IsSharedPtrTo.hpp"
 #include "NitroDefines.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <jsi/jsi.h>
 #include <type_traits>
 
diff --git a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Tuple.hpp b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Tuple.hpp
index 90db28007..5930e4363 100644
--- a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Tuple.hpp
+++ b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Tuple.hpp
@@ -12,7 +12,7 @@ struct JSIConverter;
 
 #include "JSIConverter.hpp"
 
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <jsi/jsi.h>
 #include <memory>
 #include <tuple>
diff --git a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Variant.hpp b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Variant.hpp
index e862528b0..e54357adb 100644
--- a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Variant.hpp
+++ b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Variant.hpp
@@ -18,7 +18,7 @@ struct JSIConverter;
 #include "JSIConverter.hpp"
 
 #include "AnyMap.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <jsi/jsi.h>
 #include <memory>
 #include <variant>
diff --git a/packages/react-native-nitro-modules/cpp/prototype/HybridObjectPrototype.cpp b/packages/react-native-nitro-modules/cpp/prototype/HybridObjectPrototype.cpp
index 012bf83de..bac6ec99e 100644
--- a/packages/react-native-nitro-modules/cpp/prototype/HybridObjectPrototype.cpp
+++ b/packages/react-native-nitro-modules/cpp/prototype/HybridObjectPrototype.cpp
@@ -8,7 +8,7 @@
 #include "HybridObjectPrototype.hpp"
 #include "NitroDefines.hpp"
 #include "NitroLogger.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 
 namespace margelo::nitro {
 
diff --git a/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp b/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp
index bdc321ca2..01c6352cb 100644
--- a/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp
+++ b/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp
@@ -13,7 +13,7 @@ class Promise;
 } // namespace margelo::nitro
 
 #include "Promise.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <exception>
 #include <string>
 
diff --git a/packages/react-native-nitro-modules/cpp/utils/TypeInfo.hpp b/packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp
similarity index 99%
rename from packages/react-native-nitro-modules/cpp/utils/TypeInfo.hpp
rename to packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp
index e0f788489..8921e5681 100644
--- a/packages/react-native-nitro-modules/cpp/utils/TypeInfo.hpp
+++ b/packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp
@@ -1,5 +1,5 @@
 //
-//  TypeInfo.hpp
+//  NitroNitroTypeInfo.hpp
 //  Nitro
 //
 //  Created by Marc Rousavy on 17.07.24.
diff --git a/packages/react-native-nitro-modules/ios/core/HybridContext.hpp b/packages/react-native-nitro-modules/ios/core/HybridContext.hpp
index e78d97db1..2c58da11b 100644
--- a/packages/react-native-nitro-modules/ios/core/HybridContext.hpp
+++ b/packages/react-native-nitro-modules/ios/core/HybridContext.hpp
@@ -13,7 +13,7 @@ class HybridObject;
 
 #include "HybridObject.hpp"
 #include "NitroLogger.hpp"
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <memory>
 
 namespace margelo::nitro {
diff --git a/packages/react-native-nitro-modules/ios/utils/RuntimeError.hpp b/packages/react-native-nitro-modules/ios/utils/RuntimeError.hpp
index a285839c7..7fcb523e4 100644
--- a/packages/react-native-nitro-modules/ios/utils/RuntimeError.hpp
+++ b/packages/react-native-nitro-modules/ios/utils/RuntimeError.hpp
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "TypeInfo.hpp"
+#include "NitroTypeInfo.hpp"
 #include <exception>
 #include <string>
 

From 5eaf5dde15d4e5915bce9b7af28468870e8e5332 Mon Sep 17 00:00:00 2001
From: Marc Rousavy <me@mrousavy.com>
Date: Wed, 15 Jan 2025 18:55:05 +0100
Subject: [PATCH 2/3] fix: Format

---
 packages/react-native-nitro-modules/cpp/core/Promise.hpp        | 2 +-
 .../react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-native-nitro-modules/cpp/core/Promise.hpp b/packages/react-native-nitro-modules/cpp/core/Promise.hpp
index 80a2e2ab5..2990ae771 100644
--- a/packages/react-native-nitro-modules/cpp/core/Promise.hpp
+++ b/packages/react-native-nitro-modules/cpp/core/Promise.hpp
@@ -6,8 +6,8 @@
 
 #include "AssertPromiseState.hpp"
 #include "NitroDefines.hpp"
-#include "ThreadPool.hpp"
 #include "NitroTypeInfo.hpp"
+#include "ThreadPool.hpp"
 #include <exception>
 #include <future>
 #include <jsi/jsi.h>
diff --git a/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp b/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp
index 01c6352cb..c89cc029a 100644
--- a/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp
+++ b/packages/react-native-nitro-modules/cpp/utils/AssertPromiseState.hpp
@@ -12,8 +12,8 @@ template <typename TResult>
 class Promise;
 } // namespace margelo::nitro
 
-#include "Promise.hpp"
 #include "NitroTypeInfo.hpp"
+#include "Promise.hpp"
 #include <exception>
 #include <string>
 

From 28dcc829799537d26069de29dc0a32e6f5eb4832 Mon Sep 17 00:00:00 2001
From: Marc Rousavy <me@mrousavy.com>
Date: Wed, 15 Jan 2025 18:57:09 +0100
Subject: [PATCH 3/3] Update NitroTypeInfo.hpp

---
 packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp b/packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp
index 8921e5681..e89ed8e05 100644
--- a/packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp
+++ b/packages/react-native-nitro-modules/cpp/utils/NitroTypeInfo.hpp
@@ -1,5 +1,5 @@
 //
-//  NitroNitroTypeInfo.hpp
+//  NitroTypeInfo.hpp
 //  Nitro
 //
 //  Created by Marc Rousavy on 17.07.24.