Fix this in CommonJS require

In modules included by `require`, `this` should be an empty object, but
instead it was set to the same as the scope.

To fix this, we need to add a new parameter to the Script.exec() function so that "scope" and "this" can both be specified. The old function has been deprecated.

Author: andreabergia

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/BuiltinBenchmark.java

@@ -74,7 +74,7 @@ public void init()
 
     @Benchmark
     public Object annotatedClassMethods(AnnotatedClassState state) {
-        return state.testScript.exec(state.cx, state.scope);
+        return state.testScript.exec(state.cx, state.scope, state.scope);
     }
 
     public static class AnnotatedClass extends ScriptableObject {
@@ -138,7 +138,7 @@ public void init()
 
     @Benchmark
     public Object idClassMethods(IdClassState state) {
-        return state.testScript.exec(state.cx, state.scope);
+        return state.testScript.exec(state.cx, state.scope, state.scope);
     }
 
     public static class IdClass extends IdScriptableObject {
@@ -331,7 +331,7 @@ public void init()
 
     @Benchmark
     public Object dumbLambdaClassMethods(DumbLambdaState state) {
-        return state.testScript.exec(state.cx, state.scope);
+        return state.testScript.exec(state.cx, state.scope, state.scope);
     }
 
     private static class DumbLambdaClass extends ScriptableObject {

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/SunSpiderBenchmark.java

@@ -44,7 +44,7 @@ public void tearDown() {
         }
 
         Object run() {
-            return script.exec(cx, scope);
+            return script.exec(cx, scope, scope);
         }
     }
 

examples/src/main/java/DynamicScopes.java

@@ -89,7 +89,7 @@ static void runScripts(Context cx, Script script) {
 
         // Now we can execute the precompiled script against the scope
         // to define x variable and f function in the shared scope.
-        script.exec(cx, sharedScope);
+        script.exec(cx, sharedScope, sharedScope);
 
         // Now we spawn some threads that execute a script that calls the
         // function 'f'. The scope chain looks like this:

rhino-engine/src/main/java/org/mozilla/javascript/engine/RhinoScriptEngine.java

@@ -163,7 +163,7 @@ public CompiledScript compile(Reader script) throws ScriptException {
     Object eval(Script script, ScriptContext sc) throws ScriptException {
         try (Context cx = ctxFactory.enterContext()) {
             Scriptable scope = initScope(cx, sc);
-            Object ret = script.exec(cx, scope);
+            Object ret = script.exec(cx, scope, scope);
             return Context.jsToJava(ret, Object.class);
         } catch (RhinoException re) {
             throw new ScriptException(

rhino-tools/src/main/java/org/mozilla/javascript/tools/shell/Global.java

@@ -312,7 +312,7 @@ public static void loadClass(Context cx, Scriptable thisObj, Object[] args, Func
             throw reportRuntimeError("msg.must.implement.Script");
         }
         Script script = (Script) clazz.getDeclaredConstructor().newInstance();
-        script.exec(cx, thisObj);
+        script.exec(cx, thisObj, thisObj);
     }
 
     private static Class<?> getClass(Object[] args) {
@@ -1157,7 +1157,7 @@ public void run() {
     @Override
     public Object run(Context cx) {
         if (f != null) return f.call(cx, scope, scope, args);
-        else return s.exec(cx, scope);
+        else return s.exec(cx, scope, scope);
     }
 
     ContextFactory factory;

rhino-tools/src/main/java/org/mozilla/javascript/tools/shell/Main.java

@@ -201,7 +201,8 @@ static void evalInlineScript(Context cx, String scriptText) {
         try {
             Script script = cx.compileString(scriptText, "<command>", 1, null);
             if (script != null) {
-                script.exec(cx, getShellScope());
+                Scriptable scope = getShellScope();
+                script.exec(cx, scope, scope);
             }
         } catch (RhinoException rex) {
             ToolErrorReporter.reportException(cx.getErrorReporter(), rex);
@@ -481,7 +482,7 @@ public static void processSource(Context cx, String filename) throws IOException
                     String finalSource = source.toString();
                     Script script = cx.compileString(finalSource, "<stdin>", lineno, null);
                     if (script != null) {
-                        Object result = script.exec(cx, scope);
+                        Object result = script.exec(cx, scope, scope);
                         // Avoid printing out undefined or function definitions.
                         if (result != Context.getUndefinedValue()
                                 && !(result instanceof Function
@@ -580,7 +581,7 @@ static void processFileSecure(Context cx, Scriptable scope, String path, Object
         }
 
         if (script != null) {
-            script.exec(cx, scope);
+            script.exec(cx, scope, scope);
         }
     }
 

rhino/src/main/java/org/mozilla/javascript/Context.java

@@ -1240,7 +1240,7 @@ public final Object evaluateString(
             Scriptable scope, String source, String sourceName, int lineno, Object securityDomain) {
         Script script = compileString(source, sourceName, lineno, securityDomain);
         if (script != null) {
-            return script.exec(this, scope);
+            return script.exec(this, scope, scope);
         }
         return null;
     }
@@ -1265,7 +1265,7 @@ public final Object evaluateReader(
             throws IOException {
         Script script = compileReader(in, sourceName, lineno, securityDomain);
         if (script != null) {
-            return script.exec(this, scope);
+            return script.exec(this, scope, scope);
         }
         return null;
     }

rhino/src/main/java/org/mozilla/javascript/InterpretedFunction.java

@@ -88,7 +88,7 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] ar
     }
 
     @Override
-    public Object exec(Context cx, Scriptable scope) {
+    public Object exec(Context cx, Scriptable scope, Scriptable thisObj) {
         if (!isScript()) {
             // Can only be applied to scripts
             throw new IllegalStateException();
@@ -98,9 +98,9 @@ public Object exec(Context cx, Scriptable scope) {
             // It will go through "call" path. but they are equivalent
             ret =
                     ScriptRuntime.doTopCall(
-                            this, cx, scope, scope, ScriptRuntime.emptyArgs, isStrict());
+                            this, cx, scope, thisObj, ScriptRuntime.emptyArgs, isStrict());
         } else {
-            ret = Interpreter.interpret(this, cx, scope, scope, ScriptRuntime.emptyArgs);
+            ret = Interpreter.interpret(this, cx, scope, thisObj, ScriptRuntime.emptyArgs);
         }
         cx.processMicrotasks();
         return ret;

rhino/src/main/java/org/mozilla/javascript/JavaAdapter.java

@@ -577,7 +577,7 @@ public static Scriptable runScript(final Script script) {
                 .call(
                         cx -> {
                             ScriptableObject global = ScriptRuntime.getGlobal(cx);
-                            script.exec(cx, global);
+                            script.exec(cx, global, global);
                             return global;
                         });
     }

rhino/src/main/java/org/mozilla/javascript/NativeScript.java

@@ -86,7 +86,7 @@ public String getClassName() {
     @Override
     public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
         if (script != null) {
-            return script.exec(cx, scope);
+            return script.exec(cx, scope, thisObj);
         }
         return Undefined.instance;
     }