@op-engineering/op-sqlite 15.1.3 → 15.1.4

package/android/build.gradle

@@ -85,28 +85,27 @@ if(useSQLCipher) {
 } 
 
 if(useCRSQLite) {
-  println "[OP-SQLITE] using CR-SQLite 🤖"
+  println "[OP-SQLITE] using CR-SQLite"
 }
 
 if(performanceMode) {
-  println "[OP-SQLITE] Performance mode enabled! 🚀"
+  println "[OP-SQLITE] Performance mode enabled"
 }
 
 if(enableFTS5) {
-  println "[OP-SQLITE] FTS5 enabled! 🔎"
+  println "[OP-SQLITE] FTS5 enabled"
 }
 
 if(enableRtree) {
-  println "[OP-SQLITE] RTree enabled! 🌲"
+  println "[OP-SQLITE] RTree enabled"
 }
 
 if(useSqliteVec) {
-    println "[OP-SQLITE] Sqlite Vec enabled! ↗️"
+  println "[OP-SQLITE] Sqlite-vec enabled"
 }
 
-
 if (!tokenizers.isEmpty()) {
-  println "[OP-SQLITE] Tokenizers enabled! 🧾 Tokenizers: " + tokenizers
+  println "[OP-SQLITE] Tokenizers enabled. Detected tokenizers: " + tokenizers
 }
 
 android {
@@ -120,58 +119,58 @@ android {
 
     externalNativeBuild {
       cmake {
-      if(useSQLCipher) {
-        cFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
-        cppFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
-      }
-      if(useLibsql) {
-        cFlags += "-DOP_SQLITE_USE_LIBSQL=1"
-        cppFlags += "-DOP_SQLITE_USE_LIBSQL=1"
-      }
-      if(useCRSQLite) {
-        cFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
-        cppFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
-      }
-      if(performanceMode) {
-        cFlags += ["-DSQLITE_DQS=0", "-DSQLITE_THREADSAFE=1", "-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"]
-      }
-      if(enableFTS5) {
-        cFlags += ["-DSQLITE_ENABLE_FTS5=1"]
-      }
-      if(enableRtree) {
-        cFlags += ["-DSQLITE_ENABLE_RTREE=1"]
-      }
-      if(useSqliteVec) {
-        cFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
-        cppFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
-      }
+        if(useSQLCipher) {
+          cFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
+          cppFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
+        }
+        if(useLibsql) {
+          cFlags += "-DOP_SQLITE_USE_LIBSQL=1"
+          cppFlags += "-DOP_SQLITE_USE_LIBSQL=1"
+        }
+        if(useCRSQLite) {
+          cFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
+          cppFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
+        }
+        if(performanceMode) {
+          cFlags += ["-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", "-DSQLITE_THREADSAFE=1"]
+        }
+        if(enableFTS5) {
+          cFlags += ["-DSQLITE_ENABLE_FTS5=1"]
+        }
+        if(enableRtree) {
+          cFlags += ["-DSQLITE_ENABLE_RTREE=1"]
+        }
+        if(useSqliteVec) {
+          cFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
+          cppFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
+        }
 
-      // This are zeroes because they will be passed as C flags, so they become falsy
-      def sourceFiles = 0
-      // def tokenizerInitStrings = 0
-      def tokenizersHeaderPath = 0
-      if (!tokenizers.isEmpty()) {
-        def sourceDir = isUserApp ? file("$rootDir/../../../c_sources") : file("$rootDir/../c_sources")
-        def destDir = file("$buildscript.sourceFile.parentFile/c_sources")
-        copy {
-          from sourceDir
-          into destDir
-          include "**/*.cpp", "**/*.h"
+        // This are zeroes because they will be passed as C flags, so they become falsy
+        def sourceFiles = 0
+        // def tokenizerInitStrings = 0
+        def tokenizersHeaderPath = 0
+        if (!tokenizers.isEmpty()) {
+          def sourceDir = isUserApp ? file("$rootDir/../../../c_sources") : file("$rootDir/../c_sources")
+          def destDir = file("$buildscript.sourceFile.parentFile/c_sources")
+          copy {
+            from sourceDir
+            into destDir
+            include "**/*.cpp", "**/*.h"
+          }
+          sourceFiles = fileTree(dir: destDir, include: ["**/*.cpp", "**/*.h"]).files.join(";")
+          tokenizersHeaderPath = "../c_sources/tokenizers.h"
         }
-        sourceFiles = fileTree(dir: destDir, include: ["**/*.cpp", "**/*.h"]).files.join(";")
-        tokenizersHeaderPath = "../c_sources/tokenizers.h"
-      }
 
-      cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
-      arguments "-DANDROID_STL=c++_shared",
-        "-DSQLITE_FLAGS='$sqliteFlags'",
-        "-DUSE_SQLCIPHER=${useSQLCipher ? 1 : 0}",
-        "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}",
-        "-DUSE_LIBSQL=${useLibsql ? 1 : 0}",
-        "-DUSE_SQLITE_VEC=${useSqliteVec ? 1 : 0}",
-        "-DUSER_DEFINED_SOURCE_FILES=${sourceFiles}",
-        "-DUSER_DEFINED_TOKENIZERS_HEADER_PATH='${tokenizersHeaderPath}'",
-        "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+        cppFlags "-O3 -frtti -fexceptions -Wall -fstack-protector-all"
+        arguments "-DANDROID_STL=c++_shared",
+          "-DSQLITE_FLAGS='$sqliteFlags'",
+          "-DUSE_SQLCIPHER=${useSQLCipher ? 1 : 0}",
+          "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}",
+          "-DUSE_LIBSQL=${useLibsql ? 1 : 0}",
+          "-DUSE_SQLITE_VEC=${useSqliteVec ? 1 : 0}",
+          "-DUSER_DEFINED_SOURCE_FILES=${sourceFiles}",
+          "-DUSER_DEFINED_TOKENIZERS_HEADER_PATH='${tokenizersHeaderPath}'",
+          "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
       }
     }
   }

package/ios/OPSQLite.mm

@@ -72,22 +72,24 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
     documentPath = [paths objectAtIndex:0];
   }
 
+#ifdef OP_SQLITE_USE_CRSQLITE
   NSBundle *crsqlite_bundle =
       [NSBundle bundleWithIdentifier:@"io.vlcn.crsqlite"];
   NSString *crsqlite_path = [crsqlite_bundle pathForResource:@"crsqlite"
                                                       ofType:@""];
+#else
+  NSString *crsqlite_path = @"";
+#endif
+  
+
+#ifdef OP_SQLITE_USE_SQLITE_VEC
   NSBundle *libsqlitevec_bundle =
       [NSBundle bundleWithIdentifier:@"com.ospfranco.sqlitevec"];
   NSString *sqlite_vec_path = [libsqlitevec_bundle pathForResource:@"sqlitevec"
                                                             ofType:@""];
-
-  if (crsqlite_path == nil) {
-    crsqlite_path = @"";
-  }
-
-  if (sqlite_vec_path == nil) {
-    sqlite_vec_path = @"";
-  }
+#else
+  NSString *sqlite_vec_path = @"";
+#endif
 
   opsqlite::install(runtime, callInvoker, [documentPath UTF8String],
                     [crsqlite_path UTF8String], [sqlite_vec_path UTF8String]);

package/lib/typescript/src/functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../src/functions.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,EAAE,EAEP,KAAK,aAAa,EAKnB,MAAM,SAAS,CAAC;AAEjB,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC;AA0BD,eAAO,MAAM,QAAQ,eAAyB,CAAC;AA8T/C;;;GAGG;AACH,eAAO,MAAM,QAAQ,WAAY;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,KAAG,EASH,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,WAAY;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,KAAG,EASvE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,IAAI,WAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,KAAG,EAYH,CAAC;AAEF,wBAAgB,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,MAKtE;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,SAAgB;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,KAAG,QAAQ,OAAO,CAElB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,WAAY,MAAM,QAAQ,MAAM,KAAG,MAE3D,CAAC;AAEF,eAAO,MAAM,WAAW,QAAO,OAE9B,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAO,OAE3B,CAAC;AAEF,eAAO,MAAM,aAAa,QAAO,OAMhC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,QAXO,OAWS,CAAC"}
+{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../src/functions.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,EAAE,EAEP,KAAK,aAAa,EAKnB,MAAM,SAAS,CAAC;AAEjB,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC;AA0BD,eAAO,MAAM,QAAQ,EAAY,aAAa,CAAC;AA8T/C;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAI,QAAQ;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,KAAG,EASH,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,QAAQ;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,KAAG,EASvE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,QAAQ;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,KAAG,EAYH,CAAC;AAEF,wBAAgB,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,MAKtE;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAAU,MAAM;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,KAAG,OAAO,CAAC,OAAO,CAElB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,EAAE,MAAM,MAAM,KAAG,MAE3D,CAAC;AAEF,eAAO,MAAM,WAAW,QAAO,OAE9B,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAO,OAE3B,CAAC;AAEF,eAAO,MAAM,aAAa,QAAO,OAMhC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,QAXO,OAWS,CAAC"}

package/op-sqlite.podspec

@@ -66,19 +66,19 @@ end
 
 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
 
@@ -93,6 +93,8 @@ 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}")
+
   install_modules_dependencies(s)
   
   # Base source files
@@ -114,41 +116,37 @@ Pod::Spec.new do |s|
 
   # Assign the collected source files to `s.source_files`
   s.source_files = source_files
-
+  
   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",
-    :CLANG_CXX_LANGUAGE_STANDARD => "c++17",
+    :GCC_PREPROCESSOR_DEFINITIONS => "",
+    :CLANG_CXX_LANGUAGE_STANDARD => "c++20",
+    :GCC_OPTIMIZATION_LEVEL => "2",
   }
-
-  log_message.call("[OP-SQLITE] Configuration found at #{package_json_path}")
   
   exclude_files = []
   
   if use_sqlcipher then
-    log_message.call("[OP-SQLITE] using SQLCipher 🔒")
+    log_message.call("[OP-SQLITE] using SQLCipher")
     exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h"]
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=3 SQLITE_EXTRA_INIT=sqlcipher_extra_init SQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown"
     s.dependency "OpenSSL-Universal"    
   elsif use_libsql then
-    log_message.call("[OP-SQLITE] using libsql 📘")
+    log_message.call("[OP-SQLITE] using libsql. Please contact turso (via Discord) for libsql issues")
     exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/bridge.h", "cpp/bridge.cpp"]
   else
-    log_message.call("[OP-SQLITE] using vanilla SQLite 📦")
+    log_message.call("[OP-SQLITE] using pure SQLite from CocoaPods with performance optimizations")
     exclude_files += ["cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h"]
   end
   
-  other_cflags = '-DSQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION=1'
-  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 -DSQLITE_THREADSAFE=1'
+  other_cflags = '$(inherited) -DSQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION=1 -DHAVE_USLEEP=1 -DSQLITE_ENABLE_LOCKING_STYLE=0'
+  optimizedCflags = ' -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 -DSQLITE_STRICT_SUBTYPE=1'
   frameworks = []
 
   if fts5 then
-    log_message.call("[OP-SQLITE] FTS5 enabled 🔎")
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " SQLITE_ENABLE_FTS5=1"
   end
 
   if rtree then
-    log_message.call("[OP-SQLITE] RTree enabled 🌲")
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " SQLITE_ENABLE_RTREE=1"
   end
  
@@ -160,7 +158,7 @@ Pod::Spec.new do |s|
   end
 
   if performance_mode then
-    log_message.call("[OP-SQLITE] Performance mode enabled, some features might be disabled 🚀")
+    log_message.call("[OP-SQLITE] Performance mode enabled")
     other_cflags += optimizedCflags
   end
 
@@ -186,7 +184,7 @@ Pod::Spec.new do |s|
   end
 
   if sqlite_flags != "" then
-    log_message.call("[OP-SQLITE] Custom SQLite flags: #{sqlite_flags}")
+    log_message.call("[OP-SQLITE] Detected custom SQLite flags: #{sqlite_flags}")
     other_cflags += " #{sqlite_flags}"
   end
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "15.1.3",
+  "version": "15.1.4",
   "description": "Fastest SQLite for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -62,7 +62,7 @@
     "react": "19.1.1",
     "react-native": "0.82.1",
     "react-native-builder-bob": "^0.40.15",
-    "typescript": "5.0.4"
+    "typescript": "^5.9.2"
   },
   "peerDependencies": {
     "react": "*",