html-to-markdown 2.30.0 → 3.0.1

data/vendor/html-to-markdown-rs/src/converter/handlers/blockquote.rs

@@ -11,6 +11,9 @@ use crate::converter::dom_context::DomContext;
 use crate::converter::main::walk_node;
 use crate::options::ConversionOptions;
 
+#[cfg(feature = "visitor")]
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 #[cfg(feature = "visitor")]
 use std::collections::BTreeMap;
 
@@ -86,11 +89,7 @@ pub fn handle_blockquote(
     if let Some(ref visitor) = ctx.visitor {
         use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let node_id = node_handle.get_inner();
         let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/handlers/code_block.rs

@@ -13,6 +13,9 @@ use crate::converter::main::walk_node;
 use crate::converter::text::dedent_code_block;
 use crate::options::ConversionOptions;
 
+#[cfg(feature = "visitor")]
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 #[cfg(feature = "visitor")]
 use std::collections::BTreeMap;
 
@@ -75,11 +78,7 @@ pub fn handle_code(
             let code_output = if let Some(ref visitor_handle) = ctx.visitor {
                 use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-                let attributes: BTreeMap<String, String> = tag
-                    .attributes()
-                    .iter()
-                    .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                    .collect();
+                let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
                 let node_id = node_handle.get_inner();
                 let parent_tag = dom_ctx.parent_tag_name(node_id, parser);
@@ -255,11 +254,7 @@ pub fn handle_pre(
         let code_block_output = if let Some(ref visitor_handle) = ctx.visitor {
             use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-            let attributes: BTreeMap<String, String> = tag
-                .attributes()
-                .iter()
-                .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                .collect();
+            let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
             let node_id = node_handle.get_inner();
             let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/handlers/graphic.rs

@@ -11,6 +11,8 @@ use std::collections::BTreeMap;
 
 use crate::converter::Context;
 use crate::converter::dom_context::DomContext;
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::options::ConversionOptions;
 
 #[cfg(feature = "visitor")]
@@ -100,11 +102,7 @@ pub fn handle_graphic(
     let graphic_output = if let Some(ref visitor_handle) = ctx.visitor {
         use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let node_id = node_handle.get_inner();
         let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/handlers/image.rs

@@ -11,6 +11,8 @@ use std::collections::BTreeMap;
 
 use crate::converter::Context;
 use crate::converter::dom_context::DomContext;
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::converter::utility::preprocessing::sanitize_markdown_url;
 use crate::options::ConversionOptions;
 
@@ -123,11 +125,7 @@ pub fn handle_img(
     let image_output = if let Some(ref visitor_handle) = ctx.visitor {
         use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let node_id = node_handle.get_inner();
         let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/handlers/link.rs

@@ -15,6 +15,8 @@ use crate::converter::block::heading::{find_single_heading_child, heading_allows
 use crate::converter::dom_context::DomContext;
 use crate::converter::inline::link::append_markdown_link;
 use crate::converter::main::walk_node;
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::converter::utility::content::{
     collect_link_label_text, escape_link_label, get_text_content, normalize_link_label, normalized_tag_name,
 };
@@ -194,11 +196,7 @@ pub fn handle_link(
         let link_output = if let Some(ref visitor_handle) = ctx.visitor {
             use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-            let attributes: BTreeMap<String, String> = tag
-                .attributes()
-                .iter()
-                .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                .collect();
+            let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
             let node_id = node_handle.get_inner();
             let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/inline/code.rs

@@ -10,6 +10,8 @@
 //! - Visitor callbacks for custom code processing
 //! - Whitespace normalization for kbd/samp elements
 
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::options::ConversionOptions;
 use crate::text;
 #[allow(unused_imports)]
@@ -120,11 +122,7 @@ fn handle_code(
             let code_output = if let Some(ref visitor_handle) = ctx.visitor {
                 use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-                let attributes: BTreeMap<String, String> = tag
-                    .attributes()
-                    .iter()
-                    .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                    .collect();
+                let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
                 let node_id = node_handle.get_inner();
                 let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/inline/emphasis.rs

@@ -8,6 +8,8 @@
 //! - Visitor callbacks for custom emphasis processing
 //! - Bootstrap caret detection (.caret class)
 
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::options::{ConversionOptions, OutputFormat};
 #[allow(unused_imports)]
 use std::collections::BTreeMap;
@@ -106,11 +108,7 @@ fn handle_strong(
             use crate::visitor::{NodeContext, NodeType, VisitResult};
 
             let text_content = get_text_content(node_handle, parser, dom_ctx);
-            let attributes: BTreeMap<String, String> = tag
-                .attributes()
-                .iter()
-                .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                .collect();
+            let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
             let node_id = node_handle.get_inner();
             let parent_tag = dom_ctx.parent_tag_name(node_id, parser);
@@ -246,11 +244,7 @@ fn handle_emphasis(
             use crate::visitor::{NodeContext, NodeType, VisitResult};
 
             let text_content = get_text_content(node_handle, parser, dom_ctx);
-            let attributes: BTreeMap<String, String> = tag
-                .attributes()
-                .iter()
-                .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                .collect();
+            let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
             let node_id = node_handle.get_inner();
             let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/inline/link.rs

@@ -9,7 +9,9 @@
 //! - Metadata collection for links (links, URLs, titles, rel attributes)
 //! - Block-level content within links (via inline context)
 
-use crate::converter::utility::content::{is_block_level_element, normalized_tag_name};
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
+use crate::converter::utility::content::{collect_link_label_text, escape_link_label, normalize_link_label};
 use crate::converter::utility::preprocessing::sanitize_markdown_url;
 use crate::options::ConversionOptions;
 use std::collections::BTreeMap;
@@ -230,11 +232,7 @@ pub(crate) fn handle(
         let link_output = if let Some(ref visitor_handle) = ctx.visitor {
             use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-            let attributes: BTreeMap<String, String> = tag
-                .attributes()
-                .iter()
-                .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                .collect();
+            let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
             let node_id = node_handle.get_inner();
             let parent_tag = dom_ctx.parent_tag_name(node_id, parser);
@@ -341,58 +339,6 @@ pub(crate) fn handle(
     }
 }
 
-/// Escape special Markdown characters in link labels.
-///
-/// Escapes unmatched closing brackets `]` to prevent accidental link termination.
-/// Tracks bracket nesting to avoid escaping matched closing brackets.
-///
-/// # Examples
-/// ```text
-/// Input:  "Click [here] for more"
-/// Output: "Click [here\\] for more"  (closing bracket is escaped because it's unmatched)
-///
-/// Input:  "Normal text"
-/// Output: "Normal text"  (no escaping needed)
-/// ```
-fn escape_link_label(text: &str) -> String {
-    if text.is_empty() {
-        return String::new();
-    }
-
-    let mut result = String::with_capacity(text.len());
-    let mut backslash_count = 0usize;
-    let mut bracket_depth = 0usize;
-
-    for ch in text.chars() {
-        if ch == '\\' {
-            result.push('\\');
-            backslash_count += 1;
-            continue;
-        }
-
-        let is_escaped = backslash_count % 2 == 1;
-        backslash_count = 0;
-
-        match ch {
-            '[' if !is_escaped => {
-                bracket_depth = bracket_depth.saturating_add(1);
-                result.push('[');
-            }
-            ']' if !is_escaped => {
-                if bracket_depth == 0 {
-                    result.push('\\');
-                } else {
-                    bracket_depth -= 1;
-                }
-                result.push(']');
-            }
-            _ => result.push(ch),
-        }
-    }
-
-    result
-}
-
 /// Format and append a Markdown link to the output string.
 ///
 /// Generates the link syntax: `[label](href "title")`
@@ -462,115 +408,3 @@ pub(crate) fn append_markdown_link(
 
     output.push(')');
 }
-
-/// Collect text content from direct inline children of a link element.
-///
-/// Performs a shallow scan to find text content, distinguishing between:
-/// - Inline text (normal flow, accumulated)
-/// - Block-level elements (stop at them, mark `saw_block`)
-/// - Comments (stop processing)
-///
-/// Returns:
-/// - `(text, block_nodes, saw_block)` where:
-///   - `text` is concatenated inline text
-///   - `block_nodes` is list of block-level children found
-///   - `saw_block` indicates if any block elements were encountered
-///
-/// # Algorithm
-/// Uses a stack-based approach to traverse the DOM tree, accumulating text
-/// from inline elements while identifying block-level boundaries.
-fn collect_link_label_text(
-    children: &[NodeHandle],
-    parser: &Parser,
-    dom_ctx: &DomContext,
-) -> (String, Vec<NodeHandle>, bool) {
-    let mut text = String::new();
-    let mut saw_block = false;
-    let mut block_nodes = Vec::new();
-    let mut stack: Vec<_> = children.iter().rev().copied().collect();
-
-    while let Some(handle) = stack.pop() {
-        if let Some(node) = handle.get(parser) {
-            match node {
-                tl::Node::Raw(bytes) => {
-                    let raw = bytes.as_utf8_str();
-                    let decoded = crate::text::decode_html_entities_cow(raw.as_ref());
-                    text.push_str(decoded.as_ref());
-                }
-                tl::Node::Tag(tag) => {
-                    let is_block = dom_ctx.tag_info(handle.get_inner(), parser).map_or_else(
-                        || {
-                            let tag_name = normalized_tag_name(tag.name().as_utf8_str());
-                            is_block_level_element(tag_name.as_ref())
-                        },
-                        |info| info.is_block,
-                    );
-                    if is_block {
-                        saw_block = true;
-                        block_nodes.push(handle);
-                        continue;
-                    }
-
-                    if let Some(children) = dom_ctx.children_of(handle.get_inner()) {
-                        for child in children.iter().rev() {
-                            stack.push(*child);
-                        }
-                    } else {
-                        let tag_children = tag.children();
-                        let mut child_nodes: Vec<_> = tag_children.top().iter().copied().collect();
-                        child_nodes.reverse();
-                        stack.extend(child_nodes);
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-
-    (text, block_nodes, saw_block)
-}
-
-/// Normalize link label text.
-///
-/// Collapses line breaks and normalizes whitespace:
-/// - Replaces `\n` and `\r` with spaces
-/// - Collapses multiple consecutive spaces to single space
-/// - Trims leading/trailing whitespace
-///
-/// This is required by the Markdown spec for link labels to function properly.
-///
-/// # Examples
-/// ```text
-/// Input:  "Line 1\nLine 2"
-/// Output: "Line 1 Line 2"
-///
-/// Input:  "Text  with   spaces"
-/// Output: "Text with spaces"
-/// ```
-#[allow(clippy::trivially_copy_pass_by_ref)]
-fn normalize_link_label(label: &str) -> String {
-    let mut needs_collapse = false;
-    for ch in label.chars() {
-        if ch == '\n' || ch == '\r' {
-            needs_collapse = true;
-            break;
-        }
-    }
-
-    let collapsed = if needs_collapse {
-        let mut collapsed = String::with_capacity(label.len());
-        for ch in label.chars() {
-            if ch == '\n' || ch == '\r' {
-                collapsed.push(' ');
-            } else {
-                collapsed.push(ch);
-            }
-        }
-        std::borrow::Cow::Owned(collapsed)
-    } else {
-        std::borrow::Cow::Borrowed(label)
-    };
-
-    let normalized = crate::text::normalize_whitespace_cow(collapsed.as_ref());
-    normalized.as_ref().trim().to_string()
-}

data/vendor/html-to-markdown-rs/src/converter/inline/semantic/marks.rs

@@ -5,7 +5,11 @@
 //! - Strikethrough (del, s tags) with ~~ syntax
 //! - Inserted/underlined text (ins, u tags) with == syntax
 
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::options::{ConversionOptions, OutputFormat};
+#[cfg(feature = "visitor")]
+use std::collections::BTreeMap;
 use tl::{NodeHandle, Parser};
 
 type Context = crate::converter::Context;
@@ -135,14 +139,8 @@ pub fn handle_strikethrough(
         let strikethrough_output = if let Some(ref visitor_handle) = ctx.visitor {
             use crate::converter::get_text_content;
             use crate::visitor::{NodeContext, NodeType, VisitResult};
-            use std::collections::BTreeMap;
-
             let text_content = get_text_content(node_handle, parser, dom_ctx);
-            let attributes: BTreeMap<String, String> = tag
-                .attributes()
-                .iter()
-                .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                .collect();
+            let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
             let node_id = node_handle.get_inner();
             let parent_tag = dom_ctx.parent_tag_name(node_id, parser);
@@ -262,14 +260,9 @@ pub fn handle_inserted(
     let underline_output = if let Some(ref visitor_handle) = ctx.visitor {
         use crate::converter::get_text_content;
         use crate::visitor::{NodeContext, NodeType, VisitResult};
-        use std::collections::BTreeMap;
 
         let text_content = get_text_content(node_handle, parser, dom_ctx);
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let node_id = node_handle.get_inner();
         let parent_tag = dom_ctx.parent_tag_name(node_id, parser);
@@ -377,14 +370,9 @@ pub fn handle_underline(
     if let Some(ref visitor_handle) = ctx.visitor {
         use crate::converter::get_text_content;
         use crate::visitor::{NodeContext, NodeType, VisitResult};
-        use std::collections::BTreeMap;
 
         let text_content = get_text_content(node_handle, parser, dom_ctx);
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let node_id = node_handle.get_inner();
         let parent_tag = dom_ctx.parent_tag_name(node_id, parser);

data/vendor/html-to-markdown-rs/src/converter/list/item.rs

@@ -8,6 +8,8 @@
 
 use crate::converter::main_helpers::tag_name_eq;
 use crate::converter::main_helpers::trim_trailing_whitespace;
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::converter::utility::content::normalized_tag_name;
 use crate::converter::walk_node;
 use crate::options::ConversionOptions;
@@ -216,11 +218,7 @@ pub(crate) fn handle_li(
             use crate::visitor::{NodeContext, NodeType, VisitResult};
             use std::collections::BTreeMap;
 
-            let attributes: BTreeMap<String, String> = tag
-                .attributes()
-                .iter()
-                .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-                .collect();
+            let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
             let parent_tag = dom_ctx
                 .parent_of(node_handle.get_inner())

data/vendor/html-to-markdown-rs/src/converter/list/ordered.rs

@@ -10,6 +10,8 @@ use super::utils::{
     add_list_leading_separator, add_nested_list_trailing_separator, calculate_list_nesting_depth, is_loose_list,
     process_list_children,
 };
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::options::ConversionOptions;
 #[allow(unused_imports)]
 use std::collections::BTreeMap;
@@ -60,11 +62,7 @@ pub(crate) fn handle_ol(
     if let Some(ref visitor_handle) = ctx.visitor {
         use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let parent_tag = dom_ctx
             .parent_of(node_handle.get_inner())
@@ -129,11 +127,7 @@ pub(crate) fn handle_ol(
     if let Some(ref visitor_handle) = ctx.visitor {
         use crate::visitor::{NodeContext, NodeType, VisitResult};
 
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let parent_tag = dom_ctx
             .parent_of(node_handle.get_inner())

data/vendor/html-to-markdown-rs/src/converter/list/unordered.rs

@@ -10,7 +10,11 @@ use super::utils::{
     add_list_leading_separator, add_nested_list_trailing_separator, calculate_list_nesting_depth, is_loose_list,
     process_list_children,
 };
+#[cfg(feature = "visitor")]
+use crate::converter::utility::content::collect_tag_attributes;
 use crate::options::ConversionOptions;
+#[cfg(feature = "visitor")]
+use std::collections::BTreeMap;
 use tl;
 
 // Type aliases for Context and DomContext to avoid circular imports
@@ -51,13 +55,8 @@ pub(crate) fn handle_ul(
     #[cfg(feature = "visitor")]
     if let Some(ref visitor_handle) = ctx.visitor {
         use crate::visitor::{NodeContext, NodeType, VisitResult};
-        use std::collections::BTreeMap;
 
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let parent_tag = dom_ctx
             .parent_of(node_handle.get_inner())
@@ -121,13 +120,8 @@ pub(crate) fn handle_ul(
     #[cfg(feature = "visitor")]
     if let Some(ref visitor_handle) = ctx.visitor {
         use crate::visitor::{NodeContext, NodeType, VisitResult};
-        use std::collections::BTreeMap;
 
-        let attributes: BTreeMap<String, String> = tag
-            .attributes()
-            .iter()
-            .filter_map(|(k, v)| v.as_ref().map(|val| (k.to_string(), val.to_string())))
-            .collect();
+        let attributes: BTreeMap<String, String> = collect_tag_attributes(tag);
 
         let parent_tag = dom_ctx
             .parent_of(node_handle.get_inner())

data/vendor/html-to-markdown-rs/src/converter/list/utils.rs

@@ -3,6 +3,7 @@
 //! Contains helper functions for loose list detection, indentation calculation,
 //! list spacing, and list child processing.
 
+use crate::converter::main_helpers::{tag_name_eq, trim_trailing_whitespace};
 use crate::options::{ConversionOptions, ListIndentType};
 use tl;
 
@@ -11,18 +12,6 @@ use tl;
 type Context = crate::converter::Context;
 type DomContext = crate::converter::DomContext;
 
-/// Remove trailing spaces and tabs from output string.
-fn trim_trailing_whitespace(output: &mut String) {
-    while output.ends_with(' ') || output.ends_with('\t') {
-        output.pop();
-    }
-}
-
-/// Check if tag names are equal (case-insensitive).
-fn tag_name_eq<'a>(a: impl AsRef<str>, b: &str) -> bool {
-    a.as_ref().eq_ignore_ascii_case(b)
-}
-
 /// Calculate indentation level for list item continuations.
 ///
 /// Returns the number of 4-space indent groups needed for list continuations.