refactor: solve conflicts

Author: metcoder95

crates/cli/src/commands/mod.rs

@@ -1,12 +1,14 @@
 pub mod add;
 pub mod install;
+pub mod list;
 pub mod run;
 pub mod store;
 
 use std::{env, ffi::OsString, path::PathBuf};
 
 use crate::commands::{
-    add::AddCommandArgs, install::InstallCommandArgs, run::RunCommandArgs, store::StoreSubcommands,
+    add::AddCommandArgs, install::InstallCommandArgs, list::ListArgs, run::RunCommandArgs,
+    store::StoreSubcommands,
 };
 use clap::{Parser, Subcommand};
 
@@ -46,4 +48,6 @@ pub enum Subcommands {
     /// Managing the package store.
     #[clap(subcommand)]
     Store(StoreSubcommands),
+    /// List all dependencies installed based on package.json
+    List(ListArgs),
 }

crates/cli/src/lib.rs

@@ -25,6 +25,7 @@ pub async fn run_cli() -> Result<()> {
 
 async fn run_commands(cli: Cli) -> Result<()> {
     let package_json_path = cli.current_dir.join("package.json");
+    let node_modules_path = cli.current_dir.join("node_modules");
 
     match &cli.subcommand {
         Subcommands::Init => {
@@ -100,7 +101,8 @@ async fn run_commands(cli: Cli) -> Result<()> {
         Subcommands::List(args) => {
             let group = args.get_scope();
             let depth = args.get_depth();
-            PackageJson::from_path(&package_json_path)?.list(group, &node_modules_path, depth)?;
+            let manager = PackageManager::new(&package_json_path)?;
+            manager.list(&manager.package_json, group, &node_modules_path, depth)?;
         }
     }
 

crates/package_json/src/lib.rs

@@ -197,55 +197,6 @@ impl PackageJson {
             Err(PackageJsonError::NoScript(command.to_string()))
         }
     }
-
-    pub fn list(&self, dependency_group: DependencyGroup, node_modules_path: &PathBuf, depth: u32) -> Result<String, PackageJsonError> { 
-        let mut scope: String = String::new();
-        let default = Value::default();
-        match dependency_group {
-            DependencyGroup::Dev => {
-                let mut dependencies = self
-                    .value
-                    .get("devDependencies")
-                    .unwrap_or(&default)
-                    .as_object()
-                    .into_iter();
-
-                let dep = dependencies.next();
-                while !dep.is_none() {
-                   let tree: String =  dep.unwrap()
-                        .into_iter()
-                        .map(|(name, version)| {
-                            let mut res = format!("{}@{}", name, version);
-
-                            if depth > 1 {
-                                let nested = PackageJson::from_path(&node_modules_path.join(name))
-                                    .unwrap();
-                                let unwraped = nested.list(DependencyGroup::Dev, node_modules_path, depth);
-                                res = format!("\n\t{}", unwraped.unwrap())
-                            }
-
-                            res
-                        }).collect();
-                        scope = format!("{:?}\n", tree);
-                }
-
-            },
-            DependencyGroup::Default => scope = "dependencies".to_string(),
-            _ => scope = "all".to_string()
-        }
-
-        // let binding = Value::default();
-        // let mut dependencies = self.value.get(scope).unwrap_or(&binding).as_object().into_iter();
-
-        // let mut dep = dependencies.next();
-        // while !dep.is_none() {
-        //     println!("{:?}", dep);
-        //     dep = dependencies.next();
-        // }
-
-        Ok(scope.clone())
-    }
-
 }
 
 #[cfg(test)]