chore: update logic creating rows object

Author: chrispader

package/cpp/specs/HybridNitroSQLiteQueryResult.cpp

@@ -20,10 +20,6 @@ SQLiteQueryResults HybridNitroSQLiteQueryResult::getResults() {
   return _results;
 };
 
-std::optional<NitroSQLiteQueryResultRows> HybridNitroSQLiteQueryResult::getRows() {
-  return _rows;
-}
-
 std::optional<SQLiteQueryTableMetadata> HybridNitroSQLiteQueryResult::getMetadata() {
   return _metadata;
 }

package/cpp/specs/HybridNitroSQLiteQueryResult.hpp

@@ -13,44 +13,19 @@ class HybridNitroSQLiteQueryResult : public HybridNitroSQLiteQueryResultSpec {
   HybridNitroSQLiteQueryResult() : HybridObject(TAG) {}
   HybridNitroSQLiteQueryResult(SQLiteQueryResults results, std::optional<double> insertId, double rowsAffected,
                                std::optional<SQLiteQueryTableMetadata> metadata)
-      : HybridObject(TAG), _insertId(insertId), _rowsAffected(rowsAffected), _results(std::move(results)), _metadata(metadata) {
-    if (_results.empty()) {
-      // Empty rows: empty vector, length 0, item callback always returns null
-      auto emptyItem = [](double /* idx */) -> std::shared_ptr<Promise<std::optional<SQLiteQueryResultRow>>> {
-        return Promise<std::optional<SQLiteQueryResultRow>>::async([]() -> std::optional<SQLiteQueryResultRow> { return std::nullopt; });
-      };
-      _rows = NitroSQLiteQueryResultRows(SQLiteQueryResults{}, 0.0, std::move(emptyItem));
-      return;
-    }
-
-    auto rows = _results;
-    auto itemFunction = [rows](double idx) -> std::shared_ptr<Promise<std::optional<SQLiteQueryResultRow>>> {
-      return Promise<std::optional<SQLiteQueryResultRow>>::async([rows, idx]() -> std::optional<SQLiteQueryResultRow> {
-        const auto index = static_cast<size_t>(idx);
-        if (index >= rows.size()) {
-          return std::nullopt;
-        }
-        return rows[index];
-      });
-    };
-
-    const auto length = static_cast<double>(rows.size());
-    _rows = NitroSQLiteQueryResultRows(std::move(rows), length, std::move(itemFunction));
-  }
+      : HybridObject(TAG), _insertId(insertId), _rowsAffected(rowsAffected), _results(std::move(results)), _metadata(metadata) {}
 
 private:
   std::optional<double> _insertId;
   double _rowsAffected;
   SQLiteQueryResults _results;
-  std::optional<NitroSQLiteQueryResultRows> _rows;
   std::optional<SQLiteQueryTableMetadata> _metadata;
 
 public:
   // Properties
   std::optional<double> getInsertId() override;
   double getRowsAffected() override;
   SQLiteQueryResults getResults() override;
-  std::optional<NitroSQLiteQueryResultRows> getRows() override;
   std::optional<SQLiteQueryTableMetadata> getMetadata() override;
 };
 

package/src/operations/execute.ts

@@ -1,15 +1,16 @@
 import { HybridNitroSQLite } from '../nitro'
 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> {
   try {
-    const result = HybridNitroSQLite.execute(dbName, query, params)
-    return result as QueryResult<Row>
+    const nativeResult = HybridNitroSQLite.execute(dbName, query, params)
+    return buildJSQueryResult<Row>(nativeResult)
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
   }
@@ -21,9 +22,35 @@ export async function executeAsync<Row extends QueryResultRow = never>(
   params?: SQLiteQueryParams,
 ): Promise<QueryResult<Row>> {
   try {
-    const result = await HybridNitroSQLite.executeAsync(dbName, query, params)
-    return result as QueryResult<Row>
+    const nativeResult = await HybridNitroSQLite.executeAsync(
+      dbName,
+      query,
+      params,
+    )
+    return buildJSQueryResult<Row>(nativeResult)
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
   }
 }
+
+function buildJSQueryResult<Row extends QueryResultRow = never>(
+  result: NitroSQLiteQueryResult,
+): QueryResult<Row> {
+  const resultWithRows = result as QueryResult<Row>
+
+  resultWithRows.rows = {
+    _array: result.results as Row[],
+    length: result.results.length,
+    item: (idx: number) => result.results[idx] as Row | undefined,
+  }
+
+  return resultWithRows
+
+  // return Object.assign(result, {
+  //   rows: {
+  //     _array: result.results,
+  //     length: result.results.length,
+  //     item: (idx: number) => result.results[idx],
+  //   },
+  // })
+}