fix: don't share a base env across all executions (#7)

Author: ddebrunner

callable_test.go

@@ -6,15 +6,18 @@ package jsonata
 
 import (
 	"errors"
+	"fmt"
 	"math"
 	"reflect"
 	"regexp"
 	"sort"
 	"strings"
+	"sync"
 	"testing"
 
 	"github.com/stepzen-dev/jsonata-go/jparse"
 	"github.com/stepzen-dev/jsonata-go/jtypes"
+	"github.com/stretchr/testify/assert"
 )
 
 var (
@@ -2761,3 +2764,29 @@ func TestCallableParamCount(t *testing.T) {
 		}
 	}
 }
+
+func TestConcurrentGoCallable(t *testing.T) {
+	const src = `$contains(/^DEF-/)`
+	n := 100
+	var wg sync.WaitGroup
+	for i := 0; i < n; i++ {
+		id := fmt.Sprintf("ABC-%d", i)
+		if i%3 == 0 {
+			id = fmt.Sprintf("DEF-%d", i)
+		}
+
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			result, err := MustCompile(src).Eval(id)
+			assert.NoError(t, err)
+
+			if strings.HasPrefix(id, "DEF-") {
+				assert.Equal(t, true, result)
+			} else {
+				assert.Equal(t, false, result)
+			}
+		}()
+	}
+	wg.Wait()
+}

env.go

@@ -65,7 +65,7 @@ var (
 	argCountEquals1 = jtypes.ArgCountEquals(1)
 )
 
-var baseEnv = initBaseEnv(map[string]Extension{
+var standardFunctions = map[string]Extension{
 
 	// String functions
 
@@ -385,7 +385,7 @@ var baseEnv = initBaseEnv(map[string]Extension{
 		UndefinedHandler:   nil,
 		EvalContextHandler: nil,
 	},
-})
+}
 
 func initBaseEnv(exts map[string]Extension) *environment {
 

jsonata.go

@@ -232,7 +232,9 @@ func (e *Expr) newEnv(input reflect.Value) *environment {
 
 	tc := timeCallables(time.Now())
 
-	env := newEnvironment(baseEnv, len(tc)+len(e.registry)+1)
+	// create a new base environment (with the standard functions) to
+	// ensure each execution gets its own set of goCallables for functions.
+	env := newEnvironment(initBaseEnv(standardFunctions), len(tc)+len(e.registry)+1)
 
 	env.bind("$", input)
 	env.bindAll(tc)