chore: upgrade @op-engineering/op-sqlite to v15.2.5

Author: vadymv-mendix

package-lock.json

@@ -23,7 +23,7 @@
     "mendix-native": "https://github.com/mendix/mendix-native/releases/download/v0.3.1/mendix-native-v0.3.1.tgz",
     "@notifee/react-native": "9.1.8",
     "@octokit/rest": "^21.1.1",
-    "@op-engineering/op-sqlite": "15.0.7",
+    "@op-engineering/op-sqlite": "15.2.5",
     "@shopify/flash-list": "2.2.2",
     "@react-native-async-storage/async-storage": "2.2.0",
     "@react-native-camera-roll/camera-roll": "7.4.0",
@@ -78,7 +78,7 @@
   "devDependencies": {
     "del-cli": "^3.0.1",
     "jetifier": "^1.6.8",
-    "patch-package": "^8.0.0",
+    "patch-package": "^8.0.1",
     "snyk": "^1.1118.0"
   },
   "engines": {

package.json

@@ -1,5 +1,5 @@
 diff --git a/node_modules/@op-engineering/op-sqlite/android/build.gradle b/node_modules/@op-engineering/op-sqlite/android/build.gradle
-index d36fd85..7513556 100644
+index 08631df..3e61af5 100644
 --- a/node_modules/@op-engineering/op-sqlite/android/build.gradle
 +++ b/node_modules/@op-engineering/op-sqlite/android/build.gradle
 @@ -1,5 +1,4 @@
@@ -33,7 +33,7 @@ index d36fd85..7513556 100644
 -  // Start from the root + 1 level up (to avoid detecting the op-sqlite/package.json) and traverse upwards to find the first package.json
 -  File currentDir = new File("$rootDir/../")
 -  packageJsonFile = null
--  
+-
 -  // Try to find package.json by traversing upwards
 -  while (currentDir != null) {
 -    File potential = new File(currentDir, "package.json")
@@ -54,22 +54,22 @@ index d36fd85..7513556 100644
 -
 -if(opsqliteConfig) {
 -  println "[OP-SQLITE] Detected op-sqlite config from package.json at: " + packageJsonFile.absolutePath
--  useSQLCipher = opsqliteConfig["sqlcipher"]
--  useCRSQLite = opsqliteConfig["crsqlite"]
--  useSqliteVec = opsqliteConfig["sqliteVec"]
+-  useSQLCipher = !!opsqliteConfig["sqlcipher"]
+-  useCRSQLite = !!opsqliteConfig["crsqlite"]
+-  useSqliteVec = !!opsqliteConfig["sqliteVec"]
 -  performanceMode = opsqliteConfig["performanceMode"]
 -  sqliteFlags = opsqliteConfig["sqliteFlags"] ? opsqliteConfig["sqliteFlags"] : ""
--  enableFTS5 = opsqliteConfig["fts5"]
--  useLibsql = opsqliteConfig["libsql"]
--  enableRtree = opsqliteConfig["rtree"]
+-  enableFTS5 = !!opsqliteConfig["fts5"]
+-  useLibsql = !!opsqliteConfig["libsql"]
+-  enableRtree = !!opsqliteConfig["rtree"]
 -  tokenizers = opsqliteConfig["tokenizers"] ? opsqliteConfig["tokenizers"] : []
 -}
 -
  if(useSQLCipher) {
    println "[OP-SQLITE] using sqlcipher."
  } else if(useLibsql) {
 diff --git a/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp b/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp
-index 8feaf77..261ec22 100644
+index 5912d7b..495880e 100644
 --- a/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp
 +++ b/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp
 @@ -19,8 +19,8 @@ struct OPSQLiteBridge : jni::JavaClass<OPSQLiteBridge> {
@@ -118,20 +118,20 @@ index 44f86df..9d9f710 100644
          val instance = OPSQLiteBridge()
      }
 diff --git a/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt b/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt
-index 688832f..9ea814b 100644
+index 8d341b7..3ce6179 100644
 --- a/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt
 +++ b/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt
-@@ -13,7 +13,7 @@ import java.io.OutputStream
+@@ -12,7 +12,7 @@ import java.io.InputStream
+ import java.io.OutputStream
  import com.facebook.react.util.RNLog;
 
- //@ReactModule(name = OPSQLiteModule.NAME)
 -internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextBaseJavaModule(context) {
 +class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextBaseJavaModule(context) {
      override fun getName(): String {
          return NAME
      }
-@@ -56,6 +56,17 @@ internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextB
-         return true
+@@ -54,6 +54,17 @@ internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextB
+         throw Exception("Do not call getDylibPath on Android")
      }
 
 +    @ReactMethod(isBlockingSynchronousMethod = true)
@@ -149,10 +149,10 @@ index 688832f..9ea814b 100644
      fun moveAssetsDatabase(args: ReadableMap, promise: Promise) {
          val filename = args.getString("filename")!!
 diff --git a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp
-index 85710ee..8cf10f2 100644
+index 9682941..c0b9c21 100644
 --- a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp
 +++ b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp
-@@ -889,6 +889,10 @@ void DBHostObject::invalidate() {
+@@ -682,6 +682,10 @@ void DBHostObject::invalidate() {
  #endif
  }
 
@@ -164,23 +164,23 @@ index 85710ee..8cf10f2 100644
 
  } // namespace opsqlite
 diff --git a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h
-index cc174b7..ff36f74 100644
+index 002b8c9..f3a2e1f 100644
 --- a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h
 +++ b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h
-@@ -73,6 +73,7 @@ class JSI_EXPORT DBHostObject : public jsi::HostObject {
-     void on_commit();
-     void on_rollback();
-     void invalidate();
-+    void drop();
-     ~DBHostObject() override;
+@@ -68,6 +68,7 @@ public:
+   void on_commit();
+   void on_rollback();
+   void invalidate();
++  void drop();
+   ~DBHostObject() override;
 
-   private:
-diff --git a/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp b/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp
-index 5e1c1de..dc21c65 100644
---- a/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp
-+++ b/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp
-@@ -36,6 +36,13 @@ void invalidate() {
-     dbs.clear();
+ private:
+diff --git a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp
+index e33579a..791fa70 100644
+--- a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp
++++ b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp
+@@ -42,6 +42,13 @@ void invalidate() {
+   dbs.clear();
  }
 
 +bool deleteAllDbs() {
@@ -191,12 +191,12 @@ index 5e1c1de..dc21c65 100644
 +}
 +
  void install(jsi::Runtime &rt,
-              const std::shared_ptr<react::CallInvoker> &invoker,
+              const std::shared_ptr<react::CallInvoker> &_invoker,
               const char *base_path, const char *crsqlite_path,
-diff --git a/node_modules/@op-engineering/op-sqlite/cpp/bindings.h b/node_modules/@op-engineering/op-sqlite/cpp/bindings.h
+diff --git a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp
 index 91511ab..cc73dfe 100644
---- a/node_modules/@op-engineering/op-sqlite/cpp/bindings.h
-+++ b/node_modules/@op-engineering/op-sqlite/cpp/bindings.h
+--- a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp
++++ b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp
 @@ -14,6 +14,7 @@ void install(jsi::Runtime &rt,
               const char *base_path, const char *crsqlite_path,
               const char *sqlite_vec_path);
@@ -206,17 +206,47 @@ index 91511ab..cc73dfe 100644
 
  } // namespace opsqlite
 diff --git a/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec b/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec
-index 375cc3e..e6fce21 100644
+index e717811..5f441b2 100644
 --- a/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec
 +++ b/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec
 @@ -1,4 +1,3 @@
 -require "json"
  require_relative "./generate_tokenizers_header_file"
 
  log_message = lambda do |message|
-@@ -39,11 +38,10 @@ else
-   app_package = JSON.parse(File.read(File.join(__dir__, "example", "package.json")))
- end
+@@ -8,41 +7,11 @@ end
+ # In the sample app the dir is not inside of node_modules
+ is_user_app = __dir__.include?("node_modules")
+ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+-app_package = nil
+-package_json_path = nil
+-
+-# When installed on user node_modules lives inside node_modules/@op-engineering/op-sqlite
+-# Find the users package.json by searching up through parent directories
+-if is_user_app
+-  current_dir = File.expand_path(__dir__)
+-  # Move one level up to the parent directory
+-  current_dir = File.dirname(current_dir)
+-  
+-  # Find the package.json by searching up through parent directories
+-  loop do
+-    package_path = File.join(current_dir, "package.json")
+-    if File.exist?(package_path)
+-      package_json_path = package_path
+-      break
+-    end
+-
+-    parent_dir = File.dirname(current_dir)
+-    break if parent_dir == current_dir  # reached filesystem root
+-    current_dir = parent_dir
+-  end
+-  
+-  raise "package.json not found" if package_json_path.nil?
+-else
+-  package_json_path = File.join(__dir__, "example", "package.json")
+-end
+-
+-app_package = JSON.parse(File.read(package_json_path))
 
 -op_sqlite_config = app_package["op-sqlite"]
 -use_sqlcipher = false
@@ -228,7 +258,7 @@ index 375cc3e..e6fce21 100644
  phone_version = false
  sqlite_flags = ""
  fts5 = false
-@@ -51,37 +49,6 @@ rtree = false
+@@ -50,37 +19,6 @@ rtree = false
  use_sqlite_vec = false
  tokenizers = []
 
@@ -247,22 +277,31 @@ index 375cc3e..e6fce21 100644
 -
 -if phone_version then
 -  if use_sqlcipher then
--    raise "SQLCipher is not supported with phone version"
+-    raise "SQLCipher is not supported with phone version. It cannot load extensions."
 -  end
 -
 -  if use_crsqlite then
--    raise "CRSQLite is not supported with phone version"
+-    raise "CRSQLite is not supported with phone version. It cannot load extensions."
 -  end
 -
 -  if rtree then
--    raise "RTree is not supported with phone version"
+-    raise "RTree is not supported with phone version. It cannot load extensions."
 -  end
 -
 -  if use_sqlite_vec then
--    raise "SQLite Vec is not supported with phone version"
+-    raise "SQLite Vec is not supported with phone version. It cannot load extensions."
 -  end
 -end
 -
  Pod::Spec.new do |s|
    s.name         = "op-sqlite"
    s.version      = package["version"]
+@@ -92,7 +30,7 @@ Pod::Spec.new do |s|
+   s.platforms    = { :ios => min_ios_version_supported, :tvos => "13.0", :osx => "10.15", :visionos => "1.0" }
+   s.source       = { :git => "https://github.com/op-engineering/op-sqlite.git", :tag => "#{s.version}" }
+ 
+-  log_message.call("[OP-SQLITE] Configuration found at #{package_json_path}")
++  log_message.call("[OP-SQLITE] Configuration hardcoded in podspec")
+ 
+   install_modules_dependencies(s)
+