react-native-nitro-modules 0.26.0 → 0.26.2

package/android/build.gradle

@@ -51,7 +51,7 @@ android {
     externalNativeBuild {
       cmake {
         cppFlags "-frtti -fexceptions -Wall -Wextra -fstack-protector-all"
-        arguments "-DANDROID_STL=c++_shared"
+        arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
         abiFilters (*reactNativeArchitectures())
 
         buildTypes {

package/android/src/main/cpp/core/JAnyMap.hpp

@@ -40,7 +40,7 @@ private:
   JAnyMap() {
     _map = std::make_shared<AnyMap>();
   }
-  JAnyMap(const std::shared_ptr<AnyMap>& map) : _map(map) {}
+  explicit JAnyMap(const std::shared_ptr<AnyMap>& map) : _map(map) {}
 
 protected:
   bool contains(const std::string& key) {
@@ -52,6 +52,17 @@ protected:
   void clear() {
     _map->clear();
   }
+  jni::local_ref<jni::JArrayClass<jni::JString>> getAllKeys() {
+    auto& map = _map->getMap();
+    auto array = jni::JArrayClass<jni::JString>::newArray(map.size());
+    size_t index = 0;
+    for (const auto& pair : map) {
+      auto jKey = jni::make_jstring(pair.first);
+      array->setElement(index, *jKey);
+      index++;
+    }
+    return array;
+  }
 
 protected:
   bool isNull(const std::string& key) {
@@ -163,6 +174,7 @@ public:
         makeNativeMethod("contains", JAnyMap::contains),
         makeNativeMethod("remove", JAnyMap::remove),
         makeNativeMethod("clear", JAnyMap::clear),
+        makeNativeMethod("getAllKeys", JAnyMap::getAllKeys),
         // is
         makeNativeMethod("isNull", JAnyMap::isNull),
         makeNativeMethod("isDouble", JAnyMap::isDouble),

package/android/src/main/java/com/margelo/nitro/core/AnyMap.kt

@@ -37,6 +37,7 @@ class AnyMap {
   external fun remove(key: String)
   @FastNative
   external fun clear()
+  external fun getAllKeys(): Array<String>
 
   @FastNative
   external fun isNull(key: String): Boolean

package/cpp/core/AnyMap.cpp

@@ -16,6 +16,14 @@ void AnyMap::remove(const std::string& key) {
 void AnyMap::clear() noexcept {
   _map.clear();
 }
+std::vector<std::string> AnyMap::getAllKeys() const {
+  std::vector<std::string> keys;
+  keys.reserve(_map.size());
+  for (const auto& pair : _map) {
+    keys.push_back(pair.first);
+  }
+  return keys;
+}
 
 // Is
 bool AnyMap::isNull(const std::string& key) const {

package/cpp/core/AnyMap.hpp

@@ -75,6 +75,10 @@ public:
    * Deletes all keys and values inside the map.
    */
   void clear() noexcept;
+  /**
+   * Get all keys this `AnyMap` instance contains.
+   */
+  std::vector<std::string> getAllKeys() const;
 
 public:
   /**

package/cpp/core/Promise.hpp

@@ -106,6 +106,7 @@ public:
     for (const auto& onResolved : _onResolvedListeners) {
       onResolved(std::get<TResult>(_state));
     }
+    didFinish();
   }
   void resolve(const TResult& result) {
     std::unique_lock lock(_mutex);
@@ -116,6 +117,7 @@ public:
     for (const auto& onResolved : _onResolvedListeners) {
       onResolved(std::get<TResult>(_state));
     }
+    didFinish();
   }
   /**
    * Rejects this Promise with the given error, and calls any pending listeners.
@@ -134,6 +136,7 @@ public:
     for (const auto& onRejected : _onRejectedListeners) {
       onRejected(exception);
     }
+    didFinish();
   }
 
 public:
@@ -245,6 +248,12 @@ public:
     return std::holds_alternative<std::monostate>(_state);
   }
 
+private:
+  void didFinish() noexcept {
+    _onResolvedListeners.clear();
+    _onRejectedListeners.clear();
+  }
+
 private:
   std::variant<std::monostate, TResult, std::exception_ptr> _state;
   std::vector<OnResolvedFunc> _onResolvedListeners;
@@ -319,6 +328,7 @@ public:
     for (const auto& onResolved : _onResolvedListeners) {
       onResolved();
     }
+    didFinish();
   }
   void reject(const std::exception_ptr& exception) {
     if (exception == nullptr) [[unlikely]] {
@@ -333,6 +343,7 @@ public:
     for (const auto& onRejected : _onRejectedListeners) {
       onRejected(exception);
     }
+    didFinish();
   }
 
 public:
@@ -401,6 +412,12 @@ public:
     return !isResolved() && !isRejected();
   }
 
+private:
+  void didFinish() noexcept {
+    _onResolvedListeners.clear();
+    _onRejectedListeners.clear();
+  }
+
 private:
   std::mutex _mutex;
   bool _isResolved = false;

package/cpp/utils/NitroDefines.hpp

@@ -9,7 +9,7 @@
 #define NitroDefines_h
 
 // Sets the version of the native Nitro core library
-#define NITRO_VERSION "0.26.0"
+#define NITRO_VERSION "0.26.2"
 
 // Sets whether to use debug or optimized production build flags
 #ifdef DEBUG

package/ios/core/AnyMapHolder.swift

@@ -82,6 +82,19 @@ public final class AnyMapHolder {
     cppPart.pointee.clear()
   }
 
+  /**
+   * Get all keys in this map.
+   */
+  public func getAllKeys() -> [String] {
+    let cppKeys = cppPart.pointee.getAllKeys()
+    var keys = [String]()
+    keys.reserveCapacity(cppKeys.count)
+    for cppKey in cppKeys {
+      keys.append(String(cppKey))
+    }
+    return keys
+  }
+
   // pragma MARK: Getters
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-modules",
-  "version": "0.26.0",
+  "version": "0.26.2",
   "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",