react-native-nitro-modules 0.18.0 → 0.18.1

package/NitroModules.podspec

@@ -11,16 +11,14 @@ Pod::Spec.new do |s|
   s.homepage     = package["homepage"]
   s.license      = package["license"]
   s.authors      = package["author"]
-
-  s.platforms    = { 
+  s.source       = { :git => "https://github.com/mrousavy/nitro.git", :tag => "#{s.version}" }
+  s.platforms    = {
     :ios => min_ios_version_supported,
     :visionos => 1.0,
     :macos => 10.13,
     :tvos => 13.4,
   }
-  s.source       = { :git => "https://github.com/mrousavy/nitro.git", :tag => "#{s.version}" }
 
-  # VisionCamera Core C++ bindings
   s.source_files = [
     # Shared C++ codebase
     "cpp/**/*.{h,hpp}",
@@ -41,6 +39,7 @@ Pod::Spec.new do |s|
     "cpp/entrypoint/InstallNitro.hpp",
     "cpp/registry/HybridObjectRegistry.hpp",
     "cpp/jsi/JSIConverter.hpp",
+    "cpp/platform/NitroLogger.hpp",
     "cpp/threading/Dispatcher.hpp",
     "cpp/utils/NitroHash.hpp",
     "cpp/utils/NitroDefines.hpp",
@@ -59,7 +58,11 @@ Pod::Spec.new do |s|
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",
+    # C++ compiler flags, mainly for folly.
+    "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES"
   }
 
+  s.dependency 'React-jsi'
+  s.dependency 'React-callinvoker'
   install_modules_dependencies(s)
 end

package/README.md

@@ -181,6 +181,12 @@ The following C++ / JS types are supported out of the box:
     <td>❌</td>
     <td>❌</td>
   </tr>
+  <tr>
+    <td><code>Error</code></td>
+    <td><code>std::exception_ptr</code></td>
+    <td><code>Error</code></td>
+    <td><code>Throwable</code></td>
+  </tr>
   <tr>
     <td><code>Promise&lt;T&gt;</code></td>
     <td><code>std::shared_ptr&lt;<a href="./cpp/core/Promise.hpp">Promise&lt;T&gt;</a>&gt;</code></td>

package/cpp/core/Promise.hpp

@@ -116,16 +116,6 @@ public:
   /**
    * Rejects this Promise with the given error, and calls any pending listeners.
    */
-  void reject(const std::exception& exception) {
-    std::unique_lock lock(*_mutex);
-#ifdef NITRO_DEBUG
-    assertPromiseState(*this, PromiseTask::WANTS_TO_REJECT);
-#endif
-    _state = std::make_exception_ptr(exception);
-    for (const auto& onRejected : _onRejectedListeners) {
-      onRejected(std::get<std::exception_ptr>(_state));
-    }
-  }
   void reject(const std::exception_ptr& exception) {
     std::unique_lock lock(*_mutex);
 #ifdef NITRO_DEBUG
@@ -324,16 +314,6 @@ public:
       onResolved();
     }
   }
-  void reject(const std::exception& exception) {
-    std::unique_lock lock(*_mutex);
-#ifdef NITRO_DEBUG
-    assertPromiseState(*this, PromiseTask::WANTS_TO_REJECT);
-#endif
-    _error = std::make_exception_ptr(exception);
-    for (const auto& onRejected : _onRejectedListeners) {
-      onRejected(_error.value());
-    }
-  }
   void reject(const std::exception_ptr& exception) {
     std::unique_lock lock(*_mutex);
 #ifdef NITRO_DEBUG

package/cpp/utils/TypeInfo.hpp

@@ -35,13 +35,18 @@ public:
     std::string name = typeName;
 #if __has_include(<cxxabi.h>)
     int status = 0;
-    char* demangled_name = abi::__cxa_demangle(name.c_str(), NULL, NULL, &status);
+    char* demangled_name = abi::__cxa_demangle(name.c_str(), nullptr, nullptr, &status);
     if (demangled_name != nullptr) {
       name = demangled_name;
       std::free(demangled_name);
     }
 #endif
 
+#ifdef ANDROID
+    // std::__ndk1 -> std::__1
+    name = replaceRegex(name, R"(std::__ndk1)", "std::__1");
+#endif
+
     // Make a few edge-cases nicer.
     name = replaceRegex(name, R"(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>)", "std::string");
     name = replaceRegex(name, R"(std::__1::vector<([^>]+), std::__1::allocator<\1>>)", "std::vector<$1>");

package/ios/utils/RuntimeError.hpp

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "TypeInfo.hpp"
 #include <exception>
 #include <string>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-modules",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Insanely fast native C++, Swift or Kotlin modules with a statically compiled binding layer to JSI.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",