Lightpanda: the headless browser designed for AI and automation
cdp: the label index is required, not optional
Adrià Arrufat9a3585079da3
diff --git a/src/SemanticTree.zig b/src/SemanticTree.zigindex f41797619..896a1b233 100644--- a/src/SemanticTree.zig+++ b/src/SemanticTree.zig@@ -661,7 +661,8 @@ pub fn getNodeDetails(const cdp_node = try registry.register(node);const axn = AXNode.fromNode(node);const role = try axn.getRole();- const name = try axn.getName(frame, arena, null);+ var labels: Label.LabelByForIndex = .{};+ const name = try axn.getName(frame, arena, &labels);var is_interactive = false;var is_disabled = false;diff --git a/src/browser/interactive.zig b/src/browser/interactive.zigindex 972337996..5e0b36c20 100644--- a/src/browser/interactive.zig+++ b/src/browser/interactive.zig@@ -222,8 +222,7 @@ fn walkInteractive(if (!std.ascii.eqlIgnoreCase(r, rf)) continue;}- // Resolve the name only after the cheap role filter passes: it walks- // labels and the element's text subtree.+ // Names walk labels and text; filter on role first.const name = (try axn.getName(frame, arena, &label_index)) orelse try getTextContent(node, arena);if (filter.name) |nf| {const n = name orelse continue;@@ -395,8 +394,7 @@ pub fn explicitRole(el: *Element) ?[]const u8 {return it.next();}-/// The accessibility role, or null where there is none: a plain element-/// that is interactive only by its listener or tabindex.+/// Null for elements with no role (interactive only by listener or tabindex).fn axRole(axn: AXNode) ?[]const u8 {const role = axn.getRole() catch return null;return if (std.mem.eql(u8, role, "none")) null else role;@@ -479,7 +477,7 @@ fn testInteractive(html: []const u8) ![]InteractiveElement {return collectInteractiveElements(div.asNode(), frame.call_arena, frame);}-/// Like `testInteractive`, but attached to the document so `<label for>` resolves.+/// Attached to the document so `<label for>` resolves.fn testInteractiveInBody(html: []const u8) ![]InteractiveElement {const frame = try testing.createFrame();errdefer testing.test_session.closeAllPages();diff --git a/src/browser/links.zig b/src/browser/links.zigindex 41838b745..fe9dd00b8 100644--- a/src/browser/links.zig+++ b/src/browser/links.zig@@ -63,6 +63,7 @@ pub fn registerNodes(links: []Link, registry: anytype) !void {pub fn collectLinks(arena: Allocator, root: *Node, frame: *Frame) ![]Link {var links: std.StringArrayHashMapUnmanaged(Link) = .empty;var visibility_cache: Element.VisibilityCache = .empty;+ var labels: Label.LabelByForIndex = .{};if (Selector.querySelectorAll(root, "a[href]", frame)) |list| {defer list.deinit(frame._page);@@ -80,12 +81,12 @@ pub fn collectLinks(arena: Allocator, root: *Node, frame: *Frame) ![]Link {const gop = try links.getOrPut(arena, href);if (gop.found_existing) {- if (gop.value_ptr.text == null) gop.value_ptr.text = try AXNode.fromNode(node).getName(frame, arena, null);+ if (gop.value_ptr.text == null) gop.value_ptr.text = try AXNode.fromNode(node).getName(frame, arena, &labels);continue;}gop.value_ptr.* = .{.node = node,- .text = try AXNode.fromNode(node).getName(frame, arena, null),+ .text = try AXNode.fromNode(node).getName(frame, arena, &labels),.href = href,};}@@ -98,6 +99,7 @@ pub fn collectLinks(arena: Allocator, root: *Node, frame: *Frame) ![]Link {}const testing = @import("../testing.zig");+const Label = @import("webapi/element/html/Label.zig");fn testLinks(html: []const u8) ![]Link {const frame = try testing.createFrame();diff --git a/src/browser/webapi/WebDriver.zig b/src/browser/webapi/WebDriver.zigindex 750123423..829f74919 100644--- a/src/browser/webapi/WebDriver.zig+++ b/src/browser/webapi/WebDriver.zig@@ -35,6 +35,7 @@ const TouchEvent = @import("event/TouchEvent.zig");const WheelEvent = @import("event/WheelEvent.zig");const PointerEvent = @import("event/PointerEvent.zig");const KeyboardEvent = @import("event/KeyboardEvent.zig");+const Label = @import("element/html/Label.zig");const log = lp.log;@@ -50,7 +51,8 @@ pub fn deleteAllCookies(_: *const WebDriver, page: *Page) void {pub fn getComputedLabel(_: *const WebDriver, element: *Element, frame: *Frame) ![]const u8 {const AXNode = @import("../../cdp/AXNode.zig");const axnode = AXNode.fromNode(element.asNode());- return (try axnode.getName(frame, frame.call_arena, null)) orelse "";+ var labels: Label.LabelByForIndex = .{};+ return (try axnode.getName(frame, frame.call_arena, &labels)) orelse "";}// Implements testdriver's `click`: a full trusted primary-button clickdiff --git a/src/browser/webapi/element/html/Label.zig b/src/browser/webapi/element/html/Label.zigindex f696f2a1f..e1468ddd0 100644--- a/src/browser/webapi/element/html/Label.zig+++ b/src/browser/webapi/element/html/Label.zig@@ -59,17 +59,6 @@ pub fn findWrappingLabel(control: *Element) ?*Element {return null;}-/// First `<label for="id">` descendant of `root`, if any.-pub fn findLabelByFor(root: *Node, id: []const u8) ?*Element {- var it = TreeWalker.Full.Elements.init(root, .{});- while (it.next()) |el| {- if (el.getTag() != .label) continue;- const for_attr = el.getAttributeSafe(comptime .wrap("for")) orelse continue;- if (std.mem.eql(u8, for_attr, id)) return el;- }- return null;-}-/// Lazy `for`-attribute → `<label>` index. Built in one tree walk on first/// lookup; subsequent lookups are O(1). Use when the same document is queried/// multiple times (e.g. one AX tree walk resolves names for every labellablediff --git a/src/cdp/AXNode.zig b/src/cdp/AXNode.zigindex 704a1f08e..abcb69b3d 100644--- a/src/cdp/AXNode.zig+++ b/src/cdp/AXNode.zig@@ -932,9 +932,8 @@ const AXSource = enum(u8) {value, // input value};-/// `label_index` makes repeated `<label for>` lookups one document scan-/// instead of one per element.-pub fn getName(self: AXNode, frame: *Frame, allocator: std.mem.Allocator, label_index: ?*Label.LabelByForIndex) !?[]const u8 {+/// `labels` fills on its first `<label for>` lookup; share one across a walk.+pub fn getName(self: AXNode, frame: *Frame, allocator: std.mem.Allocator, labels: *Label.LabelByForIndex) !?[]const u8 {var aw: std.Io.Writer.Allocating = .init(allocator);defer aw.deinit();@@ -961,7 +960,7 @@ pub fn getName(self: AXNode, frame: *Frame, allocator: std.mem.Allocator, label_const w: TextCaptureWriter = .{ .aw = &aw, .writer = &aw.writer };- const source = try self.writeName(null, w, frame, label_index);+ const source = try self.writeName(null, w, frame, labels);if (source != null) {// Remove literal quotes inserted by writeString.var raw_text = std.mem.trim(u8, aw.written(), "\"");@@ -977,7 +976,7 @@ fn writeName(temp_arena: ?*lp.Arena,w: anytype,frame: *Frame,- label_index: ?*Label.LabelByForIndex,+ label_index: *Label.LabelByForIndex,) !?AXSource {defer if (temp_arena) |a| a.reset(scratch_retain_limit);@@ -1240,17 +1239,13 @@ fn writeLabelName(node: *DOMNode,el: *DOMNode.Element,frame: *Frame,- label_index: ?*Label.LabelByForIndex,+ label_index: *Label.LabelByForIndex,w: anytype,) !?AXSource {if (el.getAttributeSafe(comptime .wrap("id"))) |id_value| {if (id_value.len > 0) {if (node.ownerDocument(frame)) |doc| {- const match: ?*DOMNode.Element = if (label_index) |idx|- try idx.lookup(doc.asNode(), id_value, frame.call_arena)- else- Label.findLabelByFor(doc.asNode(), id_value);- if (match) |label_el| {+ if (try label_index.lookup(doc.asNode(), id_value, frame.call_arena)) |label_el| {if (try writeLabelInnerText(temp_arena, label_el, frame, w)) return .label_element;}}@@ -2038,7 +2033,8 @@ test "AXNode: getName name-from-content honors explicit role" {for (cases) |c| {const el = (try doc.querySelector(.wrap(c.selector), frame)).?;const axn = AXNode.fromNode(el.asNode());- const name = try axn.getName(frame, testing.allocator, null);+ var labels: Label.LabelByForIndex = .{};+ const name = try axn.getName(frame, testing.allocator, &labels);defer if (name) |n| testing.allocator.free(n);if (c.expected) |exp| {