Lightpanda: the headless browser designed for AI and automation
perf: Fix query matching for anchors
Karl Seguincf839f3ddaff
diff --git a/src/browser/RenderTree.zig b/src/browser/RenderTree.zigindex e58d91430..251f68029 100644--- a/src/browser/RenderTree.zig+++ b/src/browser/RenderTree.zig@@ -365,7 +365,7 @@ fn measureChild(self: *const RenderTree, child: Child, where: Measure.Where, m:const el = child.node.subtype(Element);const inner: Measure.Where = .{.shell = where.shell or dump_html.isShellElement(el),- .link = where.link or (el.getTag() == .anchor and el.getAttributeInterned("href") != null),+ .link = where.link or (el.getTag() == .a and el.getAttributeInterned("href") != null),};if (el.is(Slot)) |slot| {var it = self.slotted(slot);diff --git a/src/browser/clutter.zig b/src/browser/clutter.zigindex 92349e9b3..499080de9 100644--- a/src/browser/clutter.zig+++ b/src/browser/clutter.zig@@ -289,7 +289,7 @@ const Pass = struct {switch (tag) {// Unlike readability: without href, <a> is a placeholder// (tag chips, JS buttons), and its text is not link text.- .anchor => if (el.getAttributeSafe(comptime .wrap("href"))) |href| {+ .a => if (el.getAttributeSafe(comptime .wrap("href"))) |href| {inner.in_link = true;inner.hash_link = href.len > 0 and href[0] == '#';},@@ -337,7 +337,7 @@ const Pass = struct {fn isUnlikely(self: *const Pass, el: *Element, tag: Element.Tag, ctx: Ctx) ?Rule {if (self.flags.unlikelys == false) return null;- if (tag != .body and tag != .anchor and !ctx.in_table and !ctx.in_code) {+ if (tag != .body and tag != .a and !ctx.in_table and !ctx.in_code) {const names = self.classAndId(el);if (containsAny(names, &unlikely) and !containsAny(names, &maybe_candidate)) {return .unlikely;diff --git a/src/browser/frame/node_factory.zig b/src/browser/frame/node_factory.zigindex 556726d84..e09a2bcaa 100644--- a/src/browser/frame/node_factory.zig+++ b/src/browser/frame/node_factory.zig@@ -79,7 +79,7 @@ pub fn createElementNS(document: *const Node.Document, namespace: Element.NamespElement.Html.Quote,namespace,attribute_iterator,- .{ ._tag_name = comptime .wrap("q"), ._tag = .quote },+ .{ ._tag_name = comptime .wrap("q"), ._tag = .q },),'s' => return createHtmlElementT(document,diff --git a/src/browser/interactive.zig b/src/browser/interactive.zigindex e1c080dd5..03a6ae4ee 100644--- a/src/browser/interactive.zig+++ b/src/browser/interactive.zig@@ -318,7 +318,7 @@ pub fn classifyInteractivity(// 1. Native interactive by tagswitch (el.getTag()) {.button, .summary, .details, .select, .textarea => return .native,- .anchor, .area => {+ .a, .area => {if (el.getAttributeInterned("href") != null) return .native;},.input => {diff --git a/src/browser/markdown.zig b/src/browser/markdown.zigindex 2068f9c57..585fc18f2 100644--- a/src/browser/markdown.zig+++ b/src/browser/markdown.zig@@ -285,7 +285,7 @@ const Context = struct {self.state.last_char_was_newline = false;return;},- .anchor => {+ .a => {const frame = self.frame;// Without href, <a> is a placeholder, not a hyperlink.const href_raw = el.getAttributeInterned("href") orelse {diff --git a/src/browser/screenshot.zig b/src/browser/screenshot.zigindex 532222e53..80a11d572 100644--- a/src/browser/screenshot.zig+++ b/src/browser/screenshot.zig@@ -984,7 +984,7 @@ const Builder = struct {}return;},- .anchor => {+ .a => {const href = el.getAttributeInterned("href");const label = el.getAttributeInterned("aria-label") orelse el.getAttributeInterned("title");const info = RenderTree.analyzeContent(el.asNode(), self.frame);diff --git a/src/browser/tests/custom_elements/built_in.html b/src/browser/tests/custom_elements/built_in.htmlindex 63fcb801a..db7d2b3a6 100644--- a/src/browser/tests/custom_elements/built_in.html+++ b/src/browser/tests/custom_elements/built_in.html@@ -32,6 +32,22 @@testing.expectEqual(true, threw);}+{+ class FancyLink extends HTMLAnchorElement {}+ customElements.define('fancy-link', FancyLink, { extends: 'a' });++ const a = document.createElement('a', { is: 'fancy-link' });+ testing.expectEqual(true, a instanceof FancyLink);+ testing.expectEqual('A', a.tagName);++ // internal Tag groupings aren't element names+ for (const name of ['anchor', 'heading', 'media']) {+ testing.expectError('NotSupportedError', () => {+ customElements.define('bad-extends-' + name, class extends HTMLElement {}, { extends: name });+ });+ }+}+{class FancyParagraph extends HTMLElement {}customElements.define('fancy-paragraph', FancyParagraph, { extends: 'p' });diff --git a/src/browser/tests/element/query_selector_all.html b/src/browser/tests/element/query_selector_all.htmlindex 3b4013c2b..6fadd468f 100644--- a/src/browser/tests/element/query_selector_all.html+++ b/src/browser/tests/element/query_selector_all.html@@ -188,3 +188,23 @@assertList(['Nested paragraph'], root.querySelectorAll(' div.nested p.text '));}</script>++<div id=grouped-tags>+ <a href="#">a</a><dir>dir</dir><h1>h1</h1><h2>h2</h2><q>q</q><blockquote>blockquote</blockquote><audio></audio><video></video>+</div>++<script id=internalTagGroupsAreNotTagNames>+{+ const root = $('#grouped-tags');+ for (const name of ['anchor', 'directory', 'heading', 'quote', 'media']) {+ testing.expectEqual(0, root.querySelectorAll(name).length);+ testing.expectEqual(0, root.getElementsByTagName(name).length);+ }+ assertList(['a'], root.querySelectorAll('a'));+ assertList(['dir'], root.querySelectorAll('dir'));+ assertList(['h1', 'h2'], root.querySelectorAll('h1, h2'));+ assertList(['q'], root.querySelectorAll('q'));+ testing.expectEqual(1, root.getElementsByTagName('blockquote').length);+ testing.expectEqual(2, root.querySelectorAll('audio, video').length);+}+</script>diff --git a/src/browser/webapi/CustomElementRegistry.zig b/src/browser/webapi/CustomElementRegistry.zigindex 87f9c69c0..23bd29c89 100644--- a/src/browser/webapi/CustomElementRegistry.zig+++ b/src/browser/webapi/CustomElementRegistry.zig@@ -45,14 +45,8 @@ pub fn define(self: *CustomElementRegistry, name: []const u8, constructor: js.Fu// Parse and validate extends optionconst extends_tag: ?Element.Tag = if (options.extends) |extends_name| blk: {- const tag = std.meta.stringToEnum(Element.Tag, extends_name) orelse return error.NotSupported;-- // Can't extend custom elements- if (tag == .custom) {- return error.NotSupported;- }-- break :blk tag;+ // null for custom elements, unknown names and Tag groupings (heading, media)+ break :blk Element.Tag.parseForMatch(extends_name) orelse return error.NotSupported;} else null;// Do not use getOrPut here to hold the GetOrPut entry until we need to writediff --git a/src/browser/webapi/Element.zig b/src/browser/webapi/Element.zigindex 23dd63d88..0d40a435e 100644--- a/src/browser/webapi/Element.zig+++ b/src/browser/webapi/Element.zig@@ -1252,7 +1252,7 @@ fn isNativelyFocusable(self: *Element) bool {return switch (self.getTag()) {.button, .select, .textarea, .iframe => true,.input => self.as(Html.Input)._input_type != .hidden,- .anchor, .area => self.getAttributeInterned("href") != null,+ .a, .area => self.getAttributeInterned("href") != null,else => false,};}@@ -2341,7 +2341,7 @@ pub fn getTag(self: *const Element) Tag {.html => blk: {const he = self.subtype(Html);break :blk switch (he._type) {- .anchor => .anchor,+ .anchor => .a,.area => .area,.base => .base,.div => .div,@@ -2354,7 +2354,7 @@ pub fn getTag(self: *const Element) Tag {.datalist => .datalist,.details => .details,.dialog => .dialog,- .directory => .directory,+ .directory => .dir,.iframe => .iframe,.img => .img,.br => .br,@@ -2424,8 +2424,8 @@ pub fn ownerFrame(self: *const Element, frame: *const Frame) ?*Frame {}pub const Tag = enum {+ a,address,- anchor,audio,area,aside,@@ -2450,8 +2450,8 @@ pub const Tag = enum {del,dfn,dialog,+ dir,div,- directory,dl,dt,embed,@@ -2508,7 +2508,7 @@ pub const Tag = enum {polyline,pre,progress,- quote,+ q,rect,s,script,@@ -2546,6 +2546,8 @@ pub const Tag = enum {const tag = std.meta.stringToEnum(Tag, lower) orelse return null;return switch (tag) {.unknown, .custom => null,+ // groupings, not element names (h1-h6, audio/video)+ .heading, .media => null,else => tag,};}diff --git a/src/browser/webapi/collections/HTMLAllCollection.zig b/src/browser/webapi/collections/HTMLAllCollection.zigindex 03e0cb757..a479a7558 100644--- a/src/browser/webapi/collections/HTMLAllCollection.zig+++ b/src/browser/webapi/collections/HTMLAllCollection.zig@@ -76,7 +76,7 @@ fn isAllNamed(el: *Element) bool {return false;}return switch (el.getTag()) {- .anchor, .button, .embed, .form, .frameset, .iframe, .img, .input, .map, .meta, .object, .select, .textarea => true,+ .a, .button, .embed, .form, .frameset, .iframe, .img, .input, .map, .meta, .object, .select, .textarea => true,else => false,};}diff --git a/src/browser/webapi/selector/List.zig b/src/browser/webapi/selector/List.zigindex 587307525..31cf0f2fb 100644--- a/src/browser/webapi/selector/List.zig+++ b/src/browser/webapi/selector/List.zig@@ -630,7 +630,7 @@ fn matchesPseudoClass(el: *Node.Element, pseudo: Selector.PseudoClass, scope: *N// and :visited matches nothing..link, .any_link => {const tag = el.getTag();- if (tag != .anchor and tag != .area) return false;+ if (tag != .a and tag != .area) return false;return el.hasAttributeInterned("href");},.visited => return false,diff --git a/src/server/bidi/browsing_context.zig b/src/server/bidi/browsing_context.zigindex 2a0833d56..2bee9419b 100644--- a/src/server/bidi/browsing_context.zig+++ b/src/server/bidi/browsing_context.zig@@ -518,7 +518,7 @@ pub const Locator = union(enum) {.tag_name => true,.link_text, .partial_link_text => |needle| blk: {// an <a> outside HTML has no rendered text- if (element.getTag() != .anchor) {+ if (element.getTag() != .a) {break :blk false;}text.clearRetainingCapacity();diff --git a/src/server/cdp/AXNode.zig b/src/server/cdp/AXNode.zigindex ce4fc1759..758c52f04 100644--- a/src/server/cdp/AXNode.zig+++ b/src/server/cdp/AXNode.zig@@ -344,7 +344,7 @@ pub const Writer = struct {if (uri.len == 0) return;try self.writeAXProperty(.{ .name = .url, .value = .{ .string = uri } }, w);},- .anchor => {+ .a => {const a = el.as(DOMNode.Element.Html.Anchor);const uri = try a.getHref(self.frame);if (uri.len == 0) return;@@ -434,7 +434,6 @@ pub const Writer = struct {try self.writeAXProperty(.{ .name = .orientation, .value = .{ .token = "horizontal" } }, w);},.li => {- // Calculate level by counting list ancestors (ul, ol, menu)var level: usize = 0;var current = dom_node._parent;while (current) |node| {@@ -449,7 +448,9 @@ pub const Writer = struct {}current = node._parent;}- try self.writeAXProperty(.{ .name = .level, .value = .{ .integer = level } }, w);+ // As far as I can see, chrome reports a min of 1, even+ // for a list without ul/ol/menu parent.+ try self.writeAXProperty(.{ .name = .level, .value = .{ .integer = @max(level, 1) } }, w);},else => {},}@@ -793,7 +794,7 @@ const AXRole = enum(u8) {.datalist => .listbox,// Interactive Elements- .anchor, .area => {+ .a, .area => {if (el.getAttributeInterned("href") == null) {return .none;}