fix HTMLAllCollection prototype

Author: rbri

src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java

@@ -592,8 +592,8 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
         CloseEvent.class, ComputedCSSStyleDeclaration.class, CustomEvent.class, DOMMatrix.class, DOMPoint.class,
         DeviceMotionEvent.class, DeviceOrientationEvent.class, ErrorEvent.class, EventSource.class,
         FederatedCredential.class, File.class, FileReader.class, FileSystemDirectoryEntry.class,
-        FileSystemFileEntry.class, FontFaceSet.class, GamepadEvent.class, HTMLCollection.class, HashChangeEvent.class,
-        IDBCursorWithValue.class, IDBDatabase.class, IDBRequest.class, IDBTransaction.class,
+        FileSystemFileEntry.class, FontFaceSet.class, GamepadEvent.class, HTMLAllCollection.class, HTMLCollection.class,
+        HashChangeEvent.class, IDBCursorWithValue.class, IDBDatabase.class, IDBRequest.class, IDBTransaction.class,
         IDBVersionChangeEvent.class, MIDIAccess.class, MIDIConnectionEvent.class, MIDIMessageEvent.class,
         MIDIPort.class, MediaDevices.class, MediaEncryptedEvent.class, MediaKeyError.class, MediaKeyMessageEvent.class,
         MediaKeySession.class, MediaQueryList.class, MediaQueryListEvent.class, MediaRecorder.class, MediaSource.class,
@@ -619,8 +619,8 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
         CanvasCaptureMediaStreamTrack.class, ChannelMergerNode.class, ChannelSplitterNode.class, CharacterData.class,
         CompositionEvent.class, ConvolverNode.class, DelayNode.class, Document.class, DocumentFragment.class,
         DocumentType.class, DynamicsCompressorNode.class, Element.class, FocusEvent.class, GainNode.class,
-        HTMLAllCollection.class, HTMLFormControlsCollection.class, IDBOpenDBRequest.class, IIRFilterNode.class,
-        InputEvent.class, KeyboardEvent.class, MIDIInput.class, MIDIOutput.class, MediaElementAudioSourceNode.class,
+        HTMLFormControlsCollection.class, IDBOpenDBRequest.class, IIRFilterNode.class, InputEvent.class,
+        KeyboardEvent.class, MIDIInput.class, MIDIOutput.class, MediaElementAudioSourceNode.class,
         MediaStreamAudioDestinationNode.class, MediaStreamAudioSourceNode.class, MouseEvent.class,
         OfflineAudioContext.class, PannerNode.class, PerformanceNavigationTiming.class, RadioNodeList.class,
         ScriptProcessorNode.class, SpeechSynthesisErrorEvent.class, StereoPannerNode.class, TextEvent.class,

src/main/java/org/htmlunit/javascript/host/dom/Document.java

@@ -1705,13 +1705,7 @@ public HtmlUnitScriptable elementFromPoint(final int x, final int y) {
      */
     @JsxGetter
     public HTMLCollection getForms() {
-        final HTMLCollection forms = new HTMLCollection(getDomNodeOrDie(), false) {
-            @Override
-            public Object call(final Context cx, final Scriptable scope,
-                    final Scriptable thisObj, final Object[] args) {
-                throw JavaScriptEngine.typeError("document.forms is not a function");
-            }
-        };
+        final HTMLCollection forms = new HTMLCollection(getDomNodeOrDie(), false);
 
         forms.setIsMatchingPredicate(
                 (Predicate<DomNode> & Serializable)
@@ -1725,13 +1719,7 @@ public Object call(final Context cx, final Scriptable scope,
      */
     @JsxGetter
     public HTMLCollection getEmbeds() {
-        final HTMLCollection embeds = new HTMLCollection(getDomNodeOrDie(), false) {
-            @Override
-            public Object call(final Context cx, final Scriptable scope,
-                    final Scriptable thisObj, final Object[] args) {
-                throw JavaScriptEngine.typeError("document.embeds is not a function");
-            }
-        };
+        final HTMLCollection embeds = new HTMLCollection(getDomNodeOrDie(), false);
 
         embeds.setIsMatchingPredicate((Predicate<DomNode> & Serializable) node -> node instanceof HtmlEmbed);
         return embeds;
@@ -1743,13 +1731,7 @@ public Object call(final Context cx, final Scriptable scope,
      */
     @JsxGetter
     public HTMLCollection getImages() {
-        final HTMLCollection images = new HTMLCollection(getDomNodeOrDie(), false) {
-            @Override
-            public Object call(final Context cx, final Scriptable scope,
-                    final Scriptable thisObj, final Object[] args) {
-                throw JavaScriptEngine.typeError("document.images is not a function");
-            }
-        };
+        final HTMLCollection images = new HTMLCollection(getDomNodeOrDie(), false);
 
         images.setIsMatchingPredicate((Predicate<DomNode> & Serializable) node -> node instanceof HtmlImage);
         return images;
@@ -1761,13 +1743,7 @@ public Object call(final Context cx, final Scriptable scope,
      */
     @JsxGetter
     public HTMLCollection getScripts() {
-        final HTMLCollection scripts = new HTMLCollection(getDomNodeOrDie(), false) {
-            @Override
-            public Object call(final Context cx, final Scriptable scope,
-                    final Scriptable thisObj, final Object[] args) {
-                throw JavaScriptEngine.typeError("document.scripts is not a function");
-            }
-        };
+        final HTMLCollection scripts = new HTMLCollection(getDomNodeOrDie(), false);
 
         scripts.setIsMatchingPredicate((Predicate<DomNode> & Serializable) node -> node instanceof HtmlScript);
         return scripts;
@@ -3505,8 +3481,8 @@ public ScriptableObject getFonts() {
      * @return the value of the {@code all} property
      */
     @JsxGetter
-    public HTMLCollection getAll() {
-        final HTMLCollection all = new HTMLAllCollection(getDomNodeOrDie());
+    public HTMLAllCollection getAll() {
+        final HTMLAllCollection all = new HTMLAllCollection(getDomNodeOrDie());
         all.setAvoidObjectDetection(true);
         all.setIsMatchingPredicate((Predicate<DomNode> & Serializable) node -> true);
         return all;

src/main/java/org/htmlunit/javascript/host/html/HTMLAllCollection.java

@@ -17,13 +17,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.htmlunit.corejs.javascript.Callable;
 import org.htmlunit.corejs.javascript.Context;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.DomNode;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
 import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
+import org.htmlunit.javascript.configuration.JsxFunction;
+import org.htmlunit.javascript.configuration.JsxGetter;
+import org.htmlunit.javascript.configuration.JsxSymbol;
+import org.htmlunit.javascript.host.dom.AbstractList;
 
 /**
  * A special {@link HTMLCollection} for <code>document.all</code>.
@@ -32,7 +39,7 @@
  * @author Ahmed Ashour
  */
 @JsxClass
-public class HTMLAllCollection extends HTMLCollection {
+public class HTMLAllCollection extends AbstractList implements Callable {
 
     /**
      * Creates an instance.
@@ -44,18 +51,16 @@ public HTMLAllCollection() {
     /**
      * JavaScript constructor.
      */
-    @Override
     @JsxConstructor
     public void jsConstructor() {
-        super.jsConstructor();
     }
 
     /**
      * Creates an instance.
      * @param parentScope parent scope
      */
     public HTMLAllCollection(final DomNode parentScope) {
-        super(parentScope, false);
+        super(parentScope, false, null);
     }
 
     /**
@@ -64,7 +69,7 @@ public HTMLAllCollection(final DomNode parentScope) {
      * @return the element or elements corresponding to the specified index or key
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms536460.aspx">MSDN doc</a>
      */
-    @Override
+    @JsxFunction
     public Object item(final Object index) {
         final double numb;
 
@@ -99,9 +104,13 @@ public Object item(final Object index) {
     }
 
     /**
-     * {@inheritDoc}
+     * Retrieves the item or items corresponding to the specified name (checks ids, and if
+     * that does not work, then names).
+     * @param name the name or id the element or elements to return
+     * @return the element or elements corresponding to the specified name or id
+     * @see <a href="http://msdn.microsoft.com/en-us/library/ms536634.aspx">MSDN doc</a>
      */
-    @Override
+    @JsxFunction
     public final Scriptable namedItem(final String name) {
         final List<DomNode> elements = getElements();
 
@@ -158,7 +167,13 @@ public Object call(final Context cx, final Scriptable scope, final Scriptable th
             }
         }
 
-        final Object value = super.call(cx, scope, thisObj, args);
+        if (args.length == 0) {
+            throw JavaScriptEngine.reportRuntimeError("Zero arguments; need an index or a key.");
+        }
+        Object value = getIt(args[0]);
+        if (value == NOT_FOUND) {
+            value = null;
+        }
         if (nullIfNotFound && JavaScriptEngine.isUndefined(value)) {
             return null;
         }
@@ -169,19 +184,68 @@ public Object call(final Context cx, final Scriptable scope, final Scriptable th
      * {@inheritDoc}
      */
     @Override
-    protected boolean supportsParentheses() {
-        return true;
+    protected Object equivalentValues(final Object value) {
+        if (value == null || JavaScriptEngine.isUndefined(value)) {
+            return Boolean.TRUE;
+        }
+
+        return super.equivalentValues(value);
+    }
+    /**
+     * @return the Iterator symbol
+     */
+    @JsxSymbol
+    public Scriptable iterator() {
+        return JavaScriptEngine.newArrayIteratorTypeValues(getParentScope(), this);
+    }
+
+    /**
+     * Returns the length.
+     * @return the length
+     */
+    @JsxGetter
+    @Override
+    public final int getLength() {
+        return super.getLength();
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    protected Object equivalentValues(final Object value) {
-        if (value == null || JavaScriptEngine.isUndefined(value)) {
-            return Boolean.TRUE;
+    protected Object getWithPreemptionByName(final String name, final List<DomNode> elements) {
+        final List<DomNode> matchingElements = new ArrayList<>();
+        final boolean searchName = isGetWithPreemptionSearchName();
+        for (final DomNode next : elements) {
+            if (next instanceof DomElement
+                    && (searchName || next instanceof HtmlInput || next instanceof HtmlForm)) {
+                final String nodeName = ((DomElement) next).getAttributeDirect(DomElement.NAME_ATTRIBUTE);
+                if (name.equals(nodeName)) {
+                    matchingElements.add(next);
+                }
+            }
         }
 
-        return super.equivalentValues(value);
+        if (matchingElements.isEmpty()) {
+            return NOT_FOUND;
+        }
+
+        if (matchingElements.size() == 1) {
+            return getScriptableForElement(matchingElements.get(0));
+        }
+
+        // many elements => build a sub collection
+        final DomNode domNode = getDomNodeOrNull();
+        final HTMLCollection collection = new HTMLCollection(domNode, matchingElements);
+        collection.setAvoidObjectDetection(true);
+        return collection;
+    }
+
+    /**
+     * Returns whether {@link #getWithPreemption(String)} should search by name or not.
+     * @return whether {@link #getWithPreemption(String)} should search by name or not
+     */
+    protected boolean isGetWithPreemptionSearchName() {
+        return true;
     }
 }

src/main/java/org/htmlunit/javascript/host/html/HTMLCollection.java

@@ -21,8 +21,6 @@
 import java.util.List;
 
 import org.htmlunit.BrowserVersion;
-import org.htmlunit.corejs.javascript.Callable;
-import org.htmlunit.corejs.javascript.Context;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.DomNode;
@@ -53,7 +51,7 @@
  * @author Ronald Brill
  */
 @JsxClass
-public class HTMLCollection extends AbstractList implements Callable {
+public class HTMLCollection extends AbstractList {
 
     /**
      * Creates an instance.
@@ -129,34 +127,6 @@ public final int getLength() {
         return super.getLength();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object call(final Context cx, final Scriptable scope, final Scriptable thisObj, final Object[] args) {
-        if (supportsParentheses()) {
-            if (args.length == 0) {
-                throw JavaScriptEngine.reportRuntimeError("Zero arguments; need an index or a key.");
-            }
-            final Object object = getIt(args[0]);
-            if (object == NOT_FOUND) {
-                return null;
-            }
-            return object;
-        }
-
-        throw JavaScriptEngine.typeError("HTMLCollection does nont support function like access");
-    }
-
-    /**
-     * Is parentheses supported.
-     *
-     * @return true or false
-     */
-    protected boolean supportsParentheses() {
-        return false;
-    }
-
     /**
      * {@inheritDoc}
      */