@op-engineering/op-sqlite 7.2.0 → 7.4.0

package/android/CMakeLists.txt

@@ -55,6 +55,12 @@ if (USE_CRSQLITE)
   )
 endif()
 
+if (USE_SQLITE_VEC)
+  add_definitions(
+    -DOP_SQLITE_USE_SQLITE_VEC=1
+  )
+endif()
+
 set_target_properties(
   ${PACKAGE_NAME} PROPERTIES
   CXX_STANDARD 20

package/android/build.gradle

@@ -33,6 +33,7 @@ def useCRSQLite = false
 def performanceMode = "0"
 def sqliteFlags = ""
 def enableFTS5 = false
+def useSqliteVec = false
 
 def packageJsonFile = new File("$rootDir/../package.json")
 def packageJson = new JsonSlurper().parseText(packageJsonFile.text)
@@ -41,6 +42,7 @@ def opsqliteConfig = packageJson["op-sqlite"]
 if(opsqliteConfig) {
   useSQLCipher = opsqliteConfig["sqlcipher"]
   useCRSQLite = opsqliteConfig["crsqlite"]
+  useSqliteVec = opsqliteConfig["sqliteVec"]
   performanceMode = opsqliteConfig["performanceMode"] ? opsqliteConfig["performanceMode"] : ""
   sqliteFlags = opsqliteConfig["sqliteFlags"] ? opsqliteConfig["sqliteFlags"] : ""
   enableFTS5 = opsqliteConfig["fts5"]
@@ -71,6 +73,10 @@ if(enableFTS5) {
   println "[OP-SQLITE] FTS5 enabled! 🔎"
 }
 
+if(useSqliteVec) {
+    println "[OP-SQLITE] Sqlite Vec enabled! ↗️"
+}
+
 if (isNewArchitectureEnabled()) {
     apply plugin: "com.facebook.react"
 }
@@ -138,6 +144,10 @@ android {
             if(enableFTS5) {
               cFlags += ["-DSQLITE_ENABLE_FTS4=1", "-DSQLITE_ENABLE_FTS3_PARENTHESIS=1", "-DSQLITE_ENABLE_FTS5=1"]
             }
+            if(useSqliteVec) {
+              cFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
+              cppFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
+            }
 
             cppFlags "-O2", "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
@@ -145,7 +155,8 @@ android {
               "-DSQLITE_FLAGS='$sqliteFlags'",
               "-DUSE_SQLCIPHER=${useSQLCipher ? 1 : 0}",
               "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}",
-              "-DUSE_LIBSQL=${useLibsql ? 1 : 0}"
+              "-DUSE_LIBSQL=${useLibsql ? 1 : 0}",
+              "-DUSE_SQLITE_VEC=${useSqliteVec ? 1 : 0}"
             abiFilters (*reactNativeArchitectures())
         }
     }

package/android/cpp-adapter.cpp

@@ -33,7 +33,7 @@ private:
     std::string dbPathStr = dbPath->toStdString();
 
     opsqlite::install(*jsiRuntime, jsCallInvoker, dbPathStr.c_str(),
-                      "libcrsqlite");
+                      "libcrsqlite", "libsqlite_vec");
   }
 
   static void clearStateNativeJsi(jni::alias_ref<jni::JObject> thiz) {

package/cpp/DBHostObject.cpp

@@ -171,17 +171,19 @@ DBHostObject::DBHostObject(jsi::Runtime &rt, std::string &base_path,
                            std::shared_ptr<ThreadPool> thread_pool,
                            std::string &db_name, std::string &path,
                            std::string &crsqlite_path,
+                           std::string &sqlite_vec_path,
                            std::string &encryption_key)
     : base_path(base_path), jsCallInvoker(jsCallInvoker),
       thread_pool(thread_pool), db_name(db_name), rt(rt) {
 
 #ifdef OP_SQLITE_USE_SQLCIPHER
   BridgeResult result =
-      opsqlite_open(db_name, path, crsqlite_path, encryption_key);
+      opsqlite_open(db_name, path, crsqlite_path, sqlite_vec_path, encryption_key);
 #elif OP_SQLITE_USE_LIBSQL
   BridgeResult result = opsqlite_libsql_open(db_name, path, crsqlite_path);
 #else
-  BridgeResult result = opsqlite_open(db_name, path, crsqlite_path);
+  BridgeResult result =
+      opsqlite_open(db_name, path, crsqlite_path, sqlite_vec_path);
 #endif
 
   if (result.type == SQLiteError) {

package/cpp/DBHostObject.h

@@ -32,7 +32,7 @@ public:
                std::shared_ptr<react::CallInvoker> js_call_invoker,
                std::shared_ptr<ThreadPool> thread_pool, std::string &db_name,
                std::string &path, std::string &crsqlite_path,
-               std::string &encryption_key);
+               std::string &sqlite_vec_path, std::string &encryption_key);
 
 #ifdef OP_SQLITE_USE_LIBSQL
   // Constructor for remoteOpen, purely for remote databases

package/cpp/bindings.cpp

@@ -21,6 +21,7 @@ namespace jsi = facebook::jsi;
 
 std::string _base_path;
 std::string _crsqlite_path;
+std::string _sqlite_vec_path;
 std::shared_ptr<react::CallInvoker> _invoker;
 std::shared_ptr<ThreadPool> thread_pool = std::make_shared<ThreadPool>();
 
@@ -43,10 +44,12 @@ void clearState() {
 }
 
 void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker,
-             const char *base_path, const char *crsqlite_path) {
+             const char *base_path, const char *crsqlite_path,
+             const char *sqlite_vec_path) {
   invalidated = false;
   _base_path = std::string(base_path);
   _crsqlite_path = std::string(crsqlite_path);
+  _sqlite_vec_path = std::string(sqlite_vec_path);
   _invoker = invoker;
 
   auto open = HOSTFN("open", 1) {
@@ -82,9 +85,9 @@ void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker,
       }
     }
 
-    std::shared_ptr<DBHostObject> db =
-        std::make_shared<DBHostObject>(rt, path, invoker, thread_pool, name,
-                                       path, _crsqlite_path, encryptionKey);
+    std::shared_ptr<DBHostObject> db = std::make_shared<DBHostObject>(
+        rt, path, invoker, thread_pool, name, path, _crsqlite_path,
+        _sqlite_vec_path, encryptionKey);
     return jsi::Object::createFromHostObject(rt, db);
   });
 

package/cpp/bindings.h

@@ -10,7 +10,8 @@ namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
 void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker,
-             const char *base_path, const char *crsqlite_path);
+             const char *base_path, const char *crsqlite_path,
+             const char *sqlite_vec_path);
 void clearState();
 
 } // namespace opsqlite

package/cpp/bridge.cpp

@@ -51,12 +51,14 @@ std::string opsqlite_get_db_path(std::string const &db_name,
 #ifdef OP_SQLITE_USE_SQLCIPHER
 BridgeResult opsqlite_open(std::string const &dbName,
                            std::string const &last_path,
-                           std::string const &crsqlitePath,
+                           std::string const &crsqlite_path,
+                           std::string const &sqlite_vec_path,
                            std::string const &encryptionKey) {
 #else
 BridgeResult opsqlite_open(std::string const &dbName,
                            std::string const &last_path,
-                           std::string const &crsqlitePath) {
+                           std::string const &crsqlite_path,
+                           std::string const &sqlite_vec_path) {
 #endif
   std::string dbPath = opsqlite_get_db_path(dbName, last_path);
 
@@ -78,13 +80,15 @@ BridgeResult opsqlite_open(std::string const &dbName,
                    nullptr, nullptr);
 #endif
 
-#ifdef OP_SQLITE_USE_CRSQLITE
+  sqlite3_enable_load_extension(db, 1);
+
   char *errMsg;
-  const char *crsqliteEntryPoint = "sqlite3_crsqlite_init";
 
-  sqlite3_enable_load_extension(db, 1);
+#ifdef OP_SQLITE_USE_CRSQLITE
+  const char *crsqliteEntryPoint = "sqlite3_crsqlite_init";
 
-  sqlite3_load_extension(db, crsqlitePath.c_str(), crsqliteEntryPoint, &errMsg);
+  sqlite3_load_extension(db, crsqlite_path.c_str(), crsqliteEntryPoint,
+                         &errMsg);
 
   if (errMsg != nullptr) {
     return {.type = SQLiteError, .message = errMsg};
@@ -93,6 +97,19 @@ BridgeResult opsqlite_open(std::string const &dbName,
   }
 #endif
 
+#ifdef OP_SQLITE_USE_SQLITE_VEC
+  const char *vec_entry_point = "sqlite3_vec_init";
+
+  sqlite3_load_extension(db, sqlite_vec_path.c_str(), vec_entry_point, &errMsg);
+
+  if (errMsg != nullptr) {
+    return {.type = SQLiteError, .message = errMsg};
+  } else {
+    LOGI("Loaded sqlite-vec successfully");
+  }
+
+#endif
+
   return {.type = SQLiteOk, .affectedRows = 0};
 }
 

package/cpp/bridge.h

@@ -24,11 +24,13 @@ std::string opsqlite_get_db_path(std::string const &db_name,
 
 #ifdef OP_SQLITE_USE_SQLCIPHER
 BridgeResult opsqlite_open(std::string const &dbName, std::string const &dbPath,
-                           std::string const &crsqlitePath,
+                           std::string const &crsqlite_path,
+                           std::string const &sqlite_vec_path,
                            std::string const &encryptionKey);
 #else
 BridgeResult opsqlite_open(std::string const &dbName, std::string const &dbPath,
-                           std::string const &crsqlitePath);
+                           std::string const &crsqlite_path,
+                           std::string const &sqlite_vec_path);
 #endif
 
 BridgeResult opsqlite_close(std::string const &dbName);

package/ios/OPSQLite.mm

@@ -75,15 +75,25 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
     documentPath = [paths objectAtIndex:0];
   }
 
-  NSBundle *bundle = [NSBundle bundleWithIdentifier:@"io.vlcn.crsqlite"];
-  NSString *crsqlitePath = [bundle pathForResource:@"crsqlite" ofType:@""];
+  NSBundle *crsqlite_bundle =
+      [NSBundle bundleWithIdentifier:@"io.vlcn.crsqlite"];
+  NSString *crsqlite_path = [crsqlite_bundle pathForResource:@"crsqlite"
+                                                      ofType:@""];
+  NSBundle *libsqlitevec_bundle =
+      [NSBundle bundleWithIdentifier:@"com.ospfranco.sqlitevec"];
+  NSString *sqlite_vec_path = [libsqlitevec_bundle pathForResource:@"sqlitevec"
+                                                            ofType:@""];
+
+  if (crsqlite_path == nil) {
+    crsqlite_path = @"";
+  }
 
-  if (crsqlitePath == nil) {
-    crsqlitePath = @"";
+  if (sqlite_vec_path == nil) {
+    sqlite_vec_path = @"";
   }
 
   opsqlite::install(runtime, callInvoker, [documentPath UTF8String],
-                    [crsqlitePath UTF8String]);
+                    [crsqlite_path UTF8String], [sqlite_vec_path UTF8String]);
   return @true;
 }
 

package/ios/sqlitevec.xcframework/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>sqlitevec.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>sqlitevec.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+  	<string>1.0.0</string>
+  	<key>CFBundleShortVersionString</key>
+  	<string>1.0.0</string>
+	<key>MinimumOSVersion</key>
+  	<string>8.0</string>
+</dict>
+</plist>

package/ios/sqlitevec.xcframework/ios-arm64/sqlitevec.framework/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>sqlitevec</string>
+  <key>CFBundleIdentifier</key>
+  <string>com.ospfranco.sqlitevec</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0.0</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+	<key>MinimumOSVersion</key>
+  <string>8.0</string>
+</dict>
+</plist>

package/ios/sqlitevec.xcframework/ios-arm64_x86_64-simulator/sqlitevec.framework/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>sqlitevec</string>
+  <key>CFBundleIdentifier</key>
+  <string>com.ospfranco.sqlitevec</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0.0</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+	<key>MinimumOSVersion</key>
+  <string>8.0</string>
+</dict>
+</plist>

package/op-sqlite.podspec

@@ -26,6 +26,7 @@ performance_mode = "0"
 phone_version = false
 sqlite_flags = ""
 fts5 = false
+use_sqlite_vec = false
 
 if(op_sqlite_config != nil)
   use_sqlcipher = op_sqlite_config["sqlcipher"] == true
@@ -35,6 +36,7 @@ if(op_sqlite_config != nil)
   phone_version = op_sqlite_config["iosSqlite"] == true
   sqlite_flags = op_sqlite_config["sqliteFlags"] || ""
   fts5 = op_sqlite_config["fts5"] == true
+  use_sqlite_vec = op_sqlite_config["sqliteVec"] == true
 end
 
 if phone_version && use_sqlcipher
@@ -86,8 +88,8 @@ Pod::Spec.new do |s|
   end
 
   other_cflags = '-DSQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION=1'
-
   optimizedCflags = other_cflags + '$(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'
+  frameworks = []
 
   if fts5 && !phone_version then
     log_message.call("[OP-SQLITE] FTS5 enabled 🔎")
@@ -126,7 +128,13 @@ Pod::Spec.new do |s|
   if use_crsqlite then
     log_message.call("[OP-SQLITE] using CRQSQLite 🤖")
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_CRSQLITE=1"
-    s.vendored_frameworks = "ios/crsqlite.xcframework"
+    frameworks.push("ios/crsqlite.xcframework")
+  end
+
+  if use_sqlite_vec then
+    log_message.call("[OP-SQLITE] using Sqlite Vec ↗️")
+    xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLITE_VEC=1"
+    frameworks.push("ios/sqlitevec.xcframework")
   end
 
   if use_libsql then
@@ -135,9 +143,9 @@ Pod::Spec.new do |s|
     end
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_LIBSQL=1"
     if use_crsqlite then
-      s.vendored_frameworks = "ios/libsql.xcframework", "ios/crsqlite.xcframework"
+      frameworks = ["ios/libsql.xcframework", "ios/crsqlite.xcframework"]
     else
-      s.vendored_frameworks = "ios/libsql.xcframework"
+      frameworks = ["ios/libsql.xcframework"]
     end
   end
 
@@ -147,4 +155,5 @@ Pod::Spec.new do |s|
   end
 
   s.pod_target_xcconfig = xcconfig
+  s.vendored_frameworks = frameworks
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "7.2.0",
+  "version": "7.4.0",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -14,7 +14,7 @@
     "ios",
     "cpp",
     "op-sqlite.podspec",
-    "crsqlite.xcframework",
+    "ios/**.xcframework",
     "!lib/typescript/example",
     "!android/build",
     "!android/.cxx",