react-native-nitro-sqlite 9.2.2 → 9.3.0

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/nitrogen/generated/shared/c++/NitroSQLiteQueryResultRows.hpp

@@ -0,0 +1,99 @@
+///
+/// NitroSQLiteQueryResultRows.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
+
+
+
+#include <string>
+#include <NitroModules/Null.hpp>
+#include <NitroModules/ArrayBuffer.hpp>
+#include <variant>
+#include <unordered_map>
+#include <vector>
+#include <optional>
+#include <NitroModules/Promise.hpp>
+#include <functional>
+
+namespace margelo::nitro::rnnitrosqlite {
+
+  /**
+   * A struct which can be represented as a JavaScript object (NitroSQLiteQueryResultRows).
+   */
+  struct NitroSQLiteQueryResultRows final {
+  public:
+    std::vector<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>> _array     SWIFT_PRIVATE;
+    double length     SWIFT_PRIVATE;
+    std::function<std::shared_ptr<Promise<std::optional<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>>(double /* idx */)> item     SWIFT_PRIVATE;
+
+  public:
+    NitroSQLiteQueryResultRows() = default;
+    explicit NitroSQLiteQueryResultRows(std::vector<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>> _array, double length, std::function<std::shared_ptr<Promise<std::optional<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>>(double /* idx */)> item): _array(_array), length(length), item(item) {}
+
+  public:
+    // NitroSQLiteQueryResultRows is not equatable because these properties are not equatable: item
+  };
+
+} // namespace margelo::nitro::rnnitrosqlite
+
+namespace margelo::nitro {
+
+  // C++ NitroSQLiteQueryResultRows <> JS NitroSQLiteQueryResultRows (object)
+  template <>
+  struct JSIConverter<margelo::nitro::rnnitrosqlite::NitroSQLiteQueryResultRows> final {
+    static inline margelo::nitro::rnnitrosqlite::NitroSQLiteQueryResultRows fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::rnnitrosqlite::NitroSQLiteQueryResultRows(
+        JSIConverter<std::vector<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "_array"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "length"))),
+        JSIConverter<std::function<std::shared_ptr<Promise<std::optional<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>>(double)>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "item")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rnnitrosqlite::NitroSQLiteQueryResultRows& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "_array"), JSIConverter<std::vector<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>::toJSI(runtime, arg._array));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "length"), JSIConverter<double>::toJSI(runtime, arg.length));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "item"), JSIConverter<std::function<std::shared_ptr<Promise<std::optional<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>>(double)>>::toJSI(runtime, arg.item));
+      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::vector<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "_array")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "length")))) return false;
+      if (!JSIConverter<std::function<std::shared_ptr<Promise<std::optional<std::unordered_map<std::string, std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>>>>>(double)>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "item")))) 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.3.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

@@ -21,13 +21,10 @@ export const NitroSQLite = {
   executeBatchAsync,
 }
 
+/** NOOP on NitroSQLite versions >= 9.3.0 */
+export function enableSimpleNullHandling() {}
+
 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,13 +1,6 @@
-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 { NitroSQLiteQueryResult } from '../specs/NitroSQLiteQueryResult.nitro'
+import type { QueryResult, QueryResultRow, SQLiteQueryParams } from '../types'
 import NitroSQLiteError from '../NitroSQLiteError'
 
 export function execute<Row extends QueryResultRow = never>(
@@ -15,18 +8,9 @@ export function execute<Row extends QueryResultRow = never>(
   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 result = HybridNitroSQLite.execute(dbName, query, params)
+    return buildJsQueryResult<Row>(result)
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
   }
@@ -37,55 +21,27 @@ 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,
-    )
-    return buildJsQueryResult<Row>(nativeResult)
+    const result = await HybridNitroSQLite.executeAsync(dbName, query, params)
+    return buildJsQueryResult<Row>(result)
   } 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[]
-
-  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[]
-  }
+function buildJsQueryResult<Row extends QueryResultRow = never>(
+  result: NitroSQLiteQueryResult,
+): QueryResult<Row> {
+  const data = result.results as Row[]
 
   return {
-    insertId,
-    rowsAffected,
+    ...result,
+    insertId: result.insertId,
+    rowsAffected: result.rowsAffected,
     rows: {
       _array: data,
       length: data.length,
       item: (idx: number) => data[idx],
     },
-  }
+  } as QueryResult<Row>
 }

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'

package/src/specs/NitroSQLite.nitro.ts

@@ -1,11 +1,11 @@
 import type { HybridObject } from 'react-native-nitro-modules'
 import type {
+  BatchQueryCommand,
   BatchQueryResult,
   FileLoadResult,
-  NativeSQLiteQueryParams,
-  NativeBatchQueryCommand,
+  SQLiteQueryParams,
 } from '../types'
-import type { NativeQueryResult } from './NativeQueryResult.nitro'
+import type { NitroSQLiteQueryResult } from './NitroSQLiteQueryResult.nitro'
 
 export interface NitroSQLite
   extends HybridObject<{ ios: 'c++'; android: 'c++' }> {
@@ -22,20 +22,17 @@ export interface NitroSQLite
   execute(
     dbName: string,
     query: string,
-    params?: NativeSQLiteQueryParams,
-  ): NativeQueryResult
+    params?: SQLiteQueryParams,
+  ): NitroSQLiteQueryResult
   executeAsync(
     dbName: string,
     query: string,
-    params?: NativeSQLiteQueryParams,
-  ): Promise<NativeQueryResult>
-  executeBatch(
-    dbName: string,
-    commands: NativeBatchQueryCommand[],
-  ): BatchQueryResult
+    params?: SQLiteQueryParams,
+  ): Promise<NitroSQLiteQueryResult>
+  executeBatch(dbName: string, commands: BatchQueryCommand[]): BatchQueryResult
   executeBatchAsync(
     dbName: string,
-    commands: NativeBatchQueryCommand[],
+    commands: BatchQueryCommand[],
   ): Promise<BatchQueryResult>
   loadFile(dbName: string, location: string): FileLoadResult
   loadFileAsync(dbName: string, location: string): Promise<FileLoadResult>

package/src/specs/{NativeQueryResult.nitro.ts → NitroSQLiteQueryResult.nitro.ts}

@@ -9,36 +9,51 @@ import type { ColumnType, SQLiteValue } from '../types'
  *  rows: if status is undefined or 0 this object will contain the query results
  * }
  *
- * @interface NativeQueryResult
+ * @interface QueryResult
  */
-export interface NativeQueryResult
+export interface NitroSQLiteQueryResult
   extends HybridObject<{ ios: 'c++'; android: 'c++' }> {
   readonly rowsAffected: number
   readonly insertId?: number
 
   /** Query results */
-  readonly results: NativeSQLiteQueryResults
+  readonly results: Record<string, SQLiteValue>[]
+
+  /** Query results in a row format for TypeORM compatibility */
+  readonly rows?: NitroSQLiteQueryResultRows
+
   /** Table metadata */
-  readonly metadata?: Record<string, SQLiteQueryColumnMetadata>
+  readonly metadata?: Record<string, NitroSQLiteQueryColumnMetadata>
 }
 
-/**
- * Table metadata
- * Describes some information about the table and it's columns fetched by the query
- * The index is the name of the column
- */
-// TODO: Investigate why this doesn't work with nitrogen
-// export type SQLiteQueryResultRow = Record<string, SQLiteValue>
-// export type SQLiteQueryResults = SQLiteQueryResultRow[]
-export type NativeSQLiteQueryResults = Record<string, SQLiteValue>[]
-
-// TODO: Investigate why this doesn't work with nitrogen
-// export type SQLiteQueryTableMetadata = Record<string, SQLiteQueryColumnMetadata>
-export interface SQLiteQueryColumnMetadata {
+// TODO: Investigate why this cannot be represented in Nitro
+// export type NitroQueryResultRow = {
+//   [key: string]: SQLiteValue
+// }
+
+// type NitroQueryResultRow = Record<string, SQLiteValue>
+
+export type NitroSQLiteQueryResultRows<
+  Row extends Record<string, SQLiteValue> = Record<string, SQLiteValue>,
+> = {
+  /** Raw array with all dataset */
+  _array: Row[]
+  /** The lengh of the dataset */
+  length: number
+  /** A convenience function to acess the index based the row object
+   * @param idx the row index
+   * @returns the row structure identified by column names
+   */
+  item: (idx: number) => Row | undefined
+}
+
+export type NitroSQLiteQueryColumnMetadata = {
   /** The name used for this column for this result set */
   name: string
+
   /** The declared column type for this column, when fetched directly from a table or a View resulting from a table column. "UNKNOWN" for dynamic values, like function returned ones. */
   type: ColumnType
+
   /** The index for this column for this result set */
   index: number
 }

package/src/typeORM.ts

@@ -6,10 +6,10 @@
 //     |_|     |_|  |_|    |______\____/|_|  \_\_|  |_| /_/    \_\_|   |_____|
 
 import type {
-  QueryResult,
   Transaction,
   SQLiteQueryParams,
   QueryResultRow,
+  QueryResult,
 } from './types'
 import * as Operations from './operations/session'