Use internal/expr

Author: k1LoW

Diff for: book.go

@@ -14,6 +14,7 @@ import (
 	"github.com/goccy/go-json"
 	"github.com/goccy/go-yaml"
 	"github.com/k1LoW/duration"
+	"github.com/k1LoW/runn/internal/expr"
 	"github.com/k1LoW/sshc/v4"
 )
 
@@ -130,7 +131,7 @@ func (bk *book) parseRunners(store map[string]any) error {
 	// parse SSH Runners first for port forwarding
 	var notSSHRunners []string
 	if store != nil {
-		r, err := EvalExpand(bk.runners, store)
+		r, err := expr.EvalExpand(bk.runners, store)
 		if err != nil {
 			return err
 		}
@@ -160,7 +161,7 @@ func (bk *book) parseRunners(store map[string]any) error {
 
 func (bk *book) parseVars(store map[string]any) error {
 	if store != nil {
-		v, err := EvalExpand(bk.vars, store)
+		v, err := expr.EvalExpand(bk.vars, store)
 		if err != nil {
 			return err
 		}

Diff for: dbg.go

@@ -12,6 +12,7 @@ import (
 	"github.com/elk-language/go-prompt"
 	pstrings "github.com/elk-language/go-prompt/strings"
 	"github.com/k0kubun/pp/v3"
+	"github.com/k1LoW/runn/internal/expr"
 	"github.com/k1LoW/runn/internal/store"
 	"github.com/olekukonko/tablewriter"
 	"github.com/samber/lo"
@@ -199,7 +200,7 @@ L:
 			if !s.deferred {
 				sm[store.RootKeyPrevious] = s.parent.store.Latest()
 			}
-			e, err := Eval(cmd[1], sm)
+			e, err := expr.Eval(cmd[1], sm)
 			if err != nil {
 				_, _ = fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 				continue

Diff for: loadt.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
+	"github.com/k1LoW/runn/internal/expr"
 	or "github.com/ryo-yamaoka/otchkiss/result"
 )
 
@@ -147,7 +148,7 @@ func (r *loadtResult) CheckThreshold(threshold string) error {
 		"p99":        r.p99 * 1000,
 		"avg":        r.avg * 1000,
 	}
-	tf, err := EvalWithTrace(threshold, store)
+	tf, err := expr.EvalWithTrace(threshold, store)
 	if err != nil {
 		return err
 	}

Diff for: operator.go

@@ -326,7 +326,7 @@ func (op *operator) runStep(ctx context.Context, s *step) error {
 			bt string
 			j  int
 		)
-		c, err := EvalCount(s.loop.Count, op.store.ToMap())
+		c, err := expr.EvalCount(s.loop.Count, op.store.ToMap())
 		if err != nil {
 			return err
 		}
@@ -352,7 +352,7 @@ func (op *operator) runStep(ctx context.Context, s *step) error {
 					sm[store.RootKeyPrevious] = op.store.Previous()
 				}
 				sm[store.RootKeyCurrent] = op.store.Latest()
-				tf, err := EvalWithTrace(s.loop.Until, sm)
+				tf, err := expr.EvalWithTrace(s.loop.Until, sm)
 				if err != nil {
 					return fmt.Errorf("loop failed on %s: %w", op.stepName(idx), err)
 				}
@@ -1058,7 +1058,7 @@ func (op *operator) runLoop(ctx context.Context) error {
 		bt      string
 		j       int
 	)
-	c, err := EvalCount(op.loop.Count, op.store.ToMap())
+	c, err := expr.EvalCount(op.loop.Count, op.store.ToMap())
 	if err != nil {
 		return err
 	}
@@ -1513,7 +1513,7 @@ func Load(pathp string, opts ...Option) (*operatorN, error) {
 			continue
 		}
 		// RUNN_LABEL, --label
-		tf, err := EvalCond(cond, labelEnv(op.labels))
+		tf, err := expr.EvalCond(cond, labelEnv(op.labels))
 		if err != nil {
 			return nil, err
 		}

Diff for: operator_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/k1LoW/donegroup"
 	"github.com/k1LoW/httpstub"
+	"github.com/k1LoW/runn/internal/expr"
 	"github.com/k1LoW/runn/internal/store"
 	"github.com/k1LoW/runn/testutil"
 	"github.com/k1LoW/stopw"
@@ -1610,7 +1611,7 @@ func TestLabelCond(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(fmt.Sprintf("%v", tt.runLabels), func(t *testing.T) {
 			cond := labelCond(tt.runLabels)
-			got, err := EvalCond(cond, labelEnv(tt.labels))
+			got, err := expr.EvalCond(cond, labelEnv(tt.labels))
 			if err != nil {
 				t.Error(err)
 			}

Diff for: option.go

@@ -19,6 +19,7 @@ import (
 	pstrings "github.com/elk-language/go-prompt/strings"
 	"github.com/k1LoW/duration"
 	"github.com/k1LoW/runn/builtin"
+	"github.com/k1LoW/runn/internal/expr"
 	"github.com/k1LoW/runn/internal/store"
 	"github.com/k1LoW/sshc/v4"
 	"github.com/samber/lo"
@@ -1033,7 +1034,7 @@ func AfterFuncIf(fn func(*RunResult) error, ifCond string) Option {
 			return ErrNilBook
 		}
 		bk.afterFuncs = append(bk.afterFuncs, func(r *RunResult) error {
-			tf, err := EvalCond(ifCond, r.Store())
+			tf, err := expr.EvalCond(ifCond, r.Store())
 			if err != nil {
 				return err
 			}