react-native-nitro-sqlite 9.1.11 → 9.2.1

package/lib/typescript/module/types.d.ts.map

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

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "react-native-nitro-sqlite",
-  "version": "9.1.11",
+  "version": "9.2.1",
   "description": "Fast SQLite library for React Native built using Nitro Modules",
-  "source": "./src/index.ts",
-  "main": "./lib/commonjs/index",
+  "main": "./lib/module/index",
   "module": "./lib/module/index",
-  "types": "./lib/typescript/commonjs/index.d.ts",
+  "types": "./lib/typescript/module/index.d.ts",
+  "source": "./src/index",
+  "react-native": "./src/index",
   "exports": {
     ".": {
       "import": {
@@ -36,14 +37,13 @@
     "!**/__mocks__"
   ],
   "scripts": {
-    "postinstall": "bun build || exit 0;",
-    "build": "bun typescript && bob build",
-    "specs": "bun typescript && bun nitro-codegen --logLevel=\"debug\"",
-    "typescript": "tsc --noEmit",
+    "build": "bun typecheck && bob build",
+    "specs": "bun typecheck && bun nitro-codegen --logLevel=\"debug\"",
+    "typecheck": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
-    "lint-ci": "eslint \"**/*.{js,ts,tsx}\" -f @jamesacarr/github-actions",
     "test": "jest",
-    "release": "release-it"
+    "release": "release-it",
+    "prepublishOnly": "bun run build"
   },
   "keywords": [
     "react-native",
@@ -66,13 +66,13 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "typeorm": "^0.3.20"
+    "typeorm": "0.3.20"
   },
   "devDependencies": {
-    "jest": "^29.7.0",
+    "jest": "^30.2.0",
     "nitro-codegen": "0.27.2",
-    "react": "19.0.0",
-    "react-native": "0.78.0",
+    "react": "19.1.1",
+    "react-native": "0.82.1",
     "react-native-builder-bob": "^0.31.0",
     "react-native-nitro-modules": "0.27.2"
   },
@@ -100,7 +100,7 @@
       "release": false
     },
     "hooks": {
-      "before:init": "bun typescript && bun lint",
+      "before:init": "bun typecheck && bun lint",
       "after:bump": "bun run build"
     }
   },

package/src/DatabaseQueue.ts

@@ -0,0 +1,129 @@
+import NitroSQLiteError from './NitroSQLiteError'
+
+export interface QueuedOperation {
+  /**
+   * Starts the operation
+   */
+  start: () => void
+}
+
+export type DatabaseQueue = {
+  queue: QueuedOperation[]
+  inProgress: boolean
+}
+
+const databaseQueues = new Map<string, DatabaseQueue>()
+
+export function openDatabaseQueue(dbName: string) {
+  if (isDatabaseOpen(dbName)) {
+    throw new NitroSQLiteError(
+      `Database ${dbName} is already open. There is already a connection to the database.`,
+    )
+  }
+
+  databaseQueues.set(dbName, { queue: [], inProgress: false })
+}
+
+export function closeDatabaseQueue(dbName: string) {
+  const databaseQueue = getDatabaseQueue(dbName)
+
+  if (databaseQueue.inProgress || databaseQueue.queue.length > 0) {
+    console.warn(
+      `Database queue for ${dbName} has operations in the queue. Closing anyway.`,
+    )
+  }
+
+  databaseQueues.delete(dbName)
+}
+
+export function isDatabaseOpen(dbName: string) {
+  return databaseQueues.has(dbName)
+}
+
+export function throwIfDatabaseIsNotOpen(dbName: string) {
+  if (!isDatabaseOpen(dbName))
+    throw new NitroSQLiteError(
+      `Database ${dbName} is not open. There is no connection to the database.`,
+    )
+}
+
+export function getDatabaseQueue(dbName: string) {
+  throwIfDatabaseIsNotOpen(dbName)
+
+  const queue = databaseQueues.get(dbName)!
+  return queue
+}
+
+export function openDatabase(dbName: string) {
+  databaseQueues.set(dbName, { queue: [], inProgress: false })
+}
+
+export function closeDatabase(dbName: string) {
+  databaseQueues.delete(dbName)
+}
+
+export function queueOperationAsync<Result>(
+  dbName: string,
+  callback: () => Promise<Result>,
+) {
+  const databaseQueue = getDatabaseQueue(dbName)
+
+  return new Promise<Result>((resolve, reject) => {
+    async function start() {
+      try {
+        const result = await callback()
+        resolve(result)
+      } catch (error) {
+        reject(error)
+      } finally {
+        databaseQueue.inProgress = false
+        startOperationAsync(dbName)
+      }
+    }
+
+    const operation: QueuedOperation = {
+      start,
+    }
+
+    databaseQueue.queue.push(operation)
+    startOperationAsync(dbName)
+  })
+}
+
+function startOperationAsync(dbName: string) {
+  const queue = getDatabaseQueue(dbName)
+
+  // Queue is empty or in progress. Bail out.
+  if (queue.inProgress || queue.queue.length === 0) {
+    return
+  }
+
+  queue.inProgress = true
+
+  const operation = queue.queue.shift()!
+  setImmediate(() => {
+    operation.start()
+  })
+}
+
+export function startOperationSync<
+  OperationCallback extends () => Result,
+  Result = void,
+>(dbName: string, callback: OperationCallback) {
+  const databaseQueue = getDatabaseQueue(dbName)
+
+  // Database is busy - cannot execute synchronously
+  if (databaseQueue.inProgress || databaseQueue.queue.length > 0) {
+    throw new NitroSQLiteError(
+      `Cannot run synchronous operation on database. Database ${dbName} is busy with another operation.`,
+    )
+  }
+
+  // Execute synchronously
+  databaseQueue.inProgress = true
+  try {
+    return callback()
+  } finally {
+    databaseQueue.inProgress = false
+  }
+}

package/src/NitroSQLiteError.ts

@@ -0,0 +1,45 @@
+const NITRO_SQLITE_ERROR_NAME = 'NitroSQLiteError' as const
+
+/**
+ * Custom error class for NitroSQLite operations
+ * Extends the native Error class with proper prototype chain and error handling
+ */
+export default class NitroSQLiteError extends Error {
+  constructor(message: string, options?: ErrorOptions) {
+    super(message, options)
+    this.name = NITRO_SQLITE_ERROR_NAME
+
+    // Maintains proper prototype chain for instanceof checks
+    Object.setPrototypeOf(this, NitroSQLiteError.prototype)
+  }
+
+  /**
+   * Converts an unknown error to a NitroSQLiteError
+   * Preserves stack traces and error causes when available
+   */
+  static fromError(error: unknown): NitroSQLiteError {
+    if (error instanceof NitroSQLiteError) {
+      return error
+    }
+
+    if (error instanceof Error) {
+      const nitroSQLiteError = new NitroSQLiteError(error.message, {
+        cause: error.cause,
+      })
+
+      // Preserve original stack trace if available
+      if (error.stack) {
+        nitroSQLiteError.stack = error.stack
+      }
+      return nitroSQLiteError
+    }
+
+    if (typeof error === 'string') {
+      return new NitroSQLiteError(error)
+    }
+
+    return new NitroSQLiteError('Unknown error occurred', {
+      cause: error,
+    })
+  }
+}

package/src/index.ts

@@ -4,8 +4,6 @@ import { open } from './operations/session'
 import { execute, executeAsync } from './operations/execute'
 import { init } from './OnLoad'
 import { executeBatch, executeBatchAsync } from './operations/executeBatch'
-export type * from './types'
-export { typeORMDriver } from './typeORM'
 
 init()
 
@@ -30,3 +28,6 @@ export {
   isSimpleNullHandlingEnabled,
   enableSimpleNullHandling,
 } from './nullHandling'
+export { default as NitroSQLiteError } from './NitroSQLiteError'
+export type * from './types'
+export { typeORMDriver } from './typeORM'

package/src/nitro.ts

@@ -1,11 +1,5 @@
 import { NitroModules } from 'react-native-nitro-modules'
 import type { NitroSQLite as NitroSQLiteSpec } from './specs/NitroSQLite.nitro'
-import type { PendingTransaction } from './operations/transaction'
 
 export const HybridNitroSQLite =
   NitroModules.createHybridObject<NitroSQLiteSpec>('NitroSQLite')
-
-export const locks: Record<
-  string,
-  { queue: PendingTransaction[]; inProgress: boolean }
-> = {}

package/src/nullHandling.ts

@@ -4,7 +4,7 @@ import { SQLiteQueryParamItem } from './types'
 let ENABLE_SIMPLE_NULL_HANDLING = false
 
 export function enableSimpleNullHandling(
-  shouldEnableSimpleNullHandling = true
+  shouldEnableSimpleNullHandling = true,
 ) {
   ENABLE_SIMPLE_NULL_HANDLING = shouldEnableSimpleNullHandling
 }
@@ -14,15 +14,19 @@ export function isSimpleNullHandlingEnabled() {
 }
 
 export const NITRO_SQLITE_NULL: SQLiteNullValue = { isNitroSQLiteNull: true }
-export function isNitroSQLiteNull(value: any): value is SQLiteNullValue {
-  if (typeof value === 'object' && 'isNitroSQLiteNull' in value) {
+export function isNitroSQLiteNull(value: unknown): value is SQLiteNullValue {
+  if (
+    value !== null &&
+    typeof value === 'object' &&
+    'isNitroSQLiteNull' in value
+  ) {
     return true
   }
   return false
 }
 
 export function replaceWithNativeNullValue(
-  value: SQLiteQueryParamItem
+  value: SQLiteQueryParamItem,
 ): SQLiteValue {
   if (value === undefined || value === null) {
     return NITRO_SQLITE_NULL

package/src/operations/execute.ts

@@ -8,45 +8,53 @@ import type {
   SQLiteQueryParams,
   QueryResultRow,
 } from '../types'
+import NitroSQLiteError from '../NitroSQLiteError'
 
 export function execute<Row extends QueryResultRow = never>(
   dbName: string,
   query: string,
-  params?: SQLiteQueryParams
+  params?: SQLiteQueryParams,
 ): QueryResult<Row> {
   const transformedParams = isSimpleNullHandlingEnabled()
     ? toNativeQueryParams(params)
     : (params as NativeSQLiteQueryParams)
 
-  const nativeResult = HybridNitroSQLite.execute(
-    dbName,
-    query,
-    transformedParams
-  )
-  const result = buildJsQueryResult<Row>(nativeResult)
-  return result
+  try {
+    const nativeResult = HybridNitroSQLite.execute(
+      dbName,
+      query,
+      transformedParams,
+    )
+
+    return buildJsQueryResult<Row>(nativeResult)
+  } catch (error) {
+    throw NitroSQLiteError.fromError(error)
+  }
 }
 
 export async function executeAsync<Row extends QueryResultRow = never>(
   dbName: string,
   query: string,
-  params?: SQLiteQueryParams
+  params?: SQLiteQueryParams,
 ): Promise<QueryResult<Row>> {
   const transformedParams = isSimpleNullHandlingEnabled()
     ? toNativeQueryParams(params)
     : (params as NativeSQLiteQueryParams)
 
-  const nativeResult = await HybridNitroSQLite.executeAsync(
-    dbName,
-    query,
-    transformedParams
-  )
-  const result = buildJsQueryResult<Row>(nativeResult)
-  return result
+  try {
+    const nativeResult = await HybridNitroSQLite.executeAsync(
+      dbName,
+      query,
+      transformedParams,
+    )
+    return buildJsQueryResult<Row>(nativeResult)
+  } catch (error) {
+    throw NitroSQLiteError.fromError(error)
+  }
 }
 
 function toNativeQueryParams(
-  params: SQLiteQueryParams | undefined
+  params: SQLiteQueryParams | undefined,
 ): NativeSQLiteQueryParams | undefined {
   return params?.map((param) => replaceWithNativeNullValue(param))
 }
@@ -66,8 +74,8 @@ function buildJsQueryResult<Row extends QueryResultRow = never>({
             return [key, null]
           }
           return [key, value]
-        })
-      )
+        }),
+      ),
     ) as Row[]
   }
 

package/src/operations/executeBatch.ts

@@ -3,42 +3,62 @@ import {
   replaceWithNativeNullValue,
 } from '../nullHandling'
 import { HybridNitroSQLite } from '../nitro'
+import {
+  queueOperationAsync,
+  startOperationSync,
+  throwIfDatabaseIsNotOpen,
+} from '../DatabaseQueue'
 import type {
   NativeSQLiteQueryParams,
   BatchQueryResult,
   BatchQueryCommand,
   NativeBatchQueryCommand,
 } from '../types'
+import NitroSQLiteError from '../NitroSQLiteError'
 
 export function executeBatch(
   dbName: string,
-  commands: BatchQueryCommand[]
+  commands: BatchQueryCommand[],
 ): BatchQueryResult {
+  throwIfDatabaseIsNotOpen(dbName)
+
   const transformedCommands = isSimpleNullHandlingEnabled()
     ? toNativeBatchQueryCommands(commands)
     : (commands as NativeBatchQueryCommand[])
 
-  const result = HybridNitroSQLite.executeBatch(dbName, transformedCommands)
-  return result
+  try {
+    return startOperationSync(dbName, () =>
+      HybridNitroSQLite.executeBatch(dbName, transformedCommands),
+    )
+  } catch (error) {
+    throw NitroSQLiteError.fromError(error)
+  }
 }
 
 export async function executeBatchAsync(
   dbName: string,
-  commands: BatchQueryCommand[]
+  commands: BatchQueryCommand[],
 ): Promise<BatchQueryResult> {
+  throwIfDatabaseIsNotOpen(dbName)
+
   const transformedCommands = isSimpleNullHandlingEnabled()
     ? toNativeBatchQueryCommands(commands)
     : (commands as NativeBatchQueryCommand[])
 
-  const result = await HybridNitroSQLite.executeBatchAsync(
-    dbName,
-    transformedCommands
-  )
-  return result
+  return queueOperationAsync(dbName, async () => {
+    try {
+      return await HybridNitroSQLite.executeBatchAsync(
+        dbName,
+        transformedCommands,
+      )
+    } catch (error) {
+      throw NitroSQLiteError.fromError(error)
+    }
+  })
 }
 
 function toNativeBatchQueryCommands(
-  commands: BatchQueryCommand[]
+  commands: BatchQueryCommand[],
 ): NativeBatchQueryCommand[] {
   return commands.map((command) => {
     const transformedParams = command.params?.map((param) => {

package/src/operations/session.ts

@@ -1,4 +1,4 @@
-import { locks, HybridNitroSQLite } from '../nitro'
+import { HybridNitroSQLite } from '../nitro'
 import { transaction } from './transaction'
 import type {
   BatchQueryCommand,
@@ -11,27 +11,41 @@ import type {
 } from '../types'
 import { execute, executeAsync } from './execute'
 import { executeBatch, executeBatchAsync } from './executeBatch'
+import NitroSQLiteError from '../NitroSQLiteError'
+import { closeDatabaseQueue, openDatabaseQueue } from '../DatabaseQueue'
 
 export function open(
-  options: NitroSQLiteConnectionOptions
+  options: NitroSQLiteConnectionOptions,
 ): NitroSQLiteConnection {
-  openDb(options.name, options.location)
+  try {
+    HybridNitroSQLite.open(options.name, options.location)
+    openDatabaseQueue(options.name)
+  } catch (error) {
+    throw NitroSQLiteError.fromError(error)
+  }
 
   return {
-    close: () => close(options.name),
+    close: () => {
+      try {
+        HybridNitroSQLite.close(options.name)
+        closeDatabaseQueue(options.name)
+      } catch (error) {
+        throw NitroSQLiteError.fromError(error)
+      }
+    },
     delete: () => HybridNitroSQLite.drop(options.name, options.location),
     attach: (dbNameToAttach: string, alias: string, location?: string) =>
       HybridNitroSQLite.attach(options.name, dbNameToAttach, alias, location),
     detach: (alias: string) => HybridNitroSQLite.detach(options.name, alias),
-    transaction: (fn: (tx: Transaction) => Promise<void> | void) =>
+    transaction: <Result = void>(fn: (tx: Transaction) => Promise<Result>) =>
       transaction(options.name, fn),
     execute: <Row extends QueryResultRow = never>(
       query: string,
-      params?: SQLiteQueryParams
+      params?: SQLiteQueryParams,
     ): QueryResult<Row> => execute(options.name, query, params),
     executeAsync: <Row extends QueryResultRow = never>(
       query: string,
-      params?: SQLiteQueryParams
+      params?: SQLiteQueryParams,
     ): Promise<QueryResult<Row>> => executeAsync(options.name, query, params),
     executeBatch: (commands: BatchQueryCommand[]) =>
       executeBatch(options.name, commands),
@@ -43,17 +57,3 @@ export function open(
       HybridNitroSQLite.loadFileAsync(options.name, location),
   }
 }
-
-export function openDb(dbName: string, location?: string) {
-  HybridNitroSQLite.open(dbName, location)
-
-  locks[dbName] = {
-    queue: [],
-    inProgress: false,
-  }
-}
-
-export function close(dbName: string) {
-  HybridNitroSQLite.close(dbName)
-  delete locks[dbName]
-}