Update dependencies, update expr module url.

RULES.md

@@ -27,8 +27,8 @@ can need access to all `endpoints` data.
 
 ### Filter Language
 
-`zda` uses the [antonmedv/expr](https://github.com/antonmedv/expr) library to provide filter functionality,
-its [language reference](https://github.com/antonmedv/expr/blob/master/docs/Language-Definition.md)
+`zda` uses the [antonmedv/expr](https://github.com/expr-lang/expr) library to provide filter functionality,
+its [language reference](https://github.com/expr-lang/expr/blob/master/docs/Language-Definition.md)
 is fully supported. `zda` expects the output of the executed filter to be a boolean value, rule execution will fail if a
 rule does not.
 

go.mod

@@ -3,16 +3,16 @@ module github.com/shimmeringbee/zda
 go 1.22.0
 
 require (
-	github.com/antonmedv/expr v1.15.5
+	github.com/expr-lang/expr v1.16.2
 	github.com/shimmeringbee/callbacks v0.0.0-20221001135028-b85b5f89d5d6
-	github.com/shimmeringbee/da v0.0.0-20240114214251-b3b74f3b1894
+	github.com/shimmeringbee/da v0.0.0-20240322212622-c67427c56547
 	github.com/shimmeringbee/logwrap v0.1.3
 	github.com/shimmeringbee/persistence v0.0.0-20240318205009-b8100e7c3887
 	github.com/shimmeringbee/retry v0.0.0-20221006193055-2ce01bf139c2
 	github.com/shimmeringbee/zcl v0.0.0-20221006205348-732be4c63285
 	github.com/shimmeringbee/zigbee v0.0.0-20221016122511-6c2328db0d94
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/sync v0.5.0
+	golang.org/x/sync v0.6.0
 )
 
 require (

go.sum

@@ -1,8 +1,8 @@
-github.com/antonmedv/expr v1.15.5 h1:y0Iz3cEwmpRz5/r3w4qQR0MfIqJGdGM1zbhD/v0G5Vg=
-github.com/antonmedv/expr v1.15.5/go.mod h1:0E/6TxnOlRNp81GMzX9QfDPAmHo2Phg00y4JUv1ihsE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/expr-lang/expr v1.16.2 h1:JvMnzUs3LeVHBvGFcXYmXo+Q6DPDmzrlcSBO6Wy3w4s=
+github.com/expr-lang/expr v1.16.2/go.mod h1:uCkhfG+x7fcZ5A5sXHKuQ07jGZRl6J0FCAaf2k4PtVQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -14,12 +14,10 @@ github.com/shimmeringbee/bytecodec v0.0.0-20210228205504-1e9e0677347b h1:8q7X6JQ
 github.com/shimmeringbee/bytecodec v0.0.0-20210228205504-1e9e0677347b/go.mod h1:WYnxfxTJ45UQ+xeAuuTSIalcEepgP8Rb7T/OhCaDdgo=
 github.com/shimmeringbee/callbacks v0.0.0-20221001135028-b85b5f89d5d6 h1:A1t2A3OrXEEdZqMw+zmwe6r7LbeZWP256es5TY9/k3Y=
 github.com/shimmeringbee/callbacks v0.0.0-20221001135028-b85b5f89d5d6/go.mod h1:1AzT3lP4dAEaqWDdWsldhRtcl0+jyCGcZaBTHTjtA9w=
-github.com/shimmeringbee/da v0.0.0-20240114214251-b3b74f3b1894 h1:Q7vXhYoHVeh3hFHlAFL1VPbPlhVDwvCnKjtu8VPbUz4=
-github.com/shimmeringbee/da v0.0.0-20240114214251-b3b74f3b1894/go.mod h1:jUKTa353LvJT3TAdwtmfGEbcxkYbG58h0gbASRf0FIs=
+github.com/shimmeringbee/da v0.0.0-20240322212622-c67427c56547 h1:9MK/0t807gjD/CRX+C9GVsONHjt2OJTM6eBIxqR5iC0=
+github.com/shimmeringbee/da v0.0.0-20240322212622-c67427c56547/go.mod h1:jUKTa353LvJT3TAdwtmfGEbcxkYbG58h0gbASRf0FIs=
 github.com/shimmeringbee/logwrap v0.1.3 h1:1PqPGdgbeQxACQqc6RUWERn7EnpA1jbiHzXVYFa7q2A=
 github.com/shimmeringbee/logwrap v0.1.3/go.mod h1:NBAcZCUl6aFOGnWTs8m67EUAmWFZXRhoRQf5nknY8W0=
-github.com/shimmeringbee/persistence v0.0.0-20240311211126-71abe465da0c h1:pxfug23MwBm39D6JKXoykQRSCwUNlr4FbsKqphh/qjU=
-github.com/shimmeringbee/persistence v0.0.0-20240311211126-71abe465da0c/go.mod h1:dKKEj8uVcBM/CArQRE4yLw5DFRfAAzabI7mbgD1ZLeI=
 github.com/shimmeringbee/persistence v0.0.0-20240318205009-b8100e7c3887 h1:hr+n6DzP37QYzCf3FN8bcuPoNSsbQe3u4QztdHjOq3I=
 github.com/shimmeringbee/persistence v0.0.0-20240318205009-b8100e7c3887/go.mod h1:dKKEj8uVcBM/CArQRE4yLw5DFRfAAzabI7mbgD1ZLeI=
 github.com/shimmeringbee/retry v0.0.0-20221006193055-2ce01bf139c2 h1:HxpPz7w7SxVf1GmcM5oTK1JK64TGpK1UflweYRSOwC4=
@@ -40,8 +38,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

rules/engine.go

@@ -3,8 +3,8 @@ package rules
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/antonmedv/expr"
-	"github.com/antonmedv/expr/vm"
+	"github.com/expr-lang/expr"
+	"github.com/expr-lang/expr/vm"
 	"github.com/shimmeringbee/zcl"
 	"github.com/shimmeringbee/zigbee"
 	"io"

rules/engine_test.go

@@ -1,7 +1,7 @@
 package rules
 
 import (
-	"github.com/antonmedv/expr"
+	"github.com/expr-lang/expr"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )