Lightpanda: the headless browser designed for AI and automation
selector: fail waitForSelector fast on pseudo-element selectors
Adrià Arrufat5c17f096cd97
diff --git a/src/browser/Runner.zig b/src/browser/Runner.zigindex acdeebede..15a31425c 100644--- a/src/browser/Runner.zig+++ b/src/browser/Runner.zig@@ -359,6 +359,9 @@ pub fn waitForSelector(self: *Runner, frame_id: u32, input: [:0]const u8, timeouconst timer: std.Io.Timestamp = .now(lp.io, .boot);const selector = try Selector.parseLeaky(arena.allocator(), input);+ for (selector) |s| {+ if (!s.hasPseudoElement()) break;+ } else return error.InvalidSelector;while (true) {if (session.isCancelled()) {@@ -505,6 +508,16 @@ test "Runner: waitForSelector" {try testing.expectEqual("selector-1-content", try el.asNode().getTextContentAlloc(testing.arena_allocator));}+test "Runner: waitForSelector pseudo-element" {+ const page = try testing.pageTest("runner/runner1.html", .{});+ defer page.close();++ var runner = page.session.runner(.{});+ try testing.expectError(error.InvalidSelector, runner.waitForSelector(page.frame_id, "#sel1::before, ::after", 10));+ const el = try runner.waitForSelector(page.frame_id, "#sel1::before, #sel1", 10);+ try testing.expectEqual("selector-1-content", try el.asNode().getTextContentAlloc(testing.arena_allocator));+}+test "Runner: waitForScript timeout" {const page = try testing.pageTest("runner/runner1.html", .{});defer page.close();diff --git a/src/browser/tests/document/query_selector_pseudo_element.html b/src/browser/tests/document/query_selector_pseudo_element.htmlindex 24186217d..5662c387b 100644--- a/src/browser/tests/document/query_selector_pseudo_element.html+++ b/src/browser/tests/document/query_selector_pseudo_element.html@@ -2,10 +2,13 @@<script src="../testing.js"></script><style>.x::after { display: none; }+ .hide, .x::before { display: none; }+ *, ::before, ::after { --ring: 3px; }</style><body><div id="d" class="x"><span id="s">S</span></div>+ <div id="h" class="hide">H</div></body><script id="valid_and_never_matches">@@ -55,5 +58,9 @@const d = document.getElementById('d');testing.expectEqual('block', getComputedStyle(d).display);testing.expectTrue(d.checkVisibility());++ // A pseudo-element in a selector list doesn't drop the other selectors.+ testing.expectFalse(document.getElementById('h').checkVisibility());+ testing.expectEqual('3px', getComputedStyle(d).getPropertyValue('--ring').trim());}</script>diff --git a/src/browser/webapi/selector/Parser.zig b/src/browser/webapi/selector/Parser.zigindex 309ce6425..bbb3ea0df 100644--- a/src/browser/webapi/selector/Parser.zig+++ b/src/browser/webapi/selector/Parser.zig@@ -473,11 +473,6 @@ fn isUnknownWebkit(name: []const u8) bool {!inList(name, &webkit_pseudo_classes);}-fn hasPseudoElement(selector: Selector.Selector) bool {- const parts = selector.rightmost().parts;- return parts[parts.len - 1] == .pseudo_element;-}-const tree_abiding_pseudo_elements = [_][]const u8{"after", "backdrop", "before","checkmark", "details-content", "file-selector-button",@@ -674,7 +669,7 @@ fn pseudoClass(self: *Parser, arena: Allocator) !Selector.PseudoClass {// Parse a full selector (with potential combinators and compounds)const selector = try parse(arena, self.consumeUntilCommaOrParen());- if (hasPseudoElement(selector)) return error.InvalidPseudoClass;+ if (selector.hasPseudoElement()) return error.InvalidPseudoClass;try selectors.append(arena, selector);_ = self.skipSpaces();@@ -772,7 +767,7 @@ fn pseudoClass(self: *Parser, arena: Allocator) !Selector.PseudoClass {}const selector = try parse(arena, self.consumeUntilCommaOrParen());- if (hasPseudoElement(selector)) return error.InvalidPseudoClass;+ if (selector.hasPseudoElement()) return error.InvalidPseudoClass;try selectors.append(arena, try absolutize(arena, selector, combinator));_ = self.skipSpaces();diff --git a/src/browser/webapi/selector/Selector.zig b/src/browser/webapi/selector/Selector.zigindex bfcdbef5f..8e0768fa2 100644--- a/src/browser/webapi/selector/Selector.zig+++ b/src/browser/webapi/selector/Selector.zig@@ -424,6 +424,12 @@ pub const Selector = struct {return self.segments[self.segments.len - 1].compound;}+ /// Such a selector matches no element.+ pub fn hasPseudoElement(self: Selector) bool {+ const parts = self.rightmost().parts;+ return parts[parts.len - 1] == .pseudo_element;+ }+pub fn format(self: Selector, writer: *std.Io.Writer) !void {try self.first.format(writer);for (self.segments) |segment| {