Merge branch 'main' into rename-to-nitro-sqlite

Author: chrispader

.github/workflows/lint-cpp.yml

@@ -11,6 +11,9 @@ on:
       - "**/*.cpp"
       - "**/*.c"
       - "**/*.mm"
+    paths-ignore:
+      - "node_modules"
+      - "**/node_modules"
   pull_request:
     paths:
       - ".github/workflows/lint-cpp.yml"
@@ -19,6 +22,9 @@ on:
       - "**/*.cpp"
       - "**/*.c"
       - "**/*.mm"
+    paths-ignore:
+      - "node_modules"
+      - "**/node_modules"
 
 jobs:
   lint:

package/android/src/main/java/com/margelo/rnquicksqlite/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/rnquicksqlite/RNQuickSQLitePackage.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/rnquicksqlite/RNQuickSQLiteOnLoadModule.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/rnquicksqlite/RNQuickSQLiteOnLoadModule.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 = "RNNNitroSQLiteOnLoad"
+
+        var reactContext: ReactApplicationContext? = null
+            private set
+        var reactApplicationContextReadyCallback: Callback? = null
+            private set
+    }
+}

package/cpp/QuickSQLiteException.hpp

@@ -0,0 +1,63 @@
+#pragma once
+
+#include <string>
+#include <iostream>
+#include <exception>
+
+enum NitroSQLiteExceptionType {
+  UnknownError,
+  DatabaseCannotBeOpened,
+  DatabaseNotOpen,
+  UnableToAttachToDatabase,
+  SqlExecutionError,
+  CouldNotLoadFile,
+  NoBatchCommandsProvided
+};
+
+inline std::unordered_map<NitroSQLiteExceptionType, std::string> exceptionTypeStrings = {
+  {UnknownError, "UnknownError"},
+  {DatabaseCannotBeOpened, "DatabaseCannotBeOpened"},
+  {DatabaseNotOpen, "DatabaseNotOpen"},
+  {UnableToAttachToDatabase, "UnableToAttachToDatabase"},
+  {SqlExecutionError, "SqlExecutionError"},
+  {CouldNotLoadFile, "CouldNotLoadFile"},
+  {NoBatchCommandsProvided, "NoBatchCommandsProvided"}
+};
+
+inline std::string typeToString(NitroSQLiteExceptionType type) {
+  return exceptionTypeStrings[type];
+}
+
+class NitroSQLiteException : public std::exception {
+public:
+  explicit NitroSQLiteException(const char* message): NitroSQLiteException(NitroSQLiteExceptionType::UnknownError, message) {}
+  explicit NitroSQLiteException(const std::string& message): NitroSQLiteException(NitroSQLiteExceptionType::UnknownError, message) {}
+  NitroSQLiteException(const NitroSQLiteExceptionType& type, const char* message) : NitroSQLiteException(type, std::string(message)) {}
+  NitroSQLiteException(const NitroSQLiteExceptionType& type, const std::string& message)
+    : _exceptionString("[react-native-nitro-sqlite] " + typeToString(type) + ": " + message) {}
+
+private:
+  const std::string _exceptionString;
+
+public:
+  [[nodiscard]] const char* what() const noexcept override {
+    return this->_exceptionString.c_str();
+  }
+
+  static NitroSQLiteException DatabaseNotOpen(const std::string& dbName) {
+    return NitroSQLiteException(NitroSQLiteExceptionType::UnableToAttachToDatabase, dbName + " is not open");
+  }
+
+  static NitroSQLiteException SqlExecution(const std::string& errorMessage) {
+    return NitroSQLiteException(NitroSQLiteExceptionType::SqlExecutionError, errorMessage);
+  }
+
+  static NitroSQLiteException DatabaseFileNotFound(const std::string& dbFilePath) {
+    return NitroSQLiteException(NitroSQLiteExceptionType::SqlExecutionError, "Database file not found: " + dbFilePath);
+  }
+
+  static NitroSQLiteException CouldNotLoadFile(const std::string& fileLocation, std::optional<std::string> additionalLine = std::nullopt) {
+    const auto message = "Could not load file: " + fileLocation + (additionalLine ? (". " + *additionalLine) : "");
+    return NitroSQLiteException(NitroSQLiteExceptionType::CouldNotLoadFile, message);
+  }
+};

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),

package/cpp/specs/HybridNativeQueryResult.hpp

@@ -4,9 +4,15 @@
 #include "types.hpp"
 #include <map>
 
+<<<<<<< HEAD
 using namespace margelo::rnnitrosqlite;
 
 namespace margelo::nitro::rnnitrosqlite {
+=======
+using namespace margelo::rnnitrosqlite;
+
+namespace margelo::nitro::rnnitrosqlite {
+>>>>>>> main
 
 class HybridNativeQueryResult : public HybridNativeQueryResultSpec {
 public:
@@ -32,4 +38,8 @@ class HybridNativeQueryResult : public HybridNativeQueryResultSpec {
   std::optional<SQLiteQueryTableMetadata> getMetadata() override;
 };
 
+<<<<<<< HEAD
+} // namespace margelo::nitro::rnnitrosqlite
+=======
 } // namespace margelo::nitro::rnnitrosqlite
+>>>>>>> main