.gitattributes

@@ -0,0 +1 @@
+*\[generated\].go linguist-language=txt

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: antonmedv

.github/scripts/coverage.mjs

@@ -1,17 +1,22 @@
-#!/usr/bin/env zx --experimental
+#!/usr/bin/env zx
 
 const expected = 90
 const exclude = [
-  'expr/test',
-  'checker/mock',
-  'vm/func_types',
-  'vm/runtime/helpers',
+  'expr/test', // We do not need to test the test package.
+  'checker/mock', // Mocks only used for testing.
+  'vm/func_types', // Generated files.
+  'vm/runtime/helpers', // Generated files.
+  'internal/difflib', // Test dependency. This is vendored dependency, and ideally we also have good tests for it.
+  'internal/spew', // Test dependency.
+  'internal/testify', // Test dependency.
+  'patcher/value', // Contains a lot of repeating code. Ideally we should have a test for it.
+  'pro', // Expr Pro is not a part of the main codebase.
 ]
 
 cd(path.resolve(__dirname, '..', '..'))
 
 await spinner('Running tests', async () => {
-  await $`go test -coverprofile=coverage.out -coverpkg=github.com/antonmedv/expr/... ./...`
+  await $`go test -coverprofile=coverage.out -coverpkg=github.com/expr-lang/expr/... ./...`
   const coverage = fs.readFileSync('coverage.out').toString()
     .split('\n')
     .filter(line => {
@@ -24,9 +29,11 @@ await spinner('Running tests', async () => {
   await $`go tool cover -html=coverage.out -o coverage.html`
 })
 
-const cover = await $`go tool cover -func=coverage.out`
+const cover = await $({verbose: true})`go tool cover -func=coverage.out`
 const total = +cover.stdout.match(/total:\s+\(statements\)\s+(\d+\.\d+)%/)[1]
 if (total < expected) {
   echo(chalk.red(`Coverage is too low: ${total}% < ${expected}% (expected)`))
   process.exit(1)
+} else {
+  echo(`Coverage is good: ${chalk.green(total + '%')} >= ${expected}% (expected)`)
 }

.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-versions: [ '1.18', '1.22', '1.24' ]
+        go-arch: [ '386' ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Go ${{ matrix.go-version }}
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Build
+        run: GOARCH=${{ matrix.go-arch }} go build

.github/workflows/check.yml

@@ -16,4 +16,4 @@ jobs:
         with:
           go-version: 1.18
       - name: Test
-        run: npx zx --experimental .github/scripts/coverage.mjs
+        run: npx zx .github/scripts/coverage.mjs

.github/workflows/diff.yml

@@ -13,7 +13,9 @@ jobs:
         with:
           go-version: 1.18
       - name: Install benchstat
-        run: go install golang.org/x/perf/cmd/benchstat@latest
+        # NOTE: benchstat@latest requires go 1.23 since 2025-02-14 - this is the last go 1.18 ref
+        # https://cs.opensource.google/go/x/perf/+/c95ad7d5b636f67d322a7e4832e83103d0fdd292
+        run: go install golang.org/x/perf/cmd/benchstat@884df5810d2850d775c2cb4885a7ea339128a17d
 
       - uses: actions/checkout@v3
       - name: Benchmark new code

.github/workflows/fuzz.yml

@@ -21,14 +21,14 @@ jobs:
           fuzz-seconds: 600
           output-sarif: true
       - name: Upload Crash
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure() && steps.build.outcome == 'success'
         with:
           name: artifacts
           path: ./out/artifacts
       - name: Upload Sarif
         if: always() && steps.build.outcome == 'success'
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           # Path to SARIF file relative to the root of the repository
           sarif_file: cifuzz-sarif/results.sarif

.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' ]
+        go-versions: [ '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24' ]
     steps:
       - uses: actions/checkout@v3
       - name: Setup Go ${{ matrix.go-version }}
@@ -20,3 +20,25 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - name: Test
         run: go test ./...
+
+  debug:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Go 1.18
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.18
+      - name: Test
+        run: go test -tags=expr_debug -run=TestDebugger -v ./vm
+
+  race:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Go 1.21
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21
+      - name: Test
+        run: go test -race .

.gitignore

@@ -6,3 +6,6 @@
 *.test
 *.out
 *.html
+custom_tests.json
+pro/
+test/avs/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Anton Medvedev
+Copyright (c) 2018 Anton Medvedev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,21 +1,29 @@
-# Expr 
-[![test](https://github.com/antonmedv/expr/actions/workflows/test.yml/badge.svg)](https://github.com/antonmedv/expr/actions/workflows/test.yml) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/antonmedv/expr)](https://goreportcard.com/report/github.com/antonmedv/expr) 
-[![GoDoc](https://godoc.org/github.com/antonmedv/expr?status.svg)](https://godoc.org/github.com/antonmedv/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)
+<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).
 
-**Expr** is a Go-centric expression language designed to deliver dynamic configurations with unparalleled accuracy, safety, and speed.
+[![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)
+[![GoDoc](https://godoc.org/github.com/expr-lang/expr?status.svg)](https://godoc.org/github.com/expr-lang/expr)
 
-<img src="https://expr.medv.io/img/logo-small.png" width="150" alt="expr logo" align="right"/>
+**Expr** is a Go-centric expression language designed to deliver dynamic configurations with unparalleled accuracy, safety, and speed. 
+**Expr** combines simple [syntax](https://expr-lang.org/docs/language-definition) with powerful features for ease of use:
 
 ```js
 // Allow only admins and moderators to moderate comments.
 user.Group in ["admin", "moderator"] || user.Id == comment.UserId
 ```
 
+```js
+// Determine whether the request is in the permitted time window.
+request.Time - resource.Age < duration("24h")
+```
+
 ```js
 // Ensure all tweets are less than 240 characters.
-all(Tweets, .Size <= 240)
+all(tweets, len(.Content) <= 240)
 ```
 
 ## Features
@@ -53,34 +61,24 @@ Here are its standout features:
 ## Install
 
 ```
-go get github.com/antonmedv/expr
+go get github.com/expr-lang/expr
 ```
 
 ## Documentation
 
-* See [Getting Started](https://expr.medv.io/docs/Getting-Started) page for developer documentation.
-* See [Language Definition](https://expr.medv.io/docs/Language-Definition) page to learn the syntax.
-
-## Expr Code Editor
-
-<a href="https://bit.ly/expr-code-editor">
-  <img src="https://antonmedv.github.io/expr/ogimage.png" align="center" alt="Expr Code Editor" width="1200"/>
-</a>
-
-Also, I have an embeddable code editor written in JavaScript which allows editing expressions with syntax highlighting and autocomplete based on your types declaration.
-
-[Learn more →](https://antonmedv.github.io/expr/)
+* See [Getting Started](https://expr-lang.org/docs/Getting-Started) page for developer documentation.
+* See [Language Definition](https://expr-lang.org/docs/language-definition) page to learn the syntax.
 
 ## Examples
 
-[Play Online](https://play.golang.org/p/z7T8ytJ1T1d)
+[Play Online](https://go.dev/play/p/XCoNXEjm3TS)
 
 ```go
 package main
 
 import (
 	"fmt"
-	"github.com/antonmedv/expr"
+	"github.com/expr-lang/expr"
 )
 
 func main() {
@@ -106,14 +104,14 @@ func main() {
 }
 ```
 
-[Play Online](https://play.golang.org/p/4S4brsIvU4i)
+[Play Online](https://go.dev/play/p/tz-ZneBfSuw)
 
 ```go
 package main
 
 import (
 	"fmt"
-	"github.com/antonmedv/expr"
+	"github.com/expr-lang/expr"
 )
 
 type Tweet struct {
@@ -153,20 +151,31 @@ func main() {
 * [Aviasales](https://aviasales.ru) utilizes Expr as a business rule engine for its flight search engine.
 * [Wish.com](https://www.wish.com) employs Expr in its decision-making rule engine for the Wish Assistant.
 * [Argo](https://argoproj.github.io) integrates Expr into Argo Rollouts and Argo Workflows for Kubernetes.
-* [Crowdsec](https://crowdsec.net) incorporates Expr into its security automation tool.
-* [FACEIT](https://www.faceit.com) uses Expr to enhance customization of its eSports matchmaking algorithm.
-* [qiniu](https://www.qiniu.com) implements Expr in its trade systems.
-* [Junglee Games](https://www.jungleegames.com/) uses Expr for its in-house marketing retention tool, Project Audience.
 * [OpenTelemetry](https://opentelemetry.io) integrates Expr into the OpenTelemetry Collector.
 * [Philips Labs](https://github.com/philips-labs/tabia) employs Expr in Tabia, a tool designed to collect insights on their code bases.
+* [CrowdSec](https://crowdsec.net) incorporates Expr into its security automation tool.
 * [CoreDNS](https://coredns.io) uses Expr in CoreDNS, which is a DNS server.
+* [qiniu](https://www.qiniu.com) implements Expr in its trade systems.
+* [Junglee Games](https://www.jungleegames.com/) uses Expr for its in-house marketing retention tool, Project Audience.
+* [Faceit](https://www.faceit.com) uses Expr to enhance customization of its eSports matchmaking algorithm.
 * [Chaos Mesh](https://chaos-mesh.org) incorporates Expr into Chaos Mesh, a cloud-native Chaos Engineering platform.
-* [Milvus](https://milvus.io) integrates Expr into Milvus, an open-source vector database.
 * [Visually.io](https://visually.io) employs Expr as a business rule engine for its personalization targeting algorithm.
 * [Akvorado](https://github.com/akvorado/akvorado) utilizes Expr to classify exporters and interfaces in network flows.
-
-[Add your company too](https://github.com/antonmedv/expr/edit/master/README.md)
+* [keda.sh](https://keda.sh) uses Expr to allow customization of its Kubernetes-based event-driven autoscaling.
+* [Span Digital](https://spandigital.com/) uses Expr in its Knowledge Management products.
+* [Xiaohongshu](https://www.xiaohongshu.com/) combining yaml with Expr for dynamically policies delivery.
+* [Melrōse](https://melrōse.org) uses Expr to implement its music programming language.
+* [Tork](https://www.tork.run/) integrates Expr into its workflow execution.
+* [Critical Moments](https://criticalmoments.io) uses Expr for its mobile realtime conditional targeting system.
+* [WoodpeckerCI](https://woodpecker-ci.org) uses Expr for [filtering workflows/steps](https://woodpecker-ci.org/docs/usage/workflow-syntax#evaluate).
+* [FastSchema](https://github.com/fastschema/fastschema) - A BaaS leveraging Expr for its customizable and dynamic Access Control system.
+* [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.
+
+[Add your company too](https://github.com/expr-lang/expr/edit/master/README.md)
 
 ## License
 
-[MIT](https://github.com/antonmedv/expr/blob/master/LICENSE)
+[MIT](https://github.com/expr-lang/expr/blob/master/LICENSE)
+
+<p align="center"><img src="https://expr-lang.org/img/gopher-small.png" width="150" /></p>

SECURITY.md

@@ -11,11 +11,8 @@ unless this is not possible or feasible with a reasonable effort.
 
 | Version | Supported          |
 |---------|--------------------|
-| 1.15    | :white_check_mark: |
-| 1.14    | :white_check_mark: |
-| 1.13    | :white_check_mark: |
-| 1.12    | :white_check_mark: |
-| < 1.12  | :x:                |
+| 1.x     | :white_check_mark: |
+| 0.x     | :x:                |
 
 ## Reporting a Vulnerability
 

ast/find.go

@@ -0,0 +1,18 @@
+package ast
+
+func Find(node Node, fn func(node Node) bool) Node {
+	v := &finder{fn: fn}
+	Walk(&node, v)
+	return v.node
+}
+
+type finder struct {
+	node Node
+	fn   func(node Node) bool
+}
+
+func (f *finder) Visit(node *Node) {
+	if f.fn(*node) {
+		f.node = *node
+	}
+}

ast/find_test.go

@@ -0,0 +1,31 @@
+package ast_test
+
+import (
+	"testing"
+
+	"github.com/expr-lang/expr/internal/testify/require"
+
+	"github.com/expr-lang/expr/ast"
+)
+
+func TestFind(t *testing.T) {
+	left := &ast.IdentifierNode{
+		Value: "a",
+	}
+	var root ast.Node = &ast.BinaryNode{
+		Operator: "+",
+		Left:     left,
+		Right: &ast.IdentifierNode{
+			Value: "b",
+		},
+	}
+
+	x := ast.Find(root, func(node ast.Node) bool {
+		if n, ok := node.(*ast.IdentifierNode); ok {
+			return n.Value == "a"
+		}
+		return false
+	})
+
+	require.Equal(t, left, x)
+}