From 693673de4fe27367efca3bc75ebf491e211b8de6 Mon Sep 17 00:00:00 2001 From: ChrisJr404 Date: Tue, 5 May 2026 10:20:52 -0400 Subject: [PATCH] refactor: switch from Knetic/govaluate to projectdiscovery fork github.com/Knetic/govaluate has been archived. Switch all import paths in the source tree and go.mod to the maintained fork at github.com/projectdiscovery/govaluate (bug fixes + perf improvements, API-compatible). All tests still pass. --- dsl.go | 2 +- dsl_benchmark_test.go | 2 +- dsl_test.go | 2 +- engine.go | 2 +- func.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dsl.go b/dsl.go index b95a21a..6eaf631 100644 --- a/dsl.go +++ b/dsl.go @@ -34,7 +34,7 @@ import ( "strings" "time" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/Mzack9999/gcache" "github.com/asaskevich/govalidator" "github.com/brianvoe/gofakeit/v7" diff --git a/dsl_benchmark_test.go b/dsl_benchmark_test.go index d5ec613..e897f5c 100644 --- a/dsl_benchmark_test.go +++ b/dsl_benchmark_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" ) func BenchmarkDSLCaching(b *testing.B) { diff --git a/dsl_test.go b/dsl_test.go index 0b64190..4429357 100644 --- a/dsl_test.go +++ b/dsl_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/stretchr/testify/require" "golang.org/x/exp/maps" ) diff --git a/engine.go b/engine.go index 39d7d14..389ef48 100644 --- a/engine.go +++ b/engine.go @@ -3,7 +3,7 @@ package dsl import ( "sync" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" ) var defaultEngine *Engine diff --git a/func.go b/func.go index b24c2ab..1949884 100644 --- a/func.go +++ b/func.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" ) type dslFunction struct { diff --git a/go.mod b/go.mod index d328570..66d42b2 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.24.1 toolchain go1.24.2 require ( - github.com/Knetic/govaluate v3.0.0+incompatible github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/brianvoe/gofakeit/v7 v7.2.1 @@ -57,6 +56,7 @@ require ( github.com/pierrec/lz4/v4 v4.1.23 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/projectdiscovery/blackrock v0.0.1 // indirect + github.com/projectdiscovery/govaluate v0.0.0-20260504230327-80320480bb6e github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect github.com/sorairolake/lzip-go v0.3.8 // indirect github.com/spf13/afero v1.15.0 // indirect diff --git a/go.sum b/go.sum index edd9682..20d4229 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg= -github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057 h1:KFac3SiGbId8ub47e7kd2PLZeACxc1LkiiNoDOFRClE= github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057/go.mod h1:iLB2pivrPICvLOuROKmlqURtFIEsoJZaMidQfCG1+D4= github.com/RumbleDiscovery/rumble-tools v0.0.0-20201105153123-f2adbb3244d2/go.mod h1:jD2+mU+E2SZUuAOHZvZj4xP4frlOo+N/YrXDvASFhkE= @@ -160,6 +158,8 @@ github.com/projectdiscovery/gologger v1.1.68 h1:KfdIO/3X7BtHssWZuqhxPZ+A946epCCx github.com/projectdiscovery/gologger v1.1.68/go.mod h1:Xae0t4SeqJVa0RQGK9iECx/+HfXhvq70nqOQp2BuW+o= github.com/projectdiscovery/gostruct v0.0.2 h1:s8gP8ApugGM4go1pA+sVlPDXaWqNP5BBDDSv7VEdG1M= github.com/projectdiscovery/gostruct v0.0.2/go.mod h1:H86peL4HKwMXcQQtEa6lmC8FuD9XFt6gkNR0B/Mu5PE= +github.com/projectdiscovery/govaluate v0.0.0-20260504230327-80320480bb6e h1:o+ulEIaC2+9V2Ezr6mI5xEhKWsf0V/+FUQIS723Aj6U= +github.com/projectdiscovery/govaluate v0.0.0-20260504230327-80320480bb6e/go.mod h1:xH7bPwHxUlz1yx9UlVeTF+UVCUaKhTnZgaxHb5z362E= github.com/projectdiscovery/mapcidr v1.1.97 h1:7FkxNNVXp+m1rIu5Nv/2SrF9k4+LwP8QuWs2puwy+2w= github.com/projectdiscovery/mapcidr v1.1.97/go.mod h1:9dgTJh1SP02gYZdpzMjm6vtYFkEHQHoTyaVNvaeJ7lA= github.com/projectdiscovery/utils v0.10.1 h1:9luYfL7PpN1L/cLO4bAES4+ltDaEBKOUnRiTn920XfM=