Make eval an internal package. Change interface to explicitly require a Config object.

Author: scunningham

cmd/wasm/wasm.go

@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/prequel-dev/preq/internal/pkg/config"
+	"github.com/prequel-dev/preq/internal/pkg/eval"
 	"github.com/prequel-dev/preq/internal/pkg/ux"
 	"github.com/prequel-dev/preq/internal/pkg/verz"
-	"github.com/prequel-dev/preq/pkg/eval"
 	"github.com/rs/zerolog/log"
 )
 
@@ -66,10 +66,10 @@ func detectWrapper(ctx context.Context) js.Func {
 	detectFunc := js.FuncOf(func(this js.Value, args []js.Value) any {
 
 		var (
-			cfg, inputData, ruleData string
-			reportDoc                ux.ReportDocT
-			stats                    ux.StatsT
-			err                      error
+			inputData, ruleData string
+			reportDoc           ux.ReportDocT
+			stats               ux.StatsT
+			err                 error
 		)
 
 		log.Info().
@@ -82,7 +82,7 @@ func detectWrapper(ctx context.Context) js.Func {
 		ruleData = args[1].String()
 
 		// Permit events to arrive out of order within a 1 hour window by default
-		cfg = config.Marshal(config.WithWindow(time.Hour))
+		cfg := config.DefaultConfig(config.WithWindow(time.Hour))
 
 		if reportDoc, stats, err = eval.Detect(ctx, cfg, inputData, ruleData); err != nil {
 			return errJson(err)

internal/pkg/config/config.go

@@ -55,7 +55,7 @@ func parseOpts(opts ...OptT) *optsT {
 }
 
 // LoadConfig loads the configuration from the specified directory and file.
-// If the file does not exist, it creates a return a default configuration.
+// If the file does not exist, it returns a default configuration.
 
 func LoadConfig(dir, file string, opts ...OptT) (*Config, error) {
 

pkg/eval/eval.go internal/pkg/eval/eval.gopkg/eval/eval.go renamed to internal/pkg/eval/eval.go

@@ -2,7 +2,6 @@ package eval
 
 import (
 	"context"
-	"strings"
 
 	"github.com/prequel-dev/preq/internal/pkg/config"
 	"github.com/prequel-dev/preq/internal/pkg/engine"
@@ -13,10 +12,9 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func Detect(ctx context.Context, cfg, data, rule string) (ux.ReportDocT, ux.StatsT, error) {
+func Detect(ctx context.Context, c *config.Config, data, rule string) (ux.ReportDocT, ux.StatsT, error) {
 
 	var (
-		c            *config.Config
 		run          *engine.RuntimeT
 		report       *ux.ReportT
 		ruleMatchers *engine.RuleMatchersT
@@ -26,16 +24,6 @@ func Detect(ctx context.Context, cfg, data, rule string) (ux.ReportDocT, ux.Stat
 		err          error
 	)
 
-	switch len(cfg) {
-	case 0:
-		c = config.DefaultConfig()
-	default:
-		if c, err = config.ReadConfig(strings.NewReader(cfg)); err != nil {
-			log.Error().Err(err).Msg("Failed to load config")
-			return nil, nil, err
-		}
-	}
-
 	opts := c.ResolveOpts()
 	opts = append(opts, resolve.WithTimestampTries(timez.DefaultSkip))
 

test/preq_test.go

@@ -5,8 +5,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/prequel-dev/preq/internal/pkg/config"
+	"github.com/prequel-dev/preq/internal/pkg/eval"
 	"github.com/prequel-dev/preq/internal/pkg/logs"
-	"github.com/prequel-dev/preq/pkg/eval"
 	"github.com/rs/zerolog/log"
 )
 
@@ -138,7 +139,7 @@ func TestSuccessExamples(t *testing.T) {
 				t.Fatalf("Error reading data file %s: %v", test.dataPath, err)
 			}
 
-			_, stats, err := eval.Detect(ctx, "", string(data), string(ruleData))
+			_, stats, err := eval.Detect(ctx, config.DefaultConfig(), string(data), string(ruleData))
 			if err != nil {
 				t.Fatalf("Error running detection: %v", err)
 			}
@@ -226,7 +227,7 @@ func TestMissExamples(t *testing.T) {
 				t.Fatalf("Error reading data file %s: %v", test.dataPath, err)
 			}
 
-			_, stats, err := eval.Detect(ctx, "", string(data), string(ruleData))
+			_, stats, err := eval.Detect(ctx, config.DefaultConfig(), string(data), string(ruleData))
 			if err != nil {
 				t.Fatalf("Error running detection: %v", err)
 			}
@@ -294,7 +295,7 @@ func TestFailureExamples(t *testing.T) {
 				t.Fatalf("Error reading data file %s: %v", test.dataPath, err)
 			}
 
-			_, _, err = eval.Detect(ctx, "", string(data), string(ruleData))
+			_, _, err = eval.Detect(ctx, config.DefaultConfig(), string(data), string(ruleData))
 			if err == nil {
 				t.Fatalf("Expected error running detection: %v", err)
 			}