Skip to content

Lightpanda: the headless browser designed for AI and automation

Add TreeWalker.ElementsOf(T) helper

Karl Seguined4a0a28685a
diff --git a/src/browser/EventManager.zig b/src/browser/EventManager.zig
index 0738330e1..fac568c15 100644
--- a/src/browser/EventManager.zig
+++ b/src/browser/EventManager.zig
@@ -817,12 +817,9 @@ const ActivationState = struct {
const root = elem.asNode().getRootNode(.{});
const TreeWalker = @import("webapi/TreeWalker.zig");
- var walker = TreeWalker.Full.init(root, .{});
-
- while (walker.next()) |node| {
- const other_element = node.is(Element) orelse continue;
- const other_input = other_element.is(Input) orelse continue;
+ var walker = TreeWalker.Full.ElementsOf(Input).init(root, .{});
+ while (walker.next()) |other_input| {
if (other_input._input_type != .radio) {
continue;
}
@@ -832,7 +829,7 @@ const ActivationState = struct {
continue;
}
- const other_name = other_element.getName() orelse continue;
+ const other_name = other_input.asElement().getName() orelse continue;
if (!std.mem.eql(u8, name, other_name)) {
continue;
}
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index a14f609fe..58f1206f1 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -1601,9 +1601,8 @@ fn notifyParentLoadComplete(self: *Frame) void {
fn metaRefreshOnLoad(self: *Frame) void {
const root = self.document.getDocumentElement() orelse return;
- var tw = TreeWalker.Full.init(root.asNode(), .{});
- while (tw.next()) |node| {
- const meta = node.is(Element.Html.Meta) orelse continue;
+ var tw = TreeWalker.Full.ElementsOf(Element.Html.Meta).init(root.asNode(), .{});
+ while (tw.next()) |meta| {
const target = meta.refreshTarget() orelse continue;
return self.metaRefresh(target) catch |err| {
log.debug(.frame, "meta refresh", .{ .err = err, .type = self._type, .url = self.url });
diff --git a/src/browser/forms.zig b/src/browser/forms.zig
index 4b713a3a3..e4b39d11e 100644
--- a/src/browser/forms.zig
+++ b/src/browser/forms.zig
@@ -161,9 +161,8 @@ pub fn collectForms(
) ![]FormInfo {
var forms: std.ArrayList(FormInfo) = .empty;
- var tw = TreeWalker.Full.init(root, .{});
- while (tw.next()) |node| {
- const form = node.is(Element.Html.Form) orelse continue;
+ var tw = TreeWalker.Full.ElementsOf(Element.Html.Form).init(root, .{});
+ while (tw.next()) |form| {
const el = form.asElement();
const fields = try collectFormFields(arena, form, frame);
@@ -173,7 +172,7 @@ pub fn collectForms(
const method_str = form.getMethod();
try forms.append(arena, .{
- .node = node,
+ .node = el.asNode(),
.action = if (action_attr) |a| if (a.len > 0) a else null else null,
.method = method_str,
.fields = fields,
@@ -259,13 +258,8 @@ fn collectSelectOptions(
frame: *Frame,
) ![]SelectOption {
var options: std.ArrayList(SelectOption) = .empty;
- const Option = Element.Html.Option;
-
- var tw = TreeWalker.Full.init(select_node, .{});
- while (tw.next()) |node| {
- const el = node.is(Element) orelse continue;
- const option = el.is(Option) orelse continue;
-
+ var tw = TreeWalker.Full.ElementsOf(Element.Html.Option).init(select_node, .{});
+ while (tw.next()) |option| {
try options.append(arena, .{
.value = option.getValue(frame),
.text = option.getText(frame),
diff --git a/src/browser/webapi/HTMLDocument.zig b/src/browser/webapi/HTMLDocument.zig
index 21cc143ab..9bcb76429 100644
--- a/src/browser/webapi/HTMLDocument.zig
+++ b/src/browser/webapi/HTMLDocument.zig
@@ -102,15 +102,8 @@ fn findBodyForDoc(document_element: *Element) ?*Element.Html.Body {
pub fn getTitle(self: *HTMLDocument, frame: *Frame) ![]const u8 {
// Search the entire document for the first <title> element
const root = self._proto.getDocumentElement() orelse return "";
- const title_element = blk: {
- var walker = TreeWalker.Full.init(root.asNode(), .{});
- while (walker.next()) |node| {
- if (node.is(Element.Html.Title)) |title| {
- break :blk title;
- }
- }
- return "";
- };
+ var walker = TreeWalker.Full.ElementsOf(Element.Html.Title).init(root.asNode(), .{});
+ const title_element = walker.next() orelse return "";
var buf = std.Io.Writer.Allocating.init(frame.local_arena);
try title_element.asNode().getTextContent(&buf.writer);
diff --git a/src/browser/webapi/TreeWalker.zig b/src/browser/webapi/TreeWalker.zig
index fdccf6d8f..26be40f8a 100644
--- a/src/browser/webapi/TreeWalker.zig
+++ b/src/browser/webapi/TreeWalker.zig
@@ -206,6 +206,29 @@ pub fn TreeWalker(comptime mode: Mode, comptime tree: Tree) type {
self.tw.reset();
}
};
+
+ pub fn ElementsOf(comptime T: type) type {
+ return struct {
+ tw: Self,
+
+ const It = @This();
+
+ pub fn init(root: *Node, opts: Opts) It {
+ return .{
+ .tw = Self.init(root, opts),
+ };
+ }
+
+ pub fn next(self: *It) ?*T {
+ while (self.tw.next()) |node| {
+ if (node.is(T)) |t| {
+ return t;
+ }
+ }
+ return null;
+ }
+ };
+ }
};
}
diff --git a/src/browser/webapi/element/html/Custom.zig b/src/browser/webapi/element/html/Custom.zig
index 1ccb0baf8..e4972b83f 100644
--- a/src/browser/webapi/element/html/Custom.zig
+++ b/src/browser/webapi/element/html/Custom.zig
@@ -176,11 +176,9 @@ pub fn formAttributeChanged(element: *Element, name: String, frame: *Frame) void
}
fn formStateChangedInSubtree(root: *Node, frame: *Frame) void {
- var tw = TreeWalker.FullExcludeSelf.Elements.init(root, .{});
- while (tw.next()) |el| {
- if (el.is(Custom)) |custom| {
- custom.formStateChanged(frame);
- }
+ var tw = TreeWalker.FullExcludeSelf.ElementsOf(Custom).init(root, .{});
+ while (tw.next()) |custom| {
+ custom.formStateChanged(frame);
}
}
diff --git a/src/browser/webapi/element/html/Label.zig b/src/browser/webapi/element/html/Label.zig
index 7161be74e..0210ceae9 100644
--- a/src/browser/webapi/element/html/Label.zig
+++ b/src/browser/webapi/element/html/Label.zig
@@ -133,13 +133,12 @@ pub fn getControlLabels(control: *Element, frame: *Frame) !js.Array {
false;
if (by_id) {
- var it = TreeWalker.Full.Elements.init(root, .{});
- while (it.next()) |el| {
- const label = el.is(Label) orelse continue;
+ var it = TreeWalker.Full.ElementsOf(Label).init(root, .{});
+ while (it.next()) |label| {
if (label.getControl() != control) {
continue;
}
- _ = try arr.set(idx, el, .{});
+ _ = try arr.set(idx, label.asElement(), .{});
idx += 1;
}
return arr;
diff --git a/src/browser/webapi/element/slotting.zig b/src/browser/webapi/element/slotting.zig
index 27914eebe..def79f569 100644
--- a/src/browser/webapi/element/slotting.zig
+++ b/src/browser/webapi/element/slotting.zig
@@ -153,11 +153,9 @@ fn assignASlot(slottable: *Node, frame: *Frame) void {
}
pub fn assignSlottablesForTree(root: *Node, frame: *Frame) void {
- var tw = TreeWalker.Full.Elements.init(root, .{});
- while (tw.next()) |el| {
- if (el.is(Slot)) |slot| {
- assignSlottables(slot, frame);
- }
+ var tw = TreeWalker.Full.ElementsOf(Slot).init(root, .{});
+ while (tw.next()) |slot| {
+ assignSlottables(slot, frame);
}
}
@@ -165,13 +163,8 @@ fn subtreeHasSlot(node: *Node) bool {
if (node.is(Element) == null) {
return false;
}
- var tw = TreeWalker.Full.Elements.init(node, .{});
- while (tw.next()) |el| {
- if (el.is(Slot) != null) {
- return true;
- }
- }
- return false;
+ var tw = TreeWalker.Full.ElementsOf(Slot).init(node, .{});
+ return tw.next() != null;
}
pub fn insertionSteps(parent: *Node, child: *Node, in_fragment_parse: bool, frame: *Frame) void {