Move WaitForEventOption parsing to mapping

Author: inancgumus

browser/browser_context_mapping.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"time"
 
 	"github.com/grafana/sobek"
 
@@ -109,14 +110,12 @@ func mapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //nolin
 			})
 		},
 		"waitForEvent": func(event string, optsOrPredicate sobek.Value) (*sobek.Promise, error) {
-			ctx := vu.Context()
-			popts := common.NewWaitForEventOptions(
-				bc.Timeout(),
-			)
-			if err := popts.Parse(ctx, optsOrPredicate); err != nil {
-				return nil, fmt.Errorf("parsing waitForEvent options: %w", err)
+			popts, err := parseWaitForEventOptions(vu.Runtime(), optsOrPredicate, bc.Timeout())
+			if err != nil {
+				return nil, fmt.Errorf("parsing wait for event options: %w", err)
 			}
 
+			ctx := vu.Context()
 			return k6ext.Promise(ctx, func() (result any, reason error) {
 				var runInTaskQueue func(p *common.Page) (bool, error)
 				if popts.PredicateFn != nil {
@@ -206,3 +205,42 @@ func parseGrantPermissionOptions(rt *sobek.Runtime, opts sobek.Value) (common.Gr
 
 	return g, nil
 }
+
+// parseWaitForEventOptions parses optsOrPredicate into a WaitForEventOptions.
+// It returns a WaitForEventOptions with the default timeout if optsOrPredicate is nil,
+// or not a callable predicate function.
+// It can parse only a callable predicate function or an object which contains a
+// callable predicate function and a timeout.
+func parseWaitForEventOptions(
+	rt *sobek.Runtime, optsOrPredicate sobek.Value, defaultTime time.Duration,
+) (*common.WaitForEventOptions, error) {
+	w := &common.WaitForEventOptions{
+		Timeout: defaultTime,
+	}
+
+	if !sobekValueExists(optsOrPredicate) {
+		return w, nil
+	}
+	var isCallable bool
+	w.PredicateFn, isCallable = sobek.AssertFunction(optsOrPredicate)
+	if isCallable {
+		return w, nil
+	}
+
+	opts := optsOrPredicate.ToObject(rt)
+	for _, k := range opts.Keys() {
+		switch k {
+		case "predicate":
+			w.PredicateFn, isCallable = sobek.AssertFunction(opts.Get(k))
+			if !isCallable {
+				return nil, errors.New("predicate function is not callable")
+			}
+		case "timeout":
+			w.Timeout = time.Duration(opts.Get(k).ToInteger()) * time.Millisecond
+		default:
+			return nil, fmt.Errorf("unknown option: %s", k)
+		}
+	}
+
+	return w, nil
+}

browser/sync_browser_context_mapping.go

@@ -61,14 +61,12 @@ func syncMapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //n
 		"setHTTPCredentials":          bc.SetHTTPCredentials, //nolint:staticcheck
 		"setOffline":                  bc.SetOffline,
 		"waitForEvent": func(event string, optsOrPredicate sobek.Value) (*sobek.Promise, error) {
-			ctx := vu.Context()
-			popts := common.NewWaitForEventOptions(
-				bc.Timeout(),
-			)
-			if err := popts.Parse(ctx, optsOrPredicate); err != nil {
-				return nil, fmt.Errorf("parsing waitForEvent options: %w", err)
+			popts, err := parseWaitForEventOptions(vu.Runtime(), optsOrPredicate, bc.Timeout())
+			if err != nil {
+				return nil, fmt.Errorf("parsing wait for event options: %w", err)
 			}
 
+			ctx := vu.Context()
 			return k6ext.Promise(ctx, func() (result any, reason error) {
 				var runInTaskQueue func(p *common.Page) (bool, error)
 				if popts.PredicateFn != nil {

common/browser_context_options.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -104,48 +103,6 @@ type WaitForEventOptions struct {
 	PredicateFn sobek.Callable
 }
 
-// NewWaitForEventOptions created a new instance of WaitForEventOptions with a
-// default timeout.
-func NewWaitForEventOptions(defaultTimeout time.Duration) *WaitForEventOptions {
-	return &WaitForEventOptions{
-		Timeout: defaultTimeout,
-	}
-}
-
-// Parse will parse the options or a callable predicate function. It can parse
-// only a callable predicate function or an object which contains a callable
-// predicate function and a timeout.
-func (w *WaitForEventOptions) Parse(ctx context.Context, optsOrPredicate sobek.Value) error {
-	if !sobekValueExists(optsOrPredicate) {
-		return nil
-	}
-
-	var (
-		isCallable bool
-		rt         = k6ext.Runtime(ctx)
-	)
-
-	w.PredicateFn, isCallable = sobek.AssertFunction(optsOrPredicate)
-	if isCallable {
-		return nil
-	}
-
-	opts := optsOrPredicate.ToObject(rt)
-	for _, k := range opts.Keys() {
-		switch k {
-		case "predicate":
-			w.PredicateFn, isCallable = sobek.AssertFunction(opts.Get(k))
-			if !isCallable {
-				return errors.New("predicate function is not callable")
-			}
-		case "timeout": //nolint:goconst
-			w.Timeout = time.Duration(opts.Get(k).ToInteger()) * time.Millisecond
-		}
-	}
-
-	return nil
-}
-
 // GrantPermissionsOptions is used by BrowserContext.GrantPermissions.
 type GrantPermissionsOptions struct {
 	Origin string