@op-engineering/op-sqlite 7.4.3 → 8.0.1

package/cpp/macros.h

@@ -1,11 +1,11 @@
 #ifndef macros_h
 #define macros_h
 
-#define HOSTFN(name, basecount)                                                \
+#define HOSTFN(name)                                                           \
 jsi::Function::createFromHostFunction( \
 rt, \
 jsi::PropNameID::forAscii(rt, name), \
-basecount, \
+0, \
 [=](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) -> jsi::Value
 
 #endif /* macros_h */

package/cpp/types.h

@@ -4,6 +4,15 @@
 #include <memory>
 #include <string>
 #include <variant>
+#include <vector>
+
+struct ArrayBuffer {
+  std::shared_ptr<uint8_t> data;
+  size_t size;
+};
+
+using JSVariant = std::variant<nullptr_t, bool, int, double, long, long long,
+                               std::string, ArrayBuffer>;
 
 enum ResultType { SQLiteOk, SQLiteError };
 
@@ -12,6 +21,8 @@ struct BridgeResult {
   std::string message;
   int affectedRows;
   double insertId;
+  std::vector<std::vector<JSVariant>> rows;
+  std::vector<std::string> column_names;
 };
 
 struct BatchResult {
@@ -21,14 +32,6 @@ struct BatchResult {
   int commands;
 };
 
-struct ArrayBuffer {
-  std::shared_ptr<uint8_t> data;
-  size_t size;
-};
-
-using JSVariant = std::variant<nullptr_t, bool, int, double, long, long long,
-                               std::string, ArrayBuffer>;
-
 struct BatchArguments {
   std::string sql;
   std::shared_ptr<std::vector<JSVariant>> params;

package/cpp/utils.cpp

@@ -158,6 +158,44 @@ std::vector<JSVariant> to_variant_vec(jsi::Runtime &rt, jsi::Value const &xs) {
   return res;
 }
 
+jsi::Value create_js_rows(jsi::Runtime &rt, BridgeResult status) {
+  if (status.type == SQLiteError) {
+    throw std::invalid_argument(status.message);
+  }
+
+  jsi::Object res = jsi::Object(rt);
+
+  res.setProperty(rt, "rowsAffected", status.affectedRows);
+  if (status.affectedRows > 0 && status.insertId != 0) {
+    res.setProperty(rt, "insertId", jsi::Value(status.insertId));
+  }
+
+  size_t row_count = status.rows.size();
+  auto rows = jsi::Array(rt, row_count);
+
+  if (row_count > 0) {
+    for (int i = 0; i < row_count; i++) {
+      auto row = jsi::Array(rt, status.column_names.size());
+      std::vector<JSVariant> native_row = status.rows[i];
+      for (int j = 0; j < native_row.size(); j++) {
+        auto value = toJSI(rt, native_row[j]);
+        row.setValueAtIndex(rt, j, value);
+      }
+      rows.setValueAtIndex(rt, i, std::move(row));
+    }
+  }
+  res.setProperty(rt, "rawRows", std::move(rows));
+
+  size_t column_count = status.column_names.size();
+  auto column_array = jsi::Array(rt, column_count);
+  for (int i = 0; i < column_count; i++) {
+    auto column = status.column_names.at(i);
+    column_array.setValueAtIndex(rt, i, toJSI(rt, column));
+  }
+  res.setProperty(rt, "columnNames", std::move(column_array));
+  return res;
+}
+
 jsi::Value
 createResult(jsi::Runtime &rt, BridgeResult status,
              std::vector<DumbHostObject> *results,
@@ -266,14 +304,12 @@ BatchResult importSQLFile(std::string dbName, std::string fileLocation) {
     try {
       int affectedRows = 0;
       int commands = 0;
-      opsqlite_execute(dbName, "BEGIN EXCLUSIVE TRANSACTION", nullptr, nullptr,
-                       nullptr);
+      opsqlite_execute(dbName, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
       while (std::getline(sqFile, line, '\n')) {
         if (!line.empty()) {
-          BridgeResult result =
-              opsqlite_execute(dbName, line, nullptr, nullptr, nullptr);
+          BridgeResult result = opsqlite_execute(dbName, line, nullptr);
           if (result.type == SQLiteError) {
-            opsqlite_execute(dbName, "ROLLBACK", nullptr, nullptr, nullptr);
+            opsqlite_execute(dbName, "ROLLBACK", nullptr);
             sqFile.close();
             return {SQLiteError, result.message, 0, commands};
           } else {
@@ -283,11 +319,11 @@ BatchResult importSQLFile(std::string dbName, std::string fileLocation) {
         }
       }
       sqFile.close();
-      opsqlite_execute(dbName, "COMMIT", nullptr, nullptr, nullptr);
+      opsqlite_execute(dbName, "COMMIT", nullptr);
       return {SQLiteOk, "", affectedRows, commands};
     } catch (...) {
       sqFile.close();
-      opsqlite_execute(dbName, "ROLLBACK", nullptr, nullptr, nullptr);
+      opsqlite_execute(dbName, "ROLLBACK", nullptr);
       return {SQLiteError,
               "[op-sqlite][loadSQLFile] Unexpected error, transaction was "
               "rolledback",

package/cpp/utils.h

@@ -23,9 +23,11 @@ std::vector<int> to_int_vec(jsi::Runtime &rt, jsi::Value const &xs);
 jsi::Value createResult(jsi::Runtime &rt, BridgeResult status,
                         std::vector<DumbHostObject> *results,
                         std::shared_ptr<std::vector<SmartHostObject>> metadata);
+jsi::Value create_js_rows(jsi::Runtime &rt, BridgeResult status);
 jsi::Value
 create_raw_result(jsi::Runtime &rt, BridgeResult status,
                   const std::vector<std::vector<JSVariant>> *results);
+
 void to_batch_arguments(jsi::Runtime &rt, jsi::Array const &batchParams,
                         std::vector<BatchArguments> *commands);
 

package/lib/commonjs/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.openSync = exports.openRemote = exports.open = exports.moveAssetsDatabase = exports.isSQLCipher = exports.isLibsql = exports.OPSQLite = exports.IOS_LIBRARY_PATH = exports.IOS_DOCUMENT_PATH = exports.ANDROID_FILES_PATH = exports.ANDROID_EXTERNAL_FILES_PATH = exports.ANDROID_DATABASE_PATH = void 0;
 var _reactNative = require("react-native");
-// import NativeOPSQLite from './NativeOPSQLite';
-
 if (global.__OPSQLiteProxy == null) {
   if (_reactNative.NativeModules.OPSQLite == null) {
     throw new Error('Base module not found. Maybe try rebuilding the app.');
@@ -119,13 +117,12 @@ function enhanceDB(db, options) {
     attach: db.attach,
     detach: db.detach,
     executeBatch: db.executeBatch,
-    executeBatchAsync: db.executeBatchAsync,
     loadFile: db.loadFile,
     updateHook: db.updateHook,
     commitHook: db.commitHook,
     rollbackHook: db.rollbackHook,
     loadExtension: db.loadExtension,
-    executeRawAsync: db.executeRawAsync,
+    executeRaw: db.executeRaw,
     getDbPath: db.getDbPath,
     reactiveExecute: db.reactiveExecute,
     sync: db.sync,
@@ -133,27 +130,44 @@ function enhanceDB(db, options) {
       db.close();
       delete locks[options.url];
     },
-    execute: (query, params) => {
+    executeWithHostObjects: async (query, params) => {
       const sanitizedParams = params?.map(p => {
         if (ArrayBuffer.isView(p)) {
           return p.buffer;
         }
         return p;
       });
-      const result = db.execute(query, sanitizedParams);
+      const result = await db.executeWithHostObjects(query, sanitizedParams);
       enhanceQueryResult(result);
       return result;
     },
-    executeAsync: async (query, params) => {
+    execute: async (query, params) => {
       const sanitizedParams = params?.map(p => {
         if (ArrayBuffer.isView(p)) {
           return p.buffer;
         }
         return p;
       });
-      const result = await db.executeAsync(query, sanitizedParams);
-      enhanceQueryResult(result);
-      return result;
+      let intermediateResult = await db.execute(query, sanitizedParams);
+      let rows = [];
+      for (let i = 0; i < (intermediateResult.rawRows?.length ?? 0); i++) {
+        let row = {};
+        for (let j = 0; j < intermediateResult.columnNames.length ?? 0; j++) {
+          let columnName = intermediateResult.columnNames[j];
+          let value = intermediateResult.rawRows[i][j];
+          row[columnName] = value;
+        }
+        rows.push(row);
+      }
+      let res = {
+        ...intermediateResult,
+        rows: {
+          _array: rows,
+          length: rows.length,
+          item: idx => rows[idx]
+        }
+      };
+      return res;
     },
     prepareStatement: query => {
       const stmt = db.prepareStatement(query);
@@ -167,8 +181,8 @@ function enhanceDB(db, options) {
           });
           stmt.bind(sanitizedParams);
         },
-        execute: () => {
-          const res = stmt.execute();
+        execute: async () => {
+          const res = await stmt.execute();
           enhanceQueryResult(res);
           return res;
         }
@@ -176,53 +190,62 @@ function enhanceDB(db, options) {
     },
     transaction: async fn => {
       let isFinalized = false;
-
-      // Local transaction context object implementation
-      const execute = (query, params) => {
+      const execute = async (query, params) => {
         if (isFinalized) {
           throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
         }
-        return enhancedDb.execute(query, params);
-      };
-      const executeAsync = (query, params) => {
-        if (isFinalized) {
-          throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
+        let intermediateResult = await enhancedDb.execute(query, params);
+        let rows = [];
+        for (let i = 0; i < (intermediateResult.rawRows?.length ?? 0); i++) {
+          let row = {};
+          for (let j = 0; j < intermediateResult.columnNames.length ?? 0; j++) {
+            let columnName = intermediateResult.columnNames[j];
+            row[columnName] = intermediateResult.rawRows[i][j];
+          }
+          rows.push(row);
         }
-        return enhancedDb.executeAsync(query, params);
+        let res = {
+          ...intermediateResult,
+          rows: {
+            _array: rows,
+            length: 0,
+            item: idx => rows[idx]
+          }
+        };
+        return res;
       };
-      const commit = () => {
+      const commit = async () => {
         if (isFinalized) {
           throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
         }
-        const result = enhancedDb.execute('COMMIT;');
+        const result = await enhancedDb.execute('COMMIT;');
         isFinalized = true;
         return result;
       };
-      const rollback = () => {
+      const rollback = async () => {
         if (isFinalized) {
           throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
         }
-        const result = enhancedDb.execute('ROLLBACK;');
+        const result = await enhancedDb.execute('ROLLBACK;');
         isFinalized = true;
         return result;
       };
       async function run() {
         try {
-          await enhancedDb.executeAsync('BEGIN TRANSACTION;');
+          await enhancedDb.execute('BEGIN TRANSACTION;');
           await fn({
             commit,
             execute,
-            executeAsync,
             rollback
           });
           if (!isFinalized) {
-            commit();
+            await commit();
           }
         } catch (executionError) {
-          console.warn('transaction error', executionError);
+          // console.warn('transaction error', executionError);
           if (!isFinalized) {
             try {
-              rollback();
+              await rollback();
             } catch (rollbackError) {
               throw rollbackError;
             }

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","global","__OPSQLiteProxy","NativeModules","OPSQLite","Error","install","result","proxy","exports","IOS_DOCUMENT_PATH","IOS_LIBRARY_PATH","ANDROID_DATABASE_PATH","ANDROID_FILES_PATH","ANDROID_EXTERNAL_FILES_PATH","getConstants","locks","enhanceQueryResult","rows","_array","length","item","idx","res","enhanceDB","db","options","lock","queue","inProgress","startNextTransaction","tx","shift","setImmediate","start","enhancedDb","delete","attach","detach","executeBatch","executeBatchAsync","loadFile","updateHook","commitHook","rollbackHook","loadExtension","executeRawAsync","getDbPath","reactiveExecute","sync","close","url","execute","query","params","sanitizedParams","map","p","ArrayBuffer","isView","buffer","executeAsync","prepareStatement","stmt","bind","transaction","fn","isFinalized","commit","rollback","run","executionError","console","warn","rollbackError","Promise","resolve","reject","then","catch","push","openSync","isLibsql","openRemote","open","moveAssetsDatabase","args","isSQLCipher"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","global","__OPSQLiteProxy","NativeModules","OPSQLite","Error","install","result","proxy","exports","IOS_DOCUMENT_PATH","IOS_LIBRARY_PATH","ANDROID_DATABASE_PATH","ANDROID_FILES_PATH","ANDROID_EXTERNAL_FILES_PATH","getConstants","locks","enhanceQueryResult","rows","_array","length","item","idx","res","enhanceDB","db","options","lock","queue","inProgress","startNextTransaction","tx","shift","setImmediate","start","enhancedDb","delete","attach","detach","executeBatch","loadFile","updateHook","commitHook","rollbackHook","loadExtension","executeRaw","getDbPath","reactiveExecute","sync","close","url","executeWithHostObjects","query","params","sanitizedParams","map","p","ArrayBuffer","isView","buffer","execute","intermediateResult","i","rawRows","row","j","columnNames","columnName","value","push","prepareStatement","stmt","bind","transaction","fn","isFinalized","commit","rollback","run","executionError","rollbackError","Promise","resolve","reject","then","catch","openSync","isLibsql","openRemote","open","moveAssetsDatabase","args","isSQLCipher"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/index.js

@@ -1,4 +1,3 @@
-// import NativeOPSQLite from './NativeOPSQLite';
 import { NativeModules } from 'react-native';
 if (global.__OPSQLiteProxy == null) {
   if (NativeModules.OPSQLite == null) {
@@ -108,13 +107,12 @@ function enhanceDB(db, options) {
     attach: db.attach,
     detach: db.detach,
     executeBatch: db.executeBatch,
-    executeBatchAsync: db.executeBatchAsync,
     loadFile: db.loadFile,
     updateHook: db.updateHook,
     commitHook: db.commitHook,
     rollbackHook: db.rollbackHook,
     loadExtension: db.loadExtension,
-    executeRawAsync: db.executeRawAsync,
+    executeRaw: db.executeRaw,
     getDbPath: db.getDbPath,
     reactiveExecute: db.reactiveExecute,
     sync: db.sync,
@@ -122,27 +120,44 @@ function enhanceDB(db, options) {
       db.close();
       delete locks[options.url];
     },
-    execute: (query, params) => {
+    executeWithHostObjects: async (query, params) => {
       const sanitizedParams = params?.map(p => {
         if (ArrayBuffer.isView(p)) {
           return p.buffer;
         }
         return p;
       });
-      const result = db.execute(query, sanitizedParams);
+      const result = await db.executeWithHostObjects(query, sanitizedParams);
       enhanceQueryResult(result);
       return result;
     },
-    executeAsync: async (query, params) => {
+    execute: async (query, params) => {
       const sanitizedParams = params?.map(p => {
         if (ArrayBuffer.isView(p)) {
           return p.buffer;
         }
         return p;
       });
-      const result = await db.executeAsync(query, sanitizedParams);
-      enhanceQueryResult(result);
-      return result;
+      let intermediateResult = await db.execute(query, sanitizedParams);
+      let rows = [];
+      for (let i = 0; i < (intermediateResult.rawRows?.length ?? 0); i++) {
+        let row = {};
+        for (let j = 0; j < intermediateResult.columnNames.length ?? 0; j++) {
+          let columnName = intermediateResult.columnNames[j];
+          let value = intermediateResult.rawRows[i][j];
+          row[columnName] = value;
+        }
+        rows.push(row);
+      }
+      let res = {
+        ...intermediateResult,
+        rows: {
+          _array: rows,
+          length: rows.length,
+          item: idx => rows[idx]
+        }
+      };
+      return res;
     },
     prepareStatement: query => {
       const stmt = db.prepareStatement(query);
@@ -156,8 +171,8 @@ function enhanceDB(db, options) {
           });
           stmt.bind(sanitizedParams);
         },
-        execute: () => {
-          const res = stmt.execute();
+        execute: async () => {
+          const res = await stmt.execute();
           enhanceQueryResult(res);
           return res;
         }
@@ -165,53 +180,62 @@ function enhanceDB(db, options) {
     },
     transaction: async fn => {
       let isFinalized = false;
-
-      // Local transaction context object implementation
-      const execute = (query, params) => {
+      const execute = async (query, params) => {
         if (isFinalized) {
           throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
         }
-        return enhancedDb.execute(query, params);
-      };
-      const executeAsync = (query, params) => {
-        if (isFinalized) {
-          throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
+        let intermediateResult = await enhancedDb.execute(query, params);
+        let rows = [];
+        for (let i = 0; i < (intermediateResult.rawRows?.length ?? 0); i++) {
+          let row = {};
+          for (let j = 0; j < intermediateResult.columnNames.length ?? 0; j++) {
+            let columnName = intermediateResult.columnNames[j];
+            row[columnName] = intermediateResult.rawRows[i][j];
+          }
+          rows.push(row);
         }
-        return enhancedDb.executeAsync(query, params);
+        let res = {
+          ...intermediateResult,
+          rows: {
+            _array: rows,
+            length: 0,
+            item: idx => rows[idx]
+          }
+        };
+        return res;
       };
-      const commit = () => {
+      const commit = async () => {
         if (isFinalized) {
           throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
         }
-        const result = enhancedDb.execute('COMMIT;');
+        const result = await enhancedDb.execute('COMMIT;');
         isFinalized = true;
         return result;
       };
-      const rollback = () => {
+      const rollback = async () => {
         if (isFinalized) {
           throw Error(`OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`);
         }
-        const result = enhancedDb.execute('ROLLBACK;');
+        const result = await enhancedDb.execute('ROLLBACK;');
         isFinalized = true;
         return result;
       };
       async function run() {
         try {
-          await enhancedDb.executeAsync('BEGIN TRANSACTION;');
+          await enhancedDb.execute('BEGIN TRANSACTION;');
           await fn({
             commit,
             execute,
-            executeAsync,
             rollback
           });
           if (!isFinalized) {
-            commit();
+            await commit();
           }
         } catch (executionError) {
-          console.warn('transaction error', executionError);
+          // console.warn('transaction error', executionError);
           if (!isFinalized) {
             try {
-              rollback();
+              await rollback();
             } catch (rollbackError) {
               throw rollbackError;
             }

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","global","__OPSQLiteProxy","OPSQLite","Error","install","result","proxy","IOS_DOCUMENT_PATH","IOS_LIBRARY_PATH","ANDROID_DATABASE_PATH","ANDROID_FILES_PATH","ANDROID_EXTERNAL_FILES_PATH","getConstants","locks","enhanceQueryResult","rows","_array","length","item","idx","res","enhanceDB","db","options","lock","queue","inProgress","startNextTransaction","tx","shift","setImmediate","start","enhancedDb","delete","attach","detach","executeBatch","executeBatchAsync","loadFile","updateHook","commitHook","rollbackHook","loadExtension","executeRawAsync","getDbPath","reactiveExecute","sync","close","url","execute","query","params","sanitizedParams","map","p","ArrayBuffer","isView","buffer","executeAsync","prepareStatement","stmt","bind","transaction","fn","isFinalized","commit","rollback","run","executionError","console","warn","rollbackError","Promise","resolve","reject","then","catch","push","openSync","isLibsql","openRemote","open","moveAssetsDatabase","args","isSQLCipher"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["NativeModules","global","__OPSQLiteProxy","OPSQLite","Error","install","result","proxy","IOS_DOCUMENT_PATH","IOS_LIBRARY_PATH","ANDROID_DATABASE_PATH","ANDROID_FILES_PATH","ANDROID_EXTERNAL_FILES_PATH","getConstants","locks","enhanceQueryResult","rows","_array","length","item","idx","res","enhanceDB","db","options","lock","queue","inProgress","startNextTransaction","tx","shift","setImmediate","start","enhancedDb","delete","attach","detach","executeBatch","loadFile","updateHook","commitHook","rollbackHook","loadExtension","executeRaw","getDbPath","reactiveExecute","sync","close","url","executeWithHostObjects","query","params","sanitizedParams","map","p","ArrayBuffer","isView","buffer","execute","intermediateResult","i","rawRows","row","j","columnNames","columnName","value","push","prepareStatement","stmt","bind","transaction","fn","isFinalized","commit","rollback","run","executionError","rollbackError","Promise","resolve","reject","then","catch","openSync","isLibsql","openRemote","open","moveAssetsDatabase","args","isSQLCipher"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/index.d.ts

@@ -29,6 +29,8 @@ export type QueryResult = {
          */
         item: (idx: number) => any;
     };
+    rawRows?: any[];
+    columnNames?: string[];
     /**
      * Query metadata, available only for select query results
      */
@@ -71,17 +73,16 @@ export interface FileLoadResult extends BatchQueryResult {
     commands?: number;
 }
 export interface Transaction {
-    commit: () => QueryResult;
-    execute: (query: string, params?: any[]) => QueryResult;
-    executeAsync: (query: string, params?: any[] | undefined) => Promise<QueryResult>;
-    rollback: () => QueryResult;
+    commit: () => Promise<QueryResult>;
+    execute: (query: string, params?: any[]) => Promise<QueryResult>;
+    rollback: () => Promise<QueryResult>;
 }
 export interface PendingTransaction {
     start: () => void;
 }
 export type PreparedStatementObj = {
     bind: (params: any[]) => void;
-    execute: () => QueryResult;
+    execute: () => Promise<QueryResult>;
 };
 export type DB = {
     close: () => void;
@@ -89,10 +90,9 @@ export type DB = {
     attach: (mainDbName: string, dbNameToAttach: string, alias: string, location?: string) => void;
     detach: (mainDbName: string, alias: string) => void;
     transaction: (fn: (tx: Transaction) => Promise<void>) => Promise<void>;
-    execute: (query: string, params?: any[]) => QueryResult;
-    executeAsync: (query: string, params?: any[]) => Promise<QueryResult>;
-    executeBatch: (commands: SQLBatchTuple[]) => BatchQueryResult;
-    executeBatchAsync: (commands: SQLBatchTuple[]) => Promise<BatchQueryResult>;
+    execute: (query: string, params?: any[]) => Promise<QueryResult>;
+    executeWithHostObjects: (query: string, params?: any[]) => Promise<QueryResult>;
+    executeBatch: (commands: SQLBatchTuple[]) => Promise<BatchQueryResult>;
     loadFile: (location: string) => Promise<FileLoadResult>;
     updateHook: (callback?: ((params: {
         table: string;
@@ -104,7 +104,7 @@ export type DB = {
     rollbackHook: (callback?: (() => void) | null) => void;
     prepareStatement: (query: string) => PreparedStatementObj;
     loadExtension: (path: string, entryPoint?: string) => void;
-    executeRawAsync: (query: string, params?: any[]) => Promise<any[]>;
+    executeRaw: (query: string, params?: any[]) => Promise<any[]>;
     getDbPath: (location?: string) => string;
     reactiveExecute: (params: {
         query: string;
@@ -141,7 +141,7 @@ export declare const openSync: (options: {
     authToken: string;
     name: string;
     location?: string;
-    syncInterval: number;
+    syncInterval?: number;
 }) => DB;
 export declare const openRemote: (options: {
     url: string;