Merge pull request #1162 from matthewbelisle-wf/remove-eval

nevkontakte · web-flow · commit 044c47a730a6 · 2022-10-17T20:46:45.000+01:00
Replacing eval() calls in syscall/js
diff --git a/compiler/natives/src/syscall/js/js.go b/compiler/natives/src/syscall/js/js.go
@@ -117,9 +117,9 @@ var (
 
 func init() {
 	if js.Global != nil {
-		id = js.Global.Call("eval", "(function(x) { return x; })")
-		instanceOf = js.Global.Call("eval", "(function(x, y) { return x instanceof y; })")
-		getValueType = js.Global.Call("eval", `(function(x) {
+		id = js.Global.Call("Function", "x", "return x")
+		instanceOf = js.Global.Call("Function", "x", "y", "return x instanceof y")
+		getValueType = js.Global.Call("Function", "x", `
   if (typeof(x) === "undefined") {
     return 0; // TypeUndefined
   }
@@ -142,7 +142,7 @@ func init() {
     return 7; // TypeFunction
   }
   return 6; // TypeObject
-})`)
+`)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,9 @@ var (`
`117`	`117`
`118`	`118`	`func init() {`
`119`	`119`	`if js.Global != nil {`
`120`		`- id = js.Global.Call("eval", "(function(x) { return x; })")`
`121`		`- instanceOf = js.Global.Call("eval", "(function(x, y) { return x instanceof y; })")`
`122`		- getValueType = js.Global.Call("eval", `(function(x) {
	`120`	`+ id = js.Global.Call("Function", "x", "return x")`
	`121`	`+ instanceOf = js.Global.Call("Function", "x", "y", "return x instanceof y")`
	`122`	+ getValueType = js.Global.Call("Function", "x", `
`123`	`123`	`if (typeof(x) === "undefined") {`
`124`	`124`	`return 0; // TypeUndefined`
`125`	`125`	`}`
`@@ -142,7 +142,7 @@ func init() {`
`142`	`142`	`return 7; // TypeFunction`
`143`	`143`	`}`
`144`	`144`	`return 6; // TypeObject`
`145`		-})`)
	`145`	+`)
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`