rumdl 0.0.49__tar.gz → 0.0.51__tar.gz

{rumdl-0.0.49 → rumdl-0.0.51}/Cargo.lock

@@ -1208,7 +1208,7 @@ dependencies = [
 
 [[package]]
 name = "rumdl"
-version = "0.0.49"
+version = "0.0.51"
 dependencies = [
  "anyhow",
  "assert_cmd",

{rumdl-0.0.49 → rumdl-0.0.51}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rumdl"
-version = "0.0.49"
+version = "0.0.51"
 edition = "2021"
 description = "A fast Markdown linter written in Rust (Ru(st) MarkDown Linter)"
 authors = ["Ruben J. Jongejan <ruben.jongejan@gmail.com>"]

{rumdl-0.0.49 → rumdl-0.0.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rumdl
-Version: 0.0.49
+Version: 0.0.51
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{rumdl-0.0.49 → rumdl-0.0.51}/benches/rule_performance.rs

@@ -1,9 +1,8 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use rumdl::rule::Rule;
 use rumdl::rules::{
-    MD013LineLength, MD015NoMissingSpaceAfterListMarker, MD033NoInlineHtml,
-    MD037SpacesAroundEmphasis, MD044ProperNames, MD051LinkFragments,
-    MD053LinkImageReferenceDefinitions,
+    MD013LineLength, MD015NoMissingSpaceAfterListMarker, MD033NoInlineHtml, MD037NoSpaceInEmphasis,
+    MD044ProperNames, MD051LinkFragments, MD053LinkImageReferenceDefinitions,
 };
 
 /// Benchmark MD013 rule on a large content with long lines
@@ -66,7 +65,7 @@ fn bench_md037(c: &mut Criterion) {
         }
     }
 
-    let rule = MD037SpacesAroundEmphasis;
+    let rule = MD037NoSpaceInEmphasis;
 
     c.bench_function("MD037 check 500 emphasis markers", |b| {
         b.iter(|| rule.check(black_box(&content)))

{rumdl-0.0.49 → rumdl-0.0.51}/src/main.rs

@@ -233,7 +233,7 @@ fn get_enabled_rules_from_checkargs(
         Box::new(MD008ULStyle::default()),
         Box::new(MD009TrailingSpaces::default()),
         Box::new(MD010NoHardTabs::default()),
-        Box::new(MD011ReversedLink {}),
+        Box::new(MD011NoReversedLinks {}),
         Box::new(MD012NoMultipleBlanks::default()),
         Box::new(MD013LineLength::default()),
         Box::new(MD015NoMissingSpaceAfterListMarker::default()),
@@ -245,7 +245,7 @@ fn get_enabled_rules_from_checkargs(
         Box::new(MD021NoMultipleSpaceClosedAtx {}),
         Box::new(MD022BlanksAroundHeadings::default()),
         Box::new(MD023HeadingStartLeft {}),
-        Box::new(MD024MultipleHeadings::default()),
+        Box::new(MD024NoDuplicateHeading::default()),
         Box::new(MD025SingleTitle::default()),
         Box::new(MD026NoTrailingPunctuation::default()),
         Box::new(MD027MultipleSpacesBlockquote {}),
@@ -257,8 +257,8 @@ fn get_enabled_rules_from_checkargs(
         Box::new(MD033NoInlineHtml::default()),
         Box::new(MD034NoBareUrls {}),
         Box::new(MD035HRStyle::default()),
-        Box::new(MD036NoEmphasisOnlyFirst {}),
-        Box::new(MD037SpacesAroundEmphasis),
+        Box::new(MD036NoEmphasisAsHeading {}),
+        Box::new(MD037NoSpaceInEmphasis),
         Box::new(MD038NoSpaceInCode::default()),
         Box::new(MD039NoSpaceInLinks),
         Box::new(MD040FencedCodeLanguage {}),
@@ -268,7 +268,7 @@ fn get_enabled_rules_from_checkargs(
         Box::new(MD044ProperNames::new(Vec::new(), true)),
         Box::new(MD045NoAltText::new()),
         Box::new(MD046CodeBlockStyle::new(CodeBlockStyle::Consistent)),
-        Box::new(MD047FileEndNewline),
+        Box::new(MD047SingleTrailingNewline),
         Box::new(MD048CodeFenceStyle::new(CodeFenceStyle::Consistent)),
         Box::new(MD049EmphasisStyle::default()),
         Box::new(MD050StrongStyle::new(StrongStyle::Consistent)),
@@ -737,7 +737,7 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD008ULStyle::default()),
                 Box::new(MD009TrailingSpaces::default()),
                 Box::new(MD010NoHardTabs::default()),
-                Box::new(MD011ReversedLink {}),
+                Box::new(MD011NoReversedLinks {}),
                 Box::new(MD012NoMultipleBlanks::default()),
                 Box::new(MD013LineLength::default()),
                 Box::new(MD015NoMissingSpaceAfterListMarker::default()),
@@ -749,7 +749,7 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD021NoMultipleSpaceClosedAtx {}),
                 Box::new(MD022BlanksAroundHeadings::default()),
                 Box::new(MD023HeadingStartLeft {}),
-                Box::new(MD024MultipleHeadings::default()),
+                Box::new(MD024NoDuplicateHeading::default()),
                 Box::new(MD025SingleTitle::default()),
                 Box::new(MD026NoTrailingPunctuation::default()),
                 Box::new(MD027MultipleSpacesBlockquote {}),
@@ -761,8 +761,8 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD033NoInlineHtml::default()),
                 Box::new(MD034NoBareUrls {}),
                 Box::new(MD035HRStyle::default()),
-                Box::new(MD036NoEmphasisOnlyFirst {}),
-                Box::new(MD037SpacesAroundEmphasis),
+                Box::new(MD036NoEmphasisAsHeading {}),
+                Box::new(MD037NoSpaceInEmphasis),
                 Box::new(MD038NoSpaceInCode::default()),
                 Box::new(MD039NoSpaceInLinks),
                 Box::new(MD040FencedCodeLanguage {}),
@@ -772,7 +772,7 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD044ProperNames::new(Vec::new(), true)),
                 Box::new(MD045NoAltText::new()),
                 Box::new(MD046CodeBlockStyle::new(CodeBlockStyle::Consistent)),
-                Box::new(MD047FileEndNewline),
+                Box::new(MD047SingleTrailingNewline),
                 Box::new(MD048CodeFenceStyle::new(CodeFenceStyle::Consistent)),
                 Box::new(MD049EmphasisStyle::default()),
                 Box::new(MD050StrongStyle::new(StrongStyle::Consistent)),
@@ -944,6 +944,10 @@ build-backend = \"setuptools.build_meta\"
                 use rumdl::rules::*;
                 use std::collections::BTreeMap;
                 use toml::Value;
+                // Build default global config
+                let global = Value::try_from(rumdl_config::GlobalConfig::default())
+                    .unwrap_or(Value::Table(Default::default()));
+                // Build default rule configs
                 let mut rule_map = BTreeMap::new();
                 let all_rules: Vec<Box<dyn Rule>> = vec![
                     Box::new(MD001HeadingIncrement),
@@ -956,7 +960,7 @@ build-backend = \"setuptools.build_meta\"
                     Box::new(MD008ULStyle::default()),
                     Box::new(MD009TrailingSpaces::default()),
                     Box::new(MD010NoHardTabs::default()),
-                    Box::new(MD011ReversedLink {}),
+                    Box::new(MD011NoReversedLinks {}),
                     Box::new(MD012NoMultipleBlanks::default()),
                     Box::new(MD013LineLength::default()),
                     Box::new(MD015NoMissingSpaceAfterListMarker::default()),
@@ -968,7 +972,7 @@ build-backend = \"setuptools.build_meta\"
                     Box::new(MD021NoMultipleSpaceClosedAtx {}),
                     Box::new(MD022BlanksAroundHeadings::default()),
                     Box::new(MD023HeadingStartLeft {}),
-                    Box::new(MD024MultipleHeadings::default()),
+                    Box::new(MD024NoDuplicateHeading::default()),
                     Box::new(MD025SingleTitle::default()),
                     Box::new(MD026NoTrailingPunctuation::default()),
                     Box::new(MD027MultipleSpacesBlockquote {}),
@@ -980,8 +984,8 @@ build-backend = \"setuptools.build_meta\"
                     Box::new(MD033NoInlineHtml::default()),
                     Box::new(MD034NoBareUrls {}),
                     Box::new(MD035HRStyle::default()),
-                    Box::new(MD036NoEmphasisOnlyFirst {}),
-                    Box::new(MD037SpacesAroundEmphasis),
+                    Box::new(MD036NoEmphasisAsHeading {}),
+                    Box::new(MD037NoSpaceInEmphasis),
                     Box::new(MD038NoSpaceInCode::default()),
                     Box::new(MD039NoSpaceInLinks),
                     Box::new(MD040FencedCodeLanguage {}),
@@ -991,7 +995,7 @@ build-backend = \"setuptools.build_meta\"
                     Box::new(MD044ProperNames::new(Vec::new(), true)),
                     Box::new(MD045NoAltText::new()),
                     Box::new(MD046CodeBlockStyle::new(CodeBlockStyle::Consistent)),
-                    Box::new(MD047FileEndNewline),
+                    Box::new(MD047SingleTrailingNewline),
                     Box::new(MD048CodeFenceStyle::new(CodeFenceStyle::Consistent)),
                     Box::new(MD049EmphasisStyle::default()),
                     Box::new(MD050StrongStyle::new(StrongStyle::Consistent)),
@@ -1009,190 +1013,23 @@ build-backend = \"setuptools.build_meta\"
                         rule_map.insert(name, value);
                     }
                 }
-                let mut global = Value::try_from(rumdl_config::GlobalConfig::default())
-                    .unwrap_or(Value::Table(Default::default()));
-                let sourced =
-                    rumdl_config::SourcedConfig::load_sourced_config(cli.config.as_deref(), None);
-                // Overlay global
-                if let Some(global_table) = global.as_table_mut() {
-                    let mut sourced_global_table = toml::map::Map::new();
-                    sourced_global_table.insert(
-                        "enable".to_string(),
-                        Value::Array(
-                            sourced
-                                .global
-                                .enable
-                                .value
-                                .iter()
-                                .map(|s| Value::String(s.clone()))
-                                .collect(),
-                        ),
-                    );
-                    sourced_global_table.insert(
-                        "disable".to_string(),
-                        Value::Array(
-                            sourced
-                                .global
-                                .disable
-                                .value
-                                .iter()
-                                .map(|s| Value::String(s.clone()))
-                                .collect(),
-                        ),
-                    );
-                    sourced_global_table.insert(
-                        "exclude".to_string(),
-                        Value::Array(
-                            sourced
-                                .global
-                                .exclude
-                                .value
-                                .iter()
-                                .map(|s| Value::String(s.clone()))
-                                .collect(),
-                        ),
-                    );
-                    sourced_global_table.insert(
-                        "include".to_string(),
-                        Value::Array(
-                            sourced
-                                .global
-                                .include
-                                .value
-                                .iter()
-                                .map(|s| Value::String(s.clone()))
-                                .collect(),
-                        ),
-                    );
-                    sourced_global_table.insert(
-                        "respect_gitignore".to_string(),
-                        Value::Boolean(sourced.global.respect_gitignore.value),
-                    );
-                    for (k, v) in sourced_global_table {
-                        global_table.insert(k, v);
-                    }
-                }
-                for (rule_name, rule_defaults) in rule_map.iter_mut() {
-                    if let Some(sourced_rule) = sourced.rules.get(rule_name) {
-                        if let Some(defaults_table) = rule_defaults.as_table_mut() {
-                            for (k, sv) in &sourced_rule.values {
-                                defaults_table.insert(k.clone(), sv.value.clone());
-                            }
-                        }
-                    }
-                }
-                // Annotated config output (after all variables are defined)
-                // --- Collect all lines for alignment ---
-                let mut all_lines = Vec::new();
-                // --- GLOBAL SECTION ---
-                let mut global_section_lines = Vec::new();
-                let global_keys = [
-                    ("enable", &sourced.global.enable, "vec"),
-                    ("disable", &sourced.global.disable, "vec"),
-                    ("exclude", &sourced.global.exclude, "vec"),
-                    ("include", &sourced.global.include, "vec"),
-                ];
-                for (key, sourced_val, kind) in &global_keys {
-                    let value_str = match *kind {
-                        "vec" => to_toml_string_vec_string(&sourced_val.value).yellow(),
-                        _ => "<unknown>".yellow(),
-                    };
-                    let src_str_colored = match sourced_val.source {
-                        rumdl_config::ConfigSource::Cli => "CLI".green(),
-                        rumdl_config::ConfigSource::RumdlToml => ".rumdl.toml".blue(),
-                        rumdl_config::ConfigSource::PyprojectToml => "pyproject.toml".magenta(),
-                        rumdl_config::ConfigSource::Default => "default".yellow(),
-                    };
-                    let key_str = key.cyan();
-                    global_section_lines.push((
-                        format!("  {} = {}", key_str, value_str),
-                        format!("[from {}]", src_str_colored),
-                    ));
-                }
-                let sourced_val = &sourced.global.respect_gitignore;
-                let value_str = sourced_val.value.to_string().yellow();
-                let src_str_colored = match sourced_val.source {
-                    rumdl_config::ConfigSource::Cli => "CLI".green(),
-                    rumdl_config::ConfigSource::RumdlToml => ".rumdl.toml".blue(),
-                    rumdl_config::ConfigSource::PyprojectToml => "pyproject.toml".magenta(),
-                    rumdl_config::ConfigSource::Default => "default".yellow(),
-                };
-                let key_str = "respect_gitignore".cyan();
-                global_section_lines.push((
-                    format!("  {} = {}", key_str, value_str),
-                    format!("[from {}]", src_str_colored),
-                ));
-                // Add section marker for printing
-                all_lines.push(("[global]".bold().underline().to_string(), String::new()));
-                all_lines.extend(global_section_lines);
-                // --- RULE SECTIONS ---
-                let mut rule_names: Vec<_> = rule_map.keys().cloned().collect();
+                // Print [global] section first
+                let mut global_table = toml::map::Map::new();
+                global_table.insert("global".to_string(), global);
+                println!(
+                    "{}",
+                    toml::to_string_pretty(&Value::Table(global_table)).unwrap()
+                );
+                // Then print each rule section
+                let mut rule_names: Vec<_> = rule_map.keys().collect();
                 rule_names.sort();
                 for rule_name in rule_names {
-                    let rule_defaults = rule_map.get(&rule_name).unwrap();
-                    let sourced_rule = sourced.rules.get(&rule_name);
-                    if let Some(defaults_table) = rule_defaults.as_table() {
-                        // Add section marker for printing
-                        all_lines.push((
-                            format!("\n{}", format!("[{}]", rule_name).bold().underline()),
-                            String::new(),
-                        ));
-                        let mut keys: Vec<_> = defaults_table.keys().collect();
-                        keys.sort();
-                        for key in keys {
-                            let default_val = &defaults_table[key];
-                            let (value, src_str_colored) = if let Some(sourced_rule) = sourced_rule
-                            {
-                                if let Some(sv) = sourced_rule.values.get(key) {
-                                    (
-                                        sv.value.clone(),
-                                        match sv.source {
-                                            rumdl_config::ConfigSource::Cli => "CLI".green(),
-                                            rumdl_config::ConfigSource::RumdlToml => {
-                                                ".rumdl.toml".blue()
-                                            }
-                                            rumdl_config::ConfigSource::PyprojectToml => {
-                                                "pyproject.toml".magenta()
-                                            }
-                                            rumdl_config::ConfigSource::Default => {
-                                                "default".yellow()
-                                            }
-                                        },
-                                    )
-                                } else {
-                                    (default_val.clone(), "default".yellow())
-                                }
-                            } else {
-                                (default_val.clone(), "default".yellow())
-                            };
-                            let value_str = match value {
-                                Value::Array(arr) => {
-                                    let vals: Vec<String> =
-                                        arr.into_iter().map(|v| v.to_string()).collect();
-                                    format!("[{}]", vals.join(", ")).yellow()
-                                }
-                                Value::String(s) => format!("\"{}\"", s).yellow(),
-                                Value::Boolean(b) => b.to_string().yellow(),
-                                Value::Integer(i) => i.to_string().yellow(),
-                                Value::Float(f) => f.to_string().yellow(),
-                                _ => value.to_string().yellow(),
-                            };
-                            let key_str = key.cyan();
-                            all_lines.push((
-                                format!("  {} = {}", key_str, value_str),
-                                format!("[from {}]", src_str_colored),
-                            ));
-                        }
-                    }
-                }
-                // --- Print all lines with global alignment ---
-                let max_left = all_lines.iter().map(|(l, _)| l.len()).max().unwrap_or(0);
-                for (left, right) in &all_lines {
-                    if right.is_empty() {
-                        println!("{}", left);
-                    } else {
-                        println!("{:<width$} {}", left, right, width = max_left);
-                    }
+                    let mut rule_table = toml::map::Map::new();
+                    rule_table.insert(rule_name.clone(), rule_map[rule_name].clone());
+                    println!(
+                        "{}",
+                        toml::to_string_pretty(&Value::Table(rule_table)).unwrap()
+                    );
                 }
                 return;
             }
@@ -1212,7 +1049,7 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD008ULStyle::default()),
                 Box::new(MD009TrailingSpaces::default()),
                 Box::new(MD010NoHardTabs::default()),
-                Box::new(MD011ReversedLink {}),
+                Box::new(MD011NoReversedLinks {}),
                 Box::new(MD012NoMultipleBlanks::default()),
                 Box::new(MD013LineLength::default()),
                 Box::new(MD015NoMissingSpaceAfterListMarker::default()),
@@ -1224,7 +1061,7 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD021NoMultipleSpaceClosedAtx {}),
                 Box::new(MD022BlanksAroundHeadings::default()),
                 Box::new(MD023HeadingStartLeft {}),
-                Box::new(MD024MultipleHeadings::default()),
+                Box::new(MD024NoDuplicateHeading::default()),
                 Box::new(MD025SingleTitle::default()),
                 Box::new(MD026NoTrailingPunctuation::default()),
                 Box::new(MD027MultipleSpacesBlockquote {}),
@@ -1236,8 +1073,8 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD033NoInlineHtml::default()),
                 Box::new(MD034NoBareUrls {}),
                 Box::new(MD035HRStyle::default()),
-                Box::new(MD036NoEmphasisOnlyFirst {}),
-                Box::new(MD037SpacesAroundEmphasis),
+                Box::new(MD036NoEmphasisAsHeading {}),
+                Box::new(MD037NoSpaceInEmphasis),
                 Box::new(MD038NoSpaceInCode::default()),
                 Box::new(MD039NoSpaceInLinks),
                 Box::new(MD040FencedCodeLanguage {}),
@@ -1247,7 +1084,7 @@ build-backend = \"setuptools.build_meta\"
                 Box::new(MD044ProperNames::new(Vec::new(), true)),
                 Box::new(MD045NoAltText::new()),
                 Box::new(MD046CodeBlockStyle::new(CodeBlockStyle::Consistent)),
-                Box::new(MD047FileEndNewline),
+                Box::new(MD047SingleTrailingNewline),
                 Box::new(MD048CodeFenceStyle::new(CodeFenceStyle::Consistent)),
                 Box::new(MD049EmphasisStyle::default()),
                 Box::new(MD050StrongStyle::new(StrongStyle::Consistent)),

{rumdl-0.0.49 → rumdl-0.0.51}/src/rules/heading_utils.rs

@@ -58,7 +58,7 @@ impl HeadingUtils {
 
         for line in content.lines() {
             line_count += 1;
-            if line_count > line_number + 1 {
+            if line_count > line_number {
                 break;
             }
 

{rumdl-0.0.49 → rumdl-0.0.51}/src/rules/md011_no_reversed_links.rs

@@ -1,5 +1,4 @@
-
-use crate::rule::{Fix, LintError, LintResult, LintWarning, Rule};
+use crate::rule::{Fix, LintError, LintResult, LintWarning, Rule, Severity};
 use regex::Regex;
 
 #[derive(Debug, Default)]
@@ -16,10 +15,15 @@ impl MD011NoReversedLinks {
             for cap in re.captures_iter(line) {
                 if cap.get(3).is_some() {
                     // Found reversed link syntax (text)[url]
-                    let url = cap[3].trim_matches('(').trim_matches(')');
-                    let text = &cap[4];
+                    let text = cap[3].trim_matches('(').trim_matches(')');
+                    let url = &cap[4];
                     let start = line_start + cap.get(0).unwrap().start();
-                    results.push((current_line, start - line_start + 1, text.to_string(), url.to_string()));
+                    results.push((
+                        current_line,
+                        start - line_start + 1,
+                        text.to_string(),
+                        url.to_string(),
+                    ));
                 }
             }
             line_start += line.len() + 1; // +1 for newline
@@ -65,13 +69,13 @@ impl Rule for MD011NoReversedLinks {
             for cap in re.captures_iter(line) {
                 let column = line_start + cap.get(0).unwrap().start() + 1;
                 warnings.push(LintWarning {
-            rule_name: Some(self.name()),
+                    rule_name: Some(self.name()),
                     message: "Reversed link syntax".to_string(),
                     line: line_num + 1,
                     column,
+                    severity: Severity::Warning,
                     fix: Some(Fix {
-                        line: line_num + 1,
-                        column,
+                        range: (0..0), // TODO: Replace with correct byte range if available
                         replacement: format!("[{}]({})", &cap[2], &cap[1]),
                     }),
                 });
@@ -101,10 +105,7 @@ impl Rule for MD011NoReversedLinks {
                 let adjusted_pos = pos + offset;
                 let original_len = format!("({})[{}]", url, text).len();
                 let replacement = format!("[{}]({})", text, url);
-                result.replace_range(
-                    adjusted_pos..adjusted_pos + original_len,
-                    &replacement
-                );
+                result.replace_range(adjusted_pos..adjusted_pos + original_len, &replacement);
                 // Update offset based on the difference in lengths
                 if replacement.len() > original_len {
                     offset += replacement.len() - original_len;
@@ -116,4 +117,8 @@ impl Rule for MD011NoReversedLinks {
 
         Ok(result)
     }
-} 
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}