@op-engineering/op-sqlite 14.1.0 → 14.1.2

package/android/build.gradle

@@ -37,19 +37,37 @@ def useSqliteVec = false
 def enableRtree = false
 def tokenizers = []
 
-def isInsideNodeModules = rootDir.absolutePath.contains("node_modules")
-def packageJson
-
-if ( isInsideNodeModules ) {
-  def packageJsonFile = new File("$rootDir/../../../package.json")
-  packageJson = new JsonSlurper().parseText(packageJsonFile.text)
+// On the example app, the package.json is located at the root of the project
+// On the user app, the package.json is located at the root of the node_modules directory
+def isUserApp = rootDir.absolutePath.contains("node_modules")
+def packageJsonFile
+
+if (isUserApp) {
+  // 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")
+    if (potential.exists()) {
+      packageJsonFile = potential
+      break
+    }
+    currentDir = currentDir.parentFile
+  }
 } else {
-  def packageJsonFile = new File("$rootDir/../package.json")
-  packageJson = new JsonSlurper().parseText(packageJsonFile.text)
+  packageJsonFile = new File("$rootDir/../package.json")
 }
 
+
+def packageJson = new JsonSlurper().parseText(packageJsonFile.text)
+
 def opsqliteConfig = packageJson["op-sqlite"]
+
 if(opsqliteConfig) {
+println "[OP-SQLITE] Detected op-sqlite config from package.json at: " + packageJsonFile.absolutePath
+
   useSQLCipher = opsqliteConfig["sqlcipher"]
   useCRSQLite = opsqliteConfig["crsqlite"]
   useSqliteVec = opsqliteConfig["sqliteVec"]
@@ -177,7 +195,7 @@ android {
             // def tokenizerInitStrings = 0
             def tokenizersHeaderPath = 0
             if (!tokenizers.isEmpty()) {
-              def sourceDir = isInsideNodeModules ? file("$rootDir/../../../c_sources") : file("$rootDir/../c_sources")
+              def sourceDir = isUserApp ? file("$rootDir/../../../c_sources") : file("$rootDir/../c_sources")
               def destDir = file("$buildscript.sourceFile.parentFile/c_sources")
               copy {
                 from sourceDir
@@ -236,6 +254,15 @@ android {
         srcDirs += 'src/paper/java'
       // }
     }
+    jniLibs {
+      srcDirs = []
+      if (useCRSQLite) {
+        srcDirs += 'src/main/libcrsqlite'
+      }
+      if (useSqliteVec) {
+        srcDirs += 'src/main/libsqlitevec'
+      }
+    }
   }
 }
 
@@ -253,7 +280,7 @@ dependencies {
   }
 }
 
-task prepareHeaders(type: Copy) {
+tasks.register('prepareHeaders', Copy) {
   from('../cpp')
   include "**/*.h"
   into "${project.buildDir}/headers/op-sqlite/op-engineering_op-sqlite/"
@@ -263,7 +290,7 @@ task prepareHeaders(type: Copy) {
 preBuild.dependsOn(prepareHeaders)
 
 // Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct".
-tasks.whenTaskAdded { task ->
+tasks.configureEach { task ->
   if (task.name.contains("configureCMakeDebug")) {
     rootProject.getTasksByName("packageReactNdkDebugLibs", true).forEach {
       task.dependsOn(it)

package/cpp/DBHostObject.h

@@ -8,8 +8,12 @@
 #ifdef OP_SQLITE_USE_LIBSQL
 #include "libsql/bridge.h"
 #else
+#ifdef __ANDROID__
+#include "sqlite3.h"
+#else
 #include <sqlite3.h>
 #endif
+#endif
 #include <unordered_map>
 #include <vector>
 

package/cpp/PreparedStatementHostObject.h

@@ -7,8 +7,12 @@
 #include "libsql.h"
 #include "libsql/bridge.h"
 #else
+#ifdef __ANDROID__
+#include "sqlite3.h"
+#else
 #include <sqlite3.h>
 #endif
+#endif
 #include "OPThreadPool.h"
 #include <string>
 #include <utility>

package/cpp/bridge.h

@@ -4,7 +4,11 @@
 #include "SmartHostObject.h"
 #include "types.h"
 #include "utils.h"
+#ifdef __ANDROID__
+#include "sqlite3.h"
+#else
 #include <sqlite3.h>
+#endif
 #include <vector>
 
 namespace opsqlite {

package/cpp/utils.h

@@ -4,7 +4,11 @@
 #include "SmartHostObject.h"
 #include "types.h"
 #include <jsi/jsi.h>
+#ifdef __ANDROID__
+#include "sqlite3.h"
+#else
 #include <sqlite3.h>
+#endif
 #include <string>
 #include <vector>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "14.1.0",
+  "version": "14.1.2",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",