From b4b1317dcff944cf4e60dc94b28acc91cdc95222 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 22 Oct 2026 19:16:22 +0100 Subject: [PATCH 1/2] refactor: rename the prepared statement hybrid object Nitro V1 registers hybrid objects under the module's namespace, so NitroSQLitePreparedStatement no longer needs its prefix to stay unique. The spec, its C++ implementation and the generated bindings now use PreparedStatement. The public NitroSQLitePreparedStatement type keeps its name because the JavaScript API already exports a PreparedStatement interface. Co-Authored-By: Claude Opus 5.5 --- .../cpp/hybridObjects/HybridNitroSQLite.cpp | 6 ++-- .../cpp/hybridObjects/HybridNitroSQLite.hpp | 4 +-- ...tement.cpp => HybridPreparedStatement.cpp} | 14 ++++---- ...tement.hpp => HybridPreparedStatement.hpp} | 6 ++-- .../android/RNNitroSQLite+autolinking.cmake | 4 +-- .../generated/android/RNNitroSQLiteOnLoad.cpp | 4 +-- ...dNitroSQLitePreparedStatementSpecClass.cpp | 33 ------------------- .../c++/HybridNitroSQLiteSpecClass.cpp | 2 +- .../c++/HybridPreparedStatementSpecClass.cpp | 33 +++++++++++++++++++ .../nitrogen/generated/hybrid-classes.json | 10 +++--- .../ios/RNNitroSQLiteAutolinking.cpp | 4 +-- ...dNitroSQLitePreparedStatementSpecClass.cpp | 33 ------------------- .../ios/c++/HybridNitroSQLiteSpecClass.cpp | 2 +- .../c++/HybridPreparedStatementSpecClass.cpp | 33 +++++++++++++++++++ ...ec.cpp => HybridPreparedStatementSpec.cpp} | 6 ++-- .../RNNitroSQLite/HybridNitroSQLiteSpec.hpp | 6 ++-- ...ec.hpp => HybridPreparedStatementSpec.hpp} | 18 +++++----- ...redStatement.cjs => PreparedStatement.cjs} | 6 ++-- ...tatement.d.cts => PreparedStatement.d.cts} | 4 +-- .../src/__tests__/prepare.test.ts | 4 +-- .../react-native-nitro-sqlite/src/index.ts | 2 +- .../src/specs/NitroSQLite.nitro.ts | 4 +-- ...nt.nitro.ts => PreparedStatement.nitro.ts} | 12 +++---- 23 files changed, 125 insertions(+), 125 deletions(-) rename packages/react-native-nitro-sqlite/cpp/hybridObjects/{HybridNitroSQLitePreparedStatement.cpp => HybridPreparedStatement.cpp} (66%) rename packages/react-native-nitro-sqlite/cpp/hybridObjects/{HybridNitroSQLitePreparedStatement.hpp => HybridPreparedStatement.hpp} (79%) delete mode 100644 packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp create mode 100644 packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridPreparedStatementSpecClass.cpp delete mode 100644 packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp create mode 100644 packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridPreparedStatementSpecClass.cpp rename packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/{HybridNitroSQLitePreparedStatementSpec.cpp => HybridPreparedStatementSpec.cpp} (53%) rename packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/{HybridNitroSQLitePreparedStatementSpec.hpp => HybridPreparedStatementSpec.hpp} (71%) rename packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/{NitroSQLitePreparedStatement.cjs => PreparedStatement.cjs} (65%) rename packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/{NitroSQLitePreparedStatement.d.cts => PreparedStatement.d.cts} (55%) rename packages/react-native-nitro-sqlite/src/specs/{NitroSQLitePreparedStatement.nitro.ts => PreparedStatement.nitro.ts} (76%) diff --git a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.cpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.cpp index 67975e57..f4a316c2 100644 --- a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.cpp +++ b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.cpp @@ -6,7 +6,7 @@ #include "../NitroSQLiteLogs.hpp" #include "../NitroSQLiteMacros.hpp" #include "../NitroSQLiteOperations.hpp" -#include "HybridNitroSQLitePreparedStatement.hpp" +#include "HybridPreparedStatement.hpp" #include #include #include @@ -234,8 +234,8 @@ Promise HybridNitroSQLite::executeAsync(const std::strin }); }; -std::shared_ptr HybridNitroSQLite::prepare(const std::string& dbName, const std::string& query) { - return std::make_shared(sqlitePrepare(_connections.get(dbName), query)); +std::shared_ptr HybridNitroSQLite::prepare(const std::string& dbName, const std::string& query) { + return std::make_shared(sqlitePrepare(_connections.get(dbName), query)); } BatchQueryResult HybridNitroSQLite::executeBatch(const std::string& dbName, const std::vector& batchParams) { diff --git a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp index d2919cbb..797c4abe 100644 --- a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp +++ b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp @@ -2,7 +2,7 @@ #include "../NitroSQLiteDatabaseConnections.hpp" #include "../NitroSQLiteTypes.hpp" -#include +#include #include namespace margelo::nitro::rnnitrosqlite { @@ -74,7 +74,7 @@ class HybridNitroSQLite : public HybridNitroSQLiteSpec { const std::optional>& onRows) override; /** Prepare one SQL statement for repeated execution on an open connection. */ - std::shared_ptr prepare(const std::string& dbName, const std::string& query) override; + std::shared_ptr prepare(const std::string& dbName, const std::string& query) override; /** Run a nonempty batch in one exclusive transaction on the calling thread. * A failed command rolls back the batch. diff --git a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLitePreparedStatement.cpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.cpp similarity index 66% rename from packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLitePreparedStatement.cpp rename to packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.cpp index f1beefca..23fff7db 100644 --- a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLitePreparedStatement.cpp +++ b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.cpp @@ -1,4 +1,4 @@ -#include "HybridNitroSQLitePreparedStatement.hpp" +#include "HybridPreparedStatement.hpp" #include namespace margelo::nitro::rnnitrosqlite { @@ -26,14 +26,14 @@ namespace { } // namespace -HybridNitroSQLitePreparedStatement::HybridNitroSQLitePreparedStatement(std::shared_ptr statement) +HybridPreparedStatement::HybridPreparedStatement(std::shared_ptr statement) : _statement(std::move(statement)) {} -NitroSQLiteQueryResult HybridNitroSQLitePreparedStatement::execute(const std::optional& params) { +NitroSQLiteQueryResult HybridPreparedStatement::execute(const std::optional& params) { return _statement->execute(params); } -Promise HybridNitroSQLitePreparedStatement::executeAsync(const std::optional& params) { +Promise HybridPreparedStatement::executeAsync(const std::optional& params) { const auto copiedParams = copyArrayBufferParamsForBackground(params); const auto statement = _statement; @@ -41,15 +41,15 @@ Promise HybridNitroSQLitePreparedStatement::executeAsync [statement, copiedParams]() -> NitroSQLiteQueryResult { return statement->execute(copiedParams); }); } -void HybridNitroSQLitePreparedStatement::finalize() { +void HybridPreparedStatement::finalize() { _statement->finalize(); } -bool HybridNitroSQLitePreparedStatement::getIsFinalized() { +bool HybridPreparedStatement::getIsFinalized() { return _statement->isFinalized(); } -size_t HybridNitroSQLitePreparedStatement::getExternalMemorySize() noexcept { +size_t HybridPreparedStatement::getExternalMemorySize() noexcept { return sizeof(*this) + _statement->getExternalMemorySize(); } diff --git a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLitePreparedStatement.hpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.hpp similarity index 79% rename from packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLitePreparedStatement.hpp rename to packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.hpp index e375574a..d9ade2ae 100644 --- a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLitePreparedStatement.hpp +++ b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.hpp @@ -2,16 +2,16 @@ #include "../NitroSQLiteOperations.hpp" #include "../NitroSQLiteTypes.hpp" -#include +#include #include namespace margelo::nitro::rnnitrosqlite { /** Nitro hybrid object for a reusable native SQLite statement. */ -class HybridNitroSQLitePreparedStatement : public HybridNitroSQLitePreparedStatementSpec { +class HybridPreparedStatement : public HybridPreparedStatementSpec { public: /** Wrap a prepared statement for calls from JavaScript. */ - explicit HybridNitroSQLitePreparedStatement(std::shared_ptr statement); + explicit HybridPreparedStatement(std::shared_ptr statement); /** Execute with new bindings on the calling thread. */ NitroSQLiteQueryResult execute(const std::optional& params) override; diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake index baddd8d9..d004b400 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake @@ -13,14 +13,14 @@ target_include_directories(RNNitroSQLite PRIVATE ) target_sources(RNNitroSQLite PRIVATE "${CMAKE_CURRENT_LIST_DIR}/RNNitroSQLiteOnLoad.cpp" - "${CMAKE_CURRENT_LIST_DIR}/../android/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp" "${CMAKE_CURRENT_LIST_DIR}/../android/c++/HybridNitroSQLiteSpecClass.cpp" + "${CMAKE_CURRENT_LIST_DIR}/../android/c++/HybridPreparedStatementSpecClass.cpp" "${CMAKE_CURRENT_LIST_DIR}/../android/c++/JHybridNitroSQLiteOnLoadSpec.cpp" "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/BatchQueryCommand.cpp" "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/BatchQueryResult.cpp" "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/FileLoadResult.cpp" - "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/HybridNitroSQLitePreparedStatementSpec.cpp" "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/HybridNitroSQLiteSpec.cpp" + "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/HybridPreparedStatementSpec.cpp" "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/NitroSQLiteQueryColumnMetadata.cpp" "${CMAKE_CURRENT_LIST_DIR}/../shared/c++/NitroSQLiteQueryResult.cpp" ) diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp index 16211d28..f5e252d3 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace margelo::nitro::rnnitrosqlite { void registerAllNatives() { @@ -17,6 +17,6 @@ namespace margelo::nitro::rnnitrosqlite { HybridClassRegistry::registerHybridClass("rnnitrosqlite.NitroSQLite", HybridNitroSQLiteSpec::Class::get()); HybridClassRegistry::registerHybridClass("rnnitrosqlite.NitroSQLiteOnLoad", JHybridNitroSQLiteOnLoadSpec::Class::get()); - HybridClassRegistry::registerHybridClass("rnnitrosqlite.NitroSQLitePreparedStatement", HybridNitroSQLitePreparedStatementSpec::Class::get()); + HybridClassRegistry::registerHybridClass("rnnitrosqlite.PreparedStatement", HybridPreparedStatementSpec::Class::get()); } } diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp deleted file mode 100644 index 3794b18e..00000000 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/// -/// HybridNitroSQLitePreparedStatementSpecClass.cpp -/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. -/// https://github.com/margelo/nitro -/// Copyright © Marc Rousavy @ Margelo -/// - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -namespace margelo::nitro::rnnitrosqlite { - - - - const std::shared_ptr& HybridNitroSQLitePreparedStatementSpec::Class::get() { - static const auto hybridClass = HybridClass::create([](HybridClass& clazz) { - clazz.registerHybridProperty("isFinalized", &HybridNitroSQLitePreparedStatementSpec::getIsFinalized); - clazz.registerHybridMethod("execute", &HybridNitroSQLitePreparedStatementSpec::execute); - clazz.registerHybridMethod("executeAsync", &HybridNitroSQLitePreparedStatementSpec::executeAsync); - clazz.registerHybridMethod("finalize", &HybridNitroSQLitePreparedStatementSpec::finalize); - }); - return hybridClass; - } - -} // namespace margelo::nitro::rnnitrosqlite diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLiteSpecClass.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLiteSpecClass.cpp index a6abbd7e..e0aaf001 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLiteSpecClass.cpp +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridNitroSQLiteSpecClass.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridPreparedStatementSpecClass.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridPreparedStatementSpecClass.cpp new file mode 100644 index 00000000..bd45d58e --- /dev/null +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/HybridPreparedStatementSpecClass.cpp @@ -0,0 +1,33 @@ +/// +/// HybridPreparedStatementSpecClass.cpp +/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. +/// https://github.com/margelo/nitro +/// Copyright © Marc Rousavy @ Margelo +/// + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +namespace margelo::nitro::rnnitrosqlite { + + + + const std::shared_ptr& HybridPreparedStatementSpec::Class::get() { + static const auto hybridClass = HybridClass::create([](HybridClass& clazz) { + clazz.registerHybridProperty("isFinalized", &HybridPreparedStatementSpec::getIsFinalized); + clazz.registerHybridMethod("execute", &HybridPreparedStatementSpec::execute); + clazz.registerHybridMethod("executeAsync", &HybridPreparedStatementSpec::executeAsync); + clazz.registerHybridMethod("finalize", &HybridPreparedStatementSpec::finalize); + }); + return hybridClass; + } + +} // namespace margelo::nitro::rnnitrosqlite diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/hybrid-classes.json b/packages/react-native-nitro-sqlite/nitrogen/generated/hybrid-classes.json index 54e482a7..79ad40ef 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/hybrid-classes.json +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/hybrid-classes.json @@ -25,18 +25,18 @@ "language": "kotlin" } }, - "NitroSQLitePreparedStatement": { + "PreparedStatement": { "android": { "implementation": { - "className": "HybridNitroSQLitePreparedStatement", - "include": "\"hybridObjects/HybridNitroSQLitePreparedStatement.hpp\"" + "className": "HybridPreparedStatement", + "include": "\"hybridObjects/HybridPreparedStatement.hpp\"" }, "language": "c++" }, "ios": { "implementation": { - "className": "HybridNitroSQLitePreparedStatement", - "include": "\"hybridObjects/HybridNitroSQLitePreparedStatement.hpp\"" + "className": "HybridPreparedStatement", + "include": "\"hybridObjects/HybridPreparedStatement.hpp\"" }, "language": "c++" } diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.cpp index 29650d9d..000a6130 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.cpp +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include namespace margelo::nitro::rnnitrosqlite { void registerHybridClasses() { @@ -17,6 +17,6 @@ namespace margelo::nitro::rnnitrosqlite { using namespace margelo::nitro::rnnitrosqlite; HybridClassRegistry::registerHybridClass("rnnitrosqlite.NitroSQLite", HybridNitroSQLiteSpec::Class::get()); - HybridClassRegistry::registerHybridClass("rnnitrosqlite.NitroSQLitePreparedStatement", HybridNitroSQLitePreparedStatementSpec::Class::get()); + HybridClassRegistry::registerHybridClass("rnnitrosqlite.PreparedStatement", HybridPreparedStatementSpec::Class::get()); } } // namespace margelo::nitro::rnnitrosqlite diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp deleted file mode 100644 index 3794b18e..00000000 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLitePreparedStatementSpecClass.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/// -/// HybridNitroSQLitePreparedStatementSpecClass.cpp -/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. -/// https://github.com/margelo/nitro -/// Copyright © Marc Rousavy @ Margelo -/// - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -namespace margelo::nitro::rnnitrosqlite { - - - - const std::shared_ptr& HybridNitroSQLitePreparedStatementSpec::Class::get() { - static const auto hybridClass = HybridClass::create([](HybridClass& clazz) { - clazz.registerHybridProperty("isFinalized", &HybridNitroSQLitePreparedStatementSpec::getIsFinalized); - clazz.registerHybridMethod("execute", &HybridNitroSQLitePreparedStatementSpec::execute); - clazz.registerHybridMethod("executeAsync", &HybridNitroSQLitePreparedStatementSpec::executeAsync); - clazz.registerHybridMethod("finalize", &HybridNitroSQLitePreparedStatementSpec::finalize); - }); - return hybridClass; - } - -} // namespace margelo::nitro::rnnitrosqlite diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLiteSpecClass.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLiteSpecClass.cpp index a6abbd7e..e0aaf001 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLiteSpecClass.cpp +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridNitroSQLiteSpecClass.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridPreparedStatementSpecClass.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridPreparedStatementSpecClass.cpp new file mode 100644 index 00000000..bd45d58e --- /dev/null +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/c++/HybridPreparedStatementSpecClass.cpp @@ -0,0 +1,33 @@ +/// +/// HybridPreparedStatementSpecClass.cpp +/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. +/// https://github.com/margelo/nitro +/// Copyright © Marc Rousavy @ Margelo +/// + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +namespace margelo::nitro::rnnitrosqlite { + + + + const std::shared_ptr& HybridPreparedStatementSpec::Class::get() { + static const auto hybridClass = HybridClass::create([](HybridClass& clazz) { + clazz.registerHybridProperty("isFinalized", &HybridPreparedStatementSpec::getIsFinalized); + clazz.registerHybridMethod("execute", &HybridPreparedStatementSpec::execute); + clazz.registerHybridMethod("executeAsync", &HybridPreparedStatementSpec::executeAsync); + clazz.registerHybridMethod("finalize", &HybridPreparedStatementSpec::finalize); + }); + return hybridClass; + } + +} // namespace margelo::nitro::rnnitrosqlite diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLitePreparedStatementSpec.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridPreparedStatementSpec.cpp similarity index 53% rename from packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLitePreparedStatementSpec.cpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridPreparedStatementSpec.cpp index ec8c805e..a52e8223 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLitePreparedStatementSpec.cpp +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridPreparedStatementSpec.cpp @@ -1,14 +1,14 @@ /// -/// HybridNitroSQLitePreparedStatementSpec.cpp +/// HybridPreparedStatementSpec.cpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/margelo/nitro /// Copyright © Marc Rousavy @ Margelo /// -#include +#include namespace margelo::nitro::rnnitrosqlite { - HybridNitroSQLitePreparedStatementSpec::~HybridNitroSQLitePreparedStatementSpec() = default; + HybridPreparedStatementSpec::~HybridPreparedStatementSpec() = default; } // namespace margelo::nitro::rnnitrosqlite diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridNitroSQLiteSpec.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridNitroSQLiteSpec.hpp index ccf6142e..8a92174f 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridNitroSQLiteSpec.hpp +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridNitroSQLiteSpec.hpp @@ -21,8 +21,8 @@ #include #include #include -// Forward declaration of `HybridNitroSQLitePreparedStatementSpec` to properly resolve imports. -namespace margelo::nitro::rnnitrosqlite { class HybridNitroSQLitePreparedStatementSpec; } +// Forward declaration of `HybridPreparedStatementSpec` to properly resolve imports. +namespace margelo::nitro::rnnitrosqlite { class HybridPreparedStatementSpec; } #include #include #include @@ -73,7 +73,7 @@ namespace margelo::nitro::rnnitrosqlite { virtual void detach(const std::string& mainDbName, const std::string& alias) = 0; virtual NitroSQLiteQueryResult execute(const std::string& dbName, const std::string& query, const std::optional>>>& params) = 0; virtual Promise executeAsync(const std::string& dbName, const std::string& query, const std::optional>>>& params, const std::optional>& onRows) = 0; - virtual std::shared_ptr prepare(const std::string& dbName, const std::string& query) = 0; + virtual std::shared_ptr prepare(const std::string& dbName, const std::string& query) = 0; virtual BatchQueryResult executeBatch(const std::string& dbName, const std::vector& commands) = 0; virtual Promise executeBatchAsync(const std::string& dbName, const std::vector& commands) = 0; virtual FileLoadResult loadFile(const std::string& dbName, const std::string& location) = 0; diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridNitroSQLitePreparedStatementSpec.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridPreparedStatementSpec.hpp similarity index 71% rename from packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridNitroSQLitePreparedStatementSpec.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridPreparedStatementSpec.hpp index 531a064f..7bcc0aeb 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridNitroSQLitePreparedStatementSpec.hpp +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/include/RNNitroSQLite/HybridPreparedStatementSpec.hpp @@ -1,5 +1,5 @@ /// -/// HybridNitroSQLitePreparedStatementSpec.hpp +/// HybridPreparedStatementSpec.hpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/margelo/nitro /// Copyright © Marc Rousavy @ Margelo @@ -23,31 +23,31 @@ namespace margelo::nitro::rnnitrosqlite { using namespace margelo::nitro; /** - * An abstract base class for `NitroSQLitePreparedStatement` - * Inherit this class to create instances of `HybridNitroSQLitePreparedStatementSpec` in C++. + * An abstract base class for `PreparedStatement` + * Inherit this class to create instances of `HybridPreparedStatementSpec` in C++. * @example * ```cpp - * class HybridNitroSQLitePreparedStatement : public HybridNitroSQLitePreparedStatementSpec { + * class HybridPreparedStatement : public HybridPreparedStatementSpec { * public: - * HybridNitroSQLitePreparedStatement(...) { ... } + * HybridPreparedStatement(...) { ... } * // ... * }; * ``` */ - class HybridNitroSQLitePreparedStatementSpec : public virtual HybridObject { + class HybridPreparedStatementSpec : public virtual HybridObject { public: struct Class { using Base = HybridObject::Class; - static constexpr const char* name = "NitroSQLitePreparedStatement"; + static constexpr const char* name = "PreparedStatement"; static const std::shared_ptr& get(); }; public: // Constructor - HybridNitroSQLitePreparedStatementSpec() = default; + HybridPreparedStatementSpec() = default; // Destructor - ~HybridNitroSQLitePreparedStatementSpec() override; + ~HybridPreparedStatementSpec() override; public: // Properties diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/NitroSQLitePreparedStatement.cjs b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/PreparedStatement.cjs similarity index 65% rename from packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/NitroSQLitePreparedStatement.cjs rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/PreparedStatement.cjs index 379dd0df..63aa7ed4 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/NitroSQLitePreparedStatement.cjs +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/PreparedStatement.cjs @@ -1,5 +1,5 @@ /// -/// NitroSQLitePreparedStatement.cjs +/// PreparedStatement.cjs /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/margelo/nitro /// Copyright © Marc Rousavy @ Margelo @@ -10,9 +10,9 @@ const { NitroModules } = require('react-native-nitro-modules') let hybridClass module.exports = { - get NitroSQLitePreparedStatement() { + get PreparedStatement() { if (hybridClass === undefined) { - hybridClass = NitroModules.getHybridClass('rnnitrosqlite.NitroSQLitePreparedStatement') + hybridClass = NitroModules.getHybridClass('rnnitrosqlite.PreparedStatement') } return hybridClass }, diff --git a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/NitroSQLitePreparedStatement.d.cts b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/PreparedStatement.d.cts similarity index 55% rename from packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/NitroSQLitePreparedStatement.d.cts rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/PreparedStatement.d.cts index 6ab1ac74..26faea34 100644 --- a/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/NitroSQLitePreparedStatement.d.cts +++ b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/javascript/PreparedStatement.d.cts @@ -1,9 +1,9 @@ /// -/// NitroSQLitePreparedStatement.d.cts +/// PreparedStatement.d.cts /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/margelo/nitro /// Copyright © Marc Rousavy @ Margelo /// -// The spec's `export declare class NitroSQLitePreparedStatement` types this runtime export. +// The spec's `export declare class PreparedStatement` types this runtime export. export {} diff --git a/packages/react-native-nitro-sqlite/src/__tests__/prepare.test.ts b/packages/react-native-nitro-sqlite/src/__tests__/prepare.test.ts index 5949e06b..c25d4f84 100644 --- a/packages/react-native-nitro-sqlite/src/__tests__/prepare.test.ts +++ b/packages/react-native-nitro-sqlite/src/__tests__/prepare.test.ts @@ -6,7 +6,7 @@ import { isDatabaseOpen, openDatabaseQueue, } from '../DatabaseQueue' -import type { NitroSQLitePreparedStatement } from '../specs/NitroSQLitePreparedStatement.nitro' +import type { PreparedStatement } from '../specs/PreparedStatement.nitro' import { prepare } from '../operations/prepare' import { open } from '../operations/session' import { nativeResult } from './testUtils' @@ -23,7 +23,7 @@ afterEach(() => { if (isDatabaseOpen(dbName)) closeDatabaseQueue(dbName) }) -function mockStatement(): NitroSQLitePreparedStatement { +function mockStatement(): PreparedStatement { let finalized = false return { toString: () => 'PreparedStatement', diff --git a/packages/react-native-nitro-sqlite/src/index.ts b/packages/react-native-nitro-sqlite/src/index.ts index 4f791b05..a8c97d47 100644 --- a/packages/react-native-nitro-sqlite/src/index.ts +++ b/packages/react-native-nitro-sqlite/src/index.ts @@ -29,7 +29,7 @@ export { open } from './operations/session' export { NitroSQLiteError, NitroSQLiteExceptionType } from './errors' export type { DatabaseQueueKey } from './DatabaseQueue' export type { NitroSQLite as NitroSQLiteNative } from './specs/NitroSQLite.nitro' -export type { NitroSQLitePreparedStatement } from './specs/NitroSQLitePreparedStatement.nitro' +export type { PreparedStatement as NitroSQLitePreparedStatement } from './specs/PreparedStatement.nitro' export type { NitroSQLiteQueryResult, NitroSQLiteQueryRows, diff --git a/packages/react-native-nitro-sqlite/src/specs/NitroSQLite.nitro.ts b/packages/react-native-nitro-sqlite/src/specs/NitroSQLite.nitro.ts index 71db521d..2597563d 100644 --- a/packages/react-native-nitro-sqlite/src/specs/NitroSQLite.nitro.ts +++ b/packages/react-native-nitro-sqlite/src/specs/NitroSQLite.nitro.ts @@ -9,7 +9,7 @@ import type { NitroSQLiteQueryResult, NitroSQLiteQueryRows, } from './NitroSQLiteQueryResult' -import type { NitroSQLitePreparedStatement } from './NitroSQLitePreparedStatement.nitro' +import type { PreparedStatement } from './PreparedStatement.nitro' export * from '#nitro/NitroSQLite' @@ -130,7 +130,7 @@ export declare class NitroSQLite extends HybridObject { * @param query SQL statement with optional positional placeholders. * @returns A native statement with synchronous and asynchronous execution methods. */ - prepare(dbName: string, query: string): NitroSQLitePreparedStatement + prepare(dbName: string, query: string): PreparedStatement /** Execute commands in one exclusive transaction on the calling thread. * An empty batch throws; a failed command rolls back the batch. * @param dbName Name of an open database. diff --git a/packages/react-native-nitro-sqlite/src/specs/NitroSQLitePreparedStatement.nitro.ts b/packages/react-native-nitro-sqlite/src/specs/PreparedStatement.nitro.ts similarity index 76% rename from packages/react-native-nitro-sqlite/src/specs/NitroSQLitePreparedStatement.nitro.ts rename to packages/react-native-nitro-sqlite/src/specs/PreparedStatement.nitro.ts index 980f653c..96ea0f2b 100644 --- a/packages/react-native-nitro-sqlite/src/specs/NitroSQLitePreparedStatement.nitro.ts +++ b/packages/react-native-nitro-sqlite/src/specs/PreparedStatement.nitro.ts @@ -2,24 +2,24 @@ import { Android, iOS, type HybridObject } from 'react-native-nitro-modules' import type { SQLiteQueryParams } from '../types' import type { NitroSQLiteQueryResult } from './NitroSQLiteQueryResult' -export * from '#nitro/NitroSQLitePreparedStatement' +export * from '#nitro/PreparedStatement' /** Native prepared statement returned by `NitroSQLite.native.prepare()`. */ @iOS({ language: 'c++', implementation: { - className: 'HybridNitroSQLitePreparedStatement', - include: '"hybridObjects/HybridNitroSQLitePreparedStatement.hpp"', + className: 'HybridPreparedStatement', + include: '"hybridObjects/HybridPreparedStatement.hpp"', }, }) @Android({ language: 'c++', implementation: { - className: 'HybridNitroSQLitePreparedStatement', - include: '"hybridObjects/HybridNitroSQLitePreparedStatement.hpp"', + className: 'HybridPreparedStatement', + include: '"hybridObjects/HybridPreparedStatement.hpp"', }, }) -export declare class NitroSQLitePreparedStatement extends HybridObject { +export declare class PreparedStatement extends HybridObject { /** Whether the native statement has been finalized. */ readonly isFinalized: boolean From c33bc759e41c0749f2adc3f08e4c6939536b5e92 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 22 Oct 2026 19:35:36 +0100 Subject: [PATCH 2/2] style: format the renamed prepared statement files The shorter class name changes how clang-format wraps the constructor and sorts the generated spec includes. Co-Authored-By: Claude Opus 5.5 --- .../cpp/hybridObjects/HybridNitroSQLite.hpp | 2 +- .../cpp/hybridObjects/HybridPreparedStatement.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp index 797c4abe..236429a5 100644 --- a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp +++ b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp @@ -2,8 +2,8 @@ #include "../NitroSQLiteDatabaseConnections.hpp" #include "../NitroSQLiteTypes.hpp" -#include #include +#include namespace margelo::nitro::rnnitrosqlite { diff --git a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.cpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.cpp index 23fff7db..75f42151 100644 --- a/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.cpp +++ b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridPreparedStatement.cpp @@ -26,8 +26,7 @@ namespace { } // namespace -HybridPreparedStatement::HybridPreparedStatement(std::shared_ptr statement) - : _statement(std::move(statement)) {} +HybridPreparedStatement::HybridPreparedStatement(std::shared_ptr statement) : _statement(std::move(statement)) {} NitroSQLiteQueryResult HybridPreparedStatement::execute(const std::optional& params) { return _statement->execute(params);