cleanups

Author: penberg

index.d.ts

@@ -3,6 +3,7 @@
 
 /* auto-generated by NAPI-RS */
 
+/** Database connection options. */
 export interface Options {
   timeout?: number
   authToken?: string
@@ -27,6 +28,7 @@ export declare class SqliteError {
   code: string
   rawCode: number
 }
+/** Database connection. */
 export declare class Database {
   constructor(path: string, opts?: Options | undefined | null)
   get memory(): boolean

src/lib.rs

@@ -160,14 +160,7 @@ impl From<libsql::Error> for Error {
     }
 }
 
-#[napi]
-pub struct Database {
-    db: libsql::Database,
-    conn: Option<Arc<tokio::sync::Mutex<libsql::Connection>>>,
-    default_safe_integers: AtomicBool,
-    memory: bool,
-}
-
+/// Database connection options.
 #[napi(object)]
 pub struct Options {
     pub timeout: Option<f64>,
@@ -176,6 +169,15 @@ pub struct Options {
     pub syncPeriod: Option<f64>,
 }
 
+/// Database connection.
+#[napi]
+pub struct Database {
+    db: libsql::Database,
+    conn: Option<Arc<tokio::sync::Mutex<libsql::Connection>>>,
+    default_safe_integers: AtomicBool,
+    memory: bool,
+}
+
 impl Drop for Database {
     fn drop(&mut self) {
         self.conn = None;
@@ -245,16 +247,15 @@ impl Database {
         self.memory
     }
 
-    #[napi(js_name = "inTransaction")]
+    #[napi]
     pub fn in_transaction(&self) -> Result<bool> {
         let rt = runtime()?;
         let conn = match &self.conn {
             Some(conn) => conn.clone(),
             None => return Ok(false),
         };
-        let conn_ = conn.clone();
         Ok(rt.block_on(async move {
-            let conn = conn_.lock().await;
+            let conn = conn.lock().await;
             !conn.is_autocommit()
         }))
     }
@@ -452,7 +453,7 @@ fn is_remote_path(path: &str) -> bool {
 fn throw_database_closed_error(env: &Env) -> napi::Error {
     let msg = "The database connection is not open";
     let err = napi::Error::new(napi::Status::InvalidArg, msg.to_string());
-    env.throw_type_error(&msg, None).unwrap();
+    env.throw_type_error(msg, None).unwrap();
     err
 }
 
@@ -680,17 +681,17 @@ impl Statement {
         let safe_ints = self.safe_ints.load(Ordering::SeqCst);
         let raw = self.raw.load(Ordering::SeqCst);
         let pluck = self.pluck.load(Ordering::SeqCst);
+        let stmt = self.stmt.clone();
         let params = {
-            let stmt = self.stmt.clone();
+            let stmt = stmt.clone();
             rt.block_on(async move {
                 let mut stmt = stmt.lock().await;
                 stmt.reset();
-                let params = if let Some(params) = params {
+                if let Some(params) = params {
                     map_params(&stmt, Some(params)).unwrap()
                 } else {
                     libsql::params::Params::None
-                };
-                params
+                }
             })
         };
         let stmt = self.stmt.clone();
@@ -721,16 +722,13 @@ impl Statement {
         let raw = self.raw.load(Ordering::SeqCst);
         let pluck = self.pluck.load(Ordering::SeqCst);
         let stmt = self.stmt.clone();
-        let future = async move {
+        let (rows, column_names) = rt.block_on(async move {
             let mut stmt = stmt.lock().await;
-            let params = {
-                stmt.reset();
-                let params = if let Some(params) = params {
-                    map_params(&stmt, Some(params)).unwrap()
-                } else {
-                    libsql::params::Params::None
-                };
-                params
+            stmt.reset();
+            let params = if let Some(params) = params {
+                map_params(&stmt, Some(params)).unwrap()
+            } else {
+                libsql::params::Params::None
             };
             let rows = stmt.query(params).await.map_err(Error::from)?;
             let mut column_names = Vec::new();
@@ -740,8 +738,7 @@ impl Statement {
                 );
             }
             Ok::<_, napi::Error>((rows, column_names))
-        };
-        let (rows, column_names) = rt.block_on(future)?;
+        })?;
         Ok(RowsIterator::new(
             Arc::new(tokio::sync::Mutex::new(rows)),
             column_names,
@@ -1059,7 +1056,7 @@ fn map_row_raw(
     let column_count = column_names.len();
     let mut js_array = env.create_array(column_count as u32)?;
 
-    for idx in 0..column_count {
+    for (idx, _col_name) in column_names.iter().enumerate().take(column_count) {
         let value = match row.get_value(idx as i32) {
             Ok(v) => v,
             Err(e) => return Err(napi::Error::from_reason(e.to_string())),