scope handling (wip)

rbri · rbri · commit a9587ffa1796 · 2026-04-05T17:39:03.000+02:00
diff --git a/src/main/java/org/htmlunit/html/ScriptElementSupport.java b/src/main/java/org/htmlunit/html/ScriptElementSupport.java
@@ -306,7 +306,7 @@ private static void executeEvent(final DomElement element, final String type) {
         final EventTarget eventTarget = element.getScriptableObject();
         final Event event = new Event(element, type);
 
-        event.setParentScope(eventTarget);
+        event.setParentScope(eventTarget.getParentScope());
         event.setPrototype(eventTarget.getPrototype(event.getClass()));
 
         eventTarget.executeEventLocally(event);
diff --git a/src/main/java/org/htmlunit/javascript/FunctionWrapper.java b/src/main/java/org/htmlunit/javascript/FunctionWrapper.java
@@ -21,6 +21,7 @@
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.Symbol;
 import org.htmlunit.corejs.javascript.SymbolScriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 
 /**
  * Wrapper for a {@link Function} delegating all calls to the wrapped instance.
@@ -181,7 +182,7 @@ public void setPrototype(final Scriptable prototype) {
      * {@inheritDoc}
      */
     @Override
-    public Scriptable getParentScope() {
+    public VarScope getParentScope() {
         return wrapped_.getParentScope();
     }
 
diff --git a/src/main/java/org/htmlunit/javascript/HtmlUnitScriptable.java b/src/main/java/org/htmlunit/javascript/HtmlUnitScriptable.java
@@ -97,9 +97,6 @@ public void setParentScope(final Scriptable scope) {
         if (scope == this) {
             throw new IllegalArgumentException("Object can't be its own parentScope");
         }
-        if (scope instanceof Window) {
-            throw new IllegalArgumentException("parentScope can't be the window");
-        }
         super.setParentScope(scope);
     }
 
diff --git a/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java b/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java
@@ -57,6 +57,8 @@
 import org.htmlunit.corejs.javascript.StackStyle;
 import org.htmlunit.corejs.javascript.Symbol;
 import org.htmlunit.corejs.javascript.TopLevel;
+import org.htmlunit.corejs.javascript.VarScope;
+import org.htmlunit.corejs.javascript.WithScope;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.javascript.background.BackgroundJavaScriptFactory;
@@ -857,11 +859,12 @@ protected String getSourceCode(final Context cx) {
         return getContextFactory().callSecured(action, page);
     }
 
-    private static Scriptable getScope(final HtmlPage page, final DomNode node) {
+    private static VarScope getScope(final HtmlPage page, final DomNode node) {
+        final TopLevel topLevel = page.getEnclosingWindow().getTopLevelScope();
         if (node != null) {
-            return node.getScriptableObject();
+            return new WithScope(topLevel, node.getScriptableObject());
         }
-        return page.getEnclosingWindow().getScriptableObject();
+        return topLevel;
     }
 
     /**
@@ -1447,7 +1450,7 @@ public static long lengthOfArrayLike(final Context cx, final Scriptable obj) {
     /**
      * @return the top call scope
      */
-    public static Scriptable getTopCallScope() {
+    public static TopLevel getTopCallScope() {
         return ScriptRuntime.getTopCallScope(Context.getCurrentContext());
     }
 
diff --git a/src/main/java/org/htmlunit/javascript/host/Element.java b/src/main/java/org/htmlunit/javascript/host/Element.java
@@ -39,6 +39,7 @@
 import org.htmlunit.corejs.javascript.NativeObject;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.WithScope;
 import org.htmlunit.css.ComputedCssStyleDeclaration;
 import org.htmlunit.css.ElementCssStyleDeclaration;
 import org.htmlunit.cssparser.parser.CSSException;
@@ -122,7 +123,8 @@ public void jsConstructor() {
     public void setDomNode(final DomNode domNode) {
         super.setDomNode(domNode);
 
-        setParentScope(getWindow().getDocument());
+        final Window window = getWindow();
+        setParentScope(new WithScope(window.getWebWindow().getTopLevelScope(), window.getDocument()));
         // CSSStyleDeclaration uses the parent scope
         style_ = new CSSStyleDeclaration(this, new ElementCssStyleDeclaration(getDomNodeOrDie()));
 
diff --git a/src/main/java/org/htmlunit/javascript/host/Location.java b/src/main/java/org/htmlunit/javascript/host/Location.java
@@ -180,16 +180,16 @@ public static Location jsConstructor(final Context cx, final Scriptable scope,
     public void initialize(final Scriptable scope, final Window window, final Page page) {
         final int attributes = ScriptableObject.PERMANENT | ScriptableObject.READONLY;
 
-        FunctionObject functionObject = new FunctionObject(METHOD_ASSIGN.getName(), METHOD_ASSIGN, this);
+        FunctionObject functionObject = new FunctionObject(METHOD_ASSIGN.getName(), METHOD_ASSIGN, scope);
         defineProperty(METHOD_ASSIGN.getName(), functionObject, attributes);
 
-        functionObject = new FunctionObject(METHOD_RELOAD.getName(), METHOD_RELOAD, this);
+        functionObject = new FunctionObject(METHOD_RELOAD.getName(), METHOD_RELOAD, scope);
         defineProperty(METHOD_RELOAD.getName(), functionObject, attributes);
 
-        functionObject = new FunctionObject(METHOD_REPLACE.getName(), METHOD_REPLACE, this);
+        functionObject = new FunctionObject(METHOD_REPLACE.getName(), METHOD_REPLACE, scope);
         defineProperty(METHOD_REPLACE.getName(), functionObject, attributes);
 
-        functionObject = new FunctionObject(METHOD_TO_STRING.getName(), METHOD_TO_STRING, this);
+        functionObject = new FunctionObject(METHOD_TO_STRING.getName(), METHOD_TO_STRING, scope);
         defineProperty("toString", functionObject, attributes);
 
         defineProperty(scope, "hash", null, GETTER_HASH, SETTER_HASH, attributes);
diff --git a/src/main/java/org/htmlunit/javascript/host/NamedNodeMap.java b/src/main/java/org/htmlunit/javascript/host/NamedNodeMap.java
@@ -68,7 +68,7 @@ public void jsConstructor() {
      */
     public NamedNodeMap(final DomElement element) {
         super();
-        setParentScope(element.getScriptableObject());
+        setParentScope(element.getScriptableObject().getParentScope());
         setPrototype(getPrototype(getClass()));
 
         attributes_ = element.getAttributes();
diff --git a/src/main/java/org/htmlunit/javascript/host/css/CSSRule.java b/src/main/java/org/htmlunit/javascript/host/css/CSSRule.java
@@ -209,7 +209,7 @@ protected CSSRule(final CSSStyleSheet stylesheet, final AbstractCSSRuleImpl rule
         super();
         stylesheet_ = stylesheet;
         rule_ = rule;
-        setParentScope(stylesheet);
+        setParentScope(stylesheet.getParentScope());
         setPrototype(getPrototype(getClass()));
     }
 
diff --git a/src/main/java/org/htmlunit/javascript/host/css/CSSStyleDeclaration.java b/src/main/java/org/htmlunit/javascript/host/css/CSSStyleDeclaration.java
@@ -121,6 +121,7 @@ public class CSSStyleDeclaration extends HtmlUnitScriptable {
 
     /** The wrapped CSSStyleDeclaration */
     private AbstractCssStyleDeclaration styleDeclaration_;
+    private CSSStyleSheet parentStyleSheet_;
 
     /**
      * Creates an instance.
@@ -165,13 +166,14 @@ public CSSStyleDeclaration(final Element element, final AbstractCssStyleDeclarat
      */
     CSSStyleDeclaration(final CSSStyleSheet parentStyleSheet, final WrappedCssStyleDeclaration styleDeclaration) {
         super();
-        setParentScope(parentStyleSheet);
+        setParentScope(parentStyleSheet.getParentScope());
         setPrototype(getPrototype(getClass()));
 
         if (styleDeclaration == null) {
             throw new IllegalStateException("styleDeclaration can't be null");
         }
         styleDeclaration_ = styleDeclaration;
+        parentStyleSheet_ = parentStyleSheet;
     }
 
     protected AbstractCssStyleDeclaration getCssStyleDeclaration() {
@@ -1504,7 +1506,7 @@ public void setPaddingTop(final Object paddingTop) {
     public CSSRule getParentRule() {
         final AbstractCSSRuleImpl parentRule = styleDeclaration_.getParentRule();
         if (parentRule != null) {
-            return CSSRule.create((CSSStyleSheet) getParentScope(), parentRule);
+            return CSSRule.create(parentStyleSheet_, parentRule);
         }
         return null;
     }
diff --git a/src/main/java/org/htmlunit/javascript/host/css/MediaList.java b/src/main/java/org/htmlunit/javascript/host/css/MediaList.java
@@ -60,7 +60,7 @@ public void jsConstructor() {
     public MediaList(final CSSStyleSheet parent, final CssMediaList cssMediaList) {
         super();
         cssMediaList_ = cssMediaList;
-        setParentScope(parent);
+        setParentScope(parent.getParentScope());
         setPrototype(getPrototype(getClass()));
     }
 
diff --git a/src/main/java/org/htmlunit/javascript/host/css/StyleSheetList.java b/src/main/java/org/htmlunit/javascript/host/css/StyleSheetList.java
@@ -18,7 +18,9 @@
 import java.util.function.Predicate;
 
 import org.htmlunit.WebClient;
+import org.htmlunit.WebWindow;
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.WithScope;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.HtmlAttributeChangeEvent;
 import org.htmlunit.html.HtmlElement;
@@ -83,10 +85,12 @@ public void jsConstructor() {
      */
     public StyleSheetList(final Document document) {
         super();
-        setParentScope(document);
+
+        final WebWindow webWindow = document.getWindow().getWebWindow();
+        setParentScope(new WithScope(webWindow.getTopLevelScope(), document));
         setPrototype(getPrototype(getClass()));
 
-        final WebClient webClient = getWindow().getWebWindow().getWebClient();
+        final WebClient webClient = webWindow.getWebClient();
 
         if (webClient.getOptions().isCssEnabled()) {
             nodes_ = new HTMLCollection(document.getDomNodeOrDie(), true);
diff --git a/src/main/java/org/htmlunit/javascript/host/dom/Document.java b/src/main/java/org/htmlunit/javascript/host/dom/Document.java
@@ -1212,7 +1212,7 @@ private static org.w3c.dom.traversal.NodeFilter createFilterWrapper(final Script
                 final Object[] args = {((DomNode) n).getScriptableObject()};
                 final Object response;
                 if (filter instanceof Callable callable) {
-                    response = callable.call(Context.getCurrentContext(), filter, filter, args);
+                    response = callable.call(Context.getCurrentContext(), filter.getParentScope(), filter, args);
                 }
                 else {
                     if (filterFunctionOnly) {
diff --git a/src/main/java/org/htmlunit/javascript/host/event/EventListenersContainer.java b/src/main/java/org/htmlunit/javascript/host/event/EventListenersContainer.java
@@ -30,6 +30,7 @@
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
 import org.htmlunit.corejs.javascript.TopLevel;
+import org.htmlunit.corejs.javascript.WithScope;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.javascript.JavaScriptEngine;
@@ -286,6 +287,10 @@ private void executeEventListeners(final int eventPhase, final Event event, fina
                 if (parentScope instanceof TopLevel topLevel) {
                     parentScope = topLevel.getGlobalThis();
                 }
+                else if (parentScope instanceof WithScope withScope) {
+                    parentScope = withScope.getObject();
+                }
+
                 if (parentScope instanceof Window window) {
                     page = (HtmlPage) window.getDomNodeOrDie();
                 }
diff --git a/src/main/java/org/htmlunit/javascript/host/html/HTMLElement.java b/src/main/java/org/htmlunit/javascript/host/html/HTMLElement.java
@@ -33,6 +33,7 @@
 import org.htmlunit.SgmlPage;
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.WithScope;
 import org.htmlunit.css.ComputedCssStyleDeclaration;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.DomNode;
@@ -231,7 +232,7 @@ public void setDomNode(final DomNode domNode) {
                 || "select".equalsIgnoreCase(name)) {
             final HtmlForm form = ((HtmlElement) domNode).getEnclosingForm();
             if (form != null) {
-                setParentScope(getScriptableFor(form));
+                setParentScope(new WithScope(getParentScope(), getScriptableFor(form)));
             }
         }
     }
diff --git a/src/main/java/org/htmlunit/javascript/host/html/HTMLOptionsCollection.java b/src/main/java/org/htmlunit/javascript/host/html/HTMLOptionsCollection.java
@@ -19,6 +19,7 @@
 import org.htmlunit.corejs.javascript.Context;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.html.ElementFactory;
 import org.htmlunit.html.HtmlOption;
 import org.htmlunit.html.HtmlSelect;
@@ -67,7 +68,7 @@ public void jsConstructor() {
      * Creates an instance.
      * @param parentScope parent scope
      */
-    public HTMLOptionsCollection(final HtmlUnitScriptable parentScope) {
+    public HTMLOptionsCollection(final VarScope parentScope) {
         super();
         setParentScope(parentScope);
         setPrototype(getPrototype(getClass()));
diff --git a/src/main/java/org/htmlunit/javascript/host/html/HTMLSelectElement.java b/src/main/java/org/htmlunit/javascript/host/html/HTMLSelectElement.java
@@ -69,7 +69,7 @@ public void initialize() {
         final HtmlSelect htmlSelect = getDomNodeOrDie();
         htmlSelect.setScriptableObject(this);
         if (optionsArray_ == null) {
-            optionsArray_ = new HTMLOptionsCollection(this);
+            optionsArray_ = new HTMLOptionsCollection(getParentScope());
             optionsArray_.initialize(htmlSelect);
         }
     }
diff --git a/src/main/java/org/htmlunit/javascript/host/intl/Intl.java b/src/main/java/org/htmlunit/javascript/host/intl/Intl.java
@@ -67,7 +67,7 @@ public static void init(final TopLevel scope, final ScriptableObject globalThis,
         final ClassConfiguration intlConfig =
                 AbstractJavaScriptConfiguration.getClassConfiguration(Intl.class, browserVersion);
         if (intlConfig != null) {
-            defineStaticFunctions(intlConfig, intl, intl);
+            defineStaticFunctions(intlConfig, scope, intl);
         }
 
         globalThis.defineProperty(intl.getClassName(), intl, ScriptableObject.DONTENUM);
@@ -89,10 +89,10 @@ private void define(final TopLevel scope, final Class<? extends HtmlUnitScriptab
             final ClassConfiguration config = AbstractJavaScriptConfiguration.getClassConfiguration(c, browserVersion);
             final HtmlUnitScriptable prototype = JavaScriptEngine.configureClass(config, scope);
             final FunctionObject constructorFn = new FunctionObject(config.getJsConstructor().getKey(),
-                    config.getJsConstructor().getValue(), this);
-            constructorFn.addAsConstructor(this, prototype, ScriptableObject.DONTENUM);
+                    config.getJsConstructor().getValue(), scope);
+            constructorFn.addAsConstructor(scope, prototype, ScriptableObject.DONTENUM);
 
-            defineStaticFunctions(config, this, constructorFn);
+            defineStaticFunctions(config, scope, constructorFn);
         }
         catch (final Exception e) {
             throw JavaScriptEngine.throwAsScriptRuntimeEx(e);
@@ -126,7 +126,7 @@ private static void defineStaticFunctions(final ClassConfiguration config,
     public static Object getCanonicalLocales(final Context cx, final Scriptable thisObj,
             final Object[] args, final Function funObj) {
         if (args.length == 0 || JavaScriptEngine.isUndefined(args[0])) {
-            return cx.newArray(TopLevel.getTopLevelScope(thisObj), new Object[0]);
+            return cx.newArray(ScriptableObject.getTopLevelScope(thisObj), new Object[0]);
         }
 
         final Object localesArgument = args[0];
@@ -170,7 +170,7 @@ else if (elem instanceof ScriptableObject) {
             }
         }
 
-        return cx.newArray(TopLevel.getTopLevelScope(thisObj), canonicalLocales.toArray());
+        return cx.newArray(ScriptableObject.getTopLevelScope(thisObj), canonicalLocales.toArray());
     }
 
     /**
@@ -202,6 +202,6 @@ static Scriptable supportedLocalesOf(final Scriptable localesArgument) {
         }
 
         return Context.getCurrentContext().newArray(
-                TopLevel.getTopLevelScope(localesArgument), supportedLocales.toArray());
+                ScriptableObject.getTopLevelScope(localesArgument), supportedLocales.toArray());
     }
 }
diff --git a/src/test/java/org/htmlunit/javascript/host/dom/NodeIteratorTest.java b/src/test/java/org/htmlunit/javascript/host/dom/NodeIteratorTest.java
@@ -22,6 +22,7 @@
  * Tests for {@link NodeIterator}.
  *
  * @author Ahmed Ashour
+ * @author Ronald Brill
  */
 public class NodeIteratorTest extends WebDriverTestCase {
 
diff --git a/src/test/java/org/htmlunit/javascript/regexp/RegExp2Test.java b/src/test/java/org/htmlunit/javascript/regexp/RegExp2Test.java
@@ -19,6 +19,7 @@
 import org.htmlunit.corejs.javascript.Context;
 import org.htmlunit.corejs.javascript.JavaScriptException;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.TopLevel;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.javascript.HtmlUnitContextFactory;
 import org.junit.jupiter.api.Test;
@@ -102,7 +103,7 @@ public void needCustomFix() {
         final HtmlUnitContextFactory cf = client.getJavaScriptEngine().getContextFactory();
         final Context ctx = cf.enterContext();
         try {
-            final ScriptableObject topScope = ctx.initStandardObjects();
+            final TopLevel topScope = ctx.initStandardObjects();
             topScope.put("str", topScope, STR);
             topScope.put("text", topScope, TEXT);
             topScope.put("expected", topScope, EXPECTED);
@@ -131,7 +132,7 @@ public void matchFixNeeded() throws Exception {
         final HtmlUnitContextFactory cf = client.getJavaScriptEngine().getContextFactory();
         final Context cx = cf.enterContext();
         try {
-            final ScriptableObject topScope = cx.initStandardObjects();
+            final TopLevel topScope = cx.initStandardObjects();
             cx.evaluateString(topScope, SCRIPT_TEST_MATCH, "test script String.match", 0, null);
             try {
                 cx.evaluateString(topScope, SCRIPT_TEST_MATCH, "test script String.match", 0, null);

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,6 @@ public void setParentScope(final Scriptable scope) {`
`97`	`97`	`if (scope == this) {`
`98`	`98`	`throw new IllegalArgumentException("Object can't be its own parentScope");`
`99`	`99`	`}`
`100`		`- if (scope instanceof Window) {`
`101`		`- throw new IllegalArgumentException("parentScope can't be the window");`
`102`		`- }`
`103`	`100`	`super.setParentScope(scope);`
`104`	`101`	`}`
`105`	`102`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ protected CSSRule(final CSSStyleSheet stylesheet, final AbstractCSSRuleImpl rule`
`209`	`209`	`super();`
`210`	`210`	`stylesheet_ = stylesheet;`
`211`	`211`	`rule_ = rule;`
`212`		`- setParentScope(stylesheet);`
	`212`	`+ setParentScope(stylesheet.getParentScope());`
`213`	`213`	`setPrototype(getPrototype(getClass()));`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void jsConstructor() {`
`60`	`60`	`public MediaList(final CSSStyleSheet parent, final CssMediaList cssMediaList) {`
`61`	`61`	`super();`
`62`	`62`	`cssMediaList_ = cssMediaList;`
`63`		`- setParentScope(parent);`
	`63`	`+ setParentScope(parent.getParentScope());`
`64`	`64`	`setPrototype(getPrototype(getClass()));`
`65`	`65`	`}`
`66`	`66`