feat: Connection newtype

src/lib.rs

@@ -1,4 +1,24 @@
+use std::path::{
+  Path,
+  PathBuf,
+};
+
+use derive_more::Deref;
+use ref_cast::RefCast;
+
 pub mod error;
 pub mod print;
+
 pub mod store;
+
 pub mod util;
+
+#[derive(Deref, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DerivationId(i64);
+
+#[derive(RefCast, Deref, Debug, PartialEq, Eq)]
+#[repr(transparent)]
+pub struct StorePath(Path);
+
+#[derive(Deref, Debug, Clone, PartialEq, Eq)]
+pub struct StorePathBuf(PathBuf);

src/store.rs

@@ -1,23 +1,21 @@
-use std::{
+use std::result;
-  path::{
-    Path,
-    PathBuf,
-  },
-  result,
-};
 
 use anyhow::{
   Context as _,
   Result,
 };
 use derive_more::Deref;
-use ref_cast::RefCast;
-use rusqlite::Connection;
 use rustc_hash::{
   FxBuildHasher,
   FxHashMap,
 };
 
+use crate::{
+  DerivationId,
+  StorePath,
+  StorePathBuf,
+};
+
 macro_rules! path_to_str {
   ($path:ident) => {
     let $path = $path.canonicalize().with_context(|| {
@@ -36,30 +34,24 @@ macro_rules! path_to_str {
   };
 }
 
-#[derive(Deref, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Deref)]
-pub struct DerivationId(i64);
+pub struct Connection(rusqlite::Connection);
-
-#[expect(clippy::module_name_repetitions)]
-#[derive(RefCast, Deref, Debug, PartialEq, Eq)]
-#[repr(transparent)]
-pub struct StorePath(Path);
-
-#[expect(clippy::module_name_repetitions)]
-#[derive(Deref, Debug, Clone, PartialEq, Eq)]
-pub struct StorePathBuf(PathBuf);
 
 /// Connects to the Nix database.
 pub fn connect() -> Result<Connection> {
   const DATABASE_PATH: &str = "/nix/var/nix/db/db.sqlite";
 
-  Connection::open(DATABASE_PATH).with_context(|| {
+  let inner = rusqlite::Connection::open(DATABASE_PATH).with_context(|| {
     format!("failed to connect to Nix database at {DATABASE_PATH}")
-  })
+  })?;
+
+  Ok(Connection(inner))
 }
 
+impl Connection {
   /// Gathers all derivations that the given store path depends on.
   pub fn query_depdendents(
-  connection: &mut Connection,
+    &mut self,
     path: &StorePath,
   ) -> Result<Vec<(DerivationId, StorePathBuf)>> {
     const QUERY: &str = "
@@ -78,8 +70,7 @@ pub fn query_depdendents(
 
     path_to_str!(path);
 
-  let packages: result::Result<Vec<(DerivationId, StorePathBuf)>, _> =
+    let packages: result::Result<Vec<(DerivationId, StorePathBuf)>, _> = self
-    connection
       .prepare_cached(QUERY)?
       .query_map([path], |row| {
         Ok((
@@ -94,10 +85,7 @@ pub fn query_depdendents(
 
   /// Gets the total closure size of the given store path by summing up the nar
   /// size of all depdendent derivations.
-pub fn query_closure_size(
+  pub fn query_closure_size(&mut self, path: &StorePath) -> Result<usize> {
-  connection: &mut Connection,
-  path: &StorePath,
-) -> Result<usize> {
     const QUERY: &str = "
       WITH RECURSIVE
         graph(p) AS (
@@ -114,7 +102,7 @@ pub fn query_closure_size(
 
     path_to_str!(path);
 
-  let closure_size = connection
+    let closure_size = self
       .prepare_cached(QUERY)?
       .query_row([path], |row| row.get(0))?;
 
@@ -128,7 +116,7 @@ pub fn query_closure_size(
   /// well in the future, depending on how much we use them
   /// in the operations on the graph.
   pub fn query_dependency_graph(
-  connection: &mut Connection,
+    &mut self,
     path: &StorePath,
   ) -> Result<FxHashMap<DerivationId, Vec<DerivationId>>> {
     const QUERY: &str = "
@@ -150,7 +138,7 @@ pub fn query_dependency_graph(
     let mut adj =
       FxHashMap::<DerivationId, Vec<DerivationId>>::with_hasher(FxBuildHasher);
 
-  let mut statement = connection.prepare_cached(QUERY)?;
+    let mut statement = self.prepare_cached(QUERY)?;
 
     let edges = statement.query_map([path], |row| {
       Ok((DerivationId(row.get(0)?), DerivationId(row.get(1)?)))
@@ -165,3 +153,4 @@ pub fn query_dependency_graph(
 
     Ok(adj)
   }
+}