Clean up ModuleScope.

Author: aardvark179

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

@@ -14,7 +14,6 @@
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import org.mozilla.javascript.commonjs.module.ModuleScope;
 import org.mozilla.javascript.lc.type.TypeInfo;
 import org.mozilla.javascript.lc.type.TypeInfoFactory;
 
@@ -399,22 +398,8 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] ar
                     thisObj = ((Delegator) thisObj).getDelegee();
                 }
                 if (!clazz.isInstance(thisObj)) {
-                    boolean compatible = false;
-                    if (thisObj == scope || thisObj instanceof ModuleScope) {
-                        Scriptable parentScope = getDeclarationScope();
-                        if (scope != parentScope) {
-                            // Call with dynamic scope for standalone function,
-                            // use parentScope as thisObj
-                            compatible = clazz.isInstance(parentScope);
-                            if (compatible) {
-                                thisObj = parentScope;
-                            }
-                        }
-                    }
-                    if (!compatible) {
-                        // Couldn't find an object to call this on.
-                        throw ScriptRuntime.typeErrorById("msg.incompat.call", functionName);
-                    }
+                    // Couldn't find an object to call this on.
+                    throw ScriptRuntime.typeErrorById("msg.incompat.call", functionName);
                 }
             }
 

rhino/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScope.java

@@ -5,14 +5,15 @@
 package org.mozilla.javascript.commonjs.module;
 
 import java.net.URI;
+import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.TopLevel;
 
 /**
  * A top-level module scope. This class provides methods to retrieve the module's source and base
  * URIs in order to resolve relative module IDs and check sandbox constraints.
  */
-public class ModuleScope extends TopLevel.GlobalThis {
+public class ModuleScope extends ScriptableObject {
     private static final long serialVersionUID = 1L;
     private final URI uri;
     private final URI base;
@@ -24,8 +25,8 @@ private ModuleScope(URI uri, URI base) {
 
     public static ScriptableObject createModuleScope(TopLevel global, URI uri, URI base) {
         var moduleScope = new ModuleScope(uri, base);
-        var scope = global.createIsolate(moduleScope);
-        return scope;
+        moduleScope.setParentScope(global);
+        return moduleScope;
     }
 
     public URI getUri() {
@@ -35,4 +36,21 @@ public URI getUri() {
     public URI getBase() {
         return base;
     }
+
+    @Override
+    public String getClassName() {
+        return "module";
+    }
+
+    /** Search up the chain of scopes to find a module scope. */
+    public static ModuleScope findModuleScope(Scriptable scope) {
+        Scriptable current = scope;
+        while (current != null) {
+            if (current instanceof ModuleScope) {
+                return (ModuleScope) current;
+            }
+            current = current.getParentScope();
+        }
+        return null;
+    }
 }

rhino/src/main/java/org/mozilla/javascript/commonjs/module/Require.java

@@ -17,6 +17,7 @@
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.TopLevel;
+import org.mozilla.javascript.Undefined;
 
 /**
  * Implements the require() function as defined by <a
@@ -176,12 +177,18 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] ar
         if (args == null || args.length < 1) {
             throw ScriptRuntime.throwError(cx, scope, "require() needs one argument");
         }
+        // Top scope from the point of view of the callee
+        TopLevel topScope = ScriptableObject.getTopLevelScope(scope);
+        if (thisObj == null || Undefined.isUndefined(thisObj)) {
+            thisObj = topScope.getGlobalThis();
+        }
+        ModuleScope moduleScope = ModuleScope.findModuleScope(scope);
 
         String id = (String) Context.jsToJava(args[0], String.class);
         URI uri = null;
         URI base = null;
         if (id.startsWith("./") || id.startsWith("../")) {
-            if (!(thisObj instanceof ModuleScope)) {
+            if (moduleScope == null) {
                 throw ScriptRuntime.throwError(
                         cx,
                         scope,
@@ -190,7 +197,6 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] ar
                                 + "\" when require() is used outside of a module");
             }
 
-            ModuleScope moduleScope = (ModuleScope) thisObj;
             base = moduleScope.getBase();
             URI current = moduleScope.getUri();
             uri = current.resolve(id);