react-native-nitro-sqlite 8.2.2-nitro.1 → 9.0.0

package/RNNitroSQLite.podspec

@@ -1,6 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 # TODO: Should be customizable in package.json.
 # Used to create comparable benchmark results
@@ -17,6 +18,9 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported, :visionos => "1.0" }
   s.source       = { :git => "https://github.com/margelo/react-native-nitro-sqlite.git", :tag => "#{s.version}" }
 
+  # s.header_mappings_dir = "cpp"
+  s.source_files = "ios/**/*.{h,hpp,m,mm}", "cpp/**/*.{h,hpp,c,cpp}"
+
   s.pod_target_xcconfig = {
     :GCC_PREPROCESSOR_DEFINITIONS => "HAVE_FULLFSYNC=1",
     :WARNING_CFLAGS => "-Wno-shorten-64-to-32 -Wno-comma -Wno-unreachable-code -Wno-conditional-uninitialized -Wno-deprecated-declarations",
@@ -25,18 +29,32 @@ Pod::Spec.new do |s|
     'CLANG_CXX_LIBRARY' => 'libc++'
   }
 
-  # s.header_mappings_dir = "cpp"
-  s.source_files = "ios/**/*.{h,hpp,m,mm}", "cpp/**/*.{h,hpp,c,cpp}"
-
   load 'nitrogen/generated/ios/RNNitroSQLite+autolinking.rb'
   add_nitrogen_files(s)
 
-  if defined?(install_modules_dependencies())
+  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+  if respond_to?(:install_modules_dependencies, true)
     install_modules_dependencies(s)
   else
     s.dependency "React-callinvoker"
     s.dependency "React"
     s.dependency "React-Core"
+
+    # Don't install the dependencies when we run `pod install` in the old architecture.
+    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig    = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
   end
 
   optimizedCflags = '$(inherited) -DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED=1 -DSQLITE_OMIT_PROGRESS_CALLBACK=1 -DSQLITE_OMIT_SHARED_CACHE=1 -DSQLITE_USE_ALLOCA=1'
@@ -55,5 +73,4 @@ Pod::Spec.new do |s|
     s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h"
     s.library = "sqlite3"
   end
-
 end

package/android/CMakeLists.txt

@@ -1,7 +1,6 @@
+cmake_minimum_required(VERSION 3.13)
 project(RNNitroSQLite)
-cmake_minimum_required(VERSION 3.9.0)
 
-set (PACKAGE_NAME RNNitroSQLite)
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 20)
 
@@ -12,11 +11,11 @@ add_definitions(
 file(GLOB_RECURSE cpp_files RELATIVE ${CMAKE_SOURCE_DIR}
   "../cpp/**.c"
   "../cpp/**.cpp"
-  "src/main/cpp/cpp-adapter.cpp"
+  "cpp-adapter.cpp"
 )
 
 # Create library "RNNitroSQLite" and add all C++ files to it
-add_library(${PACKAGE_NAME} SHARED
+add_library(${CMAKE_PROJECT_NAME} SHARED
   ${cpp_files}
 )
 
@@ -30,10 +29,48 @@ include_directories(
   src/main/cpp
 )
 
+set_target_properties(
+  ${CMAKE_PROJECT_NAME} PROPERTIES
+  CXX_STANDARD ${CMAKE_CXX_STANDARD}
+  CXX_EXTENSIONS OFF
+  POSITION_INDEPENDENT_CODE ON
+)
+
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
 find_library(LOG_LIB log)
 
 target_link_libraries(
-  ${PACKAGE_NAME}
+  ${CMAKE_PROJECT_NAME}
   ${LOG_LIB}
   android
+  fbjni::fbjni
+  ReactAndroid::jsi
+)
+
+# https://github.com/react-native-community/discussions-and-proposals/discussions/816
+# This if-then-else can be removed once this library does not support version below .76
+if (REACTNATIVE_MERGED_SO OR ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${CMAKE_PROJECT_NAME}
+    ReactAndroid::reactnative
+  )
+else()
+  target_link_libraries(
+    ${CMAKE_PROJECT_NAME}
+    ReactAndroid::turbomodulejsijni
+    ReactAndroid::react_nativemodule_core
+  )
+endif()
+
+target_compile_options(
+  ${CMAKE_PROJECT_NAME}
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -fstack-protector-all
+  -O2
+  -Wall
+  -DONANDROID
 )

package/android/build.gradle

@@ -1,4 +1,7 @@
 buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["RNNitroSQLite_kotlinVersion"]
+
   repositories {
     google()
     mavenCentral()
@@ -6,6 +9,8 @@ buildscript {
 
   dependencies {
     classpath "com.android.tools.build:gradle:7.2.2"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
@@ -18,26 +23,77 @@ def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["RNNitroSQLite_" + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNNitroSQLite_" + name]).toInteger()
+}
+
+def safeAppExtGet(prop, fallback) {
+  def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+  appProject?.ext?.has(prop) ? appProject.ext.get(prop) : fallback
+}
+
+def resolveBuildType() {
+  Gradle gradle = getGradle()
+  String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
+  return tskReqStr.contains('Release') ? 'release' : 'debug'
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
+def resolveReactNativeDirectory() {
+  def reactNativeLocation = safeAppExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
+  if (reactNativeLocation != null) {
+    return file(reactNativeLocation)
+  }
+
+  // Fallback to node resolver for custom directory structures like monorepos.
+  def reactNativePackage = file(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim())
+  if (reactNativePackage.exists()) {
+    return reactNativePackage.parentFile
+  }
+
+  throw new GradleException("[react-native-nitro-sqlite] Unable to resolve react-native location in node_modules. Your app should define `REACT_NATIVE_NODE_MODULES_DIR` extension property in `app/build.gradle` with a path to react-native in node_modules.")
+}
+
+def reactNativeRootDir = resolveReactNativeDirectory()
+def reactProperties = new Properties()
+file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+
+def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
+def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
+
 def SQLITE_FLAGS = rootProject.properties['nitroSqliteFlags']
 
 apply plugin: "com.android.library"
-apply plugin: 'org.jetbrains.kotlin.android'
-apply from: '../nitrogen/generated/android/RNNitroSQLite+autolinking.gradle'
+apply plugin: "kotlin-android"
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
 }
 
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["RNNitroSQLite_" + name]
-}
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNNitroSQLite_" + name]).toInteger()
-}
+apply from: '../nitrogen/generated/android/RNNitroSQLite+autolinking.gradle'
 
 android {
-  namespace "com.margelo.rnnitrosqlite"
+  if (supportsNamespace()) {
+    namespace "com.margelo.rnnitrosqlite"
+
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
+    }
+  }
 
   ndkVersion getExtOrDefault("ndkVersion")
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
@@ -45,12 +101,16 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
+    buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString()
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
     externalNativeBuild {
       cmake {
-        cppFlags "-O2", "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID", "-Wall", "-fstack-protector-all"
-        arguments "-DANDROID_STL=c++_shared", "-DSQLITE_FLAGS='${SQLITE_FLAGS ? SQLITE_FLAGS : ''}'"
+        arguments "-DANDROID_STL=c++_shared",
+          "-DANDROID_TOOLCHAIN=clang",
+          "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
+          "-DSQLITE_FLAGS='${SQLITE_FLAGS ? SQLITE_FLAGS : ''}'"
         abiFilters (*reactNativeArchitectures())
       }
     }
@@ -59,6 +119,7 @@ android {
   externalNativeBuild {
     cmake {
       path "CMakeLists.txt"
+      version = System.getenv("CMAKE_VERSION") ?: "3.22.1"
     }
   }
 
@@ -86,30 +147,27 @@ android {
     main {
       if (isNewArchitectureEnabled()) {
         java.srcDirs += [
-          // React Codegen files
-          "${project.buildDir}/generated/source/codegen/java"
+          "src/newarch",
+          // Codegen specs
+          "generated/java",
+          "generated/jni"
         ]
+      } else {
+        java.srcDirs += ["src/oldarch"]
       }
     }
   }
 
   packagingOptions {
+    doNotStrip resolveBuildType() == 'debug' ? "**/**/*.so" : ''
     excludes = [
       "META-INF",
       "META-INF/**",
+      "**/libreactnative.so",
       "**/libc++_shared.so",
       "**/libfbjni.so",
       "**/libjsi.so",
-      "**/libfolly_json.so",
-      "**/libfolly_runtime.so",
-      "**/libglog.so",
       "**/libhermes.so",
-      "**/libhermes-executor-debug.so",
-      "**/libhermes_executor.so",
-      "**/libreactnativejni.so",
-      "**/libturbomodulejsijni.so",
-      "**/libreact_nativemodule_core.so",
-      "**/libjscexecutor.so"
     ]
   }
 }
@@ -119,12 +177,14 @@ repositories {
   google()
 }
 
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // Add a dependency on NitroModules
   implementation project(":react-native-nitro-modules")

package/android/{src/main/cpp/cpp-adapter.cpp → cpp-adapter.cpp}

@@ -13,7 +13,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_margelo_rnnitrosqlite_RNNitroSQLiteOnLoadModule_setDocPathInJNI(JNIEnv *env, jclass clazz,
+Java_com_margelo_rnnitrosqlite_DocPathSetter_setDocPathInJNI(JNIEnv *env, jclass clazz,
                                                                          jstring doc_path) {
   const char *nativeString = env->GetStringUTFChars(doc_path, nullptr);
   HybridNitroSQLite::docPath = std::string(nativeString);

package/android/gradle.properties

@@ -0,0 +1,5 @@
+RNNitroSQLite_kotlinVersion=1.7.0
+RNNitroSQLite_minSdkVersion=21
+RNNitroSQLite_targetSdkVersion=31
+RNNitroSQLite_compileSdkVersion=31
+RNNitroSQLite_ndkversion=21.4.7075529

package/android/src/main/java/com/margelo/rnnitrosqlite/DocPathSetter.kt

@@ -0,0 +1,13 @@
+package com.margelo.rnnitrosqlite
+
+import com.facebook.react.bridge.ReactApplicationContext
+
+object DocPathSetter {
+    @JvmStatic
+    fun setDocPath(context: ReactApplicationContext) {
+        val path = context.filesDir.absolutePath
+        setDocPathInJNI(path)
+    }
+
+    private external fun setDocPathInJNI(docPath: String)
+}

package/android/src/main/java/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.kt

@@ -0,0 +1,40 @@
+package com.margelo.rnnitrosqlite
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class RNNitroSQLitePackage : TurboReactPackage() {
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return if (name == RNNitroSQLiteOnLoadModule.NAME) {
+          RNNitroSQLiteOnLoadModule(reactContext)
+        } else {
+          null
+        }
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+          val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+          val isTurboModule: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+          moduleInfos[RNNitroSQLiteOnLoadModule.NAME] = ReactModuleInfo(
+            RNNitroSQLiteOnLoadModule.NAME,
+            RNNitroSQLiteOnLoadModule.NAME,
+            canOverrideExistingModule=false,
+            needsEagerInit=true,
+            hasConstants=true,
+            isCxxModule=false,
+            isTurboModule=isTurboModule
+          )
+          moduleInfos
+        }
+    }
+
+    companion object {
+        init {
+            System.loadLibrary("RNNitroSQLite")
+        }
+    }
+}

package/android/src/newarch/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.kt

@@ -0,0 +1,41 @@
+package com.margelo.rnnitrosqlite
+
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.margelo.rnnitrosqlite.NativeNitroSQLiteOnLoadSpec
+
+class RNNitroSQLiteOnLoadModule(reactContext: ReactApplicationContext) :
+    NativeNitroSQLiteOnLoadSpec(reactContext) {
+    private var reactApplicationContextReadyCallback: Callback? = null
+
+    init {
+        Companion.reactContext = reactContext
+        DocPathSetter.setDocPath(reactContext)
+
+        if (reactApplicationContextReadyCallback != null) {
+            reactApplicationContextReadyCallback!!.invoke()
+        }
+    }
+
+    override fun getName(): String {
+        return NAME
+    }
+
+    override fun onReactApplicationContextReady(callback: Callback) {
+        if (reactContext != null) {
+            callback.invoke()
+            return
+        }
+
+        reactApplicationContextReadyCallback = callback
+    }
+
+  companion object {
+      const val NAME: String = "RNNitroSQLiteOnLoad"
+
+      var reactContext: ReactApplicationContext? = null
+        private set
+      var reactApplicationContextReadyCallback: Callback? = null
+        private set
+  }
+}

package/android/src/oldarch/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.kt

@@ -0,0 +1,43 @@
+package com.margelo.rnnitrosqlite
+
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+
+class RNNitroSQLiteOnLoadModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+
+    init {
+        Companion.reactContext = reactContext
+        DocPathSetter.setDocPath(reactContext)
+
+        if (reactApplicationContextReadyCallback != null) {
+            reactApplicationContextReadyCallback!!.invoke()
+        }
+    }
+
+    override fun getName(): String {
+        return NAME
+    }
+
+    @ReactMethod
+    fun onReactApplicationContextReady(callback: Callback) {
+        if (reactContext != null) {
+            callback.invoke()
+            return
+        }
+
+        reactApplicationContextReadyCallback = callback
+    }
+
+    companion object {
+        const val NAME: String = "RNNitroSQLiteOnLoad"
+
+        var reactContext: ReactApplicationContext? = null
+            private set
+        var reactApplicationContextReadyCallback: Callback? = null
+            private set
+    }
+}

package/cpp/operations.cpp

@@ -102,7 +102,6 @@ void bindStatement(sqlite3_stmt* statement, const SQLiteQueryParams& values) {
   for (int valueIndex = 0; valueIndex < values.size(); valueIndex++) {
     int sqliteIndex = valueIndex+1;
     SQLiteValue value = values.at(valueIndex);
-
     // if (std::holds_alternative<std::monostate>(value))
     // {
     //     sqlite3_bind_null(statement, sqliteIndex);
@@ -148,7 +147,6 @@ SQLiteExecuteQueryResult sqliteExecute(const std::string& dbName, const std::str
   std::string column_name;
   ColumnType column_declared_type;
   SQLiteQueryResultRow row;
-
   auto results = std::make_unique<SQLiteQueryResults>();
   auto metadata = new SQLiteQueryTableMetadata();
 
@@ -232,7 +230,6 @@ SQLiteExecuteQueryResult sqliteExecute(const std::string& dbName, const std::str
     ? std::make_optional(std::move(*metadata))
     : std::nullopt
   );
-
   return {
     .rowsAffected = rowsAffected,
     .insertId = static_cast<double>(latestInsertRowId),