refactor: clean up merge so it's not used by NuGet

google · Apr 23, 2024 · fc018d5 · fc018d5
1 parent e8cc083
commit fc018d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/pkg/lockfile/parse-npm-lock.go b/pkg/lockfile/parse-npm-lock.go
@@ -92,18 +92,10 @@ func (pdm npmPackageDetailsMap) add(key string, details PackageDetails) {
 	pdm[key] = details
 }
 
-func mergePkgDetailsMap(m1 npmPackageDetailsMap, m2 npmPackageDetailsMap) map[string]PackageDetails {
-	details := npmPackageDetailsMap{}
-
-	for name, detail := range m1 {
-		details.add(name, detail)
-	}
-
-	for name, detail := range m2 {
-		details.add(name, detail)
+func (pdm npmPackageDetailsMap) merge(m npmPackageDetailsMap) {
+	for key, details := range m {
+		pdm.add(key, details)
 	}
-
-	return details
 }
 
 func (dep NpmLockDependency) depGroups() []string {
@@ -125,7 +117,7 @@ func parseNpmLockDependencies(dependencies map[string]NpmLockDependency) map[str
 
 	for name, detail := range dependencies {
 		if detail.Dependencies != nil {
-			details = mergePkgDetailsMap(details, parseNpmLockDependencies(detail.Dependencies))
+			details.merge(parseNpmLockDependencies(detail.Dependencies))
 		}
 
 		version := detail.Version

diff --git a/pkg/lockfile/parse-nuget-lock.go b/pkg/lockfile/parse-nuget-lock.go
@@ -41,7 +41,9 @@ func parseNuGetLock(lockfile NuGetLockfile) ([]PackageDetails, error) {
 	// its dependencies, there might be different or duplicate dependencies
 	// between frameworks
 	for _, dependencies := range lockfile.Dependencies {
-		details = mergePkgDetailsMap(details, parseNuGetLockDependencies(dependencies))
+		for name, detail := range parseNuGetLockDependencies(dependencies) {
+			details[name] = detail
+		}
 	}
 
 	return pkgDetailsMapToSlice(details), nil