fix: further resolve dependency cycle

Author: chrispader

package/src/index.ts

@@ -1,7 +1,8 @@
-import { transaction } from './transaction'
+import { transaction } from './operations/transaction'
 import { HybridQuickSQLite } from './nitro'
-import * as Operations from './operations'
+import { open } from './operations/session'
 import QuickSQLiteOnLoad from './specs/NativeQuickSQLiteOnLoad'
+import { execute, executeAsync } from './operations/execute'
 
 export * from './types'
 export { typeORMDriver } from './typeORM'
@@ -16,10 +17,10 @@ export const QuickSQLite = {
   onInitialized,
   // Overwrite native functions with session-based JS implementations,
   // where the database name can be ommited once opened
-  open: Operations.open,
+  open,
   transaction,
-  execute: Operations.execute,
-  executeAsync: Operations.executeAsync,
+  execute,
+  executeAsync,
 }
 
-export { open } from './operations'
+export { open } from './operations/session'

package/src/nitro.ts

@@ -1,6 +1,6 @@
 import { NitroModules } from 'react-native-nitro-modules'
 import type { QuickSQLite as QuickSQLiteSpec } from './specs/QuickSQLite.nitro'
-import type { PendingTransaction } from './transaction'
+import type { PendingTransaction } from './operations/transaction'
 
 export const HybridQuickSQLite =
   NitroModules.createHybridObject<QuickSQLiteSpec>('QuickSQLite')

package/src/operations/execute.ts

@@ -0,0 +1,45 @@
+import { HybridQuickSQLite } from '../nitro'
+import type { NativeQueryResult } from '../specs/NativeQueryResult.nitro'
+import type { QueryResult, SQLiteItem, SQLiteQueryParams } from '../types'
+
+export function execute<Data extends SQLiteItem = never>(
+  dbName: string,
+  query: string,
+  params?: SQLiteQueryParams
+): QueryResult<Data> {
+  const nativeResult = HybridQuickSQLite.execute(dbName, query, params)
+  const result = buildJsQueryResult<Data>(nativeResult)
+  return result
+}
+
+export async function executeAsync<Data extends SQLiteItem = never>(
+  dbName: string,
+  query: string,
+  params?: SQLiteQueryParams
+): Promise<QueryResult<Data>> {
+  const nativeResult = await HybridQuickSQLite.executeAsync(
+    dbName,
+    query,
+    params
+  )
+  const result = buildJsQueryResult<Data>(nativeResult)
+  return result
+}
+
+function buildJsQueryResult<Data extends SQLiteItem = never>({
+  insertId,
+  rowsAffected,
+  results,
+}: NativeQueryResult): QueryResult<Data> {
+  const data = results as Data[]
+
+  return {
+    insertId,
+    rowsAffected,
+    rows: {
+      _array: data,
+      length: data.length,
+      item: (idx: number) => data[idx],
+    },
+  }
+}

package/src/operations.ts package/src/operations/session.tspackage/src/operations.ts renamed to package/src/operations/session.ts

@@ -1,5 +1,4 @@
-import { locks, HybridQuickSQLite } from './nitro'
-import type { NativeQueryResult } from './specs/NativeQueryResult.nitro'
+import { locks, HybridQuickSQLite } from '../nitro'
 import { transaction } from './transaction'
 import type {
   BatchQueryCommand,
@@ -9,7 +8,8 @@ import type {
   SQLiteItem,
   SQLiteQueryParams,
   Transaction,
-} from './types'
+} from '../types'
+import { execute, executeAsync } from './execute'
 
 export function open(
   options: QuickSQLiteConnectionOptions
@@ -56,45 +56,3 @@ export function close(dbName: string) {
   HybridQuickSQLite.close(dbName)
   delete locks[dbName]
 }
-
-export function execute<Data extends SQLiteItem = never>(
-  dbName: string,
-  query: string,
-  params?: SQLiteQueryParams
-): QueryResult<Data> {
-  const nativeResult = HybridQuickSQLite.execute(dbName, query, params)
-  const result = buildJsQueryResult<Data>(nativeResult)
-  return result
-}
-
-export async function executeAsync<Data extends SQLiteItem = never>(
-  dbName: string,
-  query: string,
-  params?: SQLiteQueryParams
-): Promise<QueryResult<Data>> {
-  const nativeResult = await HybridQuickSQLite.executeAsync(
-    dbName,
-    query,
-    params
-  )
-  const result = buildJsQueryResult<Data>(nativeResult)
-  return result
-}
-
-function buildJsQueryResult<Data extends SQLiteItem = never>({
-  insertId,
-  rowsAffected,
-  results,
-}: NativeQueryResult): QueryResult<Data> {
-  const data = results as Data[]
-
-  return {
-    insertId,
-    rowsAffected,
-    rows: {
-      _array: data,
-      length: data.length,
-      item: (idx: number) => data[idx],
-    },
-  }
-}

package/src/transaction.ts package/src/operations/transaction.tspackage/src/transaction.ts renamed to package/src/operations/transaction.ts

@@ -1,11 +1,11 @@
-import * as Operations from './operations'
-import { locks, HybridQuickSQLite } from './nitro'
+import { locks, HybridQuickSQLite } from '../nitro'
 import type {
   QueryResult,
   SQLiteItem,
   SQLiteQueryParams,
   Transaction,
-} from './types'
+} from '../types'
+import { execute, executeAsync } from './execute'
 
 export interface PendingTransaction {
   /*
@@ -39,7 +39,7 @@ export const transaction = async (
         `Quick SQLite Error: Cannot execute query on finalized transaction: ${dbName}`
       )
     }
-    return Operations.execute(dbName, query, params)
+    return execute(dbName, query, params)
   }
 
   const executeAsyncOnTransaction = <Data extends SQLiteItem = never>(
@@ -51,7 +51,7 @@ export const transaction = async (
         `Quick SQLite Error: Cannot execute query on finalized transaction: ${dbName}`
       )
     }
-    return Operations.executeAsync(dbName, query, params)
+    return executeAsync(dbName, query, params)
   }
 
   const commit = () => {

package/src/typeORM.ts

@@ -11,7 +11,7 @@ import type {
   SQLiteQueryParams,
   Transaction,
 } from './types'
-import * as Operations from './operations'
+import * as Operations from './operations/session'
 
 interface TypeOrmQuickSQLiteConnection {
   executeSql: <RowData extends SQLiteItem = never>(