react-native-mmkv 4.0.0-beta.7 → 4.0.0-beta.9

package/app.plugin.js

@@ -1 +1 @@
-module.exports = require('./lib/commonjs/expo-plugin/withMMKV')
+module.exports = require('./lib/expo-plugin/withMMKV.cjs')

package/cpp/HybridMMKV.cpp

@@ -129,8 +129,8 @@ std::optional<std::shared_ptr<ArrayBuffer>> HybridMMKV::getBuffer(const std::str
 bool HybridMMKV::contains(const std::string& key) {
   return instance->containsKey(key);
 }
-void HybridMMKV::remove(const std::string& key) {
-  instance->removeValueForKey(key);
+bool HybridMMKV::remove(const std::string& key) {
+  return instance->removeValueForKey(key);
 }
 std::vector<std::string> HybridMMKV::getAllKeys() {
   return instance->allKeys();

package/cpp/HybridMMKV.hpp

@@ -30,7 +30,7 @@ public:
   std::optional<double> getNumber(const std::string& key) override;
   std::optional<std::shared_ptr<ArrayBuffer>> getBuffer(const std::string& key) override;
   bool contains(const std::string& key) override;
-  void remove(const std::string& key) override;
+  bool remove(const std::string& key) override;
   std::vector<std::string> getAllKeys() override;
   void clearAll() override;
   void recrypt(const std::optional<std::string>& key) override;

package/lib/createMMKV/createMMKV.mock.js

@@ -23,6 +23,7 @@ export function createMockMMKV() {
             if (deleted) {
                 notifyListeners(key);
             }
+            return deleted;
         },
         set: (key, value) => {
             storage.set(key, value);

package/lib/createMMKV/createMMKV.web.js

@@ -64,7 +64,7 @@ export function createMMKV(config) {
                 }
             }
         },
-        remove: (key) => storage().removeItem(prefixedKey(key)),
+        remove: (key) => storage().removeItem(prefixedKey(key)) ?? false,
         set: (key, value) => {
             storage().setItem(prefixedKey(key), value.toString());
         },

package/lib/expo-plugin/withMMKV.cjs

@@ -0,0 +1,26 @@
+"use strict";
+const { createRunOncePlugin, withGradleProperties } = require('@expo/config-plugins');
+const pkg = require('../../package.json');
+const withMMKV = (config) => {
+    // remove 32-bit architectures from gradle.properties
+    return withGradleProperties(config, (cfg) => {
+        // Define the wanted property
+        const property = {
+            type: 'property',
+            key: 'reactNativeArchitectures',
+            value: 'arm64-v8a,x86_64',
+        };
+        // If it exists, update its value
+        const index = cfg.modResults.findIndex((p) => p.type === 'property' && p.key === property.key);
+        if (index !== -1) {
+            // Overwrite it
+            cfg.modResults[index] = property;
+        }
+        else {
+            // Append it
+            cfg.modResults.push(property);
+        }
+        return cfg;
+    });
+};
+module.exports = createRunOncePlugin(withMMKV, pkg.name, pkg.version);

package/lib/expo-plugin/withMMKV.d.cts

@@ -0,0 +1,3 @@
+import type { ConfigPlugin } from '@expo/config-plugins';
+declare const _default: ConfigPlugin<{}>;
+export = _default;

package/lib/specs/MMKV.nitro.d.ts

@@ -42,8 +42,9 @@ export interface MMKV extends HybridObject<{
     contains(key: string): boolean;
     /**
      * Removes the given `key`.
+     * @returns true if the key was removed, false otherwise
      */
-    remove(key: string): void;
+    remove(key: string): boolean;
     /**
      * Get all keys.
      *

package/nitrogen/generated/android/NitroMmkvOnLoad.cpp

@@ -45,8 +45,7 @@ int initialize(JavaVM* vm) {
       []() -> std::shared_ptr<HybridObject> {
         static DefaultConstructableObject<JHybridMMKVPlatformContextSpec::javaobject> object("com/margelo/nitro/mmkv/HybridMMKVPlatformContext");
         auto instance = object.create();
-        auto globalRef = jni::make_global(instance);
-        return globalRef->cthis()->shared();
+        return instance->cthis()->shared();
       }
     );
   });

package/nitrogen/generated/shared/c++/HybridMMKVSpec.hpp

@@ -64,7 +64,7 @@ namespace margelo::nitro::mmkv {
       virtual std::optional<double> getNumber(const std::string& key) = 0;
       virtual std::optional<std::shared_ptr<ArrayBuffer>> getBuffer(const std::string& key) = 0;
       virtual bool contains(const std::string& key) = 0;
-      virtual void remove(const std::string& key) = 0;
+      virtual bool remove(const std::string& key) = 0;
       virtual std::vector<std::string> getAllKeys() = 0;
       virtual void clearAll() = 0;
       virtual void recrypt(const std::optional<std::string>& key) = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mmkv",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.9",
   "description": "react-native-mmkv",
   "main": "lib/index",
   "module": "lib/index",
@@ -37,7 +37,7 @@
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
     "lint-ci": "eslint \"**/*.{js,ts,tsx}\" -f @jamesacarr/github-actions",
     "typescript": "tsc",
-    "specs": "tsc && nitro-codegen --logLevel=\"debug\"",
+    "specs": "tsc && nitrogen --logLevel=\"debug\"",
     "build": "tsc --noEmit false",
     "release": "release-it",
     "test": "jest"
@@ -68,11 +68,11 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "nitro-codegen": "*",
+    "nitrogen": "^0.29.4",
     "prettier": "^3.3.3",
     "react": "19.1.0",
     "react-native": "0.81.0",
-    "react-native-nitro-modules": "*",
+    "react-native-nitro-modules": "^0.29.4",
     "typescript": "^5.8.3"
   },
   "peerDependencies": {

package/src/createMMKV/createMMKV.mock.ts

@@ -27,6 +27,7 @@ export function createMockMMKV(): MMKV {
       if (deleted) {
         notifyListeners(key)
       }
+      return deleted
     },
     set: (key, value) => {
       storage.set(key, value)

package/src/createMMKV/createMMKV.web.ts

@@ -87,7 +87,7 @@ export function createMMKV(config: Configuration): MMKV {
         }
       }
     },
-    remove: (key) => storage().removeItem(prefixedKey(key)),
+    remove: (key) => storage().removeItem(prefixedKey(key)) ?? false,
     set: (key, value) => {
       storage().setItem(prefixedKey(key), value.toString())
     },

package/src/expo-plugin/withMMKV.cts

@@ -0,0 +1,31 @@
+import type { ConfigPlugin, ExportedConfigWithProps } from '@expo/config-plugins'
+const { createRunOncePlugin, withGradleProperties } = require('@expo/config-plugins')
+import type { Properties } from '@expo/config-plugins/build/android'
+
+const pkg = require('../../package.json')
+
+const withMMKV: ConfigPlugin<{}> = (config) => {
+  // remove 32-bit architectures from gradle.properties
+  return withGradleProperties(config, (cfg: ExportedConfigWithProps<Properties.PropertiesItem[]>) => {
+    // Define the wanted property
+    const property = {
+      type: 'property',
+      key: 'reactNativeArchitectures',
+      value: 'arm64-v8a,x86_64',
+    } as const
+    // If it exists, update its value
+    const index = cfg.modResults.findIndex(
+      (p) => p.type === 'property' && p.key === property.key
+    )
+    if (index !== -1) {
+      // Overwrite it
+      cfg.modResults[index] = property
+    } else {
+      // Append it
+      cfg.modResults.push(property)
+    }
+    return cfg
+  })
+}
+
+export = createRunOncePlugin(withMMKV, pkg.name, pkg.version) as ConfigPlugin<{}>

package/src/specs/MMKV.nitro.ts

@@ -41,8 +41,9 @@ export interface MMKV extends HybridObject<{ ios: 'c++'; android: 'c++' }> {
   contains(key: string): boolean
   /**
    * Removes the given `key`.
+   * @returns true if the key was removed, false otherwise
    */
-  remove(key: string): void
+  remove(key: string): boolean
   /**
    * Get all keys.
    *

package/src/expo-plugin/withMMKV.ts

@@ -1,23 +0,0 @@
-import type { ConfigPlugin } from '@expo/config-plugins'
-import { createRunOncePlugin, withGradleProperties } from '@expo/config-plugins'
-
-const pkg = require('../../package.json')
-
-const withMMKV: ConfigPlugin<{}> = (config) => {
-  // remove 32-bit architectures from gradle.properties
-  return withGradleProperties(config, (cfg) => {
-    // Drop any existing entry…
-    cfg.modResults = cfg.modResults.filter(
-      (p) => !(p.type === 'property' && p.key === 'reactNativeArchitectures')
-    )
-    // …and force 64-bit only.
-    cfg.modResults.push({
-      type: 'property',
-      key: 'reactNativeArchitectures',
-      value: 'arm64-v8a,x86_64',
-    })
-    return cfg
-  })
-}
-
-export default createRunOncePlugin(withMMKV, pkg.name, pkg.version)