@op-engineering/op-sqlite 3.0.7 → 5.0.0

package/op-sqlite.podspec

@@ -8,6 +8,36 @@ 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'
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
+parent_folder_name = File.basename(__dir__)
+app_package = nil
+# for development purposes on user machines the podspec should be able to read the package.json from the root folder
+# since it lives inside node_modules/@op-engineering/op-sqlite
+if parent_folder_name == "op-sqlite"
+  app_package = JSON.parse(File.read(File.join(__dir__, "example", "package.json")))
+else
+  app_package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+end
+
+op_sqlite_config = app_package["op-sqlite"]
+use_sqlcipher = false
+use_crsqlite = false
+performance_mode = "0"
+phone_version = false
+sqlite_flags = ""
+
+if(op_sqlite_config != nil)
+  use_sqlcipher = op_sqlite_config["sqlcipher"] == true
+  use_crsqlite = op_sqlite_config["crsqlite"] == true
+  performance_mode = op_sqlite_config["performanceMode"] || "0"
+  phone_version = op_sqlite_config["iosSqlite"] == true
+  sqlite_flags = op_sqlite_config["sqliteFlags"] || ""
+end
+
+if phone_version && use_sqlcipher
+  raise "Cannot use phone embedded version and SQLCipher. SQLCipher needs to be compiled from sources with the project."
+end
+
+
 Pod::Spec.new do |s|
   s.name         = "op-sqlite"
   s.version      = package["version"]
@@ -19,7 +49,6 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => "13.0", :osx => "10.15" }
   s.source       = { :git => "https://github.com/op-engineering/op-sqlite.git", :tag => "#{s.version}" }
   
-  # s.header_mappings_dir = "cpp"
   s.source_files = "ios/**/*.{h,m,mm}", "cpp/**/*.{h,cpp,c}"
 
   xcconfig = {
@@ -28,14 +57,16 @@ Pod::Spec.new do |s|
     :USE_HEADERMAP => "No",
     :CLANG_CXX_LANGUAGE_STANDARD => "c++17",
   }
+
+  log_message.call("[OP-SQLITE] Configuration:")
   
-  if ENV['OP_SQLITE_USE_SQLCIPHER'] == '1' then
-    log_message.call("[OP-SQLITE] using SQLCipher! 🔒")
+  if use_sqlcipher then
+    log_message.call("[OP-SQLITE] using SQLCipher 🔒")
     s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h"
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=2"
     s.dependency "OpenSSL-Universal"
   else
-    log_message.call("[OP-SQLITE] using vanilla SQLite! 📦")
+    log_message.call("[OP-SQLITE] using vanilla SQLite 📦")
     s.exclude_files = "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h"
   end
   
@@ -51,23 +82,34 @@ Pod::Spec.new do |s|
 
   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'
 
-  if ENV['OP_SQLITE_USE_PHONE_VERSION'] == '1' then
-    log_message.call("[OP-SQLITE] using iOS embedded SQLite! 📱")
+ 
+  if phone_version then
+    log_message.call("[OP-SQLITE] using iOS embedded SQLite 📱")
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_PHONE_VERSION=1"
     s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h"
     s.library = "sqlite3"
   end
 
-  if ENV['OP_SQLITE_PERF'] == '1' then
-    log_message.call("[OP-SQLITE] performance mode enabled! 🚀")
+  if performance_mode == '1' then
+    log_message.call("[OP-SQLITE] Thread unsafe (1) performance mode enabled. Use only transactions! 🚀🚀")
     xcconfig[:OTHER_CFLAGS] = optimizedCflags + ' -DSQLITE_THREADSAFE=0 '
   end
 
-  if ENV['OP_SQLITE_PERF'] == '2' then
-    log_message.call("[OP-SQLITE] (thread safe) performance mode enabled! 🚀")
+  if performance_mode == '2' then
+    log_message.call("[OP-SQLITE] Thread safe (2) performance mode enabled 🚀")
     xcconfig[:OTHER_CFLAGS] = optimizedCflags + ' -DSQLITE_THREADSAFE=1 '
   end
 
+  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"
+  end
+
+  if sqlite_flags != "" then
+    log_message.call("[OP-SQLITE] Custom SQLite flags: #{sqlite_flags}")
+    xcconfig[:OTHER_CFLAGS] += " #{sqlite_flags}"
+  end
+
   s.pod_target_xcconfig = xcconfig
-  
 end

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "3.0.7",
+  "version": "5.0.0",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
-  "types": "lib/typescript/index.d.ts",
+  "types": "lib/typescript/src/index.d.ts",
   "react-native": "src/index",
   "source": "src/index",
   "files": [
@@ -14,6 +14,7 @@
     "ios",
     "cpp",
     "op-sqlite.podspec",
+    "crsqlite.xcframework",
     "!lib/typescript/example",
     "!android/build",
     "!android/.cxx",
@@ -48,7 +49,7 @@
   "devDependencies": {
     "lefthook": "^1.5.5",
     "react": "18.2.0",
-    "react-native": "0.73.1",
+    "react-native": "0.74.0-rc.6",
     "react-native-builder-bob": "^0.23.2",
     "turbo": "^1.12.4",
     "typescript": "5.0.4"
@@ -57,14 +58,6 @@
     "react": "*",
     "react-native": "*"
   },
-  "codegenConfig": {
-    "name": "OPSQLiteSpec",
-    "type": "modules",
-    "jsSrcsDir": "src",
-    "android": {
-      "javaPackageName": "com.op.sqlite"
-    }
-  },
   "workspaces": [
     "example"
   ],

package/src/NativeOPSQLite.ts

@@ -1,4 +1,4 @@
-import { TurboModuleRegistry, TurboModule } from 'react-native';
+import { TurboModuleRegistry, type TurboModule } from 'react-native';
 
 export interface Spec extends TurboModule {
   getConstants: () => {

package/src/index.ts

@@ -1,4 +1,5 @@
-import NativeOPSQLite from './NativeOPSQLite';
+// import NativeOPSQLite from './NativeOPSQLite';
+import { NativeModules } from 'react-native';
 
 declare global {
   function nativeCallSyncHook(): unknown;
@@ -6,21 +7,21 @@ declare global {
 }
 
 if (global.__OPSQLiteProxy == null) {
-  if (NativeOPSQLite == null) {
+  if (NativeModules.OPSQLite == null) {
     throw new Error('Base module not found. Maybe try rebuilding the app.');
   }
 
-  if (NativeOPSQLite.install == null) {
+  if (NativeModules.OPSQLite.install == null) {
     throw new Error(
       'Failed to install op-sqlite: React Native is not running on-device. OPSQLite can only be used when synchronous method invocations (JSI) are possible. If you are using a remote debugger (e.g. Chrome), switch to an on-device debugger (e.g. Flipper) instead.'
     );
   }
 
   // Call the synchronous blocking install() function
-  const result = NativeOPSQLite.install();
+  const result = NativeModules.OPSQLite.install();
   if (result !== true) {
     throw new Error(
-      `Failed to install op-sqlite: The native OPSQLite Module could not be installed! Looks like something went wrong when installing JSI bindings: ${result}`
+      `Failed to install op-sqlite: The native OPSQLite Module could not be installed! Looks like something went wrong when installing JSI bindings, check the native logs for more info`
     );
   }
 
@@ -36,19 +37,14 @@ const proxy = global.__OPSQLiteProxy;
 export const OPSQLite = proxy as ISQLite;
 
 export const {
-  // @ts-expect-error
   IOS_DOCUMENT_PATH,
-  // @ts-expect-error
   IOS_LIBRARY_PATH,
-  // @ts-expect-error
   ANDROID_DATABASE_PATH,
-  // @ts-expect-error
   ANDROID_FILES_PATH,
-  // @ts-expect-error
   ANDROID_EXTERNAL_FILES_PATH,
-} = !!NativeOPSQLite.getConstants
-  ? NativeOPSQLite.getConstants()
-  : NativeOPSQLite;
+} = !!NativeModules.OPSQLite.getConstants
+  ? NativeModules.OPSQLite.getConstants()
+  : NativeModules.OPSQLite;
 
 /**
  * Object returned by SQL Query executions {
@@ -358,7 +354,7 @@ OPSQLite.transaction = async (
 
       throw executionError;
     } finally {
-      locks[dbName].inProgress = false;
+      locks[dbName]!.inProgress = false;
       isFinalized = false;
       startNextTransaction(dbName);
     }
@@ -371,7 +367,7 @@ OPSQLite.transaction = async (
       },
     };
 
-    locks[dbName].queue.push(tx);
+    locks[dbName]!.queue.push(tx);
     startNextTransaction(dbName);
   });
 };
@@ -381,14 +377,14 @@ const startNextTransaction = (dbName: string) => {
     throw Error(`Lock not found for db: ${dbName}`);
   }
 
-  if (locks[dbName].inProgress) {
+  if (locks[dbName]!.inProgress) {
     // Transaction is already in process bail out
     return;
   }
 
-  if (locks[dbName].queue.length) {
-    locks[dbName].inProgress = true;
-    const tx = locks[dbName].queue.shift();
+  if (locks[dbName]!.queue.length) {
+    locks[dbName]!.inProgress = true;
+    const tx = locks[dbName]!.queue.shift();
 
     if (!tx) {
       throw new Error('Could not get a operation on datebase');
@@ -472,5 +468,5 @@ export const moveAssetsDatabase = (
   dbName: string,
   extension: string
 ): boolean => {
-  return NativeOPSQLite.moveAssetsDatabase(dbName, extension);
+  return NativeModules.OPSQLite.moveAssetsDatabase(dbName, extension);
 };

package/lib/typescript/NativeOPSQLite.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NativeOPSQLite.d.ts","sourceRoot":"","sources":["../../src/NativeOPSQLite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhE,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,YAAY,EAAE,MAAM;QAClB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,gBAAgB,EAAE,MAAM,CAAC;QACzB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,2BAA2B,EAAE,MAAM,CAAC;KACrC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC;IAEnB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;CAC9D;;AAED,wBAAkE"}

package/lib/typescript/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}