react-native-nitro-sqlite 9.3.0 → 9.5.0

package/src/types.ts

@@ -1,8 +1,4 @@
-import type {
-  NitroSQLiteQueryColumnMetadata,
-  NitroSQLiteQueryResult,
-  NitroSQLiteQueryResultRows,
-} from './specs/NitroSQLiteQueryResult.nitro'
+import type { NitroSQLiteQueryResult } from './specs/NitroSQLiteQueryResult.nitro'
 
 export interface NitroSQLiteConnectionOptions {
   name: string
@@ -42,18 +38,25 @@ export type QueryResultRow = Record<string, SQLiteValue>
 
 export type QueryResult<Row extends QueryResultRow = QueryResultRow> =
   NitroSQLiteQueryResult & {
-    readonly rowsAffected: number
-    readonly insertId?: number
+    /** Query results in a row format for TypeORM compatibility */
+    rows: NitroSQLiteQueryResultRows<Row>
+  }
 
-    /** Query results */
-    readonly results: Row[]
+export type NitroSQLiteQueryResultRows<
+  Row extends Record<string, SQLiteValue> = Record<string, SQLiteValue>,
+> = {
+  /** Raw array with all dataset */
+  _array: Row[]
 
-    /** Query results in a row format for TypeORM compatibility */
-    readonly rows?: NitroSQLiteQueryResultRows<Row>
+  /** The lengh of the dataset */
+  length: number
 
-    /** Table metadata */
-    readonly metadata?: Record<string, NitroSQLiteQueryColumnMetadata>
-  }
+  /** 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 ExecuteQuery = <Row extends QueryResultRow = QueryResultRow>(
   query: string,

package/cpp/specs/HybridNitroSQLiteQueryResult.cpp

@@ -1,49 +0,0 @@
-#include "HybridNitroSQLiteQueryResult.hpp"
-#include <NitroModules/ArrayBuffer.hpp>
-#include <NitroModules/Null.hpp>
-#include <NitroModules/Promise.hpp>
-#include <unordered_map>
-#include <variant>
-#include <vector>
-
-namespace margelo::nitro::rnnitrosqlite {
-
-std::optional<double> HybridNitroSQLiteQueryResult::getInsertId() {
-  return _result.insertId;
-}
-
-double HybridNitroSQLiteQueryResult::getRowsAffected() {
-  return _result.rowsAffected;
-}
-
-SQLiteQueryResults HybridNitroSQLiteQueryResult::getResults() {
-  return _result.results;
-};
-
-std::optional<NitroSQLiteQueryResultRows> HybridNitroSQLiteQueryResult::getRows() {
-  if (_result.results.empty()) {
-    return std::nullopt;
-  }
-  
-  auto rows = _result.results;
-
-  // Create the item function that returns a Promise
-  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());
-  return NitroSQLiteQueryResultRows(std::move(rows), length, itemFunction);
-}
-
-std::optional<SQLiteQueryTableMetadata> HybridNitroSQLiteQueryResult::getMetadata() {
-  return _result.metadata;
-}
-
-} // namespace margelo::nitro::rnnitrosqlite

package/cpp/specs/HybridNitroSQLiteQueryResult.hpp

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "HybridNitroSQLiteQueryResultSpec.hpp"
-#include "types.hpp"
-#include <map>
-
-using namespace margelo::rnnitrosqlite;
-
-namespace margelo::nitro::rnnitrosqlite {
-
-class HybridNitroSQLiteQueryResult : public HybridNitroSQLiteQueryResultSpec {
-public:
-  HybridNitroSQLiteQueryResult() : HybridObject(TAG) {}
-  HybridNitroSQLiteQueryResult(SQLiteExecuteQueryResult&& result) : HybridObject(TAG), _result(std::move(result)) {}
-
-private:
-  SQLiteExecuteQueryResult _result;
-
-public:
-  // Properties
-  std::optional<double> getInsertId() override;
-  double getRowsAffected() override;
-  SQLiteQueryResults getResults() override;
-  std::optional<NitroSQLiteQueryResultRows> getRows() override;
-  std::optional<SQLiteQueryTableMetadata> getMetadata() override;
-};
-
-} // namespace margelo::nitro::rnnitrosqlite

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

@@ -1,99 +0,0 @@
-///
-/// 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