Merge pull request #41 from grafana/38-k6-dependency-is-not-detected-correctly-if-the-k6-module-is-not-imported

fix k6 dependency detection

Author: szkiba

dependencies.go

@@ -11,7 +11,7 @@ import (
 
 //nolint:gochecknoglobals
 var (
-	srcName       = `(?P<name>k6|k6/x/[/0-9a-zA-Z_-]+|(@[a-zA-Z0-9-_]+/)?xk6-([a-zA-Z0-9-_]+)((/[a-zA-Z0-9-_]+)*))`
+	srcName       = `(?P<name>k6|k6/[^/]{2}.*|k6/[^x]/.*|k6/x/[/0-9a-zA-Z_-]+|(@[a-zA-Z0-9-_]+/)?xk6-([a-zA-Z0-9-_]+)((/[a-zA-Z0-9-_]+)*))` //nolint:lll
 	srcConstraint = `[vxX*|,&\^0-9.+-><=, ~]+`
 
 	reName = regexp.MustCompile(srcName)
@@ -275,6 +275,11 @@ func (deps *Dependencies) UnmarshalJS(text []byte) error {
 		}
 
 		if len(extension) != 0 {
+			// no negative lookahead regex support....
+			if strings.HasPrefix(extension, "k6/") && !strings.HasPrefix(extension, "k6/x/") {
+				extension = k6
+			}
+
 			_ = deps.update(&Dependency{Name: extension}) // no chance for conflicting
 		}
 	}

dependencies_test.go

@@ -211,3 +211,23 @@ export default function () {
 	require.Equal(t, "k6/x/faker*", deps["k6/x/faker"].String())
 	require.Equal(t, "k6/x/sql*", deps["k6/x/sql"].String())
 }
+
+func Test_Dependencies_UnmarshalJS_k6_path(t *testing.T) {
+	t.Parallel()
+
+	deps := make(k6deps.Dependencies)
+
+	err := deps.UnmarshalJS([]byte(`
+import Counter from 'k6/metrics';
+
+const count = new Conter("foo")
+
+export default function () {
+  count.add(1)
+}	
+`))
+	require.NoError(t, err)
+
+	require.Len(t, deps, 1)
+	require.Equal(t, "k6*", deps["k6"].String())
+}

dependency.go

@@ -10,7 +10,12 @@ import (
 	"github.com/Masterminds/semver/v3"
 )
 
-const defaultConstraintsString = "*"
+const (
+	// ConstraintsAny is a wildcard constraint that any version matches.
+	ConstraintsAny = "*"
+
+	defaultConstraintsString = ConstraintsAny
+)
 
 //nolint:gochecknoglobals
 var (