fix: output original value from array in std.minArray and std.maxArray instead of result of keyF

Author: eduardosm

builtins.go

@@ -2293,21 +2293,30 @@ func builtinMinArray(i *interpreter, arguments []value) (value, error) {
 	if num == 0 {
 		return nil, i.Error("Expected at least one element in array. Got none")
 	}
-	minVal, err := keyF.call(i, args(arr.elements[0]))
+	minVal, err := arr.elements[0].getValue(i)
+	if err != nil {
+		return nil, err
+	}
+	minValKey, err := keyF.call(i, args(arr.elements[0]))
 	if err != nil {
 		return nil, err
 	}
 	for index := 1; index < num; index++ {
-		current, err := keyF.call(i, args(arr.elements[index]))
+		current, err := arr.elements[index].getValue(i)
+		if err != nil {
+			return nil, err
+		}
+		currentKey, err := keyF.call(i, args(arr.elements[index]))
 		if err != nil {
 			return nil, err
 		}
-		cmp, err := valueCmp(i, minVal, current)
+		cmp, err := valueCmp(i, minValKey, currentKey)
 		if err != nil {
 			return nil, err
 		}
 		if cmp > 0 {
 			minVal = current
+			minValKey = currentKey
 		}
 	}
 	return minVal, nil
@@ -2329,21 +2338,30 @@ func builtinMaxArray(i *interpreter, arguments []value) (value, error) {
 	if num == 0 {
 		return nil, i.Error("Expected at least one element in array. Got none")
 	}
-	maxVal, err := keyF.call(i, args(arr.elements[0]))
+	maxVal, err := arr.elements[0].getValue(i)
+	if err != nil {
+		return nil, err
+	}
+	maxValKey, err := keyF.call(i, args(arr.elements[0]))
 	if err != nil {
 		return nil, err
 	}
 	for index := 1; index < num; index++ {
-		current, err := keyF.call(i, args(arr.elements[index]))
+		current, err := arr.elements[index].getValue(i)
+		if err != nil {
+			return nil, err
+		}
+		currentKey, err := keyF.call(i, args(arr.elements[index]))
 		if err != nil {
 			return nil, err
 		}
-		cmp, err := valueCmp(i, maxVal, current)
+		cmp, err := valueCmp(i, maxValKey, currentKey)
 		if err != nil {
 			return nil, err
 		}
 		if cmp < 0 {
 			maxVal = current
+			maxValKey = currentKey
 		}
 	}
 	return maxVal, nil

testdata/std.maxArray.golden

@@ -0,0 +1 @@
+"b1"

testdata/std.maxArray.jsonnet

@@ -0,0 +1 @@
+std.maxArray(["a2", "b1"])

testdata/std.maxArray.linter.golden

@@ -0,0 +1 @@
+"a2"

testdata/std.maxArrayKeyF.golden

@@ -0,0 +1 @@
+std.maxArray(["a2", "b1"], keyF=function(x) x[1])

testdata/std.maxArrayKeyF.jsonnet

@@ -0,0 +1 @@
+"a2"

testdata/std.maxArrayKeyF.linter.golden

@@ -0,0 +1 @@
+std.minArray(["a2", "b1"])