use the same implementation of the libraries engine

Author: alessio-perugini

Diff for: internal/arduino/libraries/loader.go

@@ -18,6 +18,7 @@ package libraries
 import (
 	"errors"
 	"fmt"
+	"regexp"
 	"strings"
 
 	"github.com/arduino/arduino-cli/internal/arduino/globals"
@@ -130,21 +131,12 @@ func makeNewLibrary(libraryDir *paths.Path, location LibraryLocation) (*Library,
 	library.LDflags = strings.TrimSpace(libProperties.Get("ldflags"))
 	library.Properties = libProperties
 	library.InDevelopment = libraryDir.Join(".development").Exist()
-	if dependencies := libProperties.Get("depends"); dependencies != "" {
-		for dep := range strings.SplitSeq(strings.TrimSpace(libProperties.Get("depends")), ",") {
-			var depConstraint semver.Constraint
-			depName := strings.TrimSpace(dep)
-			idx := strings.LastIndex(dep, " (")
-			if idx != -1 {
-				depName = dep[:idx]
-				depConstraint, _ = semver.ParseConstraint(dep[idx+1:])
-			}
-			library.Dependencies = append(library.Dependencies, &Dependency{
-				Name:              depName,
-				VersionConstraint: depConstraint,
-			})
-		}
+
+	dependencies, err := extractDependenciesList(libProperties.Get("depends"))
+	if err != nil {
+		return nil, fmt.Errorf("%s: %w", i18n.Tr("scanning library dependencies"), err)
 	}
+	library.Dependencies = dependencies
 	return library, nil
 }
 
@@ -235,3 +227,34 @@ func filterExamplesDirs(dir *paths.Path) bool {
 	}
 	return false
 }
+
+var libraryDependsRegex = regexp.MustCompile("^([^()]+?) *(?: \\((.*)\\))?$")
+
+// extractDependenciesList extracts dependencies from the "depends" field of library.properties
+func extractDependenciesList(depends string) ([]*Dependency, error) {
+	deps := []*Dependency{}
+	depends = strings.TrimSpace(depends)
+	if depends == "" {
+		return deps, nil
+	}
+	for dep := range strings.SplitSeq(depends, ",") {
+		dep = strings.TrimSpace(dep)
+		if dep == "" {
+			return nil, fmt.Errorf("invalid dep: %s", dep)
+		}
+		matches := libraryDependsRegex.FindAllStringSubmatch(dep, -1)
+		if matches == nil {
+			return nil, fmt.Errorf("invalid dep: %s", dep)
+		}
+
+		depConstraint, err := semver.ParseConstraint(matches[0][2])
+		if err != nil {
+			return nil, fmt.Errorf("invalid dep constraint: %s", matches[0][2])
+		}
+		deps = append(deps, &Dependency{
+			Name:              matches[0][1],
+			VersionConstraint: depConstraint,
+		})
+	}
+	return deps, nil
+}

Diff for: internal/arduino/libraries/loader_test.go

@@ -0,0 +1,51 @@
+package libraries
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestDependencyExtract(t *testing.T) {
+	check := func(depDefinition string, name []string, ver []string) {
+		dep, err := extractDependenciesList(depDefinition)
+		require.NoError(t, err)
+		require.NotNil(t, dep)
+		require.Len(t, dep, len(name))
+		for i := range name {
+			require.Equal(t, name[i], dep[i].Name, depDefinition)
+			require.Equal(t, ver[i], dep[i].VersionConstraint.String(), depDefinition)
+		}
+	}
+	invalid := func(depends string) {
+		dep, err := extractDependenciesList(depends)
+		require.Nil(t, dep)
+		require.Error(t, err)
+	}
+	check("ciao", []string{"ciao"}, []string{""})
+	check("MyLib (>1.2.3)", []string{"MyLib"}, []string{">1.2.3"})
+	check("MyLib (>=1.2.3)", []string{"MyLib"}, []string{">=1.2.3"})
+	check("MyLib (<1.2.3)", []string{"MyLib"}, []string{"<1.2.3"})
+	check("MyLib (<=1.2.3)", []string{"MyLib"}, []string{"<=1.2.3"})
+	check("MyLib (!=1.2.3)", []string{"MyLib"}, []string{"!=1.2.3"})
+	check("MyLib (>1.0.0 && <2.1.0)", []string{"MyLib"}, []string{">1.0.0 && <2.1.0"})
+	check("MyLib (<1.0.0 || >2.0.0)", []string{"MyLib"}, []string{"<1.0.0 || >2.0.0"})
+	check("MyLib ((>0.1.0 && <2.0.0) || >2.1.0)", []string{"MyLib"}, []string{"(>0.1.0 && <2.0.0) || >2.1.0"})
+	check("MyLib ()", []string{"MyLib"}, []string{""})
+	check("MyLib (>=1.2.3),AnotherLib, YetAnotherLib (=1.0.0)",
+		[]string{"MyLib", "AnotherLib", "YetAnotherLib"},
+		[]string{">=1.2.3", "", "=1.0.0"})
+	invalid("MyLib,,AnotherLib")
+	invalid("(MyLib)")
+	invalid("MyLib(=1.2.3)")
+	check("Arduino Uno WiFi Dev Ed Library, LoRa Node (^2.1.2)",
+		[]string{"Arduino Uno WiFi Dev Ed Library", "LoRa Node"},
+		[]string{"", "^2.1.2"})
+	check("Arduino Uno WiFi Dev Ed Library   ,   LoRa Node    (^2.1.2)",
+		[]string{"Arduino Uno WiFi Dev Ed Library", "LoRa Node"},
+		[]string{"", "^2.1.2"})
+	check("Arduino_OAuth, ArduinoHttpClient (<0.3.0), NonExistentLib",
+		[]string{"Arduino_OAuth", "ArduinoHttpClient", "NonExistentLib"},
+		[]string{"", "<0.3.0", ""})
+	check("", []string{}, []string{})
+}