trim semicolon and other white spaces before eval

related to #566
go-rod · Mar 21, 2022 · edc26bb · edc26bb
1 parent bde2c46
commit edc26bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/page_eval.go b/page_eval.go
@@ -109,7 +109,7 @@ func (e *EvalOptions) ByPromise() *EvalOptions {
 }
 
 func (e *EvalOptions) formatToJSFunc() string {
-	js := strings.TrimSpace(e.JS)
+	js := strings.Trim(e.JS, "\t\n\v\f\r ;")
 	return fmt.Sprintf(`function() { return (%s).apply(this, arguments) }`, js)
 }
 

diff --git a/page_eval_test.go b/page_eval_test.go
@@ -33,6 +33,8 @@ func (t T) PageEval() {
 		(a, b) => a + b
 	`, 1, 2).Int())
 
+	t.Eq(page.MustEval(`	 ; () => 1; `).Int(), 1)
+
 	// reuse obj
 	obj := page.MustEvaluate(rod.Eval(`() => () => 'ok'`).ByObject())
 	t.Eq("ok", page.MustEval(`f => f()`, obj).Str())