feat: Adds parsing single require and require with comments

Signed-off-by: Farhaan Bukhsh <farhaan.bukhsh@gmail.com>

Author: farhaanbukhsh

src/licenses.rs

@@ -86,8 +86,12 @@ struct PackageJson {
 impl PackageJson {
     fn get_all_dependencies(self) -> HashMap<String, String> {
         let mut all_dependencies: HashMap<String, String> = HashMap::new();
-        if let Some(deps) = self.dev_dependencies { all_dependencies.extend(deps) };
-        if let Some(deps) = self.dependencies { all_dependencies.extend(deps) };
+        if let Some(deps) = self.dev_dependencies {
+            all_dependencies.extend(deps)
+        };
+        if let Some(deps) = self.dependencies {
+            all_dependencies.extend(deps)
+        };
         all_dependencies
     }
 }
@@ -231,12 +235,17 @@ pub fn analyze_go_licenses(go_mod_path: &str) -> Vec<LicenseInfo> {
 }
 
 pub fn get_go_dependencies(content_string: String) -> Vec<GoPackages> {
-    let re =
-        Regex::new(r"require\s*\(\s*((?:[\w./-]+\s+v[\d]+(?:\.\d+)*(?:-\S+)?\s*)+)\)").unwrap();
+    let re_comment = Regex::new(r"(?m)^(.*?)\s*(//|#).*?$").unwrap(); // Matches comments after dependencies
+    let cleaned = re_comment.replace_all(content_string.as_str(), "$1"); // Removes everything after // or #
+    let re = Regex::new(
+        r"require\s*(?:\(\s*)?((?:[\w./-]+\s+v[\d][\w\d.-]+(?:-\w+)?(?:\+\w+)?\s*)+)\)?",
+    )
+    .unwrap();
+    let re_dependency = Regex::new(r"([\w./-]+)\s+(v[\d]+(?:\.\d+)*(?:-\S+)?)").unwrap();
+
     let mut dependency = vec![];
-    for cap in re.captures_iter(content_string.as_str()) {
+    for cap in re.captures_iter(&cleaned) {
         let dependency_block = &cap[1];
-        let re_dependency = Regex::new(r"([\w./-]+)\s+(v[\d]+(?:\.\d+)*(?:-\S+)?)").unwrap();
         for dep_cap in re_dependency.captures_iter(dependency_block) {
             dependency.push(GoPackages {
                 name: dep_cap[1].to_string(),

src/parser.rs

@@ -53,7 +53,7 @@ fn find_project_roots(root_path: impl AsRef<Path>) -> Vec<ProjectRoot> {
     let mut project_roots = Vec::new();
 
     for entry in Walk::new(root_path).flatten() {
-        if !entry.file_type().map_or(false, |ft| ft.is_file()) {
+        if !entry.file_type().is_some_and(|ft| ft.is_file()) {
             continue;
         }
 
@@ -217,21 +217,28 @@ mod tests {
     github.com/aws/aws-sdk-go-v2/credentials v1.13.43
     github.com/aws/aws-sdk-go-v2/service/route53 v1.30.2
     github.com/cespare/cp v0.1.0
-    github.com/cloudflare/cloudflare-go v0.79.0
-    github.com/cockroachdb/pebble v1.1.2
-    github.com/consensys/gnark-crypto v0.14.0
-    github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a
+    github.com/cloudflare/cloudflare-go v0.79.0 //indirect
+    github.com/cockroachdb/pebble v1.1.2 //indirect
     github.com/crate-crypto/go-kzg-4844 v1.1.0
-    github.com/davecgh/go-spew v1.1.1
-)"#;
+    github.com/davecgh/go-spew v1.1.1 # Another comment
+    github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a
+    github.com/consensys/gnark-crypto v0.14.0
+    github.com/go-sourcemap/sourcemap v2.1.3+incompatible // Check the version
+)
+
+require example.com/theirmodule v1.3.4
+
+require (github.com/some/module v1.0.0)
+require (github.com/another/module v2.3.4)
+require (github.com/mixed-case/Module v3.5.7-beta)"#;
         fs::write(&go_mod_path, dependencies).unwrap();
 
         let result = parse_dependencies(&ProjectRoot {
             path: temp_dir.path().to_path_buf(),
             project_type: Language::Go("go.mod"),
         });
         let parsed = get_go_dependencies(dependencies.to_string());
-        assert!(parsed.len() == 14);
+        assert!(parsed.len() == 19);
         assert!(result.len() == parsed.len());
     }