@op-engineering/op-sqlite 7.3.0 → 8.0.0-beta0

package/src/index.ts

@@ -1,4 +1,3 @@
-// import NativeOPSQLite from './NativeOPSQLite';
 import { NativeModules } from 'react-native';
 
 declare global {
@@ -71,6 +70,10 @@ export type QueryResult = {
      */
     item: (idx: number) => any;
   };
+  // An array of intermediate results, just values without column names
+  rawRows?: any[];
+  columnNames?: string[];
+
   /**
    * Query metadata, available only for select query results
    */
@@ -119,13 +122,9 @@ export interface FileLoadResult extends BatchQueryResult {
 }
 
 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 {
@@ -143,7 +142,7 @@ export interface PendingTransaction {
 
 export type PreparedStatementObj = {
   bind: (params: any[]) => void;
-  execute: () => QueryResult;
+  execute: () => Promise<QueryResult>;
 };
 
 export type DB = {
@@ -157,10 +156,12 @@ export type DB = {
   ) => 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?:
@@ -176,7 +177,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;
@@ -260,14 +261,12 @@ function enhanceDB(db: DB, options: any): DB {
     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,
@@ -275,7 +274,10 @@ function enhanceDB(db: DB, options: any): DB {
       db.close();
       delete locks[options.url];
     },
-    execute: (query: string, params?: any[] | undefined): QueryResult => {
+    executeWithHostObjects: async (
+      query: string,
+      params?: any[] | undefined
+    ): Promise<QueryResult> => {
       const sanitizedParams = params?.map((p) => {
         if (ArrayBuffer.isView(p)) {
           return p.buffer;
@@ -284,11 +286,11 @@ function enhanceDB(db: DB, options: any): DB {
         return p;
       });
 
-      const result = db.execute(query, sanitizedParams);
+      const result = await db.executeWithHostObjects(query, sanitizedParams);
       enhanceQueryResult(result);
       return result;
     },
-    executeAsync: async (
+    execute: async (
       query: string,
       params?: any[] | undefined
     ): Promise<QueryResult> => {
@@ -300,9 +302,29 @@ function enhanceDB(db: DB, options: any): DB {
         return p;
       });
 
-      const result = await db.executeAsync(query, sanitizedParams);
-      enhanceQueryResult(result);
-      return result;
+      let intermediateResult = await db.execute(query, sanitizedParams);
+
+      let rows: any[] = [];
+      for (let i = 0; i < (intermediateResult.rawRows?.length ?? 0); i++) {
+        let row: any = {};
+        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: number) => rows[idx],
+        },
+      };
+      return res;
     },
     prepareStatement: (query: string) => {
       const stmt = db.prepareStatement(query);
@@ -319,8 +341,8 @@ function enhanceDB(db: DB, options: any): DB {
 
           stmt.bind(sanitizedParams);
         },
-        execute: () => {
-          const res = stmt.execute();
+        execute: async () => {
+          const res = await stmt.execute();
           enhanceQueryResult(res);
           return res;
         },
@@ -331,66 +353,78 @@ function enhanceDB(db: DB, options: any): DB {
     ): Promise<void> => {
       let isFinalized = false;
 
-      // Local transaction context object implementation
-      const execute = (query: string, params?: any[]): QueryResult => {
+      const execute = async (query: string, params?: any[] | undefined) => {
         if (isFinalized) {
           throw Error(
             `OP-Sqlite Error: Database: ${options.url}. Cannot execute query on finalized transaction`
           );
         }
-        return enhancedDb.execute(query, params);
-      };
-
-      const executeAsync = (query: string, params?: any[] | undefined) => {
-        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: any[] = [];
+        for (let i = 0; i < (intermediateResult.rawRows?.length ?? 0); i++) {
+          let row: any = {};
+          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: number) => rows[idx],
+          },
+        };
+        return res;
       };
 
-      const commit = () => {
+      const commit = async (): Promise<QueryResult> => {
         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 (): Promise<QueryResult> => {
         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;
             }
@@ -425,7 +459,7 @@ export const openSync = (options: {
   authToken: string;
   name: string;
   location?: string;
-  syncInterval: number;
+  syncInterval?: number;
 }): DB => {
   if (!isLibsql()) {
     throw new Error('This function is only available for libsql');

package/android/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>android_</name>
-	<comment>Project android_ created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +0,0 @@
-arguments=
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0))
-connection.project.dir=
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true

package/lib/typescript/src/NativeOPSQLite.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NativeOPSQLite.d.ts","sourceRoot":"","sources":["../../../src/NativeOPSQLite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,YAAY,EAAE,MAAM;QAClB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,gBAAgB,EAAE,MAAM,CAAC;QACzB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,2BAA2B,EAAE,MAAM,CAAC;KACrC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC;IAEnB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;CAC9D;;AAED,wBAAkE"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}