Merge branch 'master' into fix/issue-823-part2

Author: antonmedv

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-versions: [ '1.18', '1.22', '1.24', '1.25' ]
+        go-versions: [ '1.18', '1.22', '1.24', '1.25', '1.26' ]
         go-arch: [ '386' ]
     steps:
       - uses: actions/checkout@v3

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-versions: [ '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24', '1.25' ]
+        go-versions: [ '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24', '1.25', '1.26' ]
     steps:
       - uses: actions/checkout@v3
       - name: Setup Go ${{ matrix.go-version }}

README.md

@@ -1,8 +1,5 @@
 <h1><a href="https://expr-lang.org"><img src="https://expr-lang.org/img/logo.png" alt="Zx logo" height="48"align="right"></a> Expr</h1>
 
-> [!IMPORTANT]
-> The repository [github.com/antonmedv/expr](https://github.com/antonmedv/expr) moved to [github.com/**expr-lang**/expr](https://github.com/expr-lang/expr).
-
 [![test](https://github.com/expr-lang/expr/actions/workflows/test.yml/badge.svg)](https://github.com/expr-lang/expr/actions/workflows/test.yml) 
 [![Go Report Card](https://goreportcard.com/badge/github.com/expr-lang/expr)](https://goreportcard.com/report/github.com/expr-lang/expr) 
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/expr.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:expr)
@@ -173,6 +170,7 @@ func main() {
 * [WunderGraph Cosmo](https://github.com/wundergraph/cosmo) - GraphQL Federeration Router uses Expr to customize Middleware behaviour
 * [SOLO](https://solo.one) uses Expr interally to allow dynamic code execution with custom defined functions.
 * [Naoma.AI](https://www.naoma.ai) uses Expr as a part of its call scoring engine.
+* [GlassFlow.dev](https://github.com/glassflow/clickhouse-etl) uses Expr to do realtime data transformation in ETL pipelines
 
 [Add your company too](https://github.com/expr-lang/expr/edit/master/README.md)
 

ast/node.go

@@ -104,6 +104,12 @@ type StringNode struct {
 	Value string // Value of the string.
 }
 
+// BytesNode represents a byte slice.
+type BytesNode struct {
+	base
+	Value []byte // Value of the byte slice.
+}
+
 // ConstantNode represents a constant.
 // Constants are predefined values like nil, true, false, array, map, etc.
 // The parser.Parse will never generate ConstantNode, it is only generated
@@ -181,6 +187,7 @@ type BuiltinNode struct {
 	Arguments []Node // Arguments of the builtin function.
 	Throws    bool   // If true then accessing a field or array index can throw an error. Used by optimizer.
 	Map       Node   // Used by optimizer to fold filter() and map() builtins.
+	Threshold *int   // Used by optimizer for count() early termination.
 }
 
 // PredicateNode represents a predicate.

ast/print.go

@@ -33,6 +33,10 @@ func (n *StringNode) String() string {
 	return fmt.Sprintf("%q", n.Value)
 }
 
+func (n *BytesNode) String() string {
+	return fmt.Sprintf("b%q", n.Value)
+}
+
 func (n *ConstantNode) String() string {
 	if n.Value == nil {
 		return "nil"

ast/visitor.go

@@ -17,6 +17,7 @@ func Walk(node *Node, v Visitor) {
 	case *FloatNode:
 	case *BoolNode:
 	case *StringNode:
+	case *BytesNode:
 	case *ConstantNode:
 	case *UnaryNode:
 		Walk(&n.Node, v)

bench_test.go

@@ -571,3 +571,71 @@ func Benchmark_reduce(b *testing.B) {
 
 	require.Equal(b, 5050, out.(int))
 }
+
+func Benchmark_min(b *testing.B) {
+	arr := []any{55, 58, 42, 61, 75, 52, 64, 62, 16, 79, 40, 14, 50, 76, 23, 2, 5, 80, 89, 51, 21, 96, 91, 13, 71, 82, 65, 63, 11, 17, 94, 81, 74, 4, 97, 1, 39, 3, 28, 8, 84, 90, 47, 85, 7, 56, 49, 93, 33, 12, 19, 60, 86, 100, 44, 45, 36, 72, 95, 77, 34, 92, 24, 73, 18, 38, 43, 26, 41, 69, 67, 57, 9, 27, 66, 87, 46, 35, 59, 70, 10, 20, 53, 15, 32, 98, 68, 31, 54, 25, 83, 88, 22, 48, 29, 37, 6, 78, 99, 30}
+	env := map[string]any{"arr": arr}
+
+	program, err := expr.Compile(`min(arr)`, expr.Env(env))
+	require.NoError(b, err)
+
+	var out any
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		out, _ = vm.Run(program, env)
+	}
+	b.StopTimer()
+
+	require.Equal(b, 1, out)
+}
+
+func Benchmark_max(b *testing.B) {
+	arr := []any{55, 58, 42, 61, 75, 52, 64, 62, 16, 79, 40, 14, 50, 76, 23, 2, 5, 80, 89, 51, 21, 96, 91, 13, 71, 82, 65, 63, 11, 17, 94, 81, 74, 4, 97, 1, 39, 3, 28, 8, 84, 90, 47, 85, 7, 56, 49, 93, 33, 12, 19, 60, 86, 100, 44, 45, 36, 72, 95, 77, 34, 92, 24, 73, 18, 38, 43, 26, 41, 69, 67, 57, 9, 27, 66, 87, 46, 35, 59, 70, 10, 20, 53, 15, 32, 98, 68, 31, 54, 25, 83, 88, 22, 48, 29, 37, 6, 78, 99, 30}
+	env := map[string]any{"arr": arr}
+
+	program, err := expr.Compile(`max(arr)`, expr.Env(env))
+	require.NoError(b, err)
+
+	var out any
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		out, _ = vm.Run(program, env)
+	}
+	b.StopTimer()
+
+	require.Equal(b, 100, out)
+}
+
+func Benchmark_mean(b *testing.B) {
+	arr := []any{55, 58, 42, 61, 75, 52, 64, 62, 16, 79, 40, 14, 50, 76, 23, 2, 5, 80, 89, 51, 21, 96, 91, 13, 71, 82, 65, 63, 11, 17, 94, 81, 74, 4, 97, 1, 39, 3, 28, 8, 84, 90, 47, 85, 7, 56, 49, 93, 33, 12, 19, 60, 86, 100, 44, 45, 36, 72, 95, 77, 34, 92, 24, 73, 18, 38, 43, 26, 41, 69, 67, 57, 9, 27, 66, 87, 46, 35, 59, 70, 10, 20, 53, 15, 32, 98, 68, 31, 54, 25, 83, 88, 22, 48, 29, 37, 6, 78, 99, 30}
+	env := map[string]any{"arr": arr}
+
+	program, err := expr.Compile(`mean(arr)`, expr.Env(env))
+	require.NoError(b, err)
+
+	var out any
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		out, _ = vm.Run(program, env)
+	}
+	b.StopTimer()
+
+	require.Equal(b, 50.5, out)
+}
+
+func Benchmark_median(b *testing.B) {
+	arr := []any{55, 58, 42, 61, 75, 52, 64, 62, 16, 79, 40, 14, 50, 76, 23, 2, 5, 80, 89, 51, 21, 96, 91, 13, 71, 82, 65, 63, 11, 17, 94, 81, 74, 4, 97, 1, 39, 3, 28, 8, 84, 90, 47, 85, 7, 56, 49, 93, 33, 12, 19, 60, 86, 100, 44, 45, 36, 72, 95, 77, 34, 92, 24, 73, 18, 38, 43, 26, 41, 69, 67, 57, 9, 27, 66, 87, 46, 35, 59, 70, 10, 20, 53, 15, 32, 98, 68, 31, 54, 25, 83, 88, 22, 48, 29, 37, 6, 78, 99, 30}
+	env := map[string]any{"arr": arr}
+
+	program, err := expr.Compile(`median(arr)`, expr.Env(env))
+	require.NoError(b, err)
+
+	var out any
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		out, _ = vm.Run(program, env)
+	}
+	b.StopTimer()
+
+	require.Equal(b, 50.5, out)
+}

builtin/builtin.go

@@ -1000,13 +1000,17 @@ var Builtins = []*Function{
 
 			var desc bool
 			if len(args) == 2 {
-				switch args[1].(string) {
+				order, ok := args[1].(string)
+				if !ok {
+					return nil, 0, fmt.Errorf("sort order argument must be a string (got %T)", args[1])
+				}
+				switch order {
 				case "asc":
 					desc = false
 				case "desc":
 					desc = true
 				default:
-					return nil, 0, fmt.Errorf("invalid order %s, expected asc or desc", args[1])
+					return nil, 0, fmt.Errorf("invalid order %s, expected asc or desc", order)
 				}
 			}
 

builtin/builtin_test.go

@@ -21,11 +21,19 @@ import (
 func TestBuiltin(t *testing.T) {
 	ArrayWithNil := []any{42}
 	env := map[string]any{
-		"ArrayOfString":   []string{"foo", "bar", "baz"},
-		"ArrayOfInt":      []int{1, 2, 3},
-		"ArrayOfAny":      []any{1, "2", true},
-		"ArrayOfFoo":      []mock.Foo{{Value: "a"}, {Value: "b"}, {Value: "c"}},
-		"PtrArrayWithNil": &ArrayWithNil,
+		"ArrayOfString":    []string{"foo", "bar", "baz"},
+		"ArrayOfInt":       []int{1, 2, 3},
+		"ArrayOfFloat":     []float64{1.5, 2.5, 3.5},
+		"ArrayOfInt32":     []int32{1, 2, 3},
+		"ArrayOfAny":       []any{1, "2", true},
+		"ArrayOfFoo":       []mock.Foo{{Value: "a"}, {Value: "b"}, {Value: "c"}},
+		"PtrArrayWithNil":  &ArrayWithNil,
+		"EmptyIntArray":    []int{},
+		"EmptyFloatArray":  []float64{},
+		"NestedIntArrays":  []any{[]int{1, 2}, []int{3, 4}},
+		"NestedAnyArrays":  []any{[]any{1, 2}, []any{3, 4}},
+		"MixedNestedArray": []any{1, []int{2, 3}, []float64{4.0, 5.0}},
+		"NestedInt32Array": []any{[]int32{1, 2}, []int32{3, 4}},
 	}
 
 	var tests = []struct {
@@ -86,6 +94,22 @@ func TestBuiltin(t *testing.T) {
 		{`min([1, 2, 3])`, 1},
 		{`min([1.5, 2.5, 3.5])`, 1.5},
 		{`min(-1, [1.5, 2.5, 3.5])`, -1},
+		{`max(ArrayOfInt)`, 3},
+		{`min(ArrayOfInt)`, 1},
+		{`max(ArrayOfFloat)`, 3.5},
+		{`min(ArrayOfFloat)`, 1.5},
+		{`max(EmptyIntArray, 5)`, 5},
+		{`min(EmptyFloatArray, 5)`, 5},
+		{`max(NestedIntArrays)`, 4},
+		{`min(NestedIntArrays)`, 1},
+		{`max(NestedAnyArrays)`, 4},
+		{`min(NestedAnyArrays)`, 1},
+		{`max(MixedNestedArray)`, 5.0},
+		{`min(MixedNestedArray)`, 1},
+		{`max(ArrayOfInt32)`, int32(3)},
+		{`min(ArrayOfInt32)`, int32(1)},
+		{`max(NestedInt32Array)`, int32(4)},
+		{`min(NestedInt32Array)`, int32(1)},
 		{`sum(1..9)`, 45},
 		{`sum([.5, 1.5, 2.5])`, 4.5},
 		{`sum([])`, 0},
@@ -97,6 +121,13 @@ func TestBuiltin(t *testing.T) {
 		{`mean(10, [1, 2, 3], 1..9)`, 4.6923076923076925},
 		{`mean(-10, [1, 2, 3, 4])`, 0.0},
 		{`mean(10.9, 1..9)`, 5.59},
+		{`mean(ArrayOfInt)`, 2.0},
+		{`mean(ArrayOfFloat)`, 2.5},
+		{`mean(NestedIntArrays)`, 2.5},
+		{`mean(NestedAnyArrays)`, 2.5},
+		{`mean(MixedNestedArray)`, 3.0},
+		{`mean(ArrayOfInt32)`, 2.0},
+		{`mean(NestedInt32Array)`, 2.5},
 		{`median(1..9)`, 5.0},
 		{`median([.5, 1.5, 2.5])`, 1.5},
 		{`median([])`, 0.0},
@@ -105,6 +136,13 @@ func TestBuiltin(t *testing.T) {
 		{`median(10, [1, 2, 3], 1..9)`, 4.0},
 		{`median(-10, [1, 2, 3, 4])`, 2.0},
 		{`median(1..5, 4.9)`, 3.5},
+		{`median(ArrayOfInt)`, 2.0},
+		{`median(ArrayOfFloat)`, 2.5},
+		{`median(NestedIntArrays)`, 2.5},
+		{`median(NestedAnyArrays)`, 2.5},
+		{`median(MixedNestedArray)`, 3.0},
+		{`median(ArrayOfInt32)`, 2.0},
+		{`median(NestedInt32Array)`, 2.5},
 		{`toJSON({foo: 1, bar: 2})`, "{\n  \"bar\": 2,\n  \"foo\": 1\n}"},
 		{`fromJSON("[1, 2, 3]")`, []any{1.0, 2.0, 3.0}},
 		{`toBase64("hello")`, "aGVsbG8="},
@@ -150,6 +188,8 @@ func TestBuiltin(t *testing.T) {
 		{`reduce(1..9, # + #acc)`, 45},
 		{`reduce([.5, 1.5, 2.5], # + #acc, 0)`, 4.5},
 		{`reduce([], 5, 0)`, 0},
+		{`reduce(10..1, # + #acc, 100)`, 100},
+		{`reduce([], # + #acc, 42)`, 42},
 		{`concat(ArrayOfString, ArrayOfInt)`, []any{"foo", "bar", "baz", 1, 2, 3}},
 		{`concat(PtrArrayWithNil, [nil])`, []any{42, nil}},
 		{`flatten([["a", "b"], [1, 2]])`, []any{"a", "b", 1, 2}},
@@ -243,6 +283,7 @@ func TestBuiltin_errors(t *testing.T) {
 		{`timezone(nil)`, "cannot use nil as argument (type string) to call timezone (1:10)"},
 		{`flatten([1, 2], [3, 4])`, "invalid number of arguments (expected 1, got 2)"},
 		{`flatten(1)`, "cannot flatten int"},
+		{`fromJSON("5e2482")`, "cannot unmarshal number"},
 	}
 	for _, test := range errorTests {
 		t.Run(test.input, func(t *testing.T) {
@@ -259,6 +300,15 @@ func TestBuiltin_errors(t *testing.T) {
 	}
 }
 
+func TestBuiltin_env_not_callable(t *testing.T) {
+	code := `$env(''matches'i'?t:get().UTC())`
+	env := map[string]any{"t": 1}
+
+	_, err := expr.Compile(code, expr.Env(env))
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "is not callable")
+}
+
 func TestBuiltin_types(t *testing.T) {
 	env := map[string]any{
 		"num":           42,