Skip to content

style: fix selector generator Clippy warnings and formatting #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
egorsmkv merged 1 commit into from
Oct 8, 2026
Merged

style: fix selector generator Clippy warnings and formatting #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 50 additions & 64 deletions src/selector_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,10 @@ fn stable_class_tokens(value: &str) -> Vec<&str> {

fn href_path(value: &str) -> Option<String> {
let without_fragment = value.split('#').next().unwrap_or(value);
let without_query = without_fragment.split('?').next().unwrap_or(without_fragment);
let without_query = without_fragment
.split('?')
.next()
.unwrap_or(without_fragment);

if let Some(scheme_index) = without_query.find("://") {
let after_scheme = &without_query[(scheme_index + 3)..];
Expand All @@ -305,12 +308,7 @@ fn href_path(value: &str) -> Option<String> {
(!without_query.is_empty()).then(|| without_query.to_string())
}

fn push_ranked_attribute(
out: &mut Vec<RankedXPathPredicate>,
score: u16,
name: &str,
value: &str,
) {
fn push_ranked_attribute(out: &mut Vec<RankedXPathPredicate>, score: u16, name: &str, value: &str) {
if value.is_empty() || !valid_attr_name(name) || xml_safe_name(name) != name {
return;
}
Expand All @@ -320,7 +318,10 @@ fn push_ranked_attribute(
});
}

fn xpath_attribute_candidates(handle: NodeHandle, parser: &TlParser<'_>) -> Vec<RankedXPathPredicate> {
fn xpath_attribute_candidates(
handle: NodeHandle,
parser: &TlParser<'_>,
) -> Vec<RankedXPathPredicate> {
let Some(tag) = handle.get(parser).and_then(|node| node.as_tag()) else {
return Vec::new();
};
Expand All @@ -335,10 +336,7 @@ fn xpath_attribute_candidates(handle: NodeHandle, parser: &TlParser<'_>) -> Vec<
.filter(|(name, value)| {
name.starts_with("data-")
&& !value.is_empty()
&& !matches!(
name.as_str(),
"data-testid" | "data-test" | "data-qa"
)
&& !matches!(name.as_str(), "data-testid" | "data-test" | "data-qa")
&& !name.contains("render")
&& !name.contains("random")
&& !name.contains("build")
Expand All @@ -359,7 +357,11 @@ fn xpath_attribute_candidates(handle: NodeHandle, parser: &TlParser<'_>) -> Vec<
if let Some(value) = attrs.get("id").filter(|value| !value.is_empty()) {
push_ranked_attribute(
&mut out,
if looks_generated_identifier(value) { 25 } else { 92 },
if looks_generated_identifier(value) {
25
} else {
92
},
"id",
value,
);
Expand All @@ -373,39 +375,38 @@ fn xpath_attribute_candidates(handle: NodeHandle, parser: &TlParser<'_>) -> Vec<
}
}

if matches!(tag_name.as_str(), "a" | "area") {
if let Some(value) = attrs.get("href").filter(|value| !value.is_empty()) {
if let Some(path) = href_path(value) {
// Path-based match survives query-parameter churn and
// relative -> absolute URL changes.
out.push(RankedXPathPredicate {
score: 96,
predicate: format!(
"ends-with(substring-before(concat(@href, '?'), '?'), {})",
xpath_literal(&path)
),
});
}
push_ranked_attribute(&mut out, 80, "href", value);
if matches!(tag_name.as_str(), "a" | "area")
&& let Some(value) = attrs.get("href").filter(|value| !value.is_empty())
{
if let Some(path) = href_path(value) {
// Path-based match survives query-parameter churn and
// relative -> absolute URL changes.
out.push(RankedXPathPredicate {
score: 96,
predicate: format!(
"ends-with(substring-before(concat(@href, '?'), '?'), {})",
xpath_literal(&path)
),
});
}
push_ranked_attribute(&mut out, 80, "href", value);
}

if matches!(
tag_name.as_str(),
"img" | "source" | "video" | "audio" | "iframe" | "script"
) {
if let Some(value) = attrs.get("src").filter(|value| !value.is_empty()) {
if let Some(path) = href_path(value) {
out.push(RankedXPathPredicate {
score: 85,
predicate: format!(
"ends-with(substring-before(concat(@src, '?'), '?'), {})",
xpath_literal(&path)
),
});
}
push_ranked_attribute(&mut out, 70, "src", value);
) && let Some(value) = attrs.get("src").filter(|value| !value.is_empty())
{
if let Some(path) = href_path(value) {
out.push(RankedXPathPredicate {
score: 85,
predicate: format!(
"ends-with(substring-before(concat(@src, '?'), '?'), {})",
xpath_literal(&path)
),
});
}
push_ranked_attribute(&mut out, 70, "src", value);
}

for name in ["title", "alt"] {
Expand Down Expand Up @@ -462,7 +463,7 @@ fn xpath_attribute_candidates(handle: NodeHandle, parser: &TlParser<'_>) -> Vec<
push_ranked_attribute(&mut out, 65, &name, &value);
}

out.sort_by(|left, right| right.score.cmp(&left.score));
out.sort_by_key(|candidate| std::cmp::Reverse(candidate.score));
out.truncate(XPATH_ATTRIBUTE_BUDGET);

// Bounded pair predicates retain the Robula+ attribute-set behavior without
Expand All @@ -483,7 +484,7 @@ fn xpath_attribute_candidates(handle: NodeHandle, parser: &TlParser<'_>) -> Vec<
}
}

out.sort_by(|left, right| right.score.cmp(&left.score));
out.sort_by_key(|candidate| std::cmp::Reverse(candidate.score));
out
}

Expand Down Expand Up @@ -513,7 +514,6 @@ fn target_text_candidate(
})
}


fn push_xpath_unique(out: &mut Vec<String>, seen: &mut HashSet<String>, value: String) {
if out.len() < XPATH_CANDIDATE_BUDGET {
push_unique(out, seen, value);
Expand Down Expand Up @@ -555,36 +555,27 @@ pub(crate) fn generate_robust_xpath_candidates(
// Build ancestor anchors globally, then let semantic stability outrank
// proximity. This prevents a nearby presentation class from beating a
// farther stable data-section/data-zone anchor.
for (distance, ancestor) in path
.iter()
.rev()
.skip(1)
.copied()
.enumerate()
{
for (distance, ancestor) in path.iter().rev().skip(1).copied().enumerate() {
let ancestor_tag = ancestor.get(parser)?.as_tag()?;
let ancestor_name = xml_safe_name(&bytes_to_string(ancestor_tag.name()));
let ancestor_attrs = xpath_attribute_candidates(ancestor, parser);
let distance_penalty = (distance as u16).min(8);

for ancestor_candidate in ancestor_attrs.iter().take(XPATH_ATTRIBUTE_BUDGET) {
let base_score = ancestor_candidate.score.saturating_sub(distance_penalty);
let prefix = format!(
"//{ancestor_name}[{}]",
ancestor_candidate.predicate
);
let prefix = format!("//{ancestor_name}[{}]", ancestor_candidate.predicate);

add_ranked(base_score.saturating_add(1), format!("{prefix}//{target_name}"));
add_ranked(
base_score.saturating_add(1),
format!("{prefix}//{target_name}"),
);

// Keep cross-products intentionally small: the ancestor-only form
// is the robust candidate we most want to preserve under budget.
for target_candidate in target_attrs.iter().take(2) {
add_ranked(
base_score.min(target_candidate.score),
format!(
"{prefix}//{target_name}[{}]",
target_candidate.predicate
),
format!("{prefix}//{target_name}[{}]", target_candidate.predicate),
);
}
}
Expand Down Expand Up @@ -612,12 +603,7 @@ pub(crate) fn generate_robust_xpath_candidates(
};
add_ranked(5, format!("//{target_name}[{target_position}]"));

ranked.sort_by(|left, right| {
right
.0
.cmp(&left.0)
.then_with(|| left.1.cmp(&right.1))
});
ranked.sort_by(|left, right| right.0.cmp(&left.0).then_with(|| left.1.cmp(&right.1)));

let mut out = Vec::new();
let mut seen = HashSet::new();
Expand Down
Loading