rename WithLogger to WithLogHandler, move options package

README.md

@@ -50,7 +50,7 @@ import (
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/risor"
-	"github.com/robbyt/go-polyscript/options"
+	"github.com/robbyt/go-polyscript/engine/options"
 )
 
 func main() {
@@ -79,7 +79,7 @@ func main() {
 	evaluator, err := polyscript.FromRisorString(
 		scriptContent,
 		options.WithDefaults(),
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(dataProvider),
 		risor.WithGlobals([]string{"ctx"}),
 	)

engine/benchmark_test.go

@@ -31,11 +31,11 @@ import (
 	"testing"
 
 	"github.com/robbyt/go-polyscript"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/risor"
 	"github.com/robbyt/go-polyscript/machines/starlark"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // quietHandler is a slog.Handler that discards all logs
@@ -70,7 +70,7 @@ func BenchmarkEvaluationPatterns(b *testing.B) {
 				scriptContent,
 				options.WithDefaults(),
 				options.WithDataProvider(dataProvider),
-				options.WithLogger(quietHandler),
+				options.WithLogHandler(quietHandler),
 				risor.WithGlobals([]string{constants.Ctx}),
 			)
 			if err != nil {
@@ -94,7 +94,7 @@ func BenchmarkEvaluationPatterns(b *testing.B) {
 			scriptContent,
 			options.WithDefaults(),
 			options.WithDataProvider(dataProvider),
-			options.WithLogger(quietHandler),
+			options.WithLogHandler(quietHandler),
 			risor.WithGlobals([]string{constants.Ctx}),
 		)
 		if err != nil {
@@ -138,7 +138,7 @@ func BenchmarkDataProviders(b *testing.B) {
 			scriptContent,
 			options.WithDefaults(),
 			options.WithDataProvider(dataProvider),
-			options.WithLogger(quietHandler),
+			options.WithLogHandler(quietHandler),
 			risor.WithGlobals([]string{constants.Ctx}),
 		)
 		if err != nil {
@@ -160,7 +160,7 @@ func BenchmarkDataProviders(b *testing.B) {
 			scriptContent,
 			options.WithDefaults(),
 			options.WithDataProvider(dataProvider),
-			options.WithLogger(quietHandler),
+			options.WithLogHandler(quietHandler),
 			risor.WithGlobals([]string{constants.Ctx}),
 		)
 		if err != nil {
@@ -187,7 +187,7 @@ func BenchmarkDataProviders(b *testing.B) {
 			scriptContent,
 			options.WithDefaults(),
 			options.WithDataProvider(compositeProvider),
-			options.WithLogger(quietHandler),
+			options.WithLogHandler(quietHandler),
 			risor.WithGlobals([]string{constants.Ctx}),
 		)
 		if err != nil {
@@ -244,7 +244,7 @@ message = "Hello, " + name + "!"
 			risorScript,
 			options.WithDefaults(),
 			options.WithDataProvider(staticProvider),
-			options.WithLogger(quietHandler),
+			options.WithLogHandler(quietHandler),
 			risor.WithGlobals([]string{constants.Ctx}),
 		)
 		if err != nil {
@@ -265,7 +265,7 @@ message = "Hello, " + name + "!"
 			starlarkScript,
 			options.WithDefaults(),
 			options.WithDataProvider(staticProvider),
-			options.WithLogger(quietHandler),
+			options.WithLogHandler(quietHandler),
 			starlark.WithGlobals([]string{constants.Ctx}),
 		)
 		if err != nil {

engine/evaluator_test.go

@@ -9,10 +9,10 @@ import (
 	"testing"
 
 	"github.com/robbyt/go-polyscript"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/risor"
-	"github.com/robbyt/go-polyscript/options"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -30,7 +30,7 @@ method := ctx["request"]["Method"]
 greeting := ctx["input_data"]["greeting"]
 method + " " + greeting
 `,
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(provider),
 		risor.WithGlobals([]string{constants.Ctx}),
 	)
@@ -84,7 +84,7 @@ func TestEvaluatorWithPrepErrors(t *testing.T) {
 	// Test with StaticProvider (which doesn't support adding data)
 	staticProvider := data.NewStaticProvider(map[string]any{"static": "data"})
 	evaluator, err := polyscript.FromRisorString(`ctx["static"]`,
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(staticProvider),
 		risor.WithGlobals([]string{constants.Ctx}),
 	)
@@ -106,7 +106,7 @@ func TestEvaluatorWithPrepErrors(t *testing.T) {
 	// Test with evaluator that has a ContextProvider
 	contextProvider := data.NewContextProvider(constants.EvalData)
 	evaluator, err = polyscript.FromRisorString(`ctx["request"]["ID"] || "no id"`,
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(contextProvider),
 		risor.WithGlobals([]string{constants.Ctx}),
 	)

options/options.go → engine/options/options.go

@@ -27,8 +27,8 @@ type Config struct {
 // Option is a function that modifies Config
 type Option func(*Config) error
 
-// WithLogger sets the logger for the script engine
-func WithLogger(handler slog.Handler) Option {
+// WithLogHandler sets the logger for the script engine
+func WithLogHandler(handler slog.Handler) Option {
 	return func(c *Config) error {
 		if handler != nil {
 			c.handler = handler
@@ -37,6 +37,16 @@ func WithLogger(handler slog.Handler) Option {
 	}
 }
 
+// WithSlog sets the slog logger for the script engine
+func WithSlog(logger *slog.Logger) Option {
+	return func(c *Config) error {
+		if logger != nil {
+			c.handler = logger.Handler()
+		}
+		return nil
+	}
+}
+
 // WithDataProvider sets the data provider for the script engine
 func WithDataProvider(provider data.Provider) Option {
 	return func(c *Config) error {

options/options_test.go → engine/options/options_test.go

@@ -58,7 +58,7 @@ func TestWithOptions(t *testing.T) {
 	testLoader := NewMockLoader()
 
 	// Create and apply options
-	loggerOpt := WithLogger(testHandler)
+	loggerOpt := WithLogHandler(testHandler)
 	dataProviderOpt := WithDataProvider(testDataProvider)
 	loaderOpt := WithLoader(testLoader)
 

examples/data-prep/extism/main.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/robbyt/go-polyscript"
 	"github.com/robbyt/go-polyscript/engine"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/extism"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // ExtismEvaluator is a type alias to make testing cleaner
@@ -39,7 +39,7 @@ func createExtismEvaluator(
 	// Create evaluator using the functional options pattern
 	return polyscript.FromExtismFile(
 		wasmFilePath,
-		options.WithLogger(logger.Handler()),
+		options.WithLogHandler(logger.Handler()),
 		options.WithDataProvider(compositeProvider),
 		extism.WithEntryPoint("greet"),
 	)

examples/data-prep/risor/main.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/robbyt/go-polyscript"
 	"github.com/robbyt/go-polyscript/engine"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/risor"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // RisorEvaluator is a type alias to make testing cleaner
@@ -45,7 +45,7 @@ func createRisorEvaluator(
 	return polyscript.FromRisorString(
 		scriptContent,
 		options.WithDefaults(),
-		options.WithLogger(logger.Handler()),
+		options.WithLogHandler(logger.Handler()),
 		options.WithDataProvider(compositeProvider),
 		risor.WithGlobals(globals),
 	)

examples/data-prep/starlark/main.go

@@ -12,10 +12,10 @@ import (
 
 	"github.com/robbyt/go-polyscript"
 	"github.com/robbyt/go-polyscript/engine"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/starlark"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // StarlarkEvaluator is a type alias to make testing cleaner
@@ -47,7 +47,7 @@ func createStarlarkEvaluator(
 	return polyscript.FromStarlarkString(
 		scriptContent,
 		options.WithDefaults(),
-		options.WithLogger(logger.Handler()),
+		options.WithLogHandler(logger.Handler()),
 		options.WithDataProvider(compositeProvider),
 		starlark.WithGlobals(globals),
 	)

examples/multiple-instantiation/extism/main.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/robbyt/go-polyscript"
 	"github.com/robbyt/go-polyscript/engine"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/extism"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // ExtismEvaluator is a type alias to make testing cleaner
@@ -65,7 +65,7 @@ func createEvaluator(handler slog.Handler) (ExtismEvaluator, error) {
 	// Create the evaluator
 	evaluator, err := polyscript.FromExtismFile(
 		wasmFilePath,
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(dataProvider),
 		extism.WithEntryPoint("greet"),
 	)

examples/multiple-instantiation/risor/main.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/robbyt/go-polyscript"
 	"github.com/robbyt/go-polyscript/engine"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/risor"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // RisorEvaluator is a type alias to make testing cleaner
@@ -38,7 +38,7 @@ func createEvaluator(handler slog.Handler) (RisorEvaluator, error) {
 	evaluator, err := polyscript.FromRisorString(
 		risorScript,
 		options.WithDefaults(),
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(ctxProvider),
 		risor.WithGlobals(globals),
 	)

examples/multiple-instantiation/starlark/main.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/robbyt/go-polyscript"
 	"github.com/robbyt/go-polyscript/engine"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/starlark"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // StarlarkEvaluator is a type alias to make testing cleaner
@@ -38,7 +38,7 @@ func createEvaluator(handler slog.Handler) (StarlarkEvaluator, error) {
 	evaluator, err := polyscript.FromStarlarkString(
 		starlarkScript,
 		options.WithDefaults(),
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(ctxProvider),
 		starlark.WithGlobals(globals),
 	)

examples/simple/extism/main.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/robbyt/go-polyscript"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/extism"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // findWasmFile searches for the Extism WASM file in various likely locations
@@ -64,7 +64,7 @@ func runExtismExample(handler slog.Handler) (map[string]any, error) {
 	evaluator, err := polyscript.FromExtismFile(
 		wasmFilePath,
 		options.WithDefaults(),
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(dataProvider),
 		extism.WithEntryPoint("greet"),
 	)

examples/simple/risor/main.go

@@ -8,10 +8,10 @@ import (
 	"os"
 
 	"github.com/robbyt/go-polyscript"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/risor"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 //go:embed testdata/script.risor
@@ -37,7 +37,7 @@ func runRisorExample(handler slog.Handler) (map[string]any, error) {
 	evaluator, err := polyscript.FromRisorString(
 		risorScript,
 		options.WithDefaults(), // Add defaults option to ensure all required fields are set
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(dataProvider),
 		risor.WithGlobals(globals),
 	)

examples/simple/starlark/main.go

@@ -8,10 +8,10 @@ import (
 	"os"
 
 	"github.com/robbyt/go-polyscript"
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/execution/constants"
 	"github.com/robbyt/go-polyscript/execution/data"
 	"github.com/robbyt/go-polyscript/machines/starlark"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 //go:embed testdata/script.star
@@ -37,7 +37,7 @@ func runStarlarkExample(handler slog.Handler) (map[string]any, error) {
 	evaluator, err := polyscript.FromStarlarkString(
 		starlarkScript,
 		options.WithDefaults(),
-		options.WithLogger(handler),
+		options.WithLogHandler(handler),
 		options.WithDataProvider(dataProvider),
 		starlark.WithGlobals(globals),
 	)

machines/extism/options.go

@@ -3,8 +3,8 @@ package extism
 import (
 	"fmt"
 
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/machines/types"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // ExtismOptions provides configuration options for the Extism compiler

machines/extism/options_test.go

@@ -3,8 +3,8 @@ package extism
 import (
 	"testing"
 
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/machines/types"
-	"github.com/robbyt/go-polyscript/options"
 	"github.com/stretchr/testify/require"
 )
 

machines/risor/options.go

@@ -3,8 +3,8 @@ package risor
 import (
 	"fmt"
 
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/machines/types"
-	"github.com/robbyt/go-polyscript/options"
 )
 
 // RisorOptions provides configuration options for the Risor compiler

machines/risor/options_test.go

@@ -3,8 +3,8 @@ package risor
 import (
 	"testing"
 
+	"github.com/robbyt/go-polyscript/engine/options"
 	"github.com/robbyt/go-polyscript/machines/types"
-	"github.com/robbyt/go-polyscript/options"
 	"github.com/stretchr/testify/require"
 )