Add dependency version requirement resolution

src/bpmlib/dependencies.go

@@ -21,6 +21,7 @@ func (pkgInfo *PackageInfo) GetPackageDependants(rootDir string, skipMultiplePro
 
 		// Add installed package to list if its dependencies include pkgName
 		if slices.ContainsFunc(installedPkg.Depends, func(n string) bool {
+			n, _, _ = SplitPkgNameAndVersion(n)
 			return n == pkgInfo.Name
 		}) {
 			dependants = append(dependants, installedPkg.Name)
@@ -29,6 +30,7 @@ func (pkgInfo *PackageInfo) GetPackageDependants(rootDir string, skipMultiplePro
 
 		// Add installed package to list if its runtime dependencies include pkgName
 		if slices.ContainsFunc(installedPkg.RuntimeDepends, func(n string) bool {
+			n, _, _ = SplitPkgNameAndVersion(n)
 			return n == pkgInfo.Name
 		}) {
 			dependants = append(dependants, installedPkg.Name)
@@ -43,6 +45,7 @@ func (pkgInfo *PackageInfo) GetPackageDependants(rootDir string, skipMultiplePro
 
 			// Add installed package to list if its dependencies contain a provided virtual package
 			if slices.ContainsFunc(installedPkg.Depends, func(n string) bool {
+				n, _, _ = SplitPkgNameAndVersion(n)
 				return n == vpkg
 			}) {
 				dependants = append(dependants, installedPkg.Name)
@@ -51,6 +54,7 @@ func (pkgInfo *PackageInfo) GetPackageDependants(rootDir string, skipMultiplePro
 
 			// Add installed package to list if its runtime dependencies contain a provided virtual package
 			if slices.ContainsFunc(installedPkg.RuntimeDepends, func(n string) bool {
+				n, _, _ = SplitPkgNameAndVersion(n)
 				return n == vpkg
 			}) {
 				dependants = append(dependants, installedPkg.Name)
@@ -78,7 +82,13 @@ func (pkgInfo *PackageInfo) GetPackageOptionalDependants(rootDir string) (depend
 
 		// Add installed package to list if its optional dependencies include pkgName
 		if slices.ContainsFunc(installedPkg.OptionalDepends, func(n string) bool {
-			return strings.SplitN(n, ":", 2)[0] == pkgInfo.Name
+			// Remove optional dependency comment
+			n = strings.SplitN(n, ":", 2)[0]
+
+			// Remove required version
+			n, _, _ = SplitPkgNameAndVersion(n)
+
+			return n == pkgInfo.Name
 		}) {
 			dependants = append(dependants, installedPkg.Name)
 			continue
@@ -88,7 +98,13 @@ func (pkgInfo *PackageInfo) GetPackageOptionalDependants(rootDir string) (depend
 		for _, vpkg := range pkgInfo.Provides {
 			// Add installed package to list if its optional dependencies contain a provided virtual package
 			if slices.ContainsFunc(installedPkg.OptionalDepends, func(n string) bool {
-				return strings.SplitN(n, ":", 2)[0] == vpkg
+				// Remove optional dependency comment
+				n = strings.SplitN(n, ":", 2)[0]
+
+				// Remove required version
+				n, _, _ = SplitPkgNameAndVersion(n)
+
+				return n == vpkg
 			}) {
 				dependants = append(dependants, installedPkg.Name)
 				break
@@ -111,20 +127,23 @@ func ResolveDependencies(pkgInfo *PackageInfo, resolvedVirtualPackages map[strin
 	dfs = func(pkgInfo *PackageInfo) {
 		checkDependencies := func(dependencies []string, installationReason InstallationReason) {
 			for _, depend := range dependencies {
+				// Split dependency name and required version
+				dependName, _, _ := SplitPkgNameAndVersion(depend)
+
 				// Ignore if package is already installed
-				if IsPackageInstalled(depend, rootDir) {
+				if IsPackageInstalled(dependName, rootDir) && EvaluateDependency(depend, GetPackageInfo(dependName, rootDir).Version) {
 					continue
-				} else if providers := GetVirtualPackageInfo(depend, rootDir); len(providers) > 0 {
+				} else if providers := GetVirtualPackageInfo(dependName, rootDir); len(providers) > 0 {
 					continue
 				}
 
 				// Find database entry for dependency
 				var dependEntry *BPMDatabaseEntry
-				if resolvedVpkg, ok := resolvedVirtualPackages[depend]; ok {
+				if resolvedVpkg, ok := resolvedVirtualPackages[dependName]; ok {
 					dependEntry, _, _ = GetDatabaseEntry(resolvedVpkg)
-				} else if entry, _, _ := GetDatabaseEntry(depend); entry != nil {
+				} else if entry, _, _ := GetDatabaseEntry(dependName); entry != nil {
 					dependEntry = entry
-				} else if providers := GetDatabaseVirtualPackageEntry(depend); len(providers) > 0 {
+				} else if providers := GetDatabaseVirtualPackageEntry(dependName); len(providers) > 0 {
 					dependEntry = providers[0]
 				}
 
@@ -133,6 +152,12 @@ func ResolveDependencies(pkgInfo *PackageInfo, resolvedVirtualPackages map[strin
 					continue
 				}
 
+				// Ensure entry has required version
+				if !EvaluateDependency(depend, dependEntry.Info.Version) {
+					unresolved = append(unresolved, depend)
+					continue
+				}
+
 				// Skip ignored packages in config
 				if slices.Contains(MainBPMConfig.IgnorePackages, dependEntry.Info.Name) {
 					continue
@@ -161,3 +186,62 @@ func ResolveDependencies(pkgInfo *PackageInfo, resolvedVirtualPackages map[strin
 
 	return resolved, unresolved
 }
+
+func SplitPkgNameAndVersion(pkg string) (string, string, string) {
+	if strings.Contains(pkg, ">=") {
+		pkgSplit := strings.SplitN(pkg, ">=", 2)
+		pkgName := pkgSplit[0]
+		pkgVersion := pkgSplit[1]
+
+		return pkgName, ">=", pkgVersion
+	} else if strings.Contains(pkg, ">") {
+		pkgSplit := strings.SplitN(pkg, ">", 2)
+		pkgName := pkgSplit[0]
+		pkgVersion := pkgSplit[1]
+
+		return pkgName, ">", pkgVersion
+	} else if strings.Contains(pkg, "<=") {
+		pkgSplit := strings.SplitN(pkg, "<=", 2)
+		pkgName := pkgSplit[0]
+		pkgVersion := pkgSplit[1]
+
+		return pkgName, "<=", pkgVersion
+	} else if strings.Contains(pkg, "<") {
+		pkgSplit := strings.SplitN(pkg, "<", 2)
+		pkgName := pkgSplit[0]
+		pkgVersion := pkgSplit[1]
+
+		return pkgName, "<", pkgVersion
+	} else if strings.Contains(pkg, "=") {
+		pkgSplit := strings.SplitN(pkg, "=", 2)
+		pkgName := pkgSplit[0]
+		pkgVersion := pkgSplit[1]
+
+		return pkgName, "=", pkgVersion
+	}
+
+	return pkg, "", ""
+}
+
+func EvaluateDependency(pkg, matchVersion string) bool {
+	_, comparisonSymbol, pkgVersion := SplitPkgNameAndVersion(pkg)
+
+	switch comparisonSymbol {
+	case ">=":
+		return CompareVersions(matchVersion, pkgVersion) >= 0
+	case ">":
+		return CompareVersions(matchVersion, pkgVersion) > 0
+	case "<=":
+		return CompareVersions(matchVersion, pkgVersion) <= 0
+	case "<":
+		return CompareVersions(matchVersion, pkgVersion) < 0
+	case "=":
+		if cutPkgVersion, ok := strings.CutSuffix(pkgVersion, "*"); ok {
+			return strings.HasPrefix(matchVersion, cutPkgVersion)
+		} else {
+			return CompareVersions(matchVersion, pkgVersion) == 0
+		}
+	default:
+		return true
+	}
+}