chore: 更新依赖项并重构代码以支持 package_json_parser

- 在多个 `Cargo.toml` 文件中添加 `package_json_parser` 依赖项。
- 在 `pm.rs` 和 `pm_shim.rs` 中重构代码，使用 `PackageJsonParser` 替代原有的 `PJson` 解析逻辑。
- 确保代码整洁性和可读性，保持功能一致性。

Author: ityuany

Cargo.toml

@@ -11,7 +11,8 @@ members = [
   "demo",
   "crates/snm_test_utils",
   "crates/snm_downloader",
-  "crates/node", "crates/package_manager",
+  "crates/node",
+  "crates/package_manager",
 ]
 
 resolver = "2"
@@ -105,16 +106,17 @@ indicatif = "0.17.8"
 
 ## 杂项
 # async-openai = { version = "0.27.2", default-features = false, features = ["rustls-tls"] }
-flate2    = "1.0.28"
-glob      = "0.3.2"
-once_cell = "1.20.2"
-strum     = { version = "0.27.1", features = ["derive"] }
-tar       = "0.4.40"
-tempfile  = "=3.16.0"
-uuid      = "=1.12.1"
-which     = "=7.0.1"
-xz2       = { version = "0.1.7", features = ["static"] }
-zip       = "2.1.3"
+flate2              = "1.0.28"
+glob                = "0.3.2"
+once_cell           = "1.20.2"
+package_json_parser = "0.0.2"
+strum               = { version = "0.27.1", features = ["derive"] }
+tar                 = "0.4.40"
+tempfile            = "=3.16.0"
+uuid                = "=1.12.1"
+which               = "=7.0.1"
+xz2                 = { version = "0.1.7", features = ["static"] }
+zip                 = "2.1.3"
 
 # self
 snm_cli        = { path = "./crates/cli" }

crates/snm_pm/Cargo.toml

@@ -6,22 +6,23 @@ version = "0.1.0-66"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow            = { workspace = true }
-clap              = { workspace = true }
-colored           = { workspace = true }
-dialoguer         = { workspace = true }
-lazy-regex        = { workspace = true }
-once_cell         = { workspace = true }
-regex             = { workspace = true }
-reqwest           = { workspace = true }
-robust_downloader = { workspace = true }
-semver            = { workspace = true }
-serde             = { workspace = true }
-serde_json        = { workspace = true }
-strum             = { workspace = true }
-tokio             = { workspace = true }
-tracing           = { workspace = true }
-up_finder         = { workspace = true }
+anyhow              = { workspace = true }
+clap                = { workspace = true }
+colored             = { workspace = true }
+dialoguer           = { workspace = true }
+lazy-regex          = { workspace = true }
+once_cell           = { workspace = true }
+package_json_parser = { workspace = true }
+regex               = { workspace = true }
+reqwest             = { workspace = true }
+robust_downloader   = { workspace = true }
+semver              = { workspace = true }
+serde               = { workspace = true }
+serde_json          = { workspace = true }
+strum               = { workspace = true }
+tokio               = { workspace = true }
+tracing             = { workspace = true }
+up_finder           = { workspace = true }
 
 # self
 snm_config     = { workspace = true }

crates/snm_pm/src/pm.rs

@@ -2,18 +2,16 @@ use std::{path::PathBuf, str::FromStr};
 
 use anyhow::bail;
 use lazy_regex::regex_captures;
+use package_json_parser::PackageJsonParser;
 use snm_config::snm_config::SnmConfig;
 use snm_downloader::{DownloadPackageManagerResource, download_resource};
 use snm_utils::ver::ver_gt_1;
 use strum::EnumString;
 use up_finder::UpFinder;
 
-use crate::{
-  ops::{
-    npm::NpmCommandLine, ops::PackageManagerOps, pnpm::PnpmCommandLine, yarn::YarnCommandLine,
-    yarn_berry::YarnBerryCommandLine,
-  },
-  package_json::PJson,
+use crate::ops::{
+  npm::NpmCommandLine, ops::PackageManagerOps, pnpm::PnpmCommandLine, yarn::YarnCommandLine,
+  yarn_berry::YarnBerryCommandLine,
 };
 
 #[derive(Debug, PartialEq, Eq, Clone, strum::Display, EnumString, strum::AsRefStr)]
@@ -97,19 +95,23 @@ impl<'a> SPM<'a> {
     }
 
     let Some(spm) = vecs.iter().find_map(|item| {
-      let Some(dir) = item.parent() else {
-        return None;
-      };
+      // let Some(dir) = item.parent() else {
+      //   return None;
+      // };
 
-      let Some(package_json) = PJson::from(dir).ok() else {
+      let Ok(package_json) = PackageJsonParser::parse(item) else {
         return None;
       };
 
+      // let Some(package_json) = PJson::from(dir).ok() else {
+      //   return None;
+      // };
+
       let Some(raw) = package_json.package_manager else {
         return None;
       };
 
-      let Some(pm) = PackageManager::from_str(&raw).ok() else {
+      let Some(pm) = PackageManager::from_str(&raw.0).ok() else {
         return None;
       };
 

crates/snm_shim/Cargo.toml

@@ -11,18 +11,19 @@ name = "snm-shim"
 path = "src/main.rs"
 
 [dependencies]
-anyhow             = { workspace = true }
-async-trait        = { workspace = true }
-color-eyre         = { workspace = true }
-colored            = { workspace = true }
-dirs               = { workspace = true }
-lazy-regex         = { workspace = true }
-once_cell          = "1.19"
-thiserror          = "1.0"
-tokio              = { workspace = true, features = ["full"] }
-tracing            = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-up_finder          = { workspace = true }
+anyhow              = { workspace = true }
+async-trait         = { workspace = true }
+color-eyre          = { workspace = true }
+colored             = { workspace = true }
+dirs                = { workspace = true }
+lazy-regex          = { workspace = true }
+once_cell           = "1.19"
+package_json_parser = { workspace = true }
+thiserror           = "1.0"
+tokio               = { workspace = true, features = ["full"] }
+tracing             = { workspace = true }
+tracing-subscriber  = { workspace = true, features = ["env-filter"] }
+up_finder           = { workspace = true }
 
 snm_config     = { workspace = true }
 snm_downloader = { workspace = true }

crates/snm_shim/src/pm_shim.rs

@@ -2,8 +2,9 @@ use std::path::Path;
 
 use anyhow::bail;
 use colored::Colorize;
+use package_json_parser::PackageJsonParser;
 use snm_config::snm_config::SnmConfig;
-use snm_pm::{package_json::PJson, pm::SPM};
+use snm_pm::pm::SPM;
 use snm_utils::exec::exec_cli;
 
 pub struct PmShim {
@@ -69,9 +70,17 @@ impl PmShim {
     }
 
     let dir = spm.ensure_bin_dir().await?;
-    let json = PJson::from(dir)?;
 
-    if let Ok(file) = json.get_bin_with_name(bin_name) {
+    let json = PackageJsonParser::parse(dir.join("package.json"))?;
+
+    // let json = PJson::from(dir)?;
+
+    let map = json.bin_to_hash_map()?;
+
+    // let x = map.get(bin_name);
+
+    if let Some(file) = map.get(bin_name) {
+      let file = dir.join(file);
       exec_cli(
         &[
           &[
@@ -93,6 +102,28 @@ impl PmShim {
       )?;
     }
 
+    // if let Ok(file) = json.get_bin_with_name(bin_name) {
+    //   exec_cli(
+    //     &[
+    //       &[
+    //         "node".to_string(),
+    //         file.to_string_lossy().into_owned(),
+    //         command.to_owned(),
+    //       ],
+    //       args,
+    //     ]
+    //     .concat(),
+    //     &self.paths,
+    //     true,
+    //   )?;
+    // } else {
+    //   exec_cli(
+    //     &[&[bin_name.to_string(), command.to_owned()], args].concat(),
+    //     &self.paths,
+    //     true,
+    //   )?;
+    // }
+
     Ok(())
   }
 }