From d328f6ae13136de75b770f262e7a37c2d9134ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0nan=C3=A7=20G=C3=BCm=C3=BC=C5=9F?= Date: Tue, 4 Jun 2024 16:40:02 +0300 Subject: [PATCH] Remove Frame unnecessary goja object mappings --- browser/frame_mapping.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/browser/frame_mapping.go b/browser/frame_mapping.go index 8b92c20c3..03d0ec093 100644 --- a/browser/frame_mapping.go +++ b/browser/frame_mapping.go @@ -13,14 +13,13 @@ import ( // //nolint:funlen func mapFrame(vu moduleVU, f *common.Frame) mapping { //nolint:gocognit,cyclop - rt := vu.Runtime() maps := mapping{ "check": func(selector string, opts goja.Value) *goja.Promise { return k6ext.Promise(vu.Context(), func() (any, error) { return nil, f.Check(selector, opts) //nolint:wrapcheck }) }, - "childFrames": func() *goja.Object { + "childFrames": func() []mapping { var ( mcfs []mapping cfs = f.ChildFrames() @@ -28,7 +27,7 @@ func mapFrame(vu moduleVU, f *common.Frame) mapping { //nolint:gocognit,cyclop for _, fr := range cfs { mcfs = append(mcfs, mapFrame(vu, fr)) } - return rt.ToValue(mcfs).ToObject(rt) + return mcfs }, "click": func(selector string, opts goja.Value) (*goja.Promise, error) { popts, err := parseFrameClickOptions(vu.Context(), opts, f.Timeout()) @@ -164,18 +163,15 @@ func mapFrame(vu moduleVU, f *common.Frame) mapping { //nolint:gocognit,cyclop return f.IsVisible(selector, opts) //nolint:wrapcheck }) }, - "locator": func(selector string, opts goja.Value) *goja.Object { - ml := mapLocator(vu, f.Locator(selector, opts)) - return rt.ToValue(ml).ToObject(rt) + "locator": func(selector string, opts goja.Value) mapping { + return mapLocator(vu, f.Locator(selector, opts)) }, "name": f.Name, - "page": func() *goja.Object { - mp := mapPage(vu, f.Page()) - return rt.ToValue(mp).ToObject(rt) + "page": func() mapping { + return mapPage(vu, f.Page()) }, - "parentFrame": func() *goja.Object { - mf := mapFrame(vu, f.ParentFrame()) - return rt.ToValue(mf).ToObject(rt) + "parentFrame": func() mapping { + return mapFrame(vu, f.ParentFrame()) }, "press": func(selector, key string, opts goja.Value) *goja.Promise { return k6ext.Promise(vu.Context(), func() (any, error) {