react-native-nitro-sqlite 9.2.2 → 9.4.0

package/nitrogen/generated/shared/c++/ColumnType.hpp

@@ -2,7 +2,7 @@
 /// ColumnType.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -36,16 +36,14 @@ namespace margelo::nitro::rnnitrosqlite {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::rnnitrosqlite;
-
   // C++ ColumnType <> JS ColumnType (enum)
   template <>
-  struct JSIConverter<ColumnType> final {
-    static inline ColumnType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::rnnitrosqlite::ColumnType> final {
+    static inline margelo::nitro::rnnitrosqlite::ColumnType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       int enumValue = JSIConverter<int>::fromJSI(runtime, arg);
-      return static_cast<ColumnType>(enumValue);
+      return static_cast<margelo::nitro::rnnitrosqlite::ColumnType>(enumValue);
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, ColumnType arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::rnnitrosqlite::ColumnType arg) {
       int enumValue = static_cast<int>(arg);
       return JSIConverter<int>::toJSI(runtime, enumValue);
     }

package/nitrogen/generated/shared/c++/FileLoadResult.hpp

@@ -2,7 +2,7 @@
 /// FileLoadResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -17,6 +17,16 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 
 
@@ -27,7 +37,7 @@ namespace margelo::nitro::rnnitrosqlite {
   /**
    * A struct which can be represented as a JavaScript object (FileLoadResult).
    */
-  struct FileLoadResult {
+  struct FileLoadResult final {
   public:
     std::optional<double> commands     SWIFT_PRIVATE;
     std::optional<double> rowsAffected     SWIFT_PRIVATE;
@@ -35,28 +45,29 @@ namespace margelo::nitro::rnnitrosqlite {
   public:
     FileLoadResult() = default;
     explicit FileLoadResult(std::optional<double> commands, std::optional<double> rowsAffected): commands(commands), rowsAffected(rowsAffected) {}
+
+  public:
+    friend bool operator==(const FileLoadResult& lhs, const FileLoadResult& rhs) = default;
   };
 
 } // namespace margelo::nitro::rnnitrosqlite
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::rnnitrosqlite;
-
   // C++ FileLoadResult <> JS FileLoadResult (object)
   template <>
-  struct JSIConverter<FileLoadResult> final {
-    static inline FileLoadResult fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::rnnitrosqlite::FileLoadResult> final {
+    static inline margelo::nitro::rnnitrosqlite::FileLoadResult fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return FileLoadResult(
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "commands")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "rowsAffected"))
+      return margelo::nitro::rnnitrosqlite::FileLoadResult(
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "commands"))),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "rowsAffected")))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const FileLoadResult& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rnnitrosqlite::FileLoadResult& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "commands", JSIConverter<std::optional<double>>::toJSI(runtime, arg.commands));
-      obj.setProperty(runtime, "rowsAffected", JSIConverter<std::optional<double>>::toJSI(runtime, arg.rowsAffected));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "commands"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.commands));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "rowsAffected"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.rowsAffected));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -64,8 +75,11 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "commands"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "rowsAffected"))) return false;
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "commands")))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "rowsAffected")))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridNitroSQLiteOnLoadSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridNitroSQLiteOnLoadSpec.hpp"

package/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNitroSQLiteOnLoadSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.cpp

@@ -0,0 +1,24 @@
+///
+/// HybridNitroSQLiteQueryResultSpec.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#include "HybridNitroSQLiteQueryResultSpec.hpp"
+
+namespace margelo::nitro::rnnitrosqlite {
+
+  void HybridNitroSQLiteQueryResultSpec::loadHybridMethods() {
+    // load base methods/properties
+    HybridObject::loadHybridMethods();
+    // load custom methods/properties
+    registerHybrids(this, [](Prototype& prototype) {
+      prototype.registerHybridGetter("rowsAffected", &HybridNitroSQLiteQueryResultSpec::getRowsAffected);
+      prototype.registerHybridGetter("insertId", &HybridNitroSQLiteQueryResultSpec::getInsertId);
+      prototype.registerHybridGetter("results", &HybridNitroSQLiteQueryResultSpec::getResults);
+      prototype.registerHybridGetter("metadata", &HybridNitroSQLiteQueryResultSpec::getMetadata);
+    });
+  }
+
+} // namespace margelo::nitro::rnnitrosqlite

package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.hpp

@@ -0,0 +1,73 @@
+///
+/// HybridNitroSQLiteQueryResultSpec.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/HybridObject.hpp>)
+#include <NitroModules/HybridObject.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+// Forward declaration of `NitroSQLiteQueryColumnMetadata` to properly resolve imports.
+namespace margelo::nitro::rnnitrosqlite { struct NitroSQLiteQueryColumnMetadata; }
+
+#include <optional>
+#include <string>
+#include <NitroModules/Null.hpp>
+#include <NitroModules/ArrayBuffer.hpp>
+#include <variant>
+#include <unordered_map>
+#include <vector>
+#include "NitroSQLiteQueryColumnMetadata.hpp"
+
+namespace margelo::nitro::rnnitrosqlite {
+
+  using namespace margelo::nitro;
+
+  /**
+   * An abstract base class for `NitroSQLiteQueryResult`
+   * Inherit this class to create instances of `HybridNitroSQLiteQueryResultSpec` in C++.
+   * You must explicitly call `HybridObject`'s constructor yourself, because it is virtual.
+   * @example
+   * ```cpp
+   * class HybridNitroSQLiteQueryResult: public HybridNitroSQLiteQueryResultSpec {
+   * public:
+   *   HybridNitroSQLiteQueryResult(...): HybridObject(TAG) { ... }
+   *   // ...
+   * };
+   * ```
+   */
+  class HybridNitroSQLiteQueryResultSpec: public virtual HybridObject {
+    public:
+      // Constructor
+      explicit HybridNitroSQLiteQueryResultSpec(): HybridObject(TAG) { }
+
+      // Destructor
+      ~HybridNitroSQLiteQueryResultSpec() override = default;
+
+    public:
+      // Properties
+      virtual double getRowsAffected() = 0;
+      virtual std::optional<double> getInsertId() = 0;
+      virtual std::vector<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>> getResults() = 0;
+      virtual std::optional<std::unordered_map<std::string, NitroSQLiteQueryColumnMetadata>> getMetadata() = 0;
+
+    public:
+      // Methods
+      
+
+    protected:
+      // Hybrid Setup
+      void loadHybridMethods() override;
+
+    protected:
+      // Tag for logging
+      static constexpr auto TAG = "NitroSQLiteQueryResult";
+  };
+
+} // namespace margelo::nitro::rnnitrosqlite

package/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridNitroSQLiteSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridNitroSQLiteSpec.hpp"

package/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNitroSQLiteSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -13,30 +13,26 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
-// Forward declaration of `HybridNativeQueryResultSpec` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { class HybridNativeQueryResultSpec; }
-// Forward declaration of `ArrayBuffer` to properly resolve imports.
-namespace NitroModules { class ArrayBuffer; }
-// Forward declaration of `SQLiteNullValue` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { struct SQLiteNullValue; }
+// Forward declaration of `HybridNitroSQLiteQueryResultSpec` to properly resolve imports.
+namespace margelo::nitro::rnnitrosqlite { class HybridNitroSQLiteQueryResultSpec; }
 // Forward declaration of `BatchQueryResult` to properly resolve imports.
 namespace margelo::nitro::rnnitrosqlite { struct BatchQueryResult; }
-// Forward declaration of `NativeBatchQueryCommand` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { struct NativeBatchQueryCommand; }
+// Forward declaration of `BatchQueryCommand` to properly resolve imports.
+namespace margelo::nitro::rnnitrosqlite { struct BatchQueryCommand; }
 // Forward declaration of `FileLoadResult` to properly resolve imports.
 namespace margelo::nitro::rnnitrosqlite { struct FileLoadResult; }
 
 #include <string>
 #include <optional>
 #include <memory>
-#include "HybridNativeQueryResultSpec.hpp"
+#include "HybridNitroSQLiteQueryResultSpec.hpp"
+#include <NitroModules/Null.hpp>
 #include <NitroModules/ArrayBuffer.hpp>
-#include "SQLiteNullValue.hpp"
 #include <variant>
 #include <vector>
 #include <NitroModules/Promise.hpp>
 #include "BatchQueryResult.hpp"
-#include "NativeBatchQueryCommand.hpp"
+#include "BatchQueryCommand.hpp"
 #include "FileLoadResult.hpp"
 
 namespace margelo::nitro::rnnitrosqlite {
@@ -75,10 +71,10 @@ namespace margelo::nitro::rnnitrosqlite {
       virtual void drop(const std::string& dbName, const std::optional<std::string>& location) = 0;
       virtual void attach(const std::string& mainDbName, const std::string& dbNameToAttach, const std::string& alias, const std::optional<std::string>& location) = 0;
       virtual void detach(const std::string& mainDbName, const std::string& alias) = 0;
-      virtual std::shared_ptr<margelo::nitro::rnnitrosqlite::HybridNativeQueryResultSpec> execute(const std::string& dbName, const std::string& query, const std::optional<std::vector<std::variant<std::string, double, bool, std::shared_ptr<ArrayBuffer>, SQLiteNullValue>>>& params) = 0;
-      virtual std::shared_ptr<Promise<std::shared_ptr<margelo::nitro::rnnitrosqlite::HybridNativeQueryResultSpec>>> executeAsync(const std::string& dbName, const std::string& query, const std::optional<std::vector<std::variant<std::string, double, bool, std::shared_ptr<ArrayBuffer>, SQLiteNullValue>>>& params) = 0;
-      virtual BatchQueryResult executeBatch(const std::string& dbName, const std::vector<NativeBatchQueryCommand>& commands) = 0;
-      virtual std::shared_ptr<Promise<BatchQueryResult>> executeBatchAsync(const std::string& dbName, const std::vector<NativeBatchQueryCommand>& commands) = 0;
+      virtual std::shared_ptr<HybridNitroSQLiteQueryResultSpec> execute(const std::string& dbName, const std::string& query, const std::optional<std::vector<std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>& params) = 0;
+      virtual std::shared_ptr<Promise<std::shared_ptr<HybridNitroSQLiteQueryResultSpec>>> executeAsync(const std::string& dbName, const std::string& query, const std::optional<std::vector<std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>& params) = 0;
+      virtual BatchQueryResult executeBatch(const std::string& dbName, const std::vector<BatchQueryCommand>& commands) = 0;
+      virtual std::shared_ptr<Promise<BatchQueryResult>> executeBatchAsync(const std::string& dbName, const std::vector<BatchQueryCommand>& commands) = 0;
       virtual FileLoadResult loadFile(const std::string& dbName, const std::string& location) = 0;
       virtual std::shared_ptr<Promise<FileLoadResult>> loadFileAsync(const std::string& dbName, const std::string& location) = 0;
 

package/nitrogen/generated/shared/c++/NitroSQLiteQueryColumnMetadata.hpp

@@ -0,0 +1,93 @@
+///
+/// NitroSQLiteQueryColumnMetadata.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+// Forward declaration of `ColumnType` to properly resolve imports.
+namespace margelo::nitro::rnnitrosqlite { enum class ColumnType; }
+
+#include <string>
+#include "ColumnType.hpp"
+
+namespace margelo::nitro::rnnitrosqlite {
+
+  /**
+   * A struct which can be represented as a JavaScript object (NitroSQLiteQueryColumnMetadata).
+   */
+  struct NitroSQLiteQueryColumnMetadata final {
+  public:
+    std::string name     SWIFT_PRIVATE;
+    ColumnType type     SWIFT_PRIVATE;
+    double index     SWIFT_PRIVATE;
+
+  public:
+    NitroSQLiteQueryColumnMetadata() = default;
+    explicit NitroSQLiteQueryColumnMetadata(std::string name, ColumnType type, double index): name(name), type(type), index(index) {}
+
+  public:
+    friend bool operator==(const NitroSQLiteQueryColumnMetadata& lhs, const NitroSQLiteQueryColumnMetadata& rhs) = default;
+  };
+
+} // namespace margelo::nitro::rnnitrosqlite
+
+namespace margelo::nitro {
+
+  // C++ NitroSQLiteQueryColumnMetadata <> JS NitroSQLiteQueryColumnMetadata (object)
+  template <>
+  struct JSIConverter<margelo::nitro::rnnitrosqlite::NitroSQLiteQueryColumnMetadata> final {
+    static inline margelo::nitro::rnnitrosqlite::NitroSQLiteQueryColumnMetadata fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::rnnitrosqlite::NitroSQLiteQueryColumnMetadata(
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name"))),
+        JSIConverter<margelo::nitro::rnnitrosqlite::ColumnType>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "index")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rnnitrosqlite::NitroSQLiteQueryColumnMetadata& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "name"), JSIConverter<std::string>::toJSI(runtime, arg.name));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "type"), JSIConverter<margelo::nitro::rnnitrosqlite::ColumnType>::toJSI(runtime, arg.type));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "index"), JSIConverter<double>::toJSI(runtime, arg.index));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name")))) return false;
+      if (!JSIConverter<margelo::nitro::rnnitrosqlite::ColumnType>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "index")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-sqlite",
-  "version": "9.2.2",
+  "version": "9.4.0",
   "description": "Fast SQLite library for React Native built using Nitro Modules",
   "main": "./lib/module/index",
   "module": "./lib/module/index",
@@ -38,7 +38,7 @@
   ],
   "scripts": {
     "build": "bun typecheck && bob build",
-    "specs": "bun typecheck && bun nitro-codegen --logLevel=\"debug\"",
+    "specs": "bun typecheck && bun nitrogen --logLevel=\"debug\"",
     "typecheck": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
     "test": "jest",
@@ -70,16 +70,16 @@
   },
   "devDependencies": {
     "jest": "^30.2.0",
-    "nitro-codegen": "0.27.2",
+    "nitrogen": "0.33.5",
     "react": "19.1.1",
     "react-native": "0.82.1",
     "react-native-builder-bob": "^0.31.0",
-    "react-native-nitro-modules": "0.27.2"
+    "react-native-nitro-modules": "0.33.5"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
     "react-native": ">=0.75.0",
-    "react-native-nitro-modules": ">=0.27.2"
+    "react-native-nitro-modules": ">=0.32.0"
   },
   "resolutions": {
     "@types/react": "^18.2.44"

package/src/index.ts

@@ -22,12 +22,6 @@ export const NitroSQLite = {
 }
 
 export { open } from './operations/session'
-export {
-  isNitroSQLiteNull,
-  NITRO_SQLITE_NULL,
-  isSimpleNullHandlingEnabled,
-  enableSimpleNullHandling,
-} from './nullHandling'
 export { default as NitroSQLiteError } from './NitroSQLiteError'
 export type * from './types'
 export { typeORMDriver } from './typeORM'

package/src/operations/execute.ts

@@ -1,32 +1,16 @@
-import { isNitroSQLiteNull, isSimpleNullHandlingEnabled } from '../nullHandling'
 import { HybridNitroSQLite } from '../nitro'
-import { replaceWithNativeNullValue } from '../nullHandling'
-import type { NativeQueryResult } from '../specs/NativeQueryResult.nitro'
-import type {
-  QueryResult,
-  NativeSQLiteQueryParams,
-  SQLiteQueryParams,
-  QueryResultRow,
-} from '../types'
+import type { QueryResult, QueryResultRow, SQLiteQueryParams } from '../types'
 import NitroSQLiteError from '../NitroSQLiteError'
+import type { NitroSQLiteQueryResult } from '../specs/NitroSQLiteQueryResult.nitro'
 
 export function execute<Row extends QueryResultRow = never>(
   dbName: string,
   query: string,
   params?: SQLiteQueryParams,
 ): QueryResult<Row> {
-  const transformedParams = isSimpleNullHandlingEnabled()
-    ? toNativeQueryParams(params)
-    : (params as NativeSQLiteQueryParams)
-
   try {
-    const nativeResult = HybridNitroSQLite.execute(
-      dbName,
-      query,
-      transformedParams,
-    )
-
-    return buildJsQueryResult<Row>(nativeResult)
+    const nativeResult = HybridNitroSQLite.execute(dbName, query, params)
+    return buildJSQueryResult<Row>(nativeResult)
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
   }
@@ -37,55 +21,36 @@ export async function executeAsync<Row extends QueryResultRow = never>(
   query: string,
   params?: SQLiteQueryParams,
 ): Promise<QueryResult<Row>> {
-  const transformedParams = isSimpleNullHandlingEnabled()
-    ? toNativeQueryParams(params)
-    : (params as NativeSQLiteQueryParams)
-
   try {
     const nativeResult = await HybridNitroSQLite.executeAsync(
       dbName,
       query,
-      transformedParams,
+      params,
     )
-    return buildJsQueryResult<Row>(nativeResult)
+    return buildJSQueryResult<Row>(nativeResult)
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
   }
 }
 
-function toNativeQueryParams(
-  params: SQLiteQueryParams | undefined,
-): NativeSQLiteQueryParams | undefined {
-  return params?.map((param) => replaceWithNativeNullValue(param))
-}
-
-function buildJsQueryResult<Row extends QueryResultRow = never>({
-  insertId,
-  rowsAffected,
-  results,
-}: NativeQueryResult): QueryResult<Row> {
-  let data: Row[] = results as Row[]
+function buildJSQueryResult<Row extends QueryResultRow = never>(
+  result: NitroSQLiteQueryResult,
+): QueryResult<Row> {
+  const resultWithRows = result as QueryResult<Row>
 
-  if (isSimpleNullHandlingEnabled()) {
-    data = results.map((row) =>
-      Object.fromEntries(
-        Object.entries(row).map(([key, value]) => {
-          if (isNitroSQLiteNull(value)) {
-            return [key, null]
-          }
-          return [key, value]
-        }),
-      ),
-    ) as Row[]
+  resultWithRows.rows = {
+    _array: result.results as Row[],
+    length: result.results.length,
+    item: (idx: number) => result.results[idx] as Row | undefined,
   }
 
-  return {
-    insertId,
-    rowsAffected,
-    rows: {
-      _array: data,
-      length: data.length,
-      item: (idx: number) => data[idx],
-    },
-  }
+  return resultWithRows
+
+  // return Object.assign(result, {
+  //   rows: {
+  //     _array: result.results,
+  //     length: result.results.length,
+  //     item: (idx: number) => result.results[idx],
+  //   },
+  // })
 }

package/src/operations/executeBatch.ts

@@ -1,20 +1,11 @@
-import {
-  isSimpleNullHandlingEnabled,
-  replaceWithNativeNullValue,
-} from '../nullHandling'
 import { HybridNitroSQLite } from '../nitro'
 import {
   queueOperationAsync,
   startOperationSync,
   throwIfDatabaseIsNotOpen,
 } from '../DatabaseQueue'
-import type {
-  NativeSQLiteQueryParams,
-  BatchQueryResult,
-  BatchQueryCommand,
-  NativeBatchQueryCommand,
-} from '../types'
 import NitroSQLiteError from '../NitroSQLiteError'
+import type { BatchQueryCommand, BatchQueryResult } from '../types'
 
 export function executeBatch(
   dbName: string,
@@ -22,13 +13,9 @@ export function executeBatch(
 ): BatchQueryResult {
   throwIfDatabaseIsNotOpen(dbName)
 
-  const transformedCommands = isSimpleNullHandlingEnabled()
-    ? toNativeBatchQueryCommands(commands)
-    : (commands as NativeBatchQueryCommand[])
-
   try {
     return startOperationSync(dbName, () =>
-      HybridNitroSQLite.executeBatch(dbName, transformedCommands),
+      HybridNitroSQLite.executeBatch(dbName, commands),
     )
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
@@ -41,36 +28,11 @@ export async function executeBatchAsync(
 ): Promise<BatchQueryResult> {
   throwIfDatabaseIsNotOpen(dbName)
 
-  const transformedCommands = isSimpleNullHandlingEnabled()
-    ? toNativeBatchQueryCommands(commands)
-    : (commands as NativeBatchQueryCommand[])
-
   return queueOperationAsync(dbName, async () => {
     try {
-      return await HybridNitroSQLite.executeBatchAsync(
-        dbName,
-        transformedCommands,
-      )
+      return await HybridNitroSQLite.executeBatchAsync(dbName, commands)
     } catch (error) {
       throw NitroSQLiteError.fromError(error)
     }
   })
 }
-
-function toNativeBatchQueryCommands(
-  commands: BatchQueryCommand[],
-): NativeBatchQueryCommand[] {
-  return commands.map((command) => {
-    const transformedParams = command.params?.map((param) => {
-      if (Array.isArray(param)) {
-        return param.map((p) => replaceWithNativeNullValue(p))
-      }
-      return replaceWithNativeNullValue(param)
-    }) as NativeSQLiteQueryParams | NativeSQLiteQueryParams[]
-
-    return {
-      query: command.query,
-      params: transformedParams,
-    }
-  })
-}

package/src/operations/session.ts

@@ -4,10 +4,10 @@ import type {
   BatchQueryCommand,
   NitroSQLiteConnection,
   NitroSQLiteConnectionOptions,
-  QueryResult,
   Transaction,
   SQLiteQueryParams,
   QueryResultRow,
+  QueryResult,
 } from '../types'
 import { execute, executeAsync } from './execute'
 import { executeBatch, executeBatchAsync } from './executeBatch'

package/src/operations/transaction.ts

@@ -1,8 +1,8 @@
 import { queueOperationAsync, throwIfDatabaseIsNotOpen } from '../DatabaseQueue'
 import type {
-  QueryResult,
   Transaction,
   SQLiteQueryParams,
+  QueryResult,
   QueryResultRow,
 } from '../types'
 import { execute, executeAsync } from './execute'